--- valgrind-3.6.1.orig/debian/debian.supp +++ valgrind-3.6.1/debian/debian.supp @@ -0,0 +1,469 @@ +## +## Debian-specific suppressions +## + +{ + Debian libc6 (2.3.x) stripped dynamic linker + Memcheck:Cond + obj:/lib/ld-2.3.*.so + obj:/lib/ld-2.3.*.so + obj:/lib/ld-2.3.*.so + obj:/lib/ld-2.3.*.so + obj:/lib/ld-2.3.*.so +} + +{ + Debian libc6 (2.4.x) stripped dynamic linker + Memcheck:Cond + obj:/lib/ld-2.4.so + obj:/lib/ld-2.4.so + obj:/lib/ld-2.4.so + obj:/lib/ld-2.4.so + obj:/lib/ld-2.4.so +} + +{ + Debian libc6 (2.5.x) stripped dynamic linker + Memcheck:Cond + obj:/lib/ld-2.5.so + obj:/lib/ld-2.5.so + obj:/lib/ld-2.5.so + obj:/lib/ld-2.5.so + obj:/lib/ld-2.5.so +} + +{ + strchr/libc-2.3.2.so/_dl_catch_error(Cond) + Memcheck:Cond + fun:strchr + obj:*libc-2.3.2.so + fun:_dl_catch_error + obj:*libc-2.3.2.so +} + +{ + "Xlib does not zero out unused bytes in the protocol stream"; see http://keithp.com/~keithp/talks/usenix2003/html/net.html + Memcheck:Param + writev(vector[...]) + fun:vgAllRoadsLeadToRome_writev + fun:__writev + obj:/usr/X11R6/lib/libX11.so.6.2 + fun:_X11TransWritev +} + +{ + Debian_dlopen + Memcheck:Cond + fun:_dl_relocate_object + fun:dl_open_worker + fun:_dl_catch_error + fun:__GI__dl_open +} + +{ + Debian_dlopen2 + Memcheck:Addr1 + obj:/lib/ld-2.3.2.so + fun:_dl_map_object + fun:dl_open_worker + fun:_dl_catch_error +} + +{ + Debian_dlopen3 + Memcheck:Addr1 + obj:/lib/ld-2.3.2.so + fun:_dl_map_object + obj:/lib/ld-2.3.2.so + fun:_dl_catch_error +} +{ + Debian_dlopen4 + Memcheck:Addr1 + obj:/lib/ld-2.3.2.so + fun:_dl_check_map_versions + fun:dl_open_worker + fun:_dl_catch_error +} +{ + Debian_gcc_supp + Memcheck:Addr4 + obj:/lib/libgcc_s.so.1 + fun:__dl_iterate_phdr + fun:_Unwind_Find_FDE + obj:/lib/libgcc_s.so.1 +} + +{ + Debian zlib1g suppression + Memcheck:Cond + obj:/usr/lib/libz.so.1.2.2 + obj:/usr/lib/libz.so.1.2.2 + fun:deflate + fun:main +} + +# Glib stores pointers in an integral type. Bug#231989 +{ + glib type registry + Memcheck:Leak + fun:calloc + fun:g_malloc0 + fun:type_node_any_new_W +} + +{ + Debian rpmatch (malloc) static allocations + Memcheck:Leak + fun:malloc + obj:/lib/tls/libc-2.3.6.so + obj:/lib/tls/libc-2.3.6.so + obj:/lib/tls/libc-2.3.6.so + obj:/lib/tls/libc-2.3.6.so + fun:regcomp + fun:rpmatch + fun:main +} +{ + Debian rpmatch (malloc) static allocations + Memcheck:Leak + fun:malloc + obj:/lib/tls/libc-2.3.6.so + obj:/lib/tls/libc-2.3.6.so + obj:/lib/tls/libc-2.3.6.so + fun:regcomp + fun:rpmatch + fun:main +} +{ + Debian rpmatch (malloc) static allocations + Memcheck:Leak + fun:malloc + obj:/lib/tls/libc-2.3.6.so + obj:/lib/tls/libc-2.3.6.so + fun:regcomp + fun:rpmatch + fun:main +} +{ + Debian rpmatch (malloc) static allocations + Memcheck:Leak + fun:malloc + obj:/lib/tls/libc-2.3.6.so + fun:regcomp + fun:rpmatch + fun:main +} + +{ + Debian rpmatch (calloc) static allocations + Memcheck:Leak + fun:calloc + obj:/lib/tls/libc-2.3.6.so + obj:/lib/tls/libc-2.3.6.so + obj:/lib/tls/libc-2.3.6.so + obj:/lib/tls/libc-2.3.6.so + obj:/lib/tls/libc-2.3.6.so + fun:regcomp + fun:rpmatch + fun:main +} +{ + Debian rpmatch (malloc) static allocations + Memcheck:Leak + fun:malloc + obj:/lib/tls/libc-2.3.6.so + fun:regcomp + fun:rpmatch + fun:main +} +{ + Debian rpmatch (malloc) static allocations + Memcheck:Leak + fun:malloc + obj:/lib/tls/libc-2.3.6.so + fun:regcomp + fun:rpmatch + fun:main +} +{ + Debian rpmatch (calloc) static allocations + Memcheck:Leak + fun:calloc + obj:/lib/tls/libc-2.3.6.so + fun:regcomp + fun:rpmatch + fun:main +} +{ + Debian rpmatch (calloc) static allocations + Memcheck:Leak + fun:calloc + obj:/lib/tls/libc-2.3.6.so + obj:/lib/tls/libc-2.3.6.so + fun:regcomp + fun:rpmatch + fun:main +} +{ + Debian rpmatch (malloc - realloc) static allocations + Memcheck:Leak + fun:malloc + fun:realloc + obj:/lib/tls/libc-2.3.6.so + fun:regcomp + fun:rpmatch + fun:main +} +{ + Debian rpmatch (malloc) static allocations + Memcheck:Leak + fun:malloc + fun:regcomp + fun:rpmatch + fun:main +} + +# +# This is a valgrind suppression file that should be used when using python +# +# You must edit Objects/obmalloc.c and uncomment Py_USING_MEMORY_DEBUGGER +# to use the preferred suppressions with Py_ADDRESS_IN_RANGE. +# +# If you do not want to recompile Python, you can uncomment +# suppressions for PyObject_Free and PyObject_Realloc. +# +# See Misc/README.valgrind in the python source for more information. + +# all tool names: Addrcheck,Memcheck,cachegrind,helgrind,massif +{ + ADDRESS_IN_RANGE/Invalid read of size 4 + Memcheck:Addr4 + fun:Py_ADDRESS_IN_RANGE +} + +{ + ADDRESS_IN_RANGE/Invalid read of size 4 + Memcheck:Value4 + fun:Py_ADDRESS_IN_RANGE +} + +{ + ADDRESS_IN_RANGE/Conditional jump or move depends on uninitialised value + Memcheck:Cond + fun:Py_ADDRESS_IN_RANGE +} + +###{ +### ADDRESS_IN_RANGE/Invalid read of size 4 +### Memcheck:Addr4 +### fun:PyObject_Free +###} +### +###{ +### ADDRESS_IN_RANGE/Invalid read of size 4 +### Memcheck:Value4 +### fun:PyObject_Free +###} +### +###{ +### ADDRESS_IN_RANGE/Conditional jump or move depends on uninitialised value +### Memcheck:Cond +### fun:PyObject_Free +###} + +###{ +### ADDRESS_IN_RANGE/Invalid read of size 4 +### Memcheck:Addr4 +### fun:PyObject_Realloc +###} +### +###{ +### ADDRESS_IN_RANGE/Invalid read of size 4 +### Memcheck:Value4 +### fun:PyObject_Realloc +###} +### +###{ +### ADDRESS_IN_RANGE/Conditional jump or move depends on uninitialised value +### Memcheck:Cond +### fun:PyObject_Realloc +###} + +### +### All the suppressions below are for errors that occur within libraries +### that Python uses. The problems to not appear to be related to Python's +### use of the libraries. +### +{ + GDBM problems, see test_gdbm + Memcheck:Param + write(buf) + fun:write + fun:gdbm_open + +} + +### +### These occur from somewhere within the SSL, when running +### test_socket_sll. They are too general to leave on by default. +### +###{ +### somewhere in SSL stuff +### Memcheck:Cond +### fun:memset +###} +###{ +### somewhere in SSL stuff +### Memcheck:Value4 +### fun:memset +###} +### +###{ +### somewhere in SSL stuff +### Memcheck:Cond +### fun:MD5_Update +###} +### +###{ +### somewhere in SSL stuff +### Memcheck:Value4 +### fun:MD5_Update +###} + +# +# All of these problems come from using test_socket_ssl +# +{ + from test_socket_ssl + Memcheck:Cond + fun:BN_bin2bn +} + +{ + from test_socket_ssl + Memcheck:Cond + fun:BN_num_bits_word +} + +{ + from test_socket_ssl + Memcheck:Value4 + fun:BN_num_bits_word +} + +{ + from test_socket_ssl + Memcheck:Cond + fun:BN_mod_exp_mont_word +} + +{ + from test_socket_ssl + Memcheck:Cond + fun:BN_mod_exp_mont +} + +{ + from test_socket_ssl + Memcheck:Param + write(buf) + fun:write + obj:/usr/lib/libcrypto.so.0.9.7 +} + +{ + from test_socket_ssl + Memcheck:Cond + fun:RSA_verify +} + +{ + from test_socket_ssl + Memcheck:Value4 + fun:RSA_verify +} + +{ + from test_socket_ssl + Memcheck:Value4 + fun:DES_set_key_unchecked +} + +{ + from test_socket_ssl + Memcheck:Value4 + fun:DES_encrypt2 +} + +{ + from test_socket_ssl + Memcheck:Cond + obj:/usr/lib/libssl.so.0.9.7 +} + +{ + from test_socket_ssl + Memcheck:Value4 + obj:/usr/lib/libssl.so.0.9.7 +} + +{ + from test_socket_ssl + Memcheck:Cond + fun:BUF_MEM_grow_clean +} + +{ + from test_socket_ssl + Memcheck:Cond + fun:memcpy + fun:ssl3_read_bytes +} + +{ + from test_socket_ssl + Memcheck:Cond + fun:SHA1_Update +} + +{ + from test_socket_ssl + Memcheck:Value4 + fun:SHA1_Update +} + +{ + Debian libc6 (2.9.x) stripped dynamic linker + Memcheck:Cond + obj:/lib/ld-2.9.so + obj:/lib/ld-2.9.so + obj:/lib/ld-2.9.so + obj:/lib/ld-2.9.so + obj:/lib/ld-2.9.so + +} +{ + Debian libc6 (2.10.x) stripped dynamic linker + Memcheck:Cond + fun:index + fun:expand_dynamic_string_token + fun:_dl_map_object + fun:map_doit + fun:_dl_catch_error + fun:do_preload + fun:dl_main + fun:_dl_sysdep_start + fun:_dl_start + obj:/lib/ld-2.10.1.so +} +{ + Debian libc6 (2.10.x) stripped dynamic linker + Memcheck:Cond + fun:_dl_relocate_object + fun:dl_main + fun:_dl_sysdep_start + fun:_dl_start + obj:/lib/ld-2.10.1.so +} + --- valgrind-3.6.1.orig/debian/rules +++ valgrind-3.6.1/debian/rules @@ -0,0 +1,85 @@ +#!/usr/bin/make -f + +include /usr/share/dpatch/dpatch.make + +DEB_HOST_GNU_CPU ?= $(shell dpkg-achitecture -qDEB_HOST_GNU_CPU) + +# Upstream build defaults to -O2 -g -Wall; pass -O0 when noopt is set +CFLAGS += -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0) + +# Works around FTBFS in Thumb mode; see KDE #247978 +ifeq ($(DEB_HOST_GNU_CPU),arm) +CFLAGS += -marm +endif + +config.sub config.guess: %: /usr/share/misc/% + cp -a $< $@ + +config.status: config.sub config.guess $(DPATCH_STAMPFN) + dh_testdir + cat xfree-4.supp debian/debian.supp > debian.supp + ./configure --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --disable-maintainer-mode \ + CFLAGS="$(CFLAGS)" + +build: build-stamp +build-stamp: config.status + dh_testdir + # CFLAGS should only have to be passed to configure, but they get + # overriden by the upstream logic; see KDE #247980; fixed in SVN + $(MAKE) CFLAGS+="-Wno-long-long -Wno-pointer-sign -fno-stack-protector $(CFLAGS)" + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + [ ! -f Makefile ] || $(MAKE) distclean + dh_clean debian.supp + $(MAKE) -f debian/rules unpatch + +target=$(CURDIR)/debian/valgrind +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) install prefix=$(CURDIR)/debian/valgrind/usr + + # Debian stuff + cp -f debian/debian-libc6-dbg.supp $(target)/usr/lib/valgrind + mv -f $(target)/usr/bin/valgrind $(target)/usr/bin/valgrind.bin + cp -f debian/valgrind.sh $(target)/usr/bin/valgrind + chown root.root $(target)/usr/bin/valgrind.bin $(target)/usr/bin/valgrind + chmod 755 $(target)/usr/bin/valgrind.bin $(target)/usr/bin/valgrind + + install -p -m644 debian.supp $(target)/usr/lib/valgrind + install -p -d -m755 $(target)/usr/share/doc/valgrind/html + install -p -d -m755 $(target)/usr/share/lintian/overrides + install -p -m644 debian/overrides $(target)/usr/share/lintian/overrides/valgrind + install -p -m644 debian/valgrind.bash $(target)/etc/bash_completion.d/valgrind + + +binary-indep: build install + +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installexamples + dh_installmenu + dh_installchangelogs NEWS + dh_link + #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 patch unpatch --- valgrind-3.6.1.orig/debian/overrides +++ valgrind-3.6.1/debian/overrides @@ -0,0 +1,156 @@ +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/libpthread.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/valgrind.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/valgrinq.so +valgrind: unstripped-binary-or-object ./usr/bin/valgrind-listener +valgrind: unstripped-binary-or-object ./usr/bin/valgrind.bin +valgrind: statically-linked-binary ./usr/bin/valgrind.bin +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/vg_inject.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/hp2ps +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/vgpreload_massif.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/vgpreload_helgrind.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/vgpreload_addrcheck.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/stage2 +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/vgpreload_memcheck.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/valgrind +valgrind: statically-linked-binary ./usr/lib/valgrind/valgrind +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/vgskin_massif.so +valgrind: shlib-with-non-pic-code usr/lib/valgrind/vgtool_memcheck.so +valgrind: shlib-with-non-pic-code usr/lib/valgrind/vgtool_cachegrind.so +valgrind: shlib-with-non-pic-code usr/lib/valgrind/vgtool_none.so +valgrind: shlib-with-non-pic-code usr/lib/valgrind/vgtool_helgrind.so +valgrind: shlib-with-non-pic-code usr/lib/valgrind/vgpreload_memcheck.so +valgrind: shlib-with-non-pic-code usr/lib/valgrind/vgtool_lackey.so +valgrind: shlib-with-non-pic-code usr/lib/valgrind/vgtool_massif.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/vgtool_memcheck.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/vgtool_cachegrind.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/vgtool_none.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/vgtool_helgrind.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/vgtool_lackey.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/vgtool_massif.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/vg_preload_core.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/amd64-linux/cachegrind +valgrind: statically-linked-binary ./usr/lib/valgrind/amd64-linux/cachegrind +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/amd64-linux/callgrind +valgrind: statically-linked-binary ./usr/lib/valgrind/amd64-linux/callgrind +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/amd64-linux/helgrind +valgrind: statically-linked-binary ./usr/lib/valgrind/amd64-linux/helgrind +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/amd64-linux/lackey +valgrind: statically-linked-binary ./usr/lib/valgrind/amd64-linux/lackey +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/amd64-linux/massif +valgrind: statically-linked-binary ./usr/lib/valgrind/amd64-linux/massif +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/amd64-linux/memcheck +valgrind: statically-linked-binary ./usr/lib/valgrind/amd64-linux/memcheck +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/amd64-linux/none +valgrind: statically-linked-binary ./usr/lib/valgrind/amd64-linux/none +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/amd64-linux/vgpreload_core.so +valgrind: shared-lib-without-dependency-information ./usr/lib/valgrind/amd64-linux/vgpreload_core.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/amd64-linux/vgpreload_helgrind.so +valgrind: shared-lib-without-dependency-information ./usr/lib/valgrind/amd64-linux/vgpreload_helgrind.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/amd64-linux/vgpreload_massif.so +valgrind: shared-lib-without-dependency-information ./usr/lib/valgrind/amd64-linux/vgpreload_massif.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/amd64-linux/vgpreload_memcheck.so +valgrind: shared-lib-without-dependency-information ./usr/lib/valgrind/amd64-linux/vgpreload_memcheck.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/x86-linux/cachegrind +valgrind: statically-linked-binary ./usr/lib/valgrind/x86-linux/cachegrind +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/x86-linux/callgrind +valgrind: statically-linked-binary ./usr/lib/valgrind/x86-linux/callgrind +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/x86-linux/helgrind +valgrind: statically-linked-binary ./usr/lib/valgrind/x86-linux/helgrind +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/x86-linux/lackey +valgrind: statically-linked-binary ./usr/lib/valgrind/x86-linux/lackey +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/x86-linux/massif +valgrind: statically-linked-binary ./usr/lib/valgrind/x86-linux/massif +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/x86-linux/memcheck +valgrind: statically-linked-binary ./usr/lib/valgrind/x86-linux/memcheck +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/x86-linux/none +valgrind: statically-linked-binary ./usr/lib/valgrind/x86-linux/none +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/x86-linux/vgpreload_core.so +valgrind: shared-lib-without-dependency-information ./usr/lib/valgrind/x86-linux/vgpreload_core.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/x86-linux/vgpreload_helgrind.so +valgrind: shared-lib-without-dependency-information ./usr/lib/valgrind/x86-linux/vgpreload_helgrind.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/x86-linux/vgpreload_massif.so +valgrind: shared-lib-without-dependency-information ./usr/lib/valgrind/x86-linux/vgpreload_massif.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/x86-linux/vgpreload_memcheck.so +valgrind: shared-lib-without-dependency-information ./usr/lib/valgrind/x86-linux/vgpreload_memcheck.so +valgrind: unstripped-binary-or-object ./usr/bin/cg_merge +valgrind: unstripped-binary-or-object ./usr/bin/no_op_client_for_valgrind +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/amd64-linux/exp-drd +valgrind: statically-linked-binary ./usr/lib/valgrind/amd64-linux/exp-drd +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/amd64-linux/exp-omega +valgrind: statically-linked-binary ./usr/lib/valgrind/amd64-linux/exp-omega +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/amd64-linux/vgpreload_exp-drd.so +valgrind: shared-lib-without-dependency-information ./usr/lib/valgrind/amd64-linux/vgpreload_exp-drd.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/amd64-linux/vgpreload_exp-omega.so +valgrind: shared-lib-without-dependency-information ./usr/lib/valgrind/amd64-linux/vgpreload_exp-omega.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/x86-linux/exp-drd +valgrind: statically-linked-binary ./usr/lib/valgrind/x86-linux/exp-drd +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/x86-linux/exp-omega +valgrind: statically-linked-binary ./usr/lib/valgrind/x86-linux/exp-omega +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/x86-linux/vgpreload_exp-drd.so +valgrind: shared-lib-without-dependency-information ./usr/lib/valgrind/x86-linux/vgpreload_exp-drd.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/x86-linux/vgpreload_exp-omega.so +valgrind: shared-lib-without-dependency-information ./usr/lib/valgrind/x86-linux/vgpreload_exp-omega.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/cachegrind-amd64-linux +valgrind: statically-linked-binary ./usr/lib/valgrind/cachegrind-amd64-linux +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/cachegrind-x86-linux +valgrind: statically-linked-binary ./usr/lib/valgrind/cachegrind-x86-linux +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/callgrind-amd64-linux +valgrind: statically-linked-binary ./usr/lib/valgrind/callgrind-amd64-linux +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/callgrind-x86-linux +valgrind: statically-linked-binary ./usr/lib/valgrind/callgrind-x86-linux +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/drd-amd64-linux +valgrind: statically-linked-binary ./usr/lib/valgrind/drd-amd64-linux +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/drd-x86-linux +valgrind: statically-linked-binary ./usr/lib/valgrind/drd-x86-linux +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/exp-bbv-amd64-linux +valgrind: statically-linked-binary ./usr/lib/valgrind/exp-bbv-amd64-linux +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/exp-bbv-x86-linux +valgrind: statically-linked-binary ./usr/lib/valgrind/exp-bbv-x86-linux +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/exp-ptrcheck-amd64-linux +valgrind: statically-linked-binary ./usr/lib/valgrind/exp-ptrcheck-amd64-linux +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/exp-ptrcheck-x86-linux +valgrind: statically-linked-binary ./usr/lib/valgrind/exp-ptrcheck-x86-linux +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/helgrind-amd64-linux +valgrind: statically-linked-binary ./usr/lib/valgrind/helgrind-amd64-linux +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/helgrind-x86-linux +valgrind: statically-linked-binary ./usr/lib/valgrind/helgrind-x86-linux +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/lackey-amd64-linux +valgrind: statically-linked-binary ./usr/lib/valgrind/lackey-amd64-linux +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/lackey-x86-linux +valgrind: statically-linked-binary ./usr/lib/valgrind/lackey-x86-linux +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/massif-amd64-linux +valgrind: statically-linked-binary ./usr/lib/valgrind/massif-amd64-linux +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/massif-x86-linux +valgrind: statically-linked-binary ./usr/lib/valgrind/massif-x86-linux +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/memcheck-amd64-linux +valgrind: statically-linked-binary ./usr/lib/valgrind/memcheck-amd64-linux +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/memcheck-x86-linux +valgrind: statically-linked-binary ./usr/lib/valgrind/memcheck-x86-linux +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/none-amd64-linux +valgrind: statically-linked-binary ./usr/lib/valgrind/none-amd64-linux +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/none-x86-linux +valgrind: statically-linked-binary ./usr/lib/valgrind/none-x86-linux +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/vgpreload_core-amd64-linux.so +valgrind: shared-lib-without-dependency-information ./usr/lib/valgrind/vgpreload_core-amd64-linux.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/vgpreload_core-x86-linux.so +valgrind: shared-lib-without-dependency-information ./usr/lib/valgrind/vgpreload_core-x86-linux.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/vgpreload_drd-amd64-linux.so +valgrind: shared-lib-without-dependency-information ./usr/lib/valgrind/vgpreload_drd-amd64-linux.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/vgpreload_drd-x86-linux.so +valgrind: shared-lib-without-dependency-information ./usr/lib/valgrind/vgpreload_drd-x86-linux.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/vgpreload_exp-ptrcheck-amd64-linux.so +valgrind: shared-lib-without-dependency-information ./usr/lib/valgrind/vgpreload_exp-ptrcheck-amd64-linux.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/vgpreload_exp-ptrcheck-x86-linux.so +valgrind: shared-lib-without-dependency-information ./usr/lib/valgrind/vgpreload_exp-ptrcheck-x86-linux.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/vgpreload_helgrind-amd64-linux.so +valgrind: shared-lib-without-dependency-information ./usr/lib/valgrind/vgpreload_helgrind-amd64-linux.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/vgpreload_helgrind-x86-linux.so +valgrind: shared-lib-without-dependency-information ./usr/lib/valgrind/vgpreload_helgrind-x86-linux.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/vgpreload_massif-amd64-linux.so +valgrind: shared-lib-without-dependency-information ./usr/lib/valgrind/vgpreload_massif-amd64-linux.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/vgpreload_massif-x86-linux.so +valgrind: shared-lib-without-dependency-information ./usr/lib/valgrind/vgpreload_massif-x86-linux.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so +valgrind: shared-lib-without-dependency-information ./usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so +valgrind: unstripped-binary-or-object ./usr/lib/valgrind/vgpreload_memcheck-x86-linux.so +valgrind: shared-lib-without-dependency-information ./usr/lib/valgrind/vgpreload_memcheck-x86-linux.so --- valgrind-3.6.1.orig/debian/manpages +++ valgrind-3.6.1/debian/manpages @@ -0,0 +1 @@ +docs/valgrind.1 --- valgrind-3.6.1.orig/debian/README.Debian +++ valgrind-3.6.1/debian/README.Debian @@ -0,0 +1,36 @@ +valgrind for Debian +------------------- + +Valgrind is currently compiled under kernel 2.4 and hence the NPTL +support is disabled. In fact, this valgrind source compiles on kernel 2.6 +because a patch I've made and will work fine for most of the programs. + +Valgrind does not currently support NPTL yet just as one expect. This may +lead to some "Assertion failure" messages mostly on TLS and generally +thread-based programs. + +The new --watchpoint flag for the memcheck tool (former called skin) is +easy to use. + +From the watchpoint upstream patch: + +(...) + + You can also set watchpoints on the command line using --watchpoint=WP,... + WP is of the form X, X-Y or X+Y for a single address, an address range + or an address and length, respectively. X and Y can be decimal or + hexadecimal numbers. Hexadecimal numbers are prefixed with 0x. You can + specify the --watchpoint option as many times as you want. + + Watchpoints are triggered when memory within the address range is read + or written to, when memory is allocated or freed on top of the address + range or when the address range goes into or out of scope on the stack. + + When a watchpoint is triggered, the stack backtrace from the triggering + location is printed out, along with a count of the number of times the + watchpoint has been triggered. + +(...) + + + -- Andrés Roldán Tue, 10 Feb 2004 18:43:25 +0000 --- valgrind-3.6.1.orig/debian/FAQ.txt +++ valgrind-3.6.1/debian/FAQ.txt @@ -0,0 +1,430 @@ + + +Valgrind FAQ +Release 3.2.0 7 June 2006 +~~~~~~~~~~~~~~~~~~~~~~~~~ + +Table of Contents +1. Background +2. Compiling, installing and configuring +3. Valgrind aborts unexpectedly +4. Valgrind behaves unexpectedly +5. Memcheck doesn't find my bug +6. Miscellaneous +7. How To Get Further Assistance + +------------------------------------------------------------------------ +1. Background +------------------------------------------------------------------------ + +1.1. How do you pronounce "Valgrind"? + +The "Val" as in the world "value". The "grind" is pronounced with a +short 'i' -- ie. "grinned" (rhymes with "tinned") rather than "grined" +(rhymes with "find"). + +Don't feel bad: almost everyone gets it wrong at first. + +------------------------------------------------------------------------ + +1.2. Where does the name "Valgrind" come from? + +From Nordic mythology. Originally (before release) the project was named +Heimdall, after the watchman of the Nordic gods. He could "see a hundred +miles by day or night, hear the grass growing, see the wool growing on a +sheep's back" (etc). This would have been a great name, but it was +already taken by a security package "Heimdal". + +Keeping with the Nordic theme, Valgrind was chosen. Valgrind is the name +of the main entrance to Valhalla (the Hall of the Chosen Slain in +Asgard). Over this entrance there resides a wolf and over it there is +the head of a boar and on it perches a huge eagle, whose eyes can see to +the far regions of the nine worlds. Only those judged worthy by the +guardians are allowed to pass through Valgrind. All others are refused +entrance. + +It's not short for "value grinder", although that's not a bad guess. + + +------------------------------------------------------------------------ +2. Compiling, installing and configuring +------------------------------------------------------------------------ + +2.1. When I trying building Valgrind, 'make' dies partway with an +assertion failure, something like this: + + % make: expand.c:489: allocated_variable_append: + Assertion 'current_variable_set_list->next != 0' failed. + +It's probably a bug in 'make'. Some, but not all, instances of version +3.79.1 have this bug, see +www.mail-archive.com/bug-make@gnu.org/msg01658.html. Try upgrading to a +more recent version of 'make'. Alternatively, we have heard that +unsetting the CFLAGS environment variable avoids the problem. + +------------------------------------------------------------------------ + +2.2. When I try to build Valgrind, 'make' fails with /usr/bin/ld: cannot +find -lc collect2: ld returned 1 exit status + +You need to install the glibc-static-devel package. + + +------------------------------------------------------------------------ +3. Valgrind aborts unexpectedly +------------------------------------------------------------------------ + +3.1. Programs run OK on Valgrind, but at exit produce a bunch of errors +involving __libc_freeres() and then die with a segmentation fault. + +When the program exits, Valgrind runs the procedure __libc_freeres() in +glibc. This is a hook for memory debuggers, so they can ask glibc to +free up any memory it has used. Doing that is needed to ensure that +Valgrind doesn't incorrectly report space leaks in glibc. + +Problem is that running __libc_freeres() in older glibc versions causes +this crash. + +WORKAROUND FOR 1.1.X and later versions of Valgrind: use the +--run-libc-freeres=no flag. You may then get space leak reports for +glibc-allocations (please _don't_ report these to the glibc people, +since they are not real leaks), but at least the program runs. + +------------------------------------------------------------------------ + +3.2. My (buggy) program dies like this: + + % valgrind: vg_malloc2.c:442 (bszW_to_pszW): Assertion 'pszW >= 0' failed. + +If Memcheck (the memory checker) shows any invalid reads, invalid writes +and invalid frees in your program, the above may happen. Reason is that +your program may trash Valgrind's low-level memory manager, which then +dies with the above assertion, or something like this. The cure is to +fix your program so that it doesn't do any illegal memory accesses. The +above failure will hopefully go away after that. + +------------------------------------------------------------------------ + +3.3. My program dies, printing a message like this along the way: + + % disInstr: unhandled instruction bytes: 0x66 0xF 0x2E 0x5 + +Older versions did not support some x86 instructions, particularly +SSE/SSE2 instructions. Try a newer Valgrind; we now support almost all +instructions. If it still happens with newer versions, if the failing +instruction is an SSE/SSE2 instruction, you might be able to recompile +your program without it by using the flag -march to gcc. Either way, let +us know and we'll try to fix it. + +Another possibility is that your program has a bug and erroneously jumps +to a non-code address, in which case you'll get a SIGILL signal. +Memcheck may issue a warning just before this happens, but they might +not if the jump happens to land in addressable memory. + +------------------------------------------------------------------------ + +3.4. I tried running a Java program (or another program that uses a +just-in-time compiler) under Valgrind but something went wrong. Does +Valgrind handle such programs? + +Valgrind can handle dynamically generated code, so long as none of the +generated code is later overwritten by other generated code. If this +happens, though, things will go wrong as Valgrind will continue running +its translations of the old code (this is true on x86 and AMD64, on +PPC32 there are explicit cache flush instructions which Valgrind +detects). You should try running with --smc-check=all in this case; +Valgrind will run much more slowly, but should detect the use of the +out-of-date code. + +Alternativaly, if you have the source code to the JIT compiler you can +insert calls to the VALGRIND_DISCARD_TRANSLATIONS client request to mark +out-of-date code, saving you from using --smc-check=all. + +Apart from this, in theory Valgrind can run any Java program just fine, +even those that use JNI and are partially implemented in other languages +like C and C++. In practice, Java implementations tend to do nasty +things that most programs do not, and Valgrind sometimes falls over +these corner cases. + +If your Java programs do not run under Valgrind, even with +--smc-check=all, please file a bug report and hopefully we'll be able to +fix the problem. + + +------------------------------------------------------------------------ +4. Valgrind behaves unexpectedly +------------------------------------------------------------------------ + +4.1. My program uses the C++ STL and string classes. Valgrind reports +'still reachable' memory leaks involving these classes at the exit of +the program, but there should be none. + +First of all: relax, it's probably not a bug, but a feature. Many +implementations of the C++ standard libraries use their own memory pool +allocators. Memory for quite a number of destructed objects is not +immediately freed and given back to the OS, but kept in the pool(s) for +later re-use. The fact that the pools are not freed at the exit() of the +program cause Valgrind to report this memory as still reachable. The +behaviour not to free pools at the exit() could be called a bug of the +library though. + +Using gcc, you can force the STL to use malloc and to free memory as +soon as possible by globally disabling memory caching. Beware! Doing so +will probably slow down your program, sometimes drastically. + +* With gcc 2.91, 2.95, 3.0 and 3.1, compile all source using the STL +with -D__USE_MALLOC. Beware! This is removed from gcc starting with +version 3.3. + +* With gcc 3.2.2 and later, you should export the environment variable +GLIBCPP_FORCE_NEW before running your program. + +* With gcc 3.4 and later, that variable has changed name to +GLIBCXX_FORCE_NEW. + +There are other ways to disable memory pooling: using the malloc_alloc +template with your objects (not portable, but should work for gcc) or +even writing your own memory allocators. But all this goes beyond the +scope of this FAQ. Start by reading +http://gcc.gnu.org/onlinedocs/libstdc++/ext/howto.html#3: + if you +absolutely want to do that. But beware: + +1. there are currently changes underway for gcc which are not totally +reflected in the docs right now ("now" == 26 Apr 03) + +2. allocators belong to the more messy parts of the STL and people went +to great lengths to make it portable across platforms. Chances are good +that your solution will work on your platform, but not on others. + +------------------------------------------------------------------------ + +4.2. The stack traces given by Memcheck (or another tool) aren't +helpful. How can I improve them? + +If they're not long enough, use --num-callers to make them longer. + +If they're not detailed enough, make sure you are compiling with -g to +add debug information. And don't strip symbol tables (programs should be +unstripped unless you run 'strip' on them; some libraries ship +stripped). + +Also, for leak reports involving shared objects, if the shared object is +unloaded before the program terminates, Valgrind will discard the debug +information and the error message will be full of ??? entries. The +workaround here is to avoid calling dlclose() on these shared objects. + +Also, -fomit-frame-pointer and -fstack-check can make stack traces +worse. + +Some example sub-traces: + +* With debug information and unstripped (best): + + Invalid write of size 1 + at 0x80483BF: really (malloc1.c:20) + by 0x8048370: main (malloc1.c:9) + +* With no debug information, unstripped: + + Invalid write of size 1 + at 0x80483BF: really (in /auto/homes/njn25/grind/head5/a.out) + by 0x8048370: main (in /auto/homes/njn25/grind/head5/a.out) + +* With no debug information, stripped: + + Invalid write of size 1 + at 0x80483BF: (within /auto/homes/njn25/grind/head5/a.out) + by 0x8048370: (within /auto/homes/njn25/grind/head5/a.out) + by 0x42015703: __libc_start_main (in /lib/tls/libc-2.3.2.so) + by 0x80482CC: (within /auto/homes/njn25/grind/head5/a.out) + +* With debug information and -fomit-frame-pointer: + + Invalid write of size 1 + at 0x80483C4: really (malloc1.c:20) + by 0x42015703: __libc_start_main (in /lib/tls/libc-2.3.2.so) + by 0x80482CC: ??? (start.S:81) + +* A leak error message involving an unloaded shared object: + + 84 bytes in 1 blocks are possibly lost in loss record 488 of 713 + at 0x1B9036DA: operator new(unsigned) (vg_replace_malloc.c:132) + by 0x1DB63EEB: ??? + by 0x1DB4B800: ??? + by 0x1D65E007: ??? + by 0x8049EE6: main (main.cpp:24) + +------------------------------------------------------------------------ + +4.3. The stack traces given by Memcheck (or another tool) seem to have +the wrong function name in them. What's happening? + +Occasionally Valgrind stack traces get the wrong function names. This is +caused by glibc using aliases to effectively give one function two +names. Most of the time Valgrind chooses a suitable name, but very +occasionally it gets it wrong. Examples we know of are printing 'bcmp' +instead of 'memcmp', 'index' instead of 'strchr', and 'rindex' instead +of 'strrchr'. + + +------------------------------------------------------------------------ +5. Memcheck doesn't find my bug +------------------------------------------------------------------------ + +5.1. I try running "valgrind --tool=memcheck my_program" and get +Valgrind's startup message, but I don't get any errors and I know my +program has errors. + +There are two possible causes of this. + +First, by default, Valgrind only traces the top-level process. So if +your program spawns children, they won't be traced by Valgrind by +default. Also, if your program is started by a shell script, Perl +script, or something similar, Valgrind will trace the shell, or the Perl +interpreter, or equivalent. + +To trace child processes, use the --trace-children=yes option. + +If you are tracing large trees of processes, it can be less disruptive +to have the output sent over the network. Give Valgrind the flag +--log-socket=127.0.0.1:12345 (if you want logging output sent to port +12345 on localhost). You can use the valgrind-listener program to listen +on that port: + + valgrind-listener 12345 + +Obviously you have to start the listener process first. See the manual +for more details. + +Second, if your program is statically linked, most Valgrind tools won't +work as well, because they won't be able to replace certain functions, +such as malloc(), with their own versions. A key indicator of this is if +Memcheck says: All heap blocks were freed -- no leaks are possible when +you know your program calls malloc(). The workaround is to avoid +statically linking your program. + +------------------------------------------------------------------------ + +5.2. Why doesn't Memcheck find the array overruns in this program? + + int static[5]; + + int main(void) + { + int stack[5]; + + static[5] = 0; + stack [5] = 0; + + return 0; + } + +Unfortunately, Memcheck doesn't do bounds checking on static or stack +arrays. We'd like to, but it's just not possible to do in a reasonable +way that fits with how Memcheck works. Sorry. + + +------------------------------------------------------------------------ +6. Miscellaneous +------------------------------------------------------------------------ + +6.1. I tried writing a suppression but it didn't work. Can you write my +suppression for me? + +Yes! Use the --gen-suppressions=yes feature to spit out suppressions +automatically for you. You can then edit them if you like, eg. combining +similar automatically generated suppressions using wildcards like '*'. + +If you really want to write suppressions by hand, read the manual +carefully. Note particularly that C++ function names must be _mangled_. + +------------------------------------------------------------------------ + +6.2. With Memcheck's memory leak detector, what's the difference between +"definitely lost", "possibly lost", "still reachable", and "suppressed"? + +The details are in the Memcheck section of the user manual. + +In short: + +* "definitely lost" means your program is leaking memory -- fix it! + +* "possibly lost" means your program is probably leaking memory, unless +you're doing funny things with pointers. + +* "still reachable" means your program is probably ok -- it didn't free +some memory it could have. This is quite common and often reasonable. +Don't use --show-reachable=yes if you don't want to see these reports. + +* "suppressed" means that a leak error has been suppressed. There are +some suppressions in the default suppression files. You can ignore +suppressed errors. + +------------------------------------------------------------------------ + +6.3. Memcheck's uninitialised value errors are hard to track down, +because they are often reported some time after they are caused. Could +Memcheck record a trail of operations to better link the cause to the +effect? Or maybe just eagerly report any copies of uninitialised memory +values? + +We'd love to improve these errors, but we don't know how to do it +without huge performance penalties. + +You can use the client request VALGRIND_CHECK_VALUE_IS_DEFINED to help +track these errors down -- work backwards from the point where the +uninitialised error occurs, checking suspect values until you find the +cause. This requires editing, compiling and re-running your program +multiple times, which is a pain, but still easier than debugging the +problem without Memcheck's help. + +As for eager reporting of copies of uninitialised memory values, this +has been suggested multiple times. Unfortunately, almost all programs +legitimately copy uninitialise memory values around (because compilers +pad structs to preserve alignment) and eager checking leads to hundreds +of false positives. Therefore Memcheck does not support eager checking +at this time. + + +------------------------------------------------------------------------ +7. How To Get Further Assistance +------------------------------------------------------------------------ + +Please read all of this section before posting. + +If you think an answer is incomplete or inaccurate, please e-mail +valgrind@valgrind.org: . + +Read the appropriate section(s) of the Valgrind Documentation: +. + +Read the Distribution Documents: +. + +Search: the valgrind-users: + mailing list +archives, using the group name gmane.comp.debugging.valgrind. + +Only when you have tried all of these things and are still stuck, should +you post to the valgrind-users mailing list: +. In which +case, please read the following carefully. Making a complete posting +will greatly increase the chances that an expert or fellow user reading +it will have enough information and motivation to reply. + +Make sure you give full details of the problem, including the full +output of valgrind -v , if applicable. Also which Linux +distribution you're using (Red Hat, Debian, etc) and its version number. + +You are in little danger of making your posting too long unless you +include large chunks of Valgrind's (unsuppressed) output, so err on the +side of giving too much information. + +Clearly written subject lines and message bodies are appreciated, too. + +Finally, remember that, despite the fact that most of the community are +very helpful and responsive to emailed questions, you are probably +requesting help from unpaid volunteers, so you have no guarantee of +receiving an answer. + --- valgrind-3.6.1.orig/debian/valgrind-docs-build.diff +++ valgrind-3.6.1/debian/valgrind-docs-build.diff @@ -0,0 +1,26 @@ +Index: docs/xml/manual-core.xml +=================================================================== +--- docs/xml/manual-core.xml (revision 11097) ++++ docs/xml/manual-core.xml (working copy) +@@ -1286,7 +1286,7 @@ + + + +-<computeroutput>malloc</computeroutput>-related Options ++malloc-related Options + + + For tools that use their own version of +Index: drd/docs/drd-manual.xml +=================================================================== +--- drd/docs/drd-manual.xml (revision 11097) ++++ drd/docs/drd-manual.xml (working copy) +@@ -1578,7 +1578,7 @@ + + + +-<function>pthread_cond_timedwait</function> and timeouts ++pthread_cond_timedwait and timeouts + + + Historically the function --- valgrind-3.6.1.orig/debian/dirs +++ valgrind-3.6.1/debian/dirs @@ -0,0 +1,4 @@ +usr/bin +usr/lib +usr/share/doc/valgrind/html +etc/bash_completion.d --- valgrind-3.6.1.orig/debian/debian-libc6-dbg.supp +++ valgrind-3.6.1/debian/debian-libc6-dbg.supp @@ -0,0 +1,36 @@ +# Debian libc6-dbg has some errors on libpthread library. +# This file tries to suppress those errors. + +{ + Debian libpthread (libc6-dbg) - pthread_initialize + Memcheck:Cond + fun:strstr + fun:pthread_initialize + obj:/usr/lib/debug/libpthread-0.10.so + obj:/usr/lib/debug/libpthread-0.10.so + obj:/lib/ld-2.3.2.so + fun:_dl_init + obj:/lib/ld-2.3.2.so +} +{ + Debian libpthread (libc6-dbg) - pthread_create + Memcheck:Param + write(buf) + fun:write + fun:pthread_create@@GLIBC_2.1 +} +{ + Debian libpthread (libc6-dbg) - libc_start_main + Memcheck:Param + write(buf) + fun:write + fun:exit + fun:__libc_start_main +} +{ + Debian libpthread (libc6-dbg) - pthread_initialize_manager + Memcheck:Leak + fun:malloc + fun:__pthread_initialize_manager + fun:pthread_create@@GLIBC_2.1 +} --- valgrind-3.6.1.orig/debian/docs +++ valgrind-3.6.1/debian/docs @@ -0,0 +1,5 @@ +README +AUTHORS +README_MISSING_SYSCALL_OR_IOCTL +NEWS +debian/FAQ.txt --- valgrind-3.6.1.orig/debian/valgrind.bash +++ valgrind-3.6.1/debian/valgrind.bash @@ -0,0 +1,100 @@ +#-*- mode: shell-script;-*- + +# Debian GNU/Linux valgrind(1) completion + +have valgrind && +_valgrind() +{ + local cur prev opts yesno tools choosen_tool + +# list of options with yes|no answer + yesno="--trace-children\= --child-silent-after-fork\= --track-fds\= --time-stamp\= --log-fd\= --log-socket\=" + + opts="--tool\= " + opts+="-h --help --help-debug --version -q --quiet -v --verbose --log-file\= " + + + COMPREPLY=() + +# we check if a tool has been defined + for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )); do + if [[ ${COMP_WORDS[i]} == "--tool" ]]; then + choosen_tool=${COMP_WORDS[i+2]} + fi + done +# if so, we add its options for the completion + case $choosen_tool in + 'callgrind') + opts+="--callgrind-out-file\= --dump-every-bb\= --dump-before\= --zero-before\= --dump-after\= --toggle-collect\= --separate-recs\= --separate-callers\= --fn-skip\= --fn-group< --separate-recs< --separate-callers< " + yesno+="--dump-instr\= --dump-line\= --compress-strings\= --compress-pos\= --combine-dumps\= --instr-atstart\= --collect-atstart\= --collect-jumps\= --separate-threads\= --skip-plt\= --simulate-cache\= --simulate-hwpref\= " + ;; + 'cachegrind') + opts+="--I1\= --D1\= --L2\= --cachegrind-out-file\= " + yesno+="--cache-sim\= --branch-sim\= " + ;; +# as memcheck is the tool by default, we show its options if no tool is specified + 'memcheck') + yesno+="--undef-value-errors\= --track-origins\= --show-reachable\= --workaround-gcc296-bugs\= --partial-loads-ok\= " + opts+="--leak-check\= --leak-resolution\= --freelist-vol\= --malloc-fill\= --free-fill\= " + ;; + *) + yesno+="--undef-value-errors\= --track-origins\= --show-reachable\= --workaround-gcc296-bugs\= --partial-loads-ok\= " + opts+="--leak-check\= --leak-resolution\= --freelist-vol\= --malloc-fill\= --free-fill\= " + ;; + esac + + opts+="$yesno " + + cur="${COMP_WORDS[COMP_CWORD]}" + prev="${COMP_WORDS[COMP_CWORD - 1]}" +# COMPREPLY considers '=' as a word. For $prev we prefer the word before the actual "=" + if [[ "$prev" == "=" ]] + then + prev="${COMP_WORDS[COMP_CWORD - 2]}" + elif [[ "$cur" == "=" ]] + then + cur="" + fi + + +# autocompletion for the tool names, e.g. memcheck, callgrind + if [[ "$prev" == "--tool" ]] + then +# the list is automatically built +# it is composed of all the executable file in +# /usr/lib/valgrind/x86-linux +# TODO: correct the path during the installation, according to the platform + tools=`find /usr/lib/valgrind/x86-linux -executable -type f -exec basename {} \; | sed -e 's,\./,,g' | tr '\n' ' '` + COMPREPLY=( $(compgen -W "$tools" -- $cur ) ) + COMPREPLY+=" " + return 0 + fi + + if [[ "${yesno}" == *$prev* ]] + then + COMPREPLY=( $(compgen -W "yes no" -- $cur ) ) + COMPREPLY+=" " + return 0 + fi + + case "$prev" in + --log-file) + _filedir + return 0 + ;; + *) + ;; + esac + +# Look for options without an argument. + if [[ "$cur" == -* ]] + then + COMPREPLY=( $(compgen -W "$opts" -- $cur) ) + return 0 + else + _filedir + return 0 + fi +} +complete -o nospace -F _valgrind valgrind + --- valgrind-3.6.1.orig/debian/valgrind.sh +++ valgrind-3.6.1/debian/valgrind.sh @@ -0,0 +1,30 @@ +#!/bin/sh -e +# +# Valgrind wrapper + +# Default Debian debug libraries. +DBGPATH=/usr/lib/debug + +# Use special suppression file if libc6-dbg is installed +if [ -d /usr/lib/debug ] && ! echo "${VALGRIND_OPTS}" | fgrep -q -- '--suppressions=/usr/lib/valgrind/debian-libc6-dbg.supp'; then + export VALGRIND_OPTS="$VALGRIND_OPTS --suppressions=/usr/lib/valgrind/debian-libc6-dbg.supp" +fi + +# Use debug libraries if found. +if [ -z "$LD_LIBRARY_PATH" ]; then + export LD_LIBRARY_PATH=$DBGPATH +else + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$DBGPATH +fi + +# Force C++ STL to use malloc and to free memory by disabling +# memory caching. +# For gcc < 3.4 versions +export GLIBCPP_FORCE_NEW=1 + +# For gcc >= 3.4 versions +export GLIBCXX_FORCE_NEW=1 + +# Use 'exec' to avoid having another shell process hanging around. +exec $0.bin "$@" + --- valgrind-3.6.1.orig/debian/copyright +++ valgrind-3.6.1/debian/copyright @@ -0,0 +1,36 @@ +This package was debianized by Cyrille Chepelov on +Mon, 25 Feb 2002 20:16:46 +0100. + +It has been subsequently taken over by Andrés Roldán + + +Release tarballs are downloaded from http://www.valgrind.org + +SVN snapshot tarball are downloaded from svn://svn.valgrind.org/valgrind/trunk +and created with "autoreconf -fi && ./configure --prefix=/usr && make dist" +(ideally "make distcheck" would be preferred but it doesn't pass). + To build the docs, you'll need to patch the sources with +debian/valgrind-docs-build.diff and you'll need some extra build-deps: xmltex +(for pdfxmltex), texlive-latex-recommended (for rotating.sty), +texlive-latex-extra (for soul.sty), texlive-fonts-recommended (for +marvosym.sty). + Careful, valgrind's SVN repo uses svn:externals, and Subversion doesn't pass +down -r when exporting or checking out, so you need to do something like: + date=20100724 + svn co -r "{$date}" svn://svn.valgrind.org/valgrind/trunk valgrind-$date + cd "valgrind-$date" + rm VEX -rf + svn co -r "{$date}" svn://svn.valgrind.org/vex/trunk VEX + +Upstream Author: Julian Seward + +Copyright: + (C) 2000-2002 Julian Seward + jseward@acm.org + Julian_Seward@muraroa.demon.co.uk + + You are free to distribute this software under the terms of + the GNU General Public License, Version 2. + + On Debian systems, the complete text of the GNU General Public + License can be found in /usr/share/common-licenses/GPL file. --- valgrind-3.6.1.orig/debian/links +++ valgrind-3.6.1/debian/links @@ -0,0 +1 @@ +usr/share/man/man1/valgrind.1 usr/share/man/man1/valgrind.bin.1 --- valgrind-3.6.1.orig/debian/control +++ valgrind-3.6.1/debian/control @@ -0,0 +1,32 @@ +Source: valgrind +Section: devel +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Andrés Roldán +Build-Depends: debhelper (>= 5), libc6-dev (>> 2.3.0), autotools-dev, dpatch (>> 2.0.0), gdb, gcc-multilib [amd64 ppc64], libc6-dev-i386 (>> 2.3.0) [amd64], libc6-dev-powerpc [ppc64] +Standards-Version: 3.7.3.0 + +Package: valgrind +Architecture: i386 amd64 powerpc ppc64 lpia armel +Depends: ${shlibs:Depends}, libc6-dbg +Conflicts: valgrind-callgrind +Provides: valgrind-callgrind +Suggests: kcachegrind, alleyoop, valkyrie (>> 1.3.0) +Recommends: gdb +Description: A memory debugger and profiler + Valgrind is a GPL'd tool to help you find memory-management problems in your + programs. When a program is run under Valgrind's supervision, all reads and + writes of memory are checked, and calls to malloc/new/free/delete are + intercepted. + . + Valgrind can debug more or less any dynamically-linked ELF x86/Linux, + amd64/Linux and ppc/Linux executables, without modification, recompilation, + or anything. + . + Valgrind provides a generic infrastructure for supervising the execution of + programs called "tools". This is done by providing a way to instrument + programs in very precise ways, making it relatively easy to support + activities such as dynamic error detection and profiling. The Valgrind + distribution currently includes three tools: a memory error detectors, a + cache (time) profiler and a heap (space) profiler. + --- valgrind-3.6.1.orig/debian/changelog +++ valgrind-3.6.1/debian/changelog @@ -0,0 +1,1382 @@ +valgrind (1:3.6.1-0ubuntu3) oneiric; urgency=low + + * New dpatch, 71_linux-3-support, fixes FTBFS on 3.x kernels (as checked + with `uname -r` during build, so doesn't yet affect Ubuntu buildds); from + SVN r11796 and r11797; LP: #868004. Refresh autoconf patch. + * Rename files and update series to use *.dpatch consistently. + + -- Loïc Minier Wed, 05 Oct 2011 12:09:53 +0200 + +valgrind (1:3.6.1-0ubuntu2) oneiric; urgency=low + + * New dpatch 70_gcc-4.6.1-dwarf-ops_svn-r11856, cherry-picked from SVN + r11856; adds support for some DWARF ops that GCC 4.6.1 seems to use + (KDE #275284). + * Sort patches by patch number in 00list. + + -- Loïc Minier Tue, 05 Jul 2011 12:07:20 +0200 + +valgrind (1:3.6.1-0ubuntu1) natty; urgency=low + + * New upstream release + - support for glibc 2.13, fixes FTBFS on all archs. + * debian/patches/70_thumb2_fix.dpatch: Drop, included upstream. + * debian/patches/02_version.dpatch: + * debian/patches/99_autoreconf.dpatch: Update. + + -- Jani Monoses Sun, 27 Feb 2011 20:24:35 +0200 + +valgrind (1:3.6.0-0ubuntu3) natty; urgency=low + + * Build on ppc64. + + -- Colin Watson Mon, 21 Feb 2011 19:49:23 +0000 + +valgrind (1:3.6.0-0ubuntu2) natty; urgency=low + + * debian/patches/70_thumb2_fix.dpatch: Fix unhandled instruction + case which prevents running valgrind on Thumb2 armel binaries + linked to system libraries. + + -- Jani Monoses Sat, 22 Jan 2011 00:23:11 +0200 + +valgrind (1:3.6.0-0ubuntu1) natty; urgency=low + + * New upstream release + * Refresh 02_version.dpatch, 99_autoreconf.dpatch. + * Drop 91_build_with_fno_stack_protector.dpatch, integrated upstream. + + -- Steve Langasek Tue, 07 Dec 2010 19:32:50 +0000 + +valgrind (1:3.6.0~svn20100724-0ubuntu2) maverick; urgency=low + + * Remove BUILD_ALL_DOCS=no snippet from rules; this isn't needed anymore as + texlive-base got fixed. + * Pass CFLAGS to configure, and also to make due to KDE #247980 -- the make + part really needs to be reverted as it requires duplicating the upstream + flags right now. + * Honor noopt in DEB_BUILD_OPTIONS by passing -O0 in CFLAGS when noopt is + present. + * Pass -marm in CFLAGS when DEB_HOST_GNU_CPU is arm; works around new FTBFS + on armel. + + -- Loïc Minier Sun, 15 Aug 2010 19:55:28 +0200 + +valgrind (1:3.6.0~svn20100724-0ubuntu1) maverick; urgency=low + + * New upstream snapshot. + - Supports GLIB 2.12; LP: #602132. + - Drop dpatch 01_pcm-ioctl; fixed upstream slighlty differently; see + KDE #227325. + - Drop dpatch 01_more-vg-n-threads; merged upstream. + - Drop dpatch 80_splice_backport; merged upstream. + - Update dpatch 99-autoreconf. + - Update documentation on creating snapshots in debian/copyright and add + debian/valgrind-docs-build.diff to help creating these (works around an + issue with building the docs during make dist). + + -- Loïc Minier Sun, 15 Aug 2010 10:54:00 +0200 + +valgrind (1:3.6.0~svn20100212-0ubuntu5) lucid; urgency=low + + * No-change rebuild to get the package picked up for building on armel. + + -- Steve Langasek Tue, 27 Apr 2010 16:04:59 +0100 + +valgrind (1:3.6.0~svn20100212-0ubuntu4) lucid; urgency=low + + * New dpatch, 60_thumb-sigill-fixes, from upstream KDE #231108, fixes + SIGILLs on startup when build in Thumb mode. This allows valgrind-ing + simple ARM-mode binaries, but supporting Thumb-mode binaries requires much + larger changes; LP: #537458. + + -- Loïc Minier Fri, 26 Mar 2010 14:47:17 +0100 + +valgrind (1:3.6.0~svn20100212-0ubuntu3) lucid; urgency=low + + * New dpatch, 80_splice_backport, backport of splice() support from r11055; + LP: #537688. + + -- Loïc Minier Sat, 13 Mar 2010 10:36:14 +0100 + +valgrind (1:3.6.0~svn20100212-0ubuntu2) lucid; urgency=low + + * Fix typo in 02_version dpatch: default.supp instead of debian.supp. + * Only distclean if there's a Makefile. + * Clean debian.supp. + * Fix dependencies in rules to be -j safe and to patch before configure; + also, use $(DPATCH_STAMPFN) dep instead of patch as the latter is PHONY + * Forwarded manpage update proposal upstream in KDE #226609 and disabled + patch 01_manpage since it fails to unapply due to upstream removing the + manpage in distclean. + * Configure with --disable-maintainer-mode. + * Bump debhelper build-dep to >= 5. + + -- Loïc Minier Fri, 12 Feb 2010 22:34:11 +0100 + +valgrind (1:3.6.0~svn20100212-0ubuntu1) lucid; urgency=low + + * New upstream SVN snapshot from r11040 (and VEX r1959). + - Document in copyright that this snapshot tarball was created with "make + BUILD_ALL_DOCS=no dist" in svn://svn.valgrind.org/valgrind/trunk while + Debian #566591 affects the PDF build. + - Also add BUILD_ALL_DOCS=no to rules for the same reason. + - Update patch 02_version to apply to configure.in instead of configure + and to only patch the version, bug contact, and DEFAULT_SUPP. + - Drop patch 92_glibc-2.11-support, in upstream tarball. + - Update patch 99_autoreconf. + - Add armel to binary package architecture, lots of recent upstream + development toward an ARM port recently! :-) + + -- Loïc Minier Fri, 12 Feb 2010 18:34:15 +0100 + +valgrind (1:3.5.0-3ubuntu2) lucid; urgency=low + + * New patches, 92_glibc-2.11-support, cherry-picked from upstream r10941; + adds glibc 2.11 support, and 99_autoreconf. + + -- Loïc Minier Fri, 12 Feb 2010 12:44:53 +0100 + +valgrind (1:3.5.0-3ubuntu1) lucid; urgency=low + + * Merge from Debian testing. Remaining changes: + - Refresh 91_build_with_fno_stack_protector.dpatch. + - Add lpia to Architecture. + - Drop completely bogus or'ed build-dep on gcc-4.3 on amd64 + * Dropped changes, superseded in Debian: + - Move libc6-dbg to Recommends + + -- Steve Langasek Sat, 05 Dec 2009 01:06:45 +0000 + +valgrind (1:3.5.0-3) unstable; urgency=low + + * Rebuilt againts libc6 2.10.1. + * debian/control: + - Now libc6-dbg is a dependency (valgrind won't work without it now) + (Closes: #556542, #556165, #553016) + - Valkyrie added to suggested packages. + + -- Andrés Roldán Tue, 17 Nov 2009 15:12:26 +0000 + +valgrind (1:3.5.0-2ubuntu2) karmic; urgency=low + + * Drop completely bogus or'ed build-dep on gcc-4.3 on amd64 - if the + package in the archive builds for biarch, we shouldn't allow non-multilib + gcc as an alternative, this would just result in a package misbuild. + + -- Steve Langasek Thu, 08 Oct 2009 01:28:53 +0000 + +valgrind (1:3.5.0-2ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - Refresh 91_build_with_fno_stack_protector.dpatch. + - Add lpia to Architecture. + * Move libc6-dbg to Recommends (LP: #423485). + + -- Kees Cook Fri, 02 Oct 2009 15:51:36 -0700 + +valgrind (1:3.5.0-2) unstable; urgency=low + + * debian/control: + - Added libc6-dev-i386 to build-dependencies on amd64. + May reopen #507752 but closes: #548067. + + -- Andrés Roldán Thu, 24 Sep 2009 20:18:57 +0000 + +valgrind (1:3.5.0-1) unstable; urgency=low + + * New upstream version. (Closes: #545700) + * debian/patches/02_version: + - Updated to fit this new version (Thanks to Andreas Beckmann) + * debian/patches/01_pcm-ioctl.patch: + - Updated + * debian/patches/01_more-vg-n-threads.dpatch: + - Added to increas VG_N_THREADS to 500. (Closes: #514133) + * debian/docs: + - ACKNOWLEDGEMENTS file is gone + * debian/watch: + - Added (Again, thanks to Andreas Beckmann) + * debian/control: + - Removed Uploaders field (Closes: #519380, #540834) + * debian/valgrind.bash: + - Provides a first bash completion script for valgrind. (Closes: #539137) + Thanks to Jerome Reybert + * debian/debian.supp: + - Updated to fit Debian's libc6 2.10.x + + -- Andrés Roldán Wed, 09 Sep 2009 16:26:29 +0000 + +valgrind (1:3.4.1-1ubuntu2) karmic; urgency=low + + * Rebuild to include suppressions for libc6 2.10.x (LP: #423485). + + -- Colin Watson Fri, 04 Sep 2009 15:12:18 +0100 + +valgrind (1:3.4.1-1ubuntu1) jaunty; urgency=low + + * Merge with Debian; remaining changes: + - Add 91_build_with_fno_stack_protector.dpatch. + - Add lpia to Architecture. + + -- Matthias Klose Thu, 05 Mar 2009 18:27:01 +0100 + +valgrind (1:3.4.1-1) unstable; urgency=low + + * New upstream release. + * debian/debian.supp: + - Updated suppressions to fit libc6 2.9.x. (Closes: #516337, #516100) + * debian/copyright: + - Change the URL of valgrind to www.valgrind.org. (Closes: #518287) + * debian/patches/01_valgrind.pc.dpatch: + - Removed. Already fixed by upstream. + + -- Andrés Roldán Thu, 05 Mar 2009 15:19:16 +0000 + +valgrind (1:3.4.0-1) unstable; urgency=low + + * New upstream release. (Closes: #512816) + * debian/patches/01_valgrindrc.dpatch: + - Removed. Already applied by upstream. + + -- Andrés Roldán Thu, 29 Jan 2009 21:13:26 +0000 + +valgrind (1:3.3.1-3) unstable; urgency=low + + * debian/patches/01_valgrindrc.dpatch: + - New patch to avoid reading and executing .valgrindrc files unless done + by the onwer of the file. This fixes CVE-2008-4865 (Closes: #507312) + + -- Andrés Roldán Wed, 03 Dec 2008 16:42:11 +0000 + +valgrind (1:3.3.1-2ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - Add 91_build_with_fno_stack_protector.dpatch + - Add lpia to Architecture + + -- Michael Vogt Thu, 19 Jun 2008 09:57:35 +0200 + +valgrind (1:3.3.1-2) unstable; urgency=low + + * debian/rules: + - Forgot to copy debian-libc6-dbg.supp to /usr/lib/valgrind. + (Closes: #486021) + + -- Andrés Roldán Fri, 13 Jun 2008 02:31:40 +0000 + +valgrind (1:3.3.1-1) unstable; urgency=low + + * New upstream version. + * Re-debianized from the scratch. + * debian/valgrind.sh: + - Avoid to add the same suppression on programs that re-execute + themselves. (Closes: #479165) + * debian/control: + - Made valgrind buildable for etch. (Closes: #472335) + * Bumped standard version to 3.7.3 + + -- Andrés Roldán Wed, 11 Jun 2008 23:10:08 +0000 + +valgrind (1:3.3.0-1ubuntu1) hardy; urgency=low + + * Merge with Debian, remaining changes: + - Add 91_build_with_fno_stack_protector.dpatch + - Add lpia to Architecture + + -- Jonathan Riddell Sun, 06 Jan 2008 11:28:10 +0000 + +valgrind (1:3.3.0-1) unstable; urgency=low + + * New upstream release. (Closes: #455855) + - Now valgrind will compile natively on glibc > 2.6 + (Closes: #453195, #441749) + - Suppressions are now updated for the latest glibc on sid. + (Closes: #356777) + * debian/patches/01_amd64-nops.dpatch: + - Removed, already applied by upstream. + * debian/patches/01_suppression-strip.dpatch: + - Removed. Don't be jealous of your brother, Andy :) + * debian/patches/01_valgrind.pc.dpatch: + - Corrects pkg-config information. (Closes: #452307) + + -- Andrés Roldán Wed, 12 Dec 2007 20:39:58 +0000 + +valgrind (1:3.2.3-3ubuntu2) hardy; urgency=low + + * Fix FTBS with new libc6 2.7 not recognized by valgrind's + configure script (backported from svn) + - add debian/patches/92_valgrind-libc6-2.7.dpatch + - add debian/patches/99_update_configure.dpatch + - update debian/patches/00list + + -- Fabien Tassin Mon, 10 Dec 2007 20:54:23 +0100 + +valgrind (1:3.2.3-3ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - Build package for lpia + - Build using -fno-stack-protector + * Drop 21_amd64_kde148447_NEW_nop_codes.dpatch merged + into 01_amd64-nops.dpatch + - update debian/patches/00list + * Bump Standards-Version to 3.7.2 + - update debian/control + * Drop DH_COMPAT=3 from rules and add compat=5 + - update debian/rules + - add debian/compat + + -- Fabien Tassin Tue, 06 Dec 2007 19:11:43 +0100 + +valgrind (1:3.2.3-3) unstable; urgency=low + + * debian/FAQ.txt: + - Provided there to solve FTBFS if valgrind is built twice in a row + (Closes: #424129) + * debian/patches/01_amd64-nops.dpatch: + - Patch to handle new way of writing NOPs by binutils. (Closes: #437503) + * debian/patches/01_configure.dpatch: + - Merged into 02_version.patch + * debian/patches/03_valgrind-libc6-2.6.dpatch: + - Took off from dpatch and merged into debian diff. + + -- Andrés Roldán Thu, 23 Aug 2007 22:41:13 +0000 + +valgrind (1:3.2.3-2ubuntu3) gutsy; urgency=low + + * debian/patches/21_amd64_kde148447_NEW_nop_codes.dpatch: + - import patch from http://bugs.kde.org/show_bug.cgi?id=148447#c16 to fix + LP: #148465. + + -- Alexander Sack Sat, 06 Oct 2007 02:27:32 +0200 + +valgrind (1:3.2.3-2ubuntu2) gutsy; urgency=low + + * Build package for lpia. + + -- Matthias Klose Fri, 24 Aug 2007 19:26:18 +0200 + +valgrind (1:3.2.3-2ubuntu1) gutsy; urgency=low + + * Merge with Debian; remaining changes: + - Build using -fno-stack-protector. + + -- Matthias Klose Thu, 23 Aug 2007 20:14:42 +0200 + +valgrind (1:3.2.3-2) unstable; urgency=low + + * debian/patches/03_valgrind-libc6-2.6.dpatch: + - Patch based on Gentoo's to make valgrind compiles under glibc 2.6. + Thanks to francesco.pedrini@gmail.com. (Closes: #433899) + * debian/control: + - Depends on gcc-multilib [amd64] instead of libc6-dev-i386 [amd64] to + solve FTBFS on amd64. (Closes: #425834) + + -- Andrés Roldán Fri, 17 Aug 2007 13:18:21 +0000 + +valgrind (1:3.2.3-1ubuntu2) gutsy; urgency=low + + * No-change upload to work around a soyuz bug and build on lpia. + + -- Adam Conrad Fri, 10 Aug 2007 01:32:33 +1000 + +valgrind (1:3.2.3-1ubuntu1) gutsy; urgency=low + + * Merge with Debian; remaining changes: + - Build using -fno-stack-protector. + - Build-depend on gcc-multilib. + + -- Matthias Klose Thu, 24 May 2007 13:27:02 +0200 + +valgrind (1:3.2.3-1) unstable; urgency=low + + * New upstream version + * debian/control: + - Removed ia32-libs-dev [amd64] and libc6-dev-i386 [amd64] dependencies. + (Closes: #357288, #341186) + * debian/valgrind.sh + - Removed /usr/X11R6/lib/debug from DBGPATH. (Closes: #365119) + * debian/debian.supp: + - Added suppressions for glibc static allocations. (Closes: #350347) + + -- Andrés Roldán Thu, 1 Feb 2007 20:41:46 +0000 + +valgrind (1:3.2.1-1ubuntu2) feisty; urgency=low + + * Rebuild for changes in the amd64 toolchain. + * Set Ubuntu maintainer address. + + -- Matthias Klose Mon, 5 Mar 2007 01:27:22 +0000 + +valgrind (1:3.2.1-1ubuntu1) feisty; urgency=low + + * Sync with Debian: + + debian/control: + - Drop build dependency on ia32-libs-dev + + debian/patches/91_build_with_fno_stack_protector.dpatch: + - Build with -fno-stack-protector to fix FTBFS + * debian/glibc-2.5.supp, + debian/rules: + + Add suppresion file from SVN for glibc 2.5 + + -- Sebastian Dröge Thu, 16 Nov 2006 17:56:30 +0100 + +valgrind (1:3.2.1-1) unstable; urgency=low + + * New upstream release. + + -- Andrés Roldán Thu, 5 Oct 2006 15:28:35 +0000 + +valgrind (1:3.2.0-2ubuntu3) edgy; urgency=low + + * debian/patches/90_from_svn_fix_cfsi_len_assertion.dpatch: + - updated the limit, some applications were still not happy with the + previous one + + -- Sebastien Bacher Thu, 12 Oct 2006 00:29:01 +0200 + +valgrind (1:3.2.0-2ubuntu2) edgy; urgency=low + + * debian/patches/90_from_svn_fix_cfsi_len_assertion.dpatch: + - patch from SVN, fix cfsi->len assertion on amd64 (Ubuntu: #60589) + * debian/patches/91_build_with_fno_stack_protector.dpatch: + - add -fno-stack-protector to CFLAGS to fix the build + + -- Sebastien Bacher Fri, 6 Oct 2006 00:40:18 +0200 + +valgrind (1:3.2.0-2ubuntu1) edgy; urgency=low + + * Sync with Debian: + + Drop build dependency on ia32-libs-dev + + -- Sebastian Dröge Mon, 26 Jun 2006 00:17:17 +0200 + +valgrind (1:3.2.0-2) unstable; urgency=low + + * New upstream release. (Closes: #373578) + - Now callgrind is one of the main valgrind tools. + - Add conflict (and provide) valgrind-callgrind. + * debian/patches/02_load-address: + - Not applied as it is not needed anymore. + + -- Andrés Roldán Thu, 15 Jun 2006 00:21:07 +0000 + +valgrind (1:3.1.1-1) unstable; urgency=low + + * Acknowledging NMU. Thanks Kurt. + * New upstream release + * Updated 02_version and 01_suppression-strip patches + * Updated debian.supp + * Suggests alleyoop and valgrind-callgrind instead of callgrind + + -- Andrés Roldán Wed, 29 Mar 2006 22:23:53 +0000 + +valgrind (1:3.1.0-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Add build dependency on libc6-dev-i386 [amd64] | ia32-libs-dev [amd64] + so that it can get build on amd64. (Closes: #341186) + + -- Kurt Roeckx Sat, 4 Feb 2006 15:12:53 +0100 + +valgrind (1:3.1.0-2) unstable; urgency=low + + * debian/control: + - Updated package description. + - Added powerpc to Architecture list. (Closes: #270557) + * Changed valgrind base load address. (Closes: #341252) + + -- Andrés Roldán Wed, 30 Nov 2005 16:29:24 +0000 + +valgrind (1:3.1.0-1) unstable; urgency=low + + * New upstream release. + - Now it can load symbol table of large binaries. + (Closes: #337196, #319243) + - Now it runs on ppc. (Closes: #270557) + * debian/patches/01_suppression-strip.dpatch: + - Removes an existent Debian suppression. + + -- Andrés Roldán Mon, 28 Nov 2005 15:48:15 +0000 + +valgrind (1:3.0.1-2) unstable; urgency=low + + * debian/patches/02_version.dpatch: + - Adds "Debian" to package version string + * debian/debian.supp: + - Adds suppression for Debian's libc6 2.3.5 dynamic linker. + (Closes: #331727, #326832) + + -- Andrés Roldán Wed, 2 Nov 2005 14:35:58 +0000 + +valgrind (1:3.0.1-1) unstable; urgency=low + + * New upstream version. + * Standard version is now 3.6.2. + + -- Andrés Roldán Thu, 1 Sep 2005 16:16:35 +0000 + +valgrind (1:3.0.0-1) unstable; urgency=low + + * New upstream release. (Closes: + - Now valgrind run on AMD64. + * debian/patches/{01_manpage,01_configure,01_pcm-ioctl}.dpatch: + - Updated to fit this version. + * debian/patches/{01_vgPlain_do_syscall,11_errorcode}.dpatch: + - Removed. Not longer needed. + + -- Andrés Roldán Fri, 12 Aug 2005 14:47:42 +0000 + +valgrind (1:2.4.1-1) unstable; urgency=low + + * New stable release. + + -- Andrés Roldán Tue, 2 Aug 2005 13:00:20 +0000 + +valgrind (1:2.4.0-3) unstable; urgency=low + + * debian/valgrind.sh: + - Prepends LD_LIBRARY_PATH over DBGPATH. (Closes: #304315) + - Adds GLIBCPP_FORCE_NEW=1 (for gcc < 3.4) and GLIBCXX_FORCE_NEW=1 (for + gcc >= 3.4) to force C++ STL to use malloc and to free memory by + disabling memory caching (Closes: #307956) + * debian/patches/01_manpage.dpatch: + - New, adds reference to valgrind's authors and contributos on manpage. + (Closes: #304902) + * debian/patches/01_pcm-ioctl.dpatch: + - New, adds PCM ioctls. (Closes: #305051) + Patch sent by Samuel Thibault . + * debian/debian-libc6-dbg.supp: + - Updated. Thanks to Jeremy Nimmer . + (Closes: #302250) + + -- Andrés Roldán Fri, 20 May 2005 10:37:30 +0000 + +valgrind (1:2.4.0-2) unstable; urgency=low + + * debian/debian-libc6-dbg.supp: + - New file that includes suppressions for libc6-dbg/libpthread library. + (Closes: #302250) + * debian/valgrind.sh: + - As memcheck is officialy the default tool, removed --tool=memcheck from + VALGRIND_OPTS. + - Will use /usr/lib/debian-libc6-dbg.supp if and only if using libc6-dbg. + + -- Andrés Roldán Fri, 8 Apr 2005 13:37:28 +0000 + +valgrind (1:2.4.0-1) unstable; urgency=low + + * New stable upstream release. + * debian/valgrind.1: + - Removed as it is already provided and maintained by upstream based on + Debian's manpage. (Closes: #293049, #298222) + + -- Andrés Roldán Mon, 28 Mar 2005 14:59:35 +0000 + +valgrind (1:2.2.0+2.4.0rc4+1-1) unstable; urgency=low + + * New RC upstream release. + - Fix unexpected SIGSEGV when using memcheck on programs where the + first write to a particular 64k chunk is done by the FPU. + - Fix a problem with the sys_futex wrapper which was inspecting + the wrong arguments for FUTEX_REQUEUE. (Closes: #299514) + - Format fixup for a debug printf. + + -- Andrés Roldán Tue, 15 Mar 2005 13:47:00 +0000 + +valgrind (1:2.2.0+2.4.0rc4-1) unstable; urgency=low + + * New RC upstream release. + - Make sure that an FP write to a distinguished map makes it + un-distinguished. + + -- Andrés Roldán Mon, 14 Mar 2005 19:32:24 +0000 + +valgrind (1:2.2.0+2.4.0rc3-1) unstable; urgency=low + + * New RC upstream release. + - Fix which prevents an assertion failure when a threaded program + forks, and the child starts a thread. + - Fix a problem in which signals which have the default action of + "ignore" (SIGCONT, WINCH, USR and CHLD) interrupted a blocked + syscall. For these signals, Valgrind doesn't set a signal handler + unless the client needs one. + - Remove segment merging from mprotect(), which was causing rtldi to + trigger a Valgrind internal error. + - Fix the parsing of the 'R' floating-point type in the stabs parser. + + -- Andrés Roldán Sat, 12 Mar 2005 18:39:19 +0000 + +valgrind (1:2.2.0+2.4.0rc2-1) unstable; urgency=low + + * Yet another RC upstream version. + * debian/patches/12_errhandling.dpatch: + - Removed. Already on upstream source. + + -- Andrés Roldán Fri, 11 Mar 2005 13:38:46 +0000 + +valgrind (1:2.2.0+2.4.0rc1-1) unstable; urgency=low + + * New RC upstream release. (See upstream's changelog) (Closes: #296323) + - libpthread has gone along with all the bugs associated with it. + Instead, Valgrind now emulates the kernel's threading syscalls + (clone, etc), and lets the user use your standard system + libpthread. (Closes: #283995) + - Signal handling should now be indistinguishable from running + natively. (Closes: #230785, #252520) + - Valgrind is built in Position Independent Executable (PIE) format + if the toolchain supports it. This allows it to take advantage + of all the available address space on systems with 4Gbyte user + address spaces. (Closes: #272270, #288640) + * debian/debian.supp: + - Added zlib1g suppression. (Closes: #287603) + - Added pthread_initialize suppression. + * debian/patches/: + - Removed some patches as they are already on upstream source. + - {01_vgPlain_do_syscall,11_exitcode}.dpatch: Updated. + - 12_errhandling.dpatch: Stops the error handling code trying to + match object and function names against a suppression if it + wasn't able to obtain the relevant name. + + -- Andrés Roldán Wed, 9 Mar 2005 21:07:41 +0000 + +valgrind (1:2.2.0-4) unstable; urgency=low + + * debian/patches/18_cpp-stabs.dpatch: + - This patch attempts to fix the parsing of C++ stabs involving :: + delimiters. + * debian/patches/19_pthread_attr_getinheritsched.dpatch: + - Adds a dummy implementation of pthread_attr_getinheritsched. + * debian/patches/20_pthread_condattr_getsetpshared.dpatch: + - Adds a dummy implementation of pthread_condattr_getpshared and + pthread_condattr_setpshared. + * debian/valgrind.default: + - Removed. Useless file that nobody uses. (Closes: #279705) + * debian/debian.supp: + - Appended python suppression file provided by python's maintainer. + * debian/control: + - Suggests valgrind-callgrind instead of valgrind-calltree. + (Closes: #278621) + * debian/valgrind.sh: + - Some cosmetic changes. + + -- Andrés Roldán Tue, 16 Nov 2004 18:44:04 +0000 + +valgrind (1:2.2.0-3) unstable; urgency=low + + * debian/patches/01_cachegrind.dpatch: + - Cope with arguments over 510 characters in length when writing the + cachegrind output file. + * debian/patches/02_cachegrinderrno.dpatch: + - This patch makes cachegrind report the reason why it was unable to open + the output file. + * debian/patches/15_pthread_mutexattr_gettype.dpatch: + - Implements pthread_mutexattr_gettype(). + * debian/patches/16_pthread_mutex_lock.dpatch: + - Warns about a possible deadlock on thread. + * debian/patches/17_statvfs64.dpatch: + - Fixed the statfs64 wrapper to look at the right argument for the stat + buffer and added an fstatfs64 wrapper. + * debian/valgrind.sh: + - Adds /usr/X11R6/lib/debug to LD_LIBRARY_PATH. (closes: #274972) + + -- Andrés Roldán Thu, 14 Oct 2004 13:35:43 +0000 + +valgrind (1:2.2.0-2) unstable; urgency=medium + + * debian/patches/13_sched_setaffinity-getaffinity.dpatch: + - Adds support for sched_setaffinity() and sched_getaffinity() syscalls. + * debian/patches/14_ioctls.dpatch: + - Adds support for the following ioctls: + + TIOCMBIS. + + TIOCMBIC. + + SG_EMULATED_HOST. + + SG_GET_SG_TABLESIZE. + + CDROMMULTISESSION. + + CDROMVOLREAD. + + CDROMREADAUDIO. + + -- Andrés Roldán Fri, 10 Sep 2004 21:41:45 +0000 + +valgrind (1:2.2.0-1) unstable; urgency=low + + * New stable release. (closes: #234030) + * Updated patches according to this new version. + * Removed some patches already on upstream source. + * Make debian.supp the default suppression file for Debian. + + -- Andrés Roldán Wed, 1 Sep 2004 23:44:33 +0000 + +valgrind (1:2.1.2-3) unstable; urgency=low + + * debian/patches/01_libpthread.dpatch: + - Patch to improving the logic in valgrind's libpthread that handles + looking for functions in libc to forward to. If you have assertions + like "Assertion `open_ptr != ((void *)0)", you may love this patch. + * debian/patches/01_memcpy.dpatch: + - Patch to remove warning when passing an uninitialized pointer to memcpy + when length to copy is zero. + * debian/patches/02_si_addr-SIGFPE.dpatch: + - This patch should make valgrind fixup si_addr in the siginfo structure + when SIGFPE is received so that it points at the right instruction. + + -- Andrés Roldán Thu, 26 Aug 2004 19:16:34 +0000 + +valgrind (1:2.1.2-2) unstable; urgency=low + + * debian/patches/01_sfence.dpatch: New. Move the decoding of SFENCE out of + the SSE only part of disInstr. + * debian/patches/01_ssort.dpatch: New. ssort() failed when signed int return + type from comparison is too small to handle result of unsigned int + subtraction. + * debian/patches/02_sbbl.dpatch: New. gcc sometimes generates "sbbl + %reg,%reg" to convert the carry flag into 0 or -1 in reg. This has no + actual dependency on reg, but memcheck can't see that, and so will help + if reg contains garbage. + * debian/valgrind.1: + + s/--logfile-fd/--log-fd/ + + s/--logfile/--log-file/ + + s/--logsocket/--log-socket/ + + -- Andrés Roldán Sun, 8 Aug 2004 17:08:08 +0000 + +valgrind (1:2.1.2-1) unstable; urgency=low + + * New upstream release. (See changelog) (closes: #248887, #258652) + * Removed the following patches (already on upstream's package): + - 01_hp2ps + - 13_detailed_types + - 14_db-attach + - 15_async_io_syscalls.dpatch + - 16_hdio_get_identity + - 17_siocgmiiphy-siocgmiireg + * Update the following patches: + - 01_configure.dpatch + - 01_vgPlain_do_syscall.dpatch + - 11_exitcode.dpatch + - 01_ipc_stuff.dpatch + - 10_ansi-vg.dpatch + - 12_readdir.dpatch + * debian/patches/01_gettid.dpatch: New. Should closes: #238925 + + -- Andrés Roldán Tue, 20 Jul 2004 21:12:16 +0000 + +valgrind (1:2.1.1-4) unstable; urgency=low + + * debian/valgrind.sh: + - Quoted VALGRIND_OPTS to avoid conflicts with multiple pre-defined + options. (closes: #245241) + * debian/valgrind.1: + - Documented gen-suppressions option. (closes: #243734) + - sed -e 's/Valgrind/\\fIvalgrind\\fP/g' valgrind.1 + * debian/patches/15_async_io_syscalls.dpatch: + - New. Adds support for asyncronous io syscalls. + * debian/patches/16_hdio_get_identity.dpatch: + - New. Addes support for HDIO_GET_IDENTITY syscall. + * debian/patches/17_siocgmiiphy-siocgmiireg.dpatch: + - New. Adds support SIOCGMIIPHY and SIOCGMIIREG. + + -- Andrés Roldán Sun, 20 Jun 2004 16:58:22 -0500 + +valgrind (1:2.1.1-3) unstable; urgency=low + + * debian/valgrind.1: Updated. + - Added --track-fds description. + - Added lax-ioctls weird hack description. + - Added --db-attach description. + - Added --db-command description. + - Added --tool description. + - Removed --gdb-attach description. + - sed -e 's/skins/tools/g' + - (closes: #241678, #241329) + * debian/patches/14_db-attach.dpatch: New. Makes --db-attach=yes work again. + (closes: #241676) + * debian/patches/01_hp2ps.dpatch: New. Solves problem of massif creating + PostScript(R) files. + + -- Andrés Roldán Thu, 8 Apr 2004 14:19:07 -0500 + +valgrind (1:2.1.1-2) unstable; urgency=medium + + * debian/control: + sed -ne '/^Description:/,//p' control | sed -e 's/skins/tools/g' + * debian/patches/12_readdir.dpatch: New. Add support for readdir syscall. + (closes: #237996) + * debian/patches/11_exitcode.dpatch: Upgraded. Now --version exits with 0 + too. (closes: #238048) + * debian/patches/13_detailed_types.dpatch: New. Adds support for + --detailed-types option which extract detailed type info from debug + sections. + + -- Andrés Roldán Fri, 19 Mar 2004 08:57:46 -0500 + +valgrind (1:2.1.1-1) unstable; urgency=low + + * New upstream version. + - This version contains some internal structural changes needed for + valgrind's long-term future. These don't affect end-users. + It closes: #230785, #221413 + - Greater isolation between Valgrind and the program being run, so + the program is less likely to inadvertently kill Valgrind by doing + wild writes. + - Massif: a new space profiling tool. It will tell you in detail where + and when your C/C++ code is allocating heap. + Draws pretty .ps pictures of memory use against time. A potentially + powerful tool for making sense of your program's space use. + - Fixes for many bugs, including support for more SSE2/SSE3 instructions, + various signal/syscall things, and various problems with debug info + readers. (closes: #221659) + - glibc 2.3.2 w/NPTL is massively different than what valgrind expects. + - It now fully supports sysinfo page in 2.6 kernels. + (closes: #217736, #227894, #229706, #230198) + * The following patches has been updated: + 12_ipc_stuff.dpatch renamed to 01_ipc_stuff.dpatch. + 07_more_sem.dpatch renamed to 01_more_sem.dpatch. + 10_ansi-vg.dpatch. + 11_exitcode.dpatch. + * The following patches has been removed. They are already on the + upstream package: + 10_vg_stabs2.dpatch. + 01_vg_symtab2.c.dpatch. + 09_vg_stabs.dpatch. + 10_epoll.dpatch. + * The following patches has been removed. They are useless or deprecated: + 01_include-Makefile.am.dpatch. + 01_include-Makefile.in.dpatch. + 01_watchpoints.dpatch. + 06_vg_include.h.dpatch. + 10_timestamp.dpatch. + 02_stack_addresses.dpatch. + * debian/valgrind.doc: Removed PATCHES_APPLIED from the list. + * debian/valgrind.default: Updated. Now you can especify valgrind options + with VALGRIND_OPTS enviroment variable instead of VGOPTS. + * debian/overrides: Added some overrides. + * debian/valgrind.sh: Updated. Removed LD_ASSUME_KERNEL variable. Now it + should handle things well. Besides, it will use memcheck as the default as + now valgrind does not assume a default tool to use. + + -- Andrés Roldán Sat, 13 Mar 2004 04:32:15 +0000 + +valgrind (1:2.1.0-9) unstable; urgency=low + + * debian/patches/12_ipc_stuff.dpatch: New. Adds wrap of struct ipc_kludge to + solve FTBFS bug. (closes: #236402) + * debian/control: Build-Depends on dpatch (>> 2.0.0). (closes: #237214) + + -- Andrés Roldán Wed, 10 Mar 2004 14:41:24 +0000 + +valgrind (1:2.1.0-8) unstable; urgency=low + + * Fix build failures on woody. Thanks to David Kimdon. (closes: #233498) + * Now --help and --version exits with code 0. (closes: #234368) + + -- Andrés Roldán Tue, 2 Mar 2004 23:55:06 +0000 + +valgrind (1:2.1.0-7) unstable; urgency=low + + * Improved watchpoint patch. Thanks again to Robert Walsh + . + * Added patch to add the --stack-addresses option which is used to show (or + not show) the addresses in the stack trace output. + * Added patch that lets GDB backtrace through vgPlain_do_syscall. Thanks to + Daniel Jacobowitz . (closes: #225475) + + -- Andrés Roldán Mon, 16 Feb 2004 21:17:42 +0000 + +valgrind (1:2.1.0-6) unstable; urgency=low + + * Fixes bug generated by gcc which generates negatively-sized scopes and out + of order line number information in the stabs debug info. + Really fixes Bug#231093. + + -- Andrés Roldán Wed, 11 Feb 2004 13:42:04 +0000 + +valgrind (1:2.1.0-5) unstable; urgency=low + + * Added support for epoll(4) syscalls, a variant of poll(2). This API is + meaningful just for 2.5 and higher kernels. + * Upgraded copyright file. The upstream URL has changed and it was not UTF-8 + encoded. + * Added patch to support the --watchpoint option which allows the + application to set a watchpoint on a memory location. See README.Debian + for more information. Thanks to Robert Walsh . + * Added glib suppression sent by David Schleef . + (closes: #231989) + * Added patch to make the valgrind.h compile with strict ANSI gcc options. + (closes: #231604) + + -- Andrés Roldán Tue, 10 Feb 2004 18:43:25 +0000 + +valgrind (1:2.1.0-4) unstable; urgency=low + + * Added patch that fixes segfault with Objective-C debug info. + (closes: #229925) + * Added anothers suppressions to mitigate the error output due to missing + syscall page support for 2.6 kernels. + + -- Andrés Roldán Wed, 4 Feb 2004 01:39:02 +0000 + +valgrind (1:2.1.0-3) unstable; urgency=medium + + * Applied patch to handle volatile qualifiers with stabs. The former patch + just applied the const qualifiers patch. + + -- Andrés Roldán Sun, 1 Feb 2004 21:15:46 +0000 + +valgrind (1:2.1.0-2) unstable; urgency=low + + * Added patch to handle volatile and const qualifiers with stabs. + (closes: #226217) + * Added patch to show a timestamp in the output with the --time-stamp + option. + * Added $(MAKE) regtest to check valgrind when it's building. + + -- Andrés Roldán Mon, 5 Jan 2004 18:59:44 +0000 + +valgrind (1:2.1.0-1) unstable; urgency=low + + * New upstream version. + - Removed the following patches (already included in main source): + 02_valgrind-2.6-headers-fixes + 03_vg_main.c + 04_vg_syscalls.c + 05_vg_replace_malloc.c + 07_gettid_syscall + 07_lfence_mfence + 08_scas + - Now blocking syscalls behave behave exactly as they do when running + natively (not in valgrind). Hopefully closes: #166514 + - Added support for file descriptors leakage checks (--track-fds=yes). + When enabled, valgrind will print out a list of open file descriptors + on exit. + * Increased the number of semaphores supported. (closes: #221745) + + -- Andrés Roldán Wed, 17 Dec 2003 14:23:06 +0000 + +valgrind (1:2.0.0-4) unstable; urgency=low + + * Added new glibc suppressions. + * Added stolen from head patch that implements __NR_gettid (syscall 224). + * Added stolen from head patch to support LFENCE and MFENCE. + * Added stolen from head patch to implement SCAS. + * Removed potato suppressions. + * Updated sarge suppressions. + + -- Andrés Roldán Sat, 6 Dec 2003 02:33:13 +0000 + +valgrind (1:2.0.0-3) unstable; urgency=low + + * Renamed debian/patches files to the XX_name.dpatch scheme. + * Included patch from Jim Meyering to support __NR_statfs64 (syscall 268) + and __NR_utimes (syscall 271) syscalls. + * Added patch to support posix_memalign function. + * Increased the line error message. Useful when your code has long lines. + * Improved 03_vg_main.c.dpatch. Hopefully closes: #206917 + + -- Andrés Roldán Mon, 17 Nov 2003 18:14:02 +0000 + +valgrind (1:2.0.0-2) unstable; urgency=low + + * Build-depends and Recommends gdb. When configuring, it tries to determine + where is gdb and if it's not installed, --gdb-attach will not work. + (closes: #220729) + + -- Andrés Roldán Fri, 14 Nov 2003 13:39:52 +0000 + +valgrind (1:2.0.0-1) unstable; urgency=low + + * New upstream version. + - Removed patches to allow valgrind compile under kernel 2.6. It is + already on the valgrind upstream source. + - Removed compilation with profile support. + - Removed patch that solved unhandled instruction bytes problem. It is + already on the valgrind upstream source. + - Removed patch that solved the stack corruption on valgrind. It is + already on the valgrind upstream source. + + -- Andrés Roldán Thu, 13 Nov 2003 23:06:21 +0000 + +valgrind (20031012-6) unstable; urgency=low + + * I didn't want this but even the upstream has not a better solution. + It has been added LD_ASSUME_KERNEL=2.4.1 to the valgrind wrapper to solve + all the bugs related to NPTL at the moment in valgrind. Really fix #218611 + and closes: #220161, #218609 + + -- Andrés Roldán Tue, 11 Nov 2003 13:10:28 +0000 + +valgrind (20031012-5) unstable; urgency=low + + * Compiled with the latest libc6 (2.3.2.ds1-10) that added a patch to + disable NPTL for programs that call the old errno. If this bug is + still appearing on you, you may as well upgrade to libc6-2.3.2.ds1-10 + or newer. (closes: #218611) + * Updated README.Debian. Read it please. + + -- Andrés Roldán Sat, 8 Nov 2003 17:10:09 +0000 + +valgrind (20031012-4) unstable; urgency=low + + * Added patch sent from Andrew Moise that solves the bugs arised with + the latest libc6. Thanks to him. (closes: #218611, #218629, #218636) + + -- Andrés Roldán Mon, 3 Nov 2003 03:04:57 +0000 + +valgrind (20031012-3) unstable; urgency=low + + * Added patch that solves the unhandled instruction bytes bug found on + valgrind. + + -- Andrés Roldán Mon, 20 Oct 2003 13:50:08 +0000 + +valgrind (20031012-2) unstable; urgency=low + + * Removed suggestion of valgrind-headers. (closes: #215262) + * Added patch that solves the not-ever-reported bug of stack corruption on + valgrind. + + -- Andrés Roldán Thu, 16 Oct 2003 14:50:22 +0000 + +valgrind (20031012-1) unstable; urgency=low + + * New upstream version. + + -- Andrés Roldán Wed, 15 Oct 2003 21:13:02 +0000 + +valgrind (20030725-8) unstable; urgency=low + + * Put together again all the package. I know, that was a bad idea. + * Added vg_profile.c to includes. + + -- Andrés Roldán Fri, 10 Oct 2003 17:36:26 +0000 + +valgrind (20030725-7) unstable; urgency=low + + * At last, there has been included a full valgrind manpage written by me. + (closes: #166561) + + -- Andrés Roldán Thu, 2 Oct 2003 20:44:29 +0000 + +valgrind (20030725-6) unstable; urgency=low + + * The "I'm feeling smart today (am I?)" release. + * Changed maintainer's e-mail. + * Bumped Standards-Version to 3.6.1. + * Splitted into two packages: valgrind-headers (Headers only needed to + create new skins) and valgrind (the core package). + * Included "vg_profile.c" to some skins (cachegrind, corecheck, lackey and + none) to make them support profiling. + * Updated debian/README.Debian and debian/copyright. + + -- Andrés Roldán Sun, 28 Sep 2003 16:44:04 -0500 + +valgrind (20030725-5) unstable; urgency=low + + * Added new XFree86 suppression to sid.supp. + * Removed useless build-depend on sharutils. + + -- Andrés Roldán Sun, 14 Sep 2003 05:12:48 +0000 + +valgrind (20030725-4) unstable; urgency=low + + * Now it really compiles on 2.6 kernels. (closes: #208142) + + -- Andrés Roldán Wed, 3 Sep 2003 22:44:00 +0000 + +valgrind (20030725-3) unstable; urgency=low + + * Changed the valgrind wrapper. It didn't work when it was using libraries + on a non-standard location. (Thanks Jason :). (closes: #207771) + * Added patch to support compilation for 2.6 kernels (closes: #208142) + + -- Andrés Roldán Mon, 1 Sep 2003 16:38:59 +0000 + +valgrind (20030725-2) unstable; urgency=low + + * Added suggestion to use libc6-dbg which shows pretty important debugging + information. + * Added wrapper to use libc6-dbg if it's installed. + * Added sid.supp to work with the newest libc6 version. + * Built with newer libc6. + * Added patch to support waitpid syscall. (closes: #206366) + + -- Andrés Roldán Wed, 20 Aug 2003 16:42:37 +0000 + +valgrind (20030725-1) unstable; urgency=low + + * New upstream version taken from cvs head. Fixes some minor bugs. + * Fixed debian-specific suppressions errors. (closes: #202126) + + -- Andrés Roldán Tue, 29 Jul 2003 02:07:08 +0000 + +valgrind (20030716-1) unstable; urgency=low + + * New upstream version taken from cvs head. (closes: #188155) + * Add suggestion to use valgrind-calltree which is needed to make a good use + of kcachegrind (closes: #193169) + * Bumped Standard-Version to 3.6.0. Changelog and control is now UTF-8 + enconded. + * Updated long description. + + -- Andrés Roldán Fri, 18 Jul 2003 14:25:19 +0000 + +valgrind (1.9.6-1) unstable; urgency=low + + * New upstream version. + * Removed the patch from Anders Gustafsson since it is already on the + upstream source. + * Added FAQ.txt to documentation (please read it). + * Changed default suppresion to sarge.supp. I left woody.supp and + potato.supp for compatibility. + * Added a stolen-from-HEAD patch from Crispin Flowerday that closes all the + opened file descriptors when the work is done. + * Added a stolen-from-HEAD patch from Jeffrey Stedfast to avoid confussion + when the number of the suppression callers is >= VG_N_SUPP_CALLERS. + * Added a stolen-from-HEAD patch from Troels Walsted Hansen that allows reuse + of the socket. + + -- Andrés Roldán Sat, 10 May 2003 18:53:36 +0000 + +valgrind (1.9.5-2) unstable; urgency=low + + * Change index.html to manual.html in doc-base (closes: #189749, #190180) + * Fixed some minor typo issues. + * Added some overrides of some unstripped share objects. + * valgrind --help now goes to stdout (closes: #189657) + * Applied patch from Anders Gustafsson to make valgrind usable for + linux-2.5.68. (closes: #191347) + + -- Andrés Roldán Sat, 28 Apr 2003 08:45:10 +0000 + +valgrind (1.9.5-1) unstable; urgency=low + + * New maintainer. + * Began to use the devel branch of valgrind as the default version. + See README.Debian. + (closes: #166514, #179248, #186924, #179114) + * Bumped up Standard-Version according to latest Debian Policy. + + -- Andrés Roldán Wed, 16 Apr 2003 22:56:26 +0000 + +valgrind (1.0.4-2.2) unstable; urgency=low + + * Non-maintainer upload. + * Patched to support __NR_exit_group syscall. Requires compilation + against a kernel with __NR_exit_group defined. Closes: #179581. + * Remove configure generated files. + * Add a trailing new line to debian/docs, to quiet dpkg-source. + * Remove dh_testroot call from clean target in rules. Closes: #174263. + * Fix the config.sub/config.guess out of date problem, by depending on + autotools-dev. + * Remove call to dh_undocumented. + * Remove debian/conffiles, as this is done automatically now. + * Fix boilerplate text in debian/copyright, which was from dh_make. + * Mostly lintian clean. All that is left is to write some manpages. + + -- Adam Heath Fri, 7 Feb 2003 13:16:59 -0600 + +valgrind (1.0.4-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Rebuilt to work with current glibc (closes: #173918). + + -- Robert Bihlmeyer Thu, 26 Dec 2002 17:55:58 +0100 + +valgrind (1.0.4-2) unstable; urgency=low + + * removed the conflicts: against libc6 2.3 -- upstream 1.0.4 is happy with + that libc now (Closes: #165361) + + -- Cyrille Chepelov Wed, 23 Oct 2002 08:46:04 +0200 + +valgrind (1.0.4-1) unstable; urgency=low + + * New upstream release + * Added a conflicts: against libc6 2.3 until I can investigate more. If + things go well, -2 should lift this restriction. + * Includes the Call Tree patch-0.2b-valgrind-1.0.4.gz from Josef Weindorfer + * Includes the ValGui support patch vg104-after-ct0.2b.diff from Eric + Estievenart. + * added FAQ.txt to the docs + + -- Cyrille Chepelov Mon, 21 Oct 2002 07:20:42 +0200 + +valgrind (1.0.3-2) unstable; urgency=low + + * added an experimental patch from upstream, + valgrind-1.0.3-gcc3.1-and-above-patch1.txt. This should help reducing + the amount of noise when compiling with gcc3.1 and above. + + -- Cyrille Chepelov Tue, 24 Sep 2002 21:23:00 +0200 + +valgrind (1.0.3-1) unstable; urgency=low + + * New upstream release (Closes: #160469) + * added a "suggests" on kcachegrind + * Includes the Call Tree patch-0.2a-valgrind-1.0.2.gz from Josef Weindorfer, + to improve compatibility with kcachegrind (Closes: #161208) + + -- Cyrille Chepelov Thu, 19 Sep 2002 07:20:50 +0200 + +valgrind (1.0.1-2) unstable; urgency=low + + * Add forgotten upstream ChangeLog (Closes: #159333) + + -- Cyrille Chepelov Mon, 2 Sep 2002 18:52:25 +0200 + +valgrind (1.0.1-1) unstable; urgency=low + + * New upstream release (Closes: #154921) + * added CURRENT_BUG_STATUS to the doc directory. + * Using the same maintainer address for all packages, sheesh! + + -- Cyrille Chepelov Wed, 28 Aug 2002 09:48:30 +0200 + +valgrind (1.0.0-1) unstable; urgency=low + + * New upstream release (Closes: #154394) + + -- Cyrille Chepelov Sat, 27 Jul 2002 16:51:14 +0200 + +valgrind (1.0pre6-1) unstable; urgency=low + + * New upstream release + + -- Cyrille Chepelov Sun, 21 Jul 2002 17:26:16 +0200 + +valgrind (1.0pre2-2) unstable; urgency=low + + * removed call to dh_strip, at upstream's request + * Added an override against unstripped-binary-or-object, after shaleh gave + green light. + + -- Cyrille Chepelov Fri, 21 Jun 2002 15:12:24 +0200 + +valgrind (1.0pre2-1) unstable; urgency=low + + * New upstream release. Should hopefully close #150588. + + * installs file valgrind.h into /usr/include (Closes: #147718). In + fact, install now uses 'make install' which has been available for a + while. + + -- Cyrille Chepelov Fri, 21 Jun 2002 14:26:54 +0200 + +valgrind (0.0.20020511-1) unstable; urgency=low + + * New upstream release. Should close #145554; waiting for feedback + before closing this bug. + + -- Cyrille Chepelov Sat, 11 May 2002 21:48:51 +0200 + +valgrind (0.0.20020503b-2) unstable; urgency=low + + * Added a "local" suppressions file in the default conffile (Closes + #145691 a more complete way without code-level changes). + + -- Cyrille Chepelov Sun, 5 May 2002 21:52:57 +0200 + +valgrind (0.0.20020503b-1) unstable; urgency=low + + * New upstream release. This one fixes a major bug from the last two + snapshot packages (20020428 and 20020502). + + * added forgotten new binary libpthead.so (Closes: #145738) + + * Added a note in README.Debian about problems with running kernel 2.2 + with a binary built using kernel 2.4 (see #145554, which is not fixed yet). + + * Added a suppression for "ls -l" (Closes: 145727) and added a + "debian.supp" temporary suppressions file. These suppressions should + all be temporary, until upstream merges them. + + * Added a file, /etc/default/valgrind, which allows you to tweak + default options for valgrind and cachegrind; in particular, the + default suppressions file. (Closes: #145691) + + * Updated the control file to reflect the new features (libpthread, + cachegrind) + + -- Cyrille Chepelov Sun, 5 May 2002 20:26:20 +0200 + +valgrind (0.0.20020502-1) unstable; urgency=low + + * New upstream release + + * Fixed description grammar/typography (Closes: #145311) + + * Fixed suppressions file generation. Now the package ships with "woody" + and "potato" suppressions files (unconditionally uses "woody.supp" by + default). (Closes: #145445) + + * Added a hint in README.Debian about the possibility to use the + debugging libc6. + + -- Cyrille Chepelov Thu, 2 May 2002 19:23:35 +0200 + +valgrind (0.0.20020428-1) unstable; urgency=low + + * New upstream release + + * This package now works only with glibc-2.2 (upstream also supports + glibc-2.1) + + -- Cyrille Chepelov Tue, 30 Apr 2002 07:30:04 +0200 + +valgrind (0.0.20020329-3) unstable; urgency=low + + * debian/control: added a build-dependency against glibc-2.2 (prevents + attempts to build on potato; previous libc6-dev lacked a #define + IPC_64 in linux/ipc.h). This again suggested by Cristian Ionescu-Idbohrn. + + * Reviewed the upgrading checklist, and bumped up the Standards-Version + accordingly. + + -- Cyrille Chepelov Sat, 6 Apr 2002 21:44:53 +0200 + +valgrind (0.0.20020329-2) unstable; urgency=low + + * debian/rules: better cleaned up ./configure-generated files (used + distclean rather than clean). + * valgrind.1: removed a small inconsistency in the parameter + documentation. + + Both these issues were reported by Cristian Ionescu-Idbohrn + + + -- Cyrille Chepelov Sat, 6 Apr 2002 18:44:07 +0200 + +valgrind (0.0.20020329-1) unstable; urgency=low + + * New upstream release + * This time hopefully I won't re-upload a previously-rejected version. + + -- Cyrille Chepelov Sat, 6 Apr 2002 09:41:44 +0200 + +valgrind (0.0.20020320-1) unstable; urgency=low + + * New upstream version. + * Fixed copyright file, which was lacking a mention of the GPL (oops). + * added the README_MISSING_SYSCALL_OR_IOCTL docfile. + + -- Cyrille Chepelov Thu, 21 Mar 2002 19:05:21 +0100 + +valgrind (0.0.20020226-2) unstable; urgency=low + + * Updated description to reflect the fact that funky instruction and + clone() are still unsupported. (Closes a comment from Joe Buck + ) + + -- Cyrille Chepelov Wed, 27 Feb 2002 00:53:50 +0100 + +valgrind (0.0.20020226-1) unstable; urgency=low + + * New upstream release + + -- Cyrille Chepelov Tue, 26 Feb 2002 23:53:01 +0100 + +valgrind (0.0.20020224-1) unstable; urgency=low + + * Initial Release (closes: #135718) + + -- Cyrille Chepelov Mon, 25 Feb 2002 20:16:46 +0100 + --- valgrind-3.6.1.orig/debian/compat +++ valgrind-3.6.1/debian/compat @@ -0,0 +1 @@ +5 --- valgrind-3.6.1.orig/debian/patches/11_exitcode.dpatch +++ valgrind-3.6.1/debian/patches/11_exitcode.dpatch @@ -0,0 +1,35 @@ +#! /bin/sh -e +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Now --help and --version exits with 0 instead of 1. + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 +@DPATCH@ + +diff -urN valgrind-2.2.0+2.4.0rc1.orig/coregrind/vg_main.c valgrind-2.2.0+2.4.0rc1/coregrind/vg_main.c +--- valgrind-2.2.0+2.4.0rc1.orig/coregrind/vg_main.c 2005-03-07 22:06:46.000000000 +0000 ++++ valgrind-2.2.0+2.4.0rc1/coregrind/vg_main.c 2005-03-09 19:13:15.000000000 +0000 +@@ -330,7 +330,7 @@ + VG_(message)(Vg_UserMsg, + ""); + VG_(pp_sched_status)(); +- VG_(exit)(1); ++ VG_(exit)(0); + } + + /* Debugging thing .. can be called from assembly with OYNK macro. */ --- valgrind-3.6.1.orig/debian/patches/20_pthread_condattr_getsetpshared.dpatch +++ valgrind-3.6.1/debian/patches/20_pthread_condattr_getsetpshared.dpatch @@ -0,0 +1,100 @@ +#! /bin/sh -e +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add a dummy implementation of pthread_condattr_getpshared and +## DP: pthread_condattr_setpshared. + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 +@DPATCH@ + +diff -urN valgrind-2.2.0.orig/coregrind/vg_libpthread.c valgrind-2.2.0/coregrind/vg_libpthread.c +--- valgrind-2.2.0.orig/coregrind/vg_libpthread.c 2004-11-16 18:22:28.000000000 +0000 ++++ valgrind-2.2.0/coregrind/vg_libpthread.c 2004-11-16 18:26:21.000000000 +0000 +@@ -138,6 +138,16 @@ + int __vg_mutexkind; + } vg_pthread_mutexattr_t; + ++typedef struct ++{ ++ /* Combination of values: ++ ++ Bit 0 : flag whether conditional variable will be shareable between ++ processes. ++ */ ++ int __vg_value; ++} vg_pthread_condattr_t; ++ + typedef struct _vg_pthread_rwlock_t + { + struct _vg_pthread_fastlock __vg_rw_lock; /* Lock to guarantee mutual exclusion */ +@@ -1403,6 +1413,10 @@ + + int pthread_condattr_init(pthread_condattr_t *attr) + { ++ vg_pthread_condattr_t* vg_attr; ++ CONVERT(condattr, attr, vg_attr); ++ ++ memset (vg_attr, '\0', sizeof (*vg_attr)); + return 0; + } + +@@ -1411,6 +1425,29 @@ + return 0; + } + ++int pthread_condattr_setpshared(pthread_condattr_t *attr, int pshared) ++{ ++ vg_pthread_condattr_t* vg_attr; ++ CONVERT(condattr, attr, vg_attr); ++ ++ if (pshared != PTHREAD_PROCESS_PRIVATE && ++ pshared != PTHREAD_PROCESS_SHARED) ++ return EINVAL; ++ ++ int *valuep = &(vg_attr->__vg_value); ++ *valuep = (*valuep & ~1) | (pshared != PTHREAD_PROCESS_PRIVATE); ++ return 0; ++} ++ ++int pthread_condattr_getpshared (const pthread_condattr_t *attr, int *pshared) ++{ ++ vg_pthread_condattr_t* vg_attr; ++ CONVERT(condattr, attr, vg_attr); ++ ++ *pshared = vg_attr->__vg_value & 1; ++ return 0; ++} ++ + int pthread_cond_init( pthread_cond_t *cond, + const pthread_condattr_t *cond_attr) + { +diff -urN valgrind-2.2.0.orig/coregrind/vg_libpthread_unimp.c valgrind-2.2.0/coregrind/vg_libpthread_unimp.c +--- valgrind-2.2.0.orig/coregrind/vg_libpthread_unimp.c 2004-11-16 18:22:41.000000000 +0000 ++++ valgrind-2.2.0/coregrind/vg_libpthread_unimp.c 2004-11-16 18:26:42.000000000 +0000 +@@ -119,9 +119,9 @@ + //void pthread_cond_timedwait ( void ) { unimp("pthread_cond_timedwait"); } + //void pthread_cond_wait ( void ) { unimp("pthread_cond_wait"); } + //void pthread_condattr_destroy ( void ) { unimp("pthread_condattr_destroy"); } +-void pthread_condattr_getpshared ( void ) { unimp("pthread_condattr_getpshared"); } ++//void pthread_condattr_getpshared ( void ) { unimp("pthread_condattr_getpshared"); } + //void pthread_condattr_init ( void ) { unimp("pthread_condattr_init"); } +-void pthread_condattr_setpshared ( void ) { unimp("pthread_condattr_setpshared"); } ++//void pthread_condattr_setpshared ( void ) { unimp("pthread_condattr_setpshared"); } + //void pthread_detach ( void ) { unimp("pthread_detach"); } + //void pthread_equal ( void ) { unimp("pthread_equal"); } + //void pthread_exit ( void ) { unimp("pthread_exit"); } --- valgrind-3.6.1.orig/debian/patches/02_load-address.dpatch +++ valgrind-3.6.1/debian/patches/02_load-address.dpatch @@ -0,0 +1,35 @@ +#! /bin/sh -e +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Change valgrind load base address + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 +@DPATCH@ + +diff -urN valgrind-3.1.0.orig/configure valgrind-3.1.0/configure +--- valgrind-3.1.0.orig/configure 2005-11-30 16:23:23.000000000 +0000 ++++ valgrind-3.1.0/configure 2005-11-30 16:27:28.000000000 +0000 +@@ -3988,7 +3988,7 @@ + echo "$as_me:$LINENO: result: ok (${host_cpu})" >&5 + echo "${ECHO_T}ok (${host_cpu})" >&6 + VG_ARCH="x86" +- valt_load_address_normal="0xb0000000" ++ valt_load_address_normal="0xa000000" + valt_load_address_inner="0xa0000000" + ;; + --- valgrind-3.6.1.orig/debian/patches/02_cachegrinderrno.dpatch +++ valgrind-3.6.1/debian/patches/02_cachegrinderrno.dpatch @@ -0,0 +1,47 @@ +#! /bin/sh -e +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: This patch makes cachegrind report the reason why it was unable +## DP: to open the output file. + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 +@DPATCH@ + +diff -urN valgrind-2.2.0.orig/cachegrind/cg_main.c valgrind-2.2.0/cachegrind/cg_main.c +--- valgrind-2.2.0.orig/cachegrind/cg_main.c 2004-10-14 13:48:20.000000000 +0000 ++++ valgrind-2.2.0/cachegrind/cg_main.c 2004-10-14 13:49:49.000000000 +0000 +@@ -41,6 +41,8 @@ + + #include "cg_sim.c" + ++#include ++ + /*------------------------------------------------------------*/ + /*--- Constants ---*/ + /*------------------------------------------------------------*/ +@@ -1089,8 +1091,8 @@ + static void file_err ( void ) + { + VG_(message)(Vg_UserMsg, +- "error: can't open cache simulation output file `%s'", +- cachegrind_out_file ); ++ "error: can't open cache simulation output file `%s': %s", ++ cachegrind_out_file, strerror(errno) ); + VG_(message)(Vg_UserMsg, + " ... so simulation results will be missing."); + } --- valgrind-3.6.1.orig/debian/patches/60_thumb-sigill-fixes.dpatch +++ valgrind-3.6.1/debian/patches/60_thumb-sigill-fixes.dpatch @@ -0,0 +1,48 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 60_thumb-sigill-fixes.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad valgrind-3.6.0~svn20100212~/coregrind/m_main.c valgrind-3.6.0~svn20100212/coregrind/m_main.c +--- valgrind-3.6.0~svn20100212~/coregrind/m_main.c 2010-02-12 14:30:23.000000000 +0100 ++++ valgrind-3.6.0~svn20100212/coregrind/m_main.c 2010-03-26 14:46:54.086880594 +0100 +@@ -2790,11 +2790,12 @@ + asm("\n" + "\t.align 2\n" + "\t.global _start\n" ++ "\t.type _start, %function\n" + "_start:\n" +- "\tldr r0, [pc, #36]\n" +- "\tldr r1, [pc, #36]\n" ++ "\tldr r0, =vgPlain_interim_stack\n" ++ "\tldr r1, =" VG_STRINGIFY(VG_STACK_GUARD_SZB) "\n" + "\tadd r0, r1, r0\n" +- "\tldr r1, [pc, #32]\n" ++ "\tldr r1, =" VG_STRINGIFY(VG_STACK_ACTIVE_SZB) "\n" + "\tadd r0, r1, r0\n" + "\tmvn r1, #15\n" + "\tand r0, r0, r1\n" +@@ -2802,9 +2803,7 @@ + "\tmov sp, r0\n" + "\tmov r0, r1\n" + "\tb _start_in_C_linux\n" +- "\t.word vgPlain_interim_stack\n" +- "\t.word "VG_STRINGIFY(VG_STACK_GUARD_SZB)"\n" +- "\t.word "VG_STRINGIFY(VG_STACK_ACTIVE_SZB)"\n" ++ "\t.ltorg\n" + ); + #else + # error "Unknown linux platform" +diff -urNad valgrind-3.6.0~svn20100212~/coregrind/m_syswrap/syswrap-x86-linux.c valgrind-3.6.0~svn20100212/coregrind/m_syswrap/syswrap-x86-linux.c +--- valgrind-3.6.0~svn20100212~/coregrind/m_syswrap/syswrap-x86-linux.c 2010-02-12 14:30:21.000000000 +0100 ++++ valgrind-3.6.0~svn20100212/coregrind/m_syswrap/syswrap-x86-linux.c 2010-03-26 14:46:54.076886726 +0100 +@@ -82,6 +82,7 @@ + asm( + ".text\n" + ".globl vgModuleLocal_call_on_new_stack_0_1\n" ++".type vgModuleLocal_call_on_new_stack_0_1, %function\n" + "vgModuleLocal_call_on_new_stack_0_1:\n" + " movl %esp, %esi\n" // remember old stack pointer + " movl 4(%esi), %esp\n" // set stack --- valgrind-3.6.1.orig/debian/patches/70_gcc-4.6.1-dwarf-ops_svn-r11856.dpatch +++ valgrind-3.6.1/debian/patches/70_gcc-4.6.1-dwarf-ops_svn-r11856.dpatch @@ -0,0 +1,89 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 70_gcc-4.6.1-dwarf-ops_svn-r11856.patch.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/coregrind/m_debuginfo/debuginfo.c valgrind-3.6.1/coregrind/m_debuginfo/debuginfo.c +--- valgrind-3.6.1~/coregrind/m_debuginfo/debuginfo.c 2010-10-20 22:19:43.000000000 +0200 ++++ valgrind-3.6.1/coregrind/m_debuginfo/debuginfo.c 2011-07-05 12:06:31.048092238 +0200 +@@ -1958,6 +1958,14 @@ + case Cop_Sub: return wL - wR; + case Cop_And: return wL & wR; + case Cop_Mul: return wL * wR; ++ case Cop_Shl: return wL << wR; ++ case Cop_Shr: return wL >> wR; ++ case Cop_Eq: return wL == wR ? 1 : 0; ++ case Cop_Ge: return wL >= wR ? 1 : 0; ++ case Cop_Gt: return wL > wR ? 1 : 0; ++ case Cop_Le: return wL <= wR ? 1 : 0; ++ case Cop_Lt: return wL < wR ? 1 : 0; ++ case Cop_Ne: return wL != wR ? 1 : 0; + default: goto unhandled; + } + /*NOTREACHED*/ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/coregrind/m_debuginfo/priv_storage.h valgrind-3.6.1/coregrind/m_debuginfo/priv_storage.h +--- valgrind-3.6.1~/coregrind/m_debuginfo/priv_storage.h 2010-10-20 22:19:43.000000000 +0200 ++++ valgrind-3.6.1/coregrind/m_debuginfo/priv_storage.h 2011-07-05 12:06:31.048092238 +0200 +@@ -218,7 +218,15 @@ + Cop_Add=0x321, + Cop_Sub, + Cop_And, +- Cop_Mul ++ Cop_Mul, ++ Cop_Shl, ++ Cop_Shr, ++ Cop_Eq, ++ Cop_Ge, ++ Cop_Gt, ++ Cop_Le, ++ Cop_Lt, ++ Cop_Ne + } + CfiOp; + +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/coregrind/m_debuginfo/readdwarf.c valgrind-3.6.1/coregrind/m_debuginfo/readdwarf.c +--- valgrind-3.6.1~/coregrind/m_debuginfo/readdwarf.c 2010-10-20 22:19:43.000000000 +0200 ++++ valgrind-3.6.1/coregrind/m_debuginfo/readdwarf.c 2011-07-05 12:06:31.038092225 +0200 +@@ -2831,6 +2831,22 @@ + op = Cop_And; opname = "and"; goto binop; + case DW_OP_mul: + op = Cop_Mul; opname = "mul"; goto binop; ++ case DW_OP_shl: ++ op = Cop_Shl; opname = "shl"; goto binop; ++ case DW_OP_shr: ++ op = Cop_Shr; opname = "shr"; goto binop; ++ case DW_OP_eq: ++ op = Cop_Eq; opname = "eq"; goto binop; ++ case DW_OP_ge: ++ op = Cop_Ge; opname = "ge"; goto binop; ++ case DW_OP_gt: ++ op = Cop_Gt; opname = "gt"; goto binop; ++ case DW_OP_le: ++ op = Cop_Le; opname = "le"; goto binop; ++ case DW_OP_lt: ++ op = Cop_Lt; opname = "lt"; goto binop; ++ case DW_OP_ne: ++ op = Cop_Ne; opname = "ne"; goto binop; + binop: + POP( ix ); + POP( ix2 ); +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/coregrind/m_debuginfo/storage.c valgrind-3.6.1/coregrind/m_debuginfo/storage.c +--- valgrind-3.6.1~/coregrind/m_debuginfo/storage.c 2010-10-20 22:19:43.000000000 +0200 ++++ valgrind-3.6.1/coregrind/m_debuginfo/storage.c 2011-07-05 12:06:31.048092238 +0200 +@@ -595,6 +595,14 @@ + case Cop_Sub: VG_(printf)("-"); break; + case Cop_And: VG_(printf)("&"); break; + case Cop_Mul: VG_(printf)("*"); break; ++ case Cop_Shl: VG_(printf)("<<"); break; ++ case Cop_Shr: VG_(printf)(">>"); break; ++ case Cop_Eq: VG_(printf)("=="); break; ++ case Cop_Ge: VG_(printf)(">="); break; ++ case Cop_Gt: VG_(printf)(">"); break; ++ case Cop_Le: VG_(printf)("<="); break; ++ case Cop_Lt: VG_(printf)("<"); break; ++ case Cop_Ne: VG_(printf)("!="); break; + default: vg_assert(0); + } + } --- valgrind-3.6.1.orig/debian/patches/19_pthread_attr_getinheritsched.dpatch +++ valgrind-3.6.1/debian/patches/19_pthread_attr_getinheritsched.dpatch @@ -0,0 +1,54 @@ +#! /bin/sh -e +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add a dummy implementation of pthread_attr_getinheritsched. + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 +@DPATCH@ + +diff -urN valgrind-2.2.0.orig/coregrind/vg_libpthread.c valgrind-2.2.0/coregrind/vg_libpthread.c +--- valgrind-2.2.0.orig/coregrind/vg_libpthread.c 2004-11-16 18:13:44.000000000 +0000 ++++ valgrind-2.2.0/coregrind/vg_libpthread.c 2004-11-16 18:22:28.000000000 +0000 +@@ -444,6 +444,15 @@ + return 0; + } + ++int pthread_attr_getinheritsched(const pthread_attr_t *attr, int *inherit) ++{ ++ static int moans = N_MOANS; ++ if (moans-- > 0) ++ kludged("pthread_attr_getinheritsched", NULL); ++ *inherit = PTHREAD_EXPLICIT_SCHED; ++ return 0; ++} ++ + int pthread_attr_setinheritsched(pthread_attr_t *attr, int inherit) + { + static int moans = N_MOANS; +diff -urN valgrind-2.2.0.orig/coregrind/vg_libpthread_unimp.c valgrind-2.2.0/coregrind/vg_libpthread_unimp.c +--- valgrind-2.2.0.orig/coregrind/vg_libpthread_unimp.c 2004-11-16 18:13:44.000000000 +0000 ++++ valgrind-2.2.0/coregrind/vg_libpthread_unimp.c 2004-11-16 18:22:41.000000000 +0000 +@@ -95,7 +95,7 @@ + //void pthread_atfork ( void ) { unimp("pthread_atfork"); } + //void pthread_attr_destroy ( void ) { unimp("pthread_attr_destroy"); } + //void pthread_attr_getdetachstate ( void ) { unimp("pthread_attr_getdetachstate"); } +-void pthread_attr_getinheritsched ( void ) { unimp("pthread_attr_getinheritsched"); } ++//void pthread_attr_getinheritsched ( void ) { unimp("pthread_attr_getinheritsched"); } + //void pthread_attr_getschedparam ( void ) { unimp("pthread_attr_getschedparam"); } + //void pthread_attr_getschedpolicy ( void ) { unimp("pthread_attr_getschedpolicy"); } + //void pthread_attr_getscope ( void ) { unimp("pthread_attr_getscope"); } --- valgrind-3.6.1.orig/debian/patches/12_readdir.dpatch +++ valgrind-3.6.1/debian/patches/12_readdir.dpatch @@ -0,0 +1,47 @@ +#! /bin/sh -e +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Adds support for readdir syscall. Bug#237996 + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 +@DPATCH@ + +diff -urN valgrind-2.2.0.orig/coregrind/vg_syscalls.c valgrind-2.2.0/coregrind/vg_syscalls.c +--- valgrind-2.2.0.orig/coregrind/vg_syscalls.c 2004-08-31 00:08:37.000000000 +0000 ++++ valgrind-2.2.0/coregrind/vg_syscalls.c 2004-09-01 23:40:53.000000000 +0000 +@@ -2148,6 +2148,20 @@ + VG_TRACK( post_mem_write, arg2, res ); + } + ++PRE(readdir) ++{ ++ /* int readdir(unsigned int fd, struct dirent *dirp, ++ unsigned int count); */ ++ MAYBE_PRINTF("readdir ( %d, %p, %d )\n", arg1,arg2,arg3); ++ SYSCALL_TRACK( pre_mem_write, tid, "readdir(dirp)", arg2, arg3 ); ++} ++ ++POST(readdir) ++{ ++ if (res > 0) ++ VG_TRACK( post_mem_write, arg2, sizeof(struct vki_dirent) ); ++} ++ + PRE(getgroups) + { + /* int getgroups(int size, gid_t list[]); */ --- valgrind-3.6.1.orig/debian/patches/00list +++ valgrind-3.6.1/debian/patches/00list @@ -0,0 +1,5 @@ +02_version.dpatch +60_thumb-sigill-fixes.dpatch +70_gcc-4.6.1-dwarf-ops_svn-r11856.dpatch +71_linux-3-support.dpatch +99_autoreconf.dpatch --- valgrind-3.6.1.orig/debian/patches/71_linux-3-support.dpatch +++ valgrind-3.6.1/debian/patches/71_linux-3-support.dpatch @@ -0,0 +1,23 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## linux-3-support.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Support building on linux 3.x kernels; from SVN r11796 and r11797 + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/configure.in valgrind-3.6.1/configure.in +--- valgrind-3.6.1~/configure.in 2011-10-05 12:05:42.030046532 +0200 ++++ valgrind-3.6.1/configure.in 2011-10-05 12:06:22.642247919 +0200 +@@ -220,9 +220,9 @@ + kernel=`uname -r` + + case "${kernel}" in +- 2.6.*) +- AC_MSG_RESULT([2.6 family (${kernel})]) +- AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x]) ++ 2.6.*|3.*) ++ AC_MSG_RESULT([2.6.x/3.x family (${kernel})]) ++ AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x or Linux 3.x]) + ;; + + 2.4.*) --- valgrind-3.6.1.orig/debian/patches/01_configure.dpatch +++ valgrind-3.6.1/debian/patches/01_configure.dpatch @@ -0,0 +1,35 @@ +#! /bin/sh -e +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Default suppressions for this package. + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 +@DPATCH@ + +diff -urN valgrind-3.2.0.orig/configure valgrind-3.2.0/configure +--- valgrind-3.2.0.orig/configure 2006-06-06 01:37:21.000000000 +0000 ++++ valgrind-3.2.0/configure 2006-06-14 23:38:53.000000000 +0000 +@@ -4279,7 +4279,7 @@ + + # This variable will collect the individual suppression files + # depending on the results of autoconf +-DEFAULT_SUPP="" ++DEFAULT_SUPP="debian.supp" + + + --- valgrind-3.6.1.orig/debian/patches/01_valgrindrc.dpatch +++ valgrind-3.6.1/debian/patches/01_valgrindrc.dpatch @@ -0,0 +1,70 @@ +#! /bin/sh -e +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Don't use .valgrindrc file unless read by the owner + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 +@DPATCH@ + +diff -urN valgrind-3.3.1.orig/coregrind/m_commandline.c valgrind-3.3.1/coregrind/m_commandline.c +--- valgrind-3.3.1.orig/coregrind/m_commandline.c 2008-06-01 01:39:05.000000000 +0000 ++++ valgrind-3.3.1/coregrind/m_commandline.c 2008-12-03 16:54:55.000000000 +0000 +@@ -56,25 +56,30 @@ + static HChar* read_dot_valgrindrc ( HChar* dir ) + { + Int n; +- SysRes fd; ++ struct vki_stat st; ++ SysRes fd, res; + Int size; + HChar* f_clo = NULL; + HChar filename[VKI_PATH_MAX]; + + VG_(snprintf)(filename, VKI_PATH_MAX, "%s/.valgrindrc", + ( NULL == dir ? "" : dir ) ); +- fd = VG_(open)(filename, 0, VKI_S_IRUSR); +- if ( !fd.isError ) { +- size = VG_(fsize)(fd.res); +- if (size > 0) { +- f_clo = VG_(malloc)(size+1); +- vg_assert(f_clo); +- n = VG_(read)(fd.res, f_clo, size); +- if (n == -1) n = 0; +- vg_assert(n >= 0 && n <= size+1); +- f_clo[n] = '\0'; +- } +- VG_(close)(fd.res); ++ ++ res = VG_(stat)(filename, &st); ++ if (st.st_uid == VG_(geteuid)() && st.st_mode != VKI_S_IWOTH) { ++ fd = VG_(open)(filename, 0, VKI_S_IRUSR); ++ if ( !fd.isError ) { ++ size = VG_(fsize)(fd.res); ++ if (size > 0) { ++ f_clo = VG_(malloc)(size+1); ++ vg_assert(f_clo); ++ n = VG_(read)(fd.res, f_clo, size); ++ if (n == -1) n = 0; ++ vg_assert(n >= 0 && n <= size+1); ++ f_clo[n] = '\0'; ++ } ++ VG_(close)(fd.res); ++ } + } + return f_clo; + } --- valgrind-3.6.1.orig/debian/patches/01_cachegrind.dpatch +++ valgrind-3.6.1/debian/patches/01_cachegrind.dpatch @@ -0,0 +1,38 @@ +#! /bin/sh -e +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Cope with arguments over 510 characters in length when writing the +## DP: cachegrind output file + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 +@DPATCH@ + +diff -urN valgrind-2.2.0.orig/cachegrind/cg_main.c valgrind-2.2.0/cachegrind/cg_main.c +--- valgrind-2.2.0.orig/cachegrind/cg_main.c 2004-08-29 21:02:26.000000000 +0000 ++++ valgrind-2.2.0/cachegrind/cg_main.c 2004-10-13 18:44:58.000000000 +0000 +@@ -1142,8 +1142,8 @@ + VG_(strcpy)(buf, "cmd:"); + VG_(write)(fd, (void*)buf, VG_(strlen)(buf)); + for (i = 0; i < VG_(client_argc); i++) { +- VG_(sprintf)(buf, " %s", VG_(client_argv)[i]); +- VG_(write)(fd, (void*)buf, VG_(strlen)(buf)); ++ VG_(write)(fd, "", 1); ++ VG_(write)(fd, VG_(client_argv)[i], VG_(strlen)(VG_(client_argv)[i])); + } + // "events:" line + VG_(sprintf)(buf, "\nevents: Ir I1mr I2mr Dr D1mr D2mr Dw D1mw D2mw\n"); --- valgrind-3.6.1.orig/debian/patches/99_autoreconf.dpatch +++ valgrind-3.6.1/debian/patches/99_autoreconf.dpatch @@ -0,0 +1,3153 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## Description: add some description +## Origin/Author: add some origin or author +## Bug: bug URL +## 99_autoreconf.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/Makefile.in valgrind-3.6.1/Makefile.in +--- valgrind-3.6.1~/Makefile.in 2011-02-15 18:34:14.000000000 +0100 ++++ valgrind-3.6.1/Makefile.in 2011-10-05 12:25:18.259879142 +0200 +@@ -210,6 +210,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/Makefile.vex.in valgrind-3.6.1/Makefile.vex.in +--- valgrind-3.6.1~/Makefile.vex.in 2011-02-15 18:34:09.000000000 +0100 ++++ valgrind-3.6.1/Makefile.vex.in 2011-10-05 12:25:18.259879142 +0200 +@@ -252,6 +252,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/aclocal.m4 valgrind-3.6.1/aclocal.m4 +--- valgrind-3.6.1~/aclocal.m4 2011-02-15 18:34:08.000000000 +0100 ++++ valgrind-3.6.1/aclocal.m4 2011-10-05 12:25:18.259879142 +0200 +@@ -13,13 +13,14 @@ + + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, +-[m4_warning([this file was generated for autoconf 2.65. ++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, ++[m4_warning([this file was generated for autoconf 2.68. + 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'.])]) + + # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- ++# serial 1 (pkg-config-0.24) + # + # Copyright © 2004 Scott James Remnant . + # +@@ -46,8 +47,12 @@ + # ---------------------------------- + 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 ++m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) ++m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) ++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]) ++ + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) + fi +@@ -60,7 +65,6 @@ + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +- + fi[]dnl + ])# PKG_PROG_PKG_CONFIG + +@@ -69,34 +73,32 @@ + # Check to see whether a particular set of modules exists. Similar + # to PKG_CHECK_MODULES(), but does not set variables or print errors. + # +-# +-# 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 ++# 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 + # -------------------------------------------------------------- + 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_default([$2], [:]) + m4_ifvaln([$3], [else + $3])dnl + fi]) + +- + # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) + # --------------------------------------------- + m4_define([_PKG_CONFIG], +-[if test -n "$PKG_CONFIG"; then +- if test -n "$$1"; then +- pkg_cv_[]$1="$$1" +- else +- PKG_CHECK_EXISTS([$3], +- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], +- [pkg_failed=yes]) +- fi +-else +- pkg_failed=untried ++[if test -n "$$1"; then ++ pkg_cv_[]$1="$$1" ++ elif test -n "$PKG_CONFIG"; then ++ PKG_CHECK_EXISTS([$3], ++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes ], ++ [pkg_failed=yes]) ++ else ++ pkg_failed=untried + fi[]dnl + ])# _PKG_CONFIG + +@@ -138,16 +140,17 @@ + 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 --errors-to-stdout --print-errors "$2"` ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else +- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$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 ++ m4_default([$4], [AC_MSG_ERROR( + [Package requirements ($2) were not met: + + $$1_PKG_ERRORS +@@ -155,25 +158,24 @@ + Consider adjusting the PKG_CONFIG_PATH environment variable if you + installed software in a non-standard prefix. + +-_PKG_TEXT +-])], +- [AC_MSG_RESULT([no]) +- $4]) ++_PKG_TEXT])[]dnl ++ ]) + elif test $pkg_failed = untried; then +- ifelse([$4], , [AC_MSG_FAILURE(dnl ++ AC_MSG_RESULT([no]) ++ m4_default([$4], [AC_MSG_FAILURE( + [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 .])], +- [$4]) ++To get pkg-config, see .])[]dnl ++ ]) + else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) +- ifelse([$3], , :, [$3]) ++ $3 + fi[]dnl + ])# PKG_CHECK_MODULES + +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/auxprogs/Makefile.in valgrind-3.6.1/auxprogs/Makefile.in +--- valgrind-3.6.1~/auxprogs/Makefile.in 2011-02-15 18:34:09.000000000 +0100 ++++ valgrind-3.6.1/auxprogs/Makefile.in 2011-10-05 12:25:18.259879142 +0200 +@@ -148,6 +148,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/cachegrind/Makefile.in valgrind-3.6.1/cachegrind/Makefile.in +--- valgrind-3.6.1~/cachegrind/Makefile.in 2011-02-15 18:34:09.000000000 +0100 ++++ valgrind-3.6.1/cachegrind/Makefile.in 2011-10-05 12:25:18.259879142 +0200 +@@ -241,6 +241,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/cachegrind/tests/Makefile.in valgrind-3.6.1/cachegrind/tests/Makefile.in +--- valgrind-3.6.1~/cachegrind/tests/Makefile.in 2011-02-15 18:34:09.000000000 +0100 ++++ valgrind-3.6.1/cachegrind/tests/Makefile.in 2011-10-05 12:25:18.263879161 +0200 +@@ -194,6 +194,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/cachegrind/tests/x86/Makefile.in valgrind-3.6.1/cachegrind/tests/x86/Makefile.in +--- valgrind-3.6.1~/cachegrind/tests/x86/Makefile.in 2011-02-15 18:34:09.000000000 +0100 ++++ valgrind-3.6.1/cachegrind/tests/x86/Makefile.in 2011-10-05 12:25:18.263879161 +0200 +@@ -146,6 +146,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/callgrind/Makefile.in valgrind-3.6.1/callgrind/Makefile.in +--- valgrind-3.6.1~/callgrind/Makefile.in 2011-02-15 18:34:10.000000000 +0100 ++++ valgrind-3.6.1/callgrind/Makefile.in 2011-10-05 12:25:18.263879161 +0200 +@@ -260,6 +260,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/callgrind/tests/Makefile.in valgrind-3.6.1/callgrind/tests/Makefile.in +--- valgrind-3.6.1~/callgrind/tests/Makefile.in 2011-02-15 18:34:10.000000000 +0100 ++++ valgrind-3.6.1/callgrind/tests/Makefile.in 2011-10-05 12:25:18.263879161 +0200 +@@ -187,6 +187,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/config.h.in valgrind-3.6.1/config.h.in +--- valgrind-3.6.1~/config.h.in 2011-02-14 12:50:57.000000000 +0100 ++++ valgrind-3.6.1/config.h.in 2011-10-05 12:25:18.267879186 +0200 +@@ -278,7 +278,7 @@ + /* Define to 1 if you're using Linux 2.4.x */ + #undef KERNEL_2_4 + +-/* Define to 1 if you're using Linux 2.6.x */ ++/* Define to 1 if you're using Linux 2.6.x or Linux 3.x */ + #undef KERNEL_2_6 + + /* Define to 1 if your C compiler doesn't accept -c and -o together. */ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/configure valgrind-3.6.1/configure +--- valgrind-3.6.1~/configure 2011-02-15 18:34:14.000000000 +0100 ++++ valgrind-3.6.1/configure 2011-10-05 12:25:18.275879226 +0200 +@@ -1,13 +1,13 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.65 for Valgrind 3.6.1. ++# Generated by GNU Autoconf 2.68 for Valgrind 3.6.1-Debian. + # + # Report bugs to . + # + # + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +-# Inc. ++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software ++# Foundation, Inc. + # + # + # This configure script is free software; the Free Software Foundation +@@ -91,6 +91,7 @@ + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. ++as_myself= + case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -216,11 +217,18 @@ + # 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. ++ # Preserve -v and -x to the replacement shell. + 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+"$@"} ++ case $- in # (((( ++ *v*x* | *x*v* ) as_opts=-vx ;; ++ *v* ) as_opts=-v ;; ++ *x* ) as_opts=-x ;; ++ * ) as_opts= ;; ++ esac ++ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + fi + + if test x$as_have_required = xno; then : +@@ -319,7 +327,7 @@ + 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" ++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + + } # as_fn_mkdir_p +@@ -359,19 +367,19 @@ + fi # as_fn_arith + + +-# as_fn_error ERROR [LINENO LOG_FD] +-# --------------------------------- ++# as_fn_error STATUS ERROR [LINENO LOG_FD] ++# ---------------------------------------- + # Output "`basename $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. ++# script with STATUS, using 1 if that was 0. + as_fn_error () + { +- as_status=$?; test $as_status -eq 0 && as_status=1 +- if test "$3"; then +- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ 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: $1" >&2 ++ $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status + } # as_fn_error + +@@ -533,7 +541,7 @@ + exec 6>&1 + + # Name of the host. +-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, ++# 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` + +@@ -552,8 +560,8 @@ + # Identity of this package. + PACKAGE_NAME='Valgrind' + PACKAGE_TARNAME='valgrind' +-PACKAGE_VERSION='3.6.1' +-PACKAGE_STRING='Valgrind 3.6.1' ++PACKAGE_VERSION='3.6.1-Debian' ++PACKAGE_STRING='Valgrind 3.6.1-Debian' + PACKAGE_BUGREPORT='valgrind-users@lists.sourceforge.net' + PACKAGE_URL='' + +@@ -612,6 +620,8 @@ + HAVE_QTCORE_TRUE + QTCORE_LIBS + QTCORE_CFLAGS ++PKG_CONFIG_LIBDIR ++PKG_CONFIG_PATH + PKG_CONFIG + BUILD_MPIWRAP_SEC_FALSE + BUILD_MPIWRAP_SEC_TRUE +@@ -832,6 +842,8 @@ + CCAS + CCASFLAGS + PKG_CONFIG ++PKG_CONFIG_PATH ++PKG_CONFIG_LIBDIR + QTCORE_CFLAGS + QTCORE_LIBS' + +@@ -896,8 +908,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. +@@ -942,7 +955,7 @@ + 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" ++ 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 +@@ -968,7 +981,7 @@ + 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" ++ 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 +@@ -1172,7 +1185,7 @@ + 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" ++ 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 +@@ -1188,7 +1201,7 @@ + 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" ++ 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 +@@ -1218,8 +1231,8 @@ + | --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." ++ -*) as_fn_error $? "unrecognized option: \`$ac_option' ++Try \`$0 --help' for more information" + ;; + + *=*) +@@ -1227,7 +1240,7 @@ + # 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'" ;; ++ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; +@@ -1237,7 +1250,7 @@ + $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} ++ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" + ;; + + esac +@@ -1245,13 +1258,13 @@ + + if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` +- as_fn_error "missing argument to $ac_option" ++ 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" ;; ++ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac + fi +@@ -1274,7 +1287,7 @@ + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac +- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" ++ 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' +@@ -1288,8 +1301,8 @@ + 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 ++ $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 +@@ -1304,9 +1317,9 @@ + 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" ++ 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" ++ as_fn_error $? "pwd does not report name of working directory" + + + # Find the source files, if location was not specified. +@@ -1345,11 +1358,11 @@ + 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" ++ 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" ++ 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 +@@ -1375,7 +1388,7 @@ + # 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 Valgrind 3.6.1 to adapt to many kinds of systems. ++\`configure' configures Valgrind 3.6.1-Debian to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -1389,7 +1402,7 @@ + --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 ++ -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 +@@ -1445,7 +1458,7 @@ + + if test -n "$ac_init_help"; then + case $ac_init_help in +- short | recursive ) echo "Configuration of Valgrind 3.6.1:";; ++ short | recursive ) echo "Configuration of Valgrind 3.6.1-Debian:";; + esac + cat <<\_ACEOF + +@@ -1482,6 +1495,10 @@ + CCAS assembler compiler command (defaults to CC) + CCASFLAGS assembler compiler flags (defaults to CFLAGS) + 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 + QTCORE_CFLAGS + C compiler flags for QTCORE, overriding pkg-config + QTCORE_LIBS linker flags for QTCORE, overriding pkg-config +@@ -1552,10 +1569,10 @@ + test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF +-Valgrind configure 3.6.1 +-generated by GNU Autoconf 2.65 ++Valgrind configure 3.6.1-Debian ++generated by GNU Autoconf 2.68 + +-Copyright (C) 2009 Free Software Foundation, Inc. ++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 +@@ -1599,7 +1616,7 @@ + + ac_retval=1 + fi +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + + } # ac_fn_c_try_compile +@@ -1625,7 +1642,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 : +@@ -1636,7 +1653,7 @@ + + ac_retval=1 + fi +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + + } # ac_fn_c_try_cpp +@@ -1674,7 +1691,7 @@ + + ac_retval=1 + fi +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + + } # ac_fn_cxx_try_compile +@@ -1720,7 +1737,7 @@ + # 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;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + + } # ac_fn_c_try_link +@@ -1733,10 +1750,10 @@ + ac_fn_c_check_header_mongrel () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval \${$3+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 + fi + eval ac_res=\$$3 +@@ -1772,7 +1789,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; } + +@@ -1795,17 +1812,15 @@ + $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;} +-( cat <<\_ASBOX +-## --------------------------------------------------- ## ++( $as_echo "## --------------------------------------------------- ## + ## Report this to valgrind-users@lists.sourceforge.net ## +-## --------------------------------------------------- ## +-_ASBOX ++## --------------------------------------------------- ##" + ) | 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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 + else + eval "$3=\$ac_header_compiler" +@@ -1814,7 +1829,7 @@ + { $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;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + + } # ac_fn_c_check_header_mongrel + +@@ -1855,7 +1870,7 @@ + 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;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + + } # ac_fn_c_try_run +@@ -1869,7 +1884,7 @@ + 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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -1887,7 +1902,7 @@ + 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;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + + } # ac_fn_c_check_header_compile + +@@ -1900,7 +1915,7 @@ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 + $as_echo_n "checking for $2.$3... " >&6; } +-if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$4+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -1944,7 +1959,7 @@ + eval ac_res=\$$4 + { $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;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + + } # ac_fn_c_check_member + +@@ -1957,7 +1972,7 @@ + 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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 + else + eval "$3=no" +@@ -1998,7 +2013,7 @@ + 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;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + + } # ac_fn_c_check_type + +@@ -2010,7 +2025,7 @@ + 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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -2065,7 +2080,7 @@ + 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;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + + } # ac_fn_c_check_func + +@@ -2110,7 +2125,7 @@ + # 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;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + + } # ac_fn_cxx_try_link +@@ -2118,8 +2133,8 @@ + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + +-It was created by Valgrind $as_me 3.6.1, which was +-generated by GNU Autoconf 2.65. Invocation command line was ++It was created by Valgrind $as_me 3.6.1-Debian, which was ++generated by GNU Autoconf 2.68. Invocation command line was + + $ $0 $@ + +@@ -2229,11 +2244,9 @@ + { + echo + +- cat <<\_ASBOX +-## ---------------- ## ++ $as_echo "## ---------------- ## + ## Cache variables. ## +-## ---------------- ## +-_ASBOX ++## ---------------- ##" + echo + # The following way of writing the cache mishandles newlines in values, + ( +@@ -2267,11 +2280,9 @@ + ) + echo + +- cat <<\_ASBOX +-## ----------------- ## ++ $as_echo "## ----------------- ## + ## Output variables. ## +-## ----------------- ## +-_ASBOX ++## ----------------- ##" + echo + for ac_var in $ac_subst_vars + do +@@ -2284,11 +2295,9 @@ + echo + + if test -n "$ac_subst_files"; then +- cat <<\_ASBOX +-## ------------------- ## ++ $as_echo "## ------------------- ## + ## File substitutions. ## +-## ------------------- ## +-_ASBOX ++## ------------------- ##" + echo + for ac_var in $ac_subst_files + do +@@ -2302,11 +2311,9 @@ + fi + + if test -s confdefs.h; then +- cat <<\_ASBOX +-## ----------- ## ++ $as_echo "## ----------- ## + ## confdefs.h. ## +-## ----------- ## +-_ASBOX ++## ----------- ##" + echo + cat confdefs.h + echo +@@ -2361,7 +2368,12 @@ + ac_site_file1=NONE + ac_site_file2=NONE + if test -n "$CONFIG_SITE"; then +- ac_site_file1=$CONFIG_SITE ++ # 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 +@@ -2376,7 +2388,11 @@ + { $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" ++ . "$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 + +@@ -2455,7 +2471,7 @@ + $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 ++ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + fi + ## -------------------- ## + ## Main body of script. ## +@@ -2475,16 +2491,22 @@ + + ac_aux_dir= + for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do +- for ac_t in install-sh install.sh shtool; do +- if test -f "$ac_dir/$ac_t"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/$ac_t -c" +- break 2 +- fi +- done ++ 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 \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 ++ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + fi + + # These three variables are undocumented and unsupported, +@@ -2513,7 +2535,7 @@ + { $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 : ++if ${ac_cv_path_install+:} false; then : + $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -2600,11 +2622,11 @@ + ' + case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) +- as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; ++ 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;; ++ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + esac + + # Do `set' in a subshell so we don't clobber the current shell's +@@ -2626,7 +2648,7 @@ + # 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 ++ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + +@@ -2636,7 +2658,7 @@ + # Ok. + : + else +- as_fn_error "newly created file is older than distributed files! ++ 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 +@@ -2690,7 +2712,7 @@ + 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 : ++if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$STRIP"; then +@@ -2730,7 +2752,7 @@ + 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 : ++if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_STRIP"; then +@@ -2783,7 +2805,7 @@ + { $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 : ++ if ${ac_cv_path_mkdir+:} false; then : + $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -2834,7 +2856,7 @@ + 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 : ++if ${ac_cv_prog_AWK+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$AWK"; then +@@ -2874,7 +2896,7 @@ + $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 { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat >conftest.make <<\_ACEOF +@@ -2882,7 +2904,7 @@ + all: + @echo '@@@%%%=$(MAKE)=@@@%%%' + _ACEOF +-# GNU make sometimes prints "make[1]: Entering...", which would confuse us. ++# 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;; +@@ -2916,7 +2938,7 @@ + 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 ++ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + fi + fi + +@@ -2932,7 +2954,7 @@ + + # Define the identity of the package. + PACKAGE='valgrind' +- VERSION='3.6.1' ++ VERSION='3.6.1-Debian' + + + cat >>confdefs.h <<_ACEOF +@@ -3023,7 +3045,7 @@ + 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 : ++if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3063,7 +3085,7 @@ + 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 : ++if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -3116,7 +3138,7 @@ + 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 : ++if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3156,7 +3178,7 @@ + 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 : ++if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3215,7 +3237,7 @@ + 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 : ++if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3259,7 +3281,7 @@ + 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 : ++if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -3313,8 +3335,8 @@ + + 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; } ++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 +@@ -3428,9 +3450,8 @@ + + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "C compiler cannot create executables +-See \`config.log' for more details." "$LINENO" 5; }; } ++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; } +@@ -3472,8 +3493,8 @@ + 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; } ++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 +@@ -3530,9 +3551,9 @@ + 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. ++as_fn_error $? "cannot run C compiled programs. + If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." "$LINENO" 5; } ++See \`config.log' for more details" "$LINENO" 5; } + fi + fi + fi +@@ -3543,7 +3564,7 @@ + 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 : ++if ${ac_cv_objext+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -3583,8 +3604,8 @@ + + { { $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; } ++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 +@@ -3594,7 +3615,7 @@ + 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 : ++if ${ac_cv_c_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -3631,7 +3652,7 @@ + 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 : ++if ${ac_cv_prog_cc_g+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_save_c_werror_flag=$ac_c_werror_flag +@@ -3709,7 +3730,7 @@ + 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 : ++if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_cv_prog_cc_c89=no +@@ -3870,7 +3891,7 @@ + + { $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 : ++if ${am_cv_CC_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +@@ -4002,7 +4023,7 @@ + fi + set dummy $CC; ac_cc=`$as_echo "$2" | + sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` +-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -4131,7 +4152,7 @@ + CPP= + fi + if test -z "$CPP"; then +- if test "${ac_cv_prog_CPP+set}" = set; then : ++ if ${ac_cv_prog_CPP+:} false; then : + $as_echo_n "(cached) " >&6 + else + # Double quotes because CPP needs to be expanded +@@ -4161,7 +4182,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. +@@ -4177,11 +4198,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 +@@ -4220,7 +4241,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. +@@ -4236,18 +4257,18 @@ + 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 + { { $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; } ++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details" "$LINENO" 5; } + fi + + ac_ext=c +@@ -4272,7 +4293,7 @@ + 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_CXX+set}" = set; then : ++if ${ac_cv_prog_CXX+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CXX"; then +@@ -4316,7 +4337,7 @@ + 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_CXX+set}" = set; then : ++if ${ac_cv_prog_ac_ct_CXX+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CXX"; then +@@ -4394,7 +4415,7 @@ + + { $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_cxx_compiler_gnu+set}" = set; then : ++if ${ac_cv_cxx_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -4431,7 +4452,7 @@ + ac_save_CXXFLAGS=$CXXFLAGS + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 + $as_echo_n "checking whether $CXX accepts -g... " >&6; } +-if test "${ac_cv_prog_cxx_g+set}" = set; then : ++if ${ac_cv_prog_cxx_g+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_save_cxx_werror_flag=$ac_cxx_werror_flag +@@ -4517,7 +4538,7 @@ + + { $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_CXX_dependencies_compiler_type+set}" = set; then : ++if ${am_cv_CXX_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +@@ -4658,7 +4679,7 @@ + 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 : ++if ${ac_cv_prog_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$RANLIB"; then +@@ -4698,7 +4719,7 @@ + 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 : ++if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_RANLIB"; then +@@ -4750,7 +4771,7 @@ + + { $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 : ++if ${ac_cv_path_SED+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ +@@ -4805,7 +4826,7 @@ + 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 ++ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi + else + ac_cv_path_SED=$SED +@@ -4827,7 +4848,7 @@ + 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_path_AR+set}" = set; then : ++if ${ac_cv_path_AR+:} false; then : + $as_echo_n "(cached) " >&6 + else + case $AR in +@@ -4872,7 +4893,7 @@ + + # Check for the compiler support + if test "${GCC}" != "yes" ; then +- as_fn_error "Valgrind relies on GCC to be compiled" "$LINENO" 5 ++ as_fn_error $? "Valgrind relies on GCC to be compiled" "$LINENO" 5 + fi + + # figure out where perl lives +@@ -4880,7 +4901,7 @@ + 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_PERL+set}" = set; then : ++if ${ac_cv_path_PERL+:} false; then : + $as_echo_n "(cached) " >&6 + else + case $PERL in +@@ -4922,7 +4943,7 @@ + set dummy gdb; 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_GDB+set}" = set; then : ++if ${ac_cv_path_GDB+:} false; then : + $as_echo_n "(cached) " >&6 + else + case $GDB in +@@ -4977,7 +4998,7 @@ + + { $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_CCAS_dependencies_compiler_type+set}" = set; then : ++if ${am_cv_CCAS_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +@@ -5132,7 +5153,7 @@ + 2.*) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (${gcc_version})" >&5 + $as_echo "no (${gcc_version})" >&6; } +- as_fn_error "please use a recent (>= gcc-3.0) version of gcc" "$LINENO" 5 ++ as_fn_error $? "please use a recent (>= gcc-3.0) version of gcc" "$LINENO" 5 + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (${gcc_version})" >&5 +@@ -5150,27 +5171,27 @@ + + # 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_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 : ++if ${ac_cv_build+:} false; 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 ++ 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 ++ 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;; ++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; + esac + build=$ac_cv_build + ac_save_IFS=$IFS; IFS='-' +@@ -5188,14 +5209,14 @@ + + { $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 : ++if ${ac_cv_host+:} false; 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 ++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + fi + + fi +@@ -5203,7 +5224,7 @@ + $as_echo "$ac_cv_host" >&6; } + case $ac_cv_host in + *-*-*) ;; +-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; ++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; + esac + host=$ac_cv_host + ac_save_IFS=$IFS; IFS='-' +@@ -5271,7 +5292,7 @@ + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (${host_cpu})" >&5 + $as_echo "no (${host_cpu})" >&6; } +- as_fn_error "Unsupported host architecture. Sorry" "$LINENO" 5 ++ as_fn_error $? "Unsupported host architecture. Sorry" "$LINENO" 5 + ;; + esac + +@@ -5288,7 +5309,7 @@ + # Check if a 64-bit only build has been requested + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a 64-bit only build" >&5 + $as_echo_n "checking for a 64-bit only build... " >&6; } +-if test "${vg_cv_only64bit+set}" = set; then : ++if ${vg_cv_only64bit+:} false; then : + $as_echo_n "(cached) " >&6 + else + # Check whether --enable-only64bit was given. +@@ -5305,7 +5326,7 @@ + # Check if a 32-bit only build has been requested + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a 32-bit only build" >&5 + $as_echo_n "checking for a 32-bit only build... " >&6; } +-if test "${vg_cv_only32bit+set}" = set; then : ++if ${vg_cv_only32bit+:} false; then : + $as_echo_n "(cached) " >&6 + else + # Check whether --enable-only32bit was given. +@@ -5321,7 +5342,7 @@ + + # Stay sane + if test x$vg_cv_only64bit = xyes -a x$vg_cv_only32bit = xyes; then +- as_fn_error "Nonsensical: both --enable-only64bit and --enable-only32bit." "$LINENO" 5 ++ as_fn_error $? "Nonsensical: both --enable-only64bit and --enable-only32bit." "$LINENO" 5 + fi + + #---------------------------------------------------------------------------- +@@ -5333,7 +5354,7 @@ + $as_echo_n "checking for a supported OS... " >&6; } + + +-DEFAULT_SUPP="" ++DEFAULT_SUPP="debian.supp" + + case "${host_os}" in + *linux*) +@@ -5348,9 +5369,9 @@ + kernel=`uname -r` + + case "${kernel}" in +- 2.6.*) +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.6 family (${kernel})" >&5 +-$as_echo "2.6 family (${kernel})" >&6; } ++ 2.6.*|3.*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.6.x/3.x family (${kernel})" >&5 ++$as_echo "2.6.x/3.x family (${kernel})" >&6; } + + $as_echo "#define KERNEL_2_6 1" >>confdefs.h + +@@ -5367,7 +5388,7 @@ + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported (${kernel})" >&5 + $as_echo "unsupported (${kernel})" >&6; } +- as_fn_error "Valgrind works on kernels 2.4, 2.6" "$LINENO" 5 ++ as_fn_error $? "Valgrind works on kernels 2.4, 2.6" "$LINENO" 5 + ;; + esac + +@@ -5437,7 +5458,7 @@ + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported (${kernel})" >&5 + $as_echo "unsupported (${kernel})" >&6; } +- as_fn_error "Valgrind works on Darwin 9.x and 10.x (Mac OS X 10.5 and 10.6)" "$LINENO" 5 ++ as_fn_error $? "Valgrind works on Darwin 9.x and 10.x (Mac OS X 10.5 and 10.6)" "$LINENO" 5 + ;; + esac + ;; +@@ -5445,7 +5466,7 @@ + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (${host_os})" >&5 + $as_echo "no (${host_os})" >&6; } +- as_fn_error "Valgrind is operating system specific. Sorry." "$LINENO" 5 ++ as_fn_error $? "Valgrind is operating system specific. Sorry." "$LINENO" 5 + ;; + esac + +@@ -5493,7 +5514,7 @@ + esac + + if test x$vg_cv_only64bit = xyes -a x$vg_cv_only32bit = xyes; then +- as_fn_error "--enable-only32bit was specified but system does not support 32 bit builds" "$LINENO" 5 ++ as_fn_error $? "--enable-only32bit was specified but system does not support 32 bit builds" "$LINENO" 5 + fi + + #---------------------------------------------------------------------------- +@@ -5711,7 +5732,7 @@ + valt_load_address_sec_inner="0xUNSET" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (${ARCH_MAX}-${VGCONF_OS})" >&5 + $as_echo "no (${ARCH_MAX}-${VGCONF_OS})" >&6; } +- as_fn_error "Valgrind is platform specific. Sorry. Please consider doing a port." "$LINENO" 5 ++ as_fn_error $? "Valgrind is platform specific. Sorry. Please consider doing a port." "$LINENO" 5 + ;; + esac + +@@ -5907,7 +5928,7 @@ + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for use as an inner Valgrind" >&5 + $as_echo_n "checking for use as an inner Valgrind... " >&6; } +-if test "${vg_cv_inner+set}" = set; then : ++if ${vg_cv_inner+:} false; then : + $as_echo_n "(cached) " >&6 + else + # Check whether --enable-inner was given. +@@ -5941,7 +5962,7 @@ + + { $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 : ++if ${ac_cv_path_GREP+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$GREP"; then +@@ -5990,7 +6011,7 @@ + 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 ++ 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 +@@ -6004,7 +6025,7 @@ + + { $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 : ++if ${ac_cv_path_EGREP+:} false; then : + $as_echo_n "(cached) " >&6 + else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 +@@ -6056,7 +6077,7 @@ + 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 ++ 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 +@@ -6071,7 +6092,7 @@ + + { $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 : ++if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -6188,8 +6209,7 @@ + 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 + " +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++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 +@@ -6200,7 +6220,7 @@ + + + ac_fn_c_check_header_mongrel "$LINENO" "features.h" "ac_cv_header_features_h" "$ac_includes_default" +-if test "x$ac_cv_header_features_h" = x""yes; then : ++if test "x$ac_cv_header_features_h" = xyes; then : + + fi + +@@ -6397,9 +6417,9 @@ + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5 + $as_echo "unsupported version ${GLIBC_VERSION}" >&6; } +- as_fn_error "Valgrind requires glibc version 2.2 - 2.13" "$LINENO" 5 +- as_fn_error "or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION" "$LINENO" 5 +- as_fn_error "or Darwin libc" "$LINENO" 5 ++ as_fn_error $? "Valgrind requires glibc version 2.2 - 2.13" "$LINENO" 5 ++ as_fn_error $? "or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION" "$LINENO" 5 ++ as_fn_error $? "or Darwin libc" "$LINENO" 5 + ;; + esac + +@@ -6617,7 +6637,7 @@ + + ac_fn_c_check_member "$LINENO" "pthread_mutex_t" "__m_kind" "ac_cv_member_pthread_mutex_t___m_kind" "#include + " +-if test "x$ac_cv_member_pthread_mutex_t___m_kind" = x""yes; then : ++if test "x$ac_cv_member_pthread_mutex_t___m_kind" = xyes; then : + + $as_echo "#define HAVE_PTHREAD_MUTEX_T__M_KIND 1" >>confdefs.h + +@@ -6630,7 +6650,7 @@ + + ac_fn_c_check_member "$LINENO" "pthread_mutex_t" "__data.__kind" "ac_cv_member_pthread_mutex_t___data___kind" "#include + " +-if test "x$ac_cv_member_pthread_mutex_t___data___kind" = x""yes; then : ++if test "x$ac_cv_member_pthread_mutex_t___data___kind" = xyes; then : + + $as_echo "#define HAVE_PTHREAD_MUTEX_T__DATA__KIND 1" >>confdefs.h + +@@ -7657,7 +7677,7 @@ + # succeeds but running programs using TLS fails. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TLS support" >&5 + $as_echo_n "checking for TLS support... " >&6; } +-if test "${vg_cv_tls+set}" = set; then : ++if ${vg_cv_tls+:} false; then : + $as_echo_n "(cached) " >&6 + else + # Check whether --enable-tls was given. +@@ -7667,8 +7687,8 @@ + if test "$cross_compiling" = yes; 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 "cannot run test program while cross compiling +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot run test program while cross compiling ++See \`config.log' for more details" "$LINENO" 5; } + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -7699,7 +7719,7 @@ + # Cross-compiling: check whether linking a program using TLS succeeds. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TLS support" >&5 + $as_echo_n "checking for TLS support... " >&6; } +-if test "${vg_cv_tls+set}" = set; then : ++if ${vg_cv_tls+:} false; then : + $as_echo_n "(cached) " >&6 + else + # Check whether --enable-tls was given. +@@ -7744,7 +7764,7 @@ + + { $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 : ++if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -7872,8 +7892,7 @@ + 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" +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++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 +@@ -7888,7 +7907,7 @@ + #---------------------------------------------------------------------------- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5 + $as_echo_n "checking for uid_t in sys/types.h... " >&6; } +-if test "${ac_cv_type_uid_t+set}" = set; then : ++if ${ac_cv_type_uid_t+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -7917,7 +7936,7 @@ + fi + + 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 : ++if test "x$ac_cv_type_off_t" = xyes; then : + + else + +@@ -7928,7 +7947,7 @@ + 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 : ++if test "x$ac_cv_type_size_t" = xyes; then : + + else + +@@ -7940,7 +7959,7 @@ + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 + $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } +-if test "${ac_cv_header_time+set}" = set; then : ++if ${ac_cv_header_time+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -7980,7 +7999,7 @@ + #---------------------------------------------------------------------------- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5 + $as_echo_n "checking for working memcmp... " >&6; } +-if test "${ac_cv_func_memcmp_working+set}" = set; then : ++if ${ac_cv_func_memcmp_working+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -8048,8 +8067,7 @@ + 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 + " +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++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 +@@ -8068,7 +8086,7 @@ + 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 : ++if test "x$ac_cv_func_getpagesize" = xyes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_GETPAGESIZE 1 + _ACEOF +@@ -8078,7 +8096,7 @@ + + { $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 : ++if ${ac_cv_func_mmap_fixed_mapped+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -8244,7 +8262,7 @@ + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 + $as_echo_n "checking return type of signal handlers... " >&6; } +-if test "${ac_cv_type_signal+set}" = set; then : ++if ${ac_cv_type_signal+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -8278,7 +8296,7 @@ + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5 + $as_echo_n "checking for clock_gettime in -lrt... " >&6; } +-if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then : ++if ${ac_cv_lib_rt_clock_gettime+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -8312,7 +8330,7 @@ + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5 + $as_echo "$ac_cv_lib_rt_clock_gettime" >&6; } +-if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then : ++if test "x$ac_cv_lib_rt_clock_gettime" = xyes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_LIBRT 1 + _ACEOF +@@ -8357,8 +8375,7 @@ + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +@@ -8594,13 +8611,18 @@ + + + ++ ++ ++ ++ ++ + 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 : ++if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 + else + case $PKG_CONFIG in +@@ -8643,7 +8665,7 @@ + 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 : ++if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 + else + case $ac_pt_PKG_CONFIG in +@@ -8706,7 +8728,6 @@ + $as_echo "no" >&6; } + PKG_CONFIG="" + fi +- + fi + + if test -n "$PKG_CONFIG" && \ +@@ -8721,46 +8742,46 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for QTCORE" >&5 + $as_echo_n "checking for QTCORE... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$QTCORE_CFLAGS"; then +- pkg_cv_QTCORE_CFLAGS="$QTCORE_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$QTCORE_CFLAGS"; then ++ pkg_cv_QTCORE_CFLAGS="$QTCORE_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore\""; } >&5 + ($PKG_CONFIG --exists --print-errors "QtCore") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_QTCORE_CFLAGS=`$PKG_CONFIG --cflags "QtCore" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$QTCORE_LIBS"; then +- pkg_cv_QTCORE_LIBS="$QTCORE_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$QTCORE_LIBS"; then ++ pkg_cv_QTCORE_LIBS="$QTCORE_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore\""; } >&5 + ($PKG_CONFIG --exists --print-errors "QtCore") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_QTCORE_LIBS=`$PKG_CONFIG --libs "QtCore" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + + + 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 +@@ -8768,14 +8789,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- QTCORE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "QtCore"` ++ QTCORE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "QtCore" 2>&1` + else +- QTCORE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "QtCore"` ++ QTCORE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "QtCore" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$QTCORE_PKG_ERRORS" >&5 + +- as_fn_error "Package requirements (QtCore) were not met: ++ as_fn_error $? "Package requirements (QtCore) were not met: + + $QTCORE_PKG_ERRORS + +@@ -8784,12 +8805,13 @@ + + Alternatively, you may set the environment variables QTCORE_CFLAGS + and QTCORE_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 ++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. + +@@ -8798,13 +8820,13 @@ + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details." "$LINENO" 5; } ++See \`config.log' for more details" "$LINENO" 5; } + else + QTCORE_CFLAGS=$pkg_cv_QTCORE_CFLAGS + QTCORE_LIBS=$pkg_cv_QTCORE_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +- : ++ + fi + # Paranoia: don't trust the result reported by pkg-config, but when + # pkg-config reports that QtCore has been found, verify whether linking +@@ -9225,10 +9247,21 @@ + :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" && ++ if test "x$cache_file" != "x/dev/null"; then + { $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 ++ if test ! -f "$cache_file" || test -h "$cache_file"; then ++ cat confcache >"$cache_file" ++ else ++ case $cache_file in #( ++ */* | ?:*) ++ mv -f confcache "$cache_file"$$ && ++ mv -f "$cache_file"$$ "$cache_file" ;; #( ++ *) ++ mv -f confcache "$cache_file" ;; ++ esac ++ fi ++ fi + 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;} +@@ -9244,6 +9277,7 @@ + + ac_libobjs= + ac_ltlibobjs= ++U= + for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' +@@ -9267,163 +9301,163 @@ + fi + + if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then +- as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. ++ 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. ++ 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. ++ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then +- as_fn_error "conditional \"am__fastdepCXX\" was never defined. ++ as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then +- as_fn_error "conditional \"am__fastdepCCAS\" was never defined. ++ as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${VGCONF_ARCHS_INCLUDE_X86_TRUE}" && test -z "${VGCONF_ARCHS_INCLUDE_X86_FALSE}"; then +- as_fn_error "conditional \"VGCONF_ARCHS_INCLUDE_X86\" was never defined. ++ as_fn_error $? "conditional \"VGCONF_ARCHS_INCLUDE_X86\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${VGCONF_ARCHS_INCLUDE_AMD64_TRUE}" && test -z "${VGCONF_ARCHS_INCLUDE_AMD64_FALSE}"; then +- as_fn_error "conditional \"VGCONF_ARCHS_INCLUDE_AMD64\" was never defined. ++ as_fn_error $? "conditional \"VGCONF_ARCHS_INCLUDE_AMD64\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${VGCONF_ARCHS_INCLUDE_PPC32_TRUE}" && test -z "${VGCONF_ARCHS_INCLUDE_PPC32_FALSE}"; then +- as_fn_error "conditional \"VGCONF_ARCHS_INCLUDE_PPC32\" was never defined. ++ as_fn_error $? "conditional \"VGCONF_ARCHS_INCLUDE_PPC32\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${VGCONF_ARCHS_INCLUDE_PPC64_TRUE}" && test -z "${VGCONF_ARCHS_INCLUDE_PPC64_FALSE}"; then +- as_fn_error "conditional \"VGCONF_ARCHS_INCLUDE_PPC64\" was never defined. ++ as_fn_error $? "conditional \"VGCONF_ARCHS_INCLUDE_PPC64\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${VGCONF_ARCHS_INCLUDE_ARM_TRUE}" && test -z "${VGCONF_ARCHS_INCLUDE_ARM_FALSE}"; then +- as_fn_error "conditional \"VGCONF_ARCHS_INCLUDE_ARM\" was never defined. ++ as_fn_error $? "conditional \"VGCONF_ARCHS_INCLUDE_ARM\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${VGCONF_PLATFORMS_INCLUDE_X86_LINUX_TRUE}" && test -z "${VGCONF_PLATFORMS_INCLUDE_X86_LINUX_FALSE}"; then +- as_fn_error "conditional \"VGCONF_PLATFORMS_INCLUDE_X86_LINUX\" was never defined. ++ as_fn_error $? "conditional \"VGCONF_PLATFORMS_INCLUDE_X86_LINUX\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX_TRUE}" && test -z "${VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX_FALSE}"; then +- as_fn_error "conditional \"VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX\" was never defined. ++ as_fn_error $? "conditional \"VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX_TRUE}" && test -z "${VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX_FALSE}"; then +- as_fn_error "conditional \"VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX\" was never defined. ++ as_fn_error $? "conditional \"VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX_TRUE}" && test -z "${VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX_FALSE}"; then +- as_fn_error "conditional \"VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX\" was never defined. ++ as_fn_error $? "conditional \"VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${VGCONF_PLATFORMS_INCLUDE_ARM_LINUX_TRUE}" && test -z "${VGCONF_PLATFORMS_INCLUDE_ARM_LINUX_FALSE}"; then +- as_fn_error "conditional \"VGCONF_PLATFORMS_INCLUDE_ARM_LINUX\" was never defined. ++ as_fn_error $? "conditional \"VGCONF_PLATFORMS_INCLUDE_ARM_LINUX\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5_TRUE}" && test -z "${VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5_FALSE}"; then +- as_fn_error "conditional \"VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5\" was never defined. ++ as_fn_error $? "conditional \"VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5_TRUE}" && test -z "${VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5_FALSE}"; then +- as_fn_error "conditional \"VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5\" was never defined. ++ as_fn_error $? "conditional \"VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${VGCONF_PLATFORMS_INCLUDE_X86_DARWIN_TRUE}" && test -z "${VGCONF_PLATFORMS_INCLUDE_X86_DARWIN_FALSE}"; then +- as_fn_error "conditional \"VGCONF_PLATFORMS_INCLUDE_X86_DARWIN\" was never defined. ++ as_fn_error $? "conditional \"VGCONF_PLATFORMS_INCLUDE_X86_DARWIN\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${VGCONF_PLATFORMS_INCLUDE_AMD64_DARWIN_TRUE}" && test -z "${VGCONF_PLATFORMS_INCLUDE_AMD64_DARWIN_FALSE}"; then +- as_fn_error "conditional \"VGCONF_PLATFORMS_INCLUDE_AMD64_DARWIN\" was never defined. ++ as_fn_error $? "conditional \"VGCONF_PLATFORMS_INCLUDE_AMD64_DARWIN\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${VGCONF_OS_IS_LINUX_TRUE}" && test -z "${VGCONF_OS_IS_LINUX_FALSE}"; then +- as_fn_error "conditional \"VGCONF_OS_IS_LINUX\" was never defined. ++ as_fn_error $? "conditional \"VGCONF_OS_IS_LINUX\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${VGCONF_OS_IS_AIX5_TRUE}" && test -z "${VGCONF_OS_IS_AIX5_FALSE}"; then +- as_fn_error "conditional \"VGCONF_OS_IS_AIX5\" was never defined. ++ as_fn_error $? "conditional \"VGCONF_OS_IS_AIX5\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${VGCONF_OS_IS_DARWIN_TRUE}" && test -z "${VGCONF_OS_IS_DARWIN_FALSE}"; then +- as_fn_error "conditional \"VGCONF_OS_IS_DARWIN\" was never defined. ++ as_fn_error $? "conditional \"VGCONF_OS_IS_DARWIN\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${VGCONF_HAVE_PLATFORM_SEC_TRUE}" && test -z "${VGCONF_HAVE_PLATFORM_SEC_FALSE}"; then +- as_fn_error "conditional \"VGCONF_HAVE_PLATFORM_SEC\" was never defined. ++ as_fn_error $? "conditional \"VGCONF_HAVE_PLATFORM_SEC\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAS_ALTIVEC_TRUE}" && test -z "${HAS_ALTIVEC_FALSE}"; then +- as_fn_error "conditional \"HAS_ALTIVEC\" was never defined. ++ as_fn_error $? "conditional \"HAS_ALTIVEC\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_PTHREAD_CREATE_GLIBC_2_0_TRUE}" && test -z "${HAVE_PTHREAD_CREATE_GLIBC_2_0_FALSE}"; then +- as_fn_error "conditional \"HAVE_PTHREAD_CREATE_GLIBC_2_0\" was never defined. ++ as_fn_error $? "conditional \"HAVE_PTHREAD_CREATE_GLIBC_2_0\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${BUILD_SSE3_TESTS_TRUE}" && test -z "${BUILD_SSE3_TESTS_FALSE}"; then +- as_fn_error "conditional \"BUILD_SSE3_TESTS\" was never defined. ++ as_fn_error $? "conditional \"BUILD_SSE3_TESTS\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${BUILD_SSSE3_TESTS_TRUE}" && test -z "${BUILD_SSSE3_TESTS_FALSE}"; then +- as_fn_error "conditional \"BUILD_SSSE3_TESTS\" was never defined. ++ as_fn_error $? "conditional \"BUILD_SSSE3_TESTS\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${BUILD_PCLMULQDQ_TESTS_TRUE}" && test -z "${BUILD_PCLMULQDQ_TESTS_FALSE}"; then +- as_fn_error "conditional \"BUILD_PCLMULQDQ_TESTS\" was never defined. ++ as_fn_error $? "conditional \"BUILD_PCLMULQDQ_TESTS\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${BUILD_LZCNT_TESTS_TRUE}" && test -z "${BUILD_LZCNT_TESTS_FALSE}"; then +- as_fn_error "conditional \"BUILD_LZCNT_TESTS\" was never defined. ++ as_fn_error $? "conditional \"BUILD_LZCNT_TESTS\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_PTHREAD_BARRIER_TRUE}" && test -z "${HAVE_PTHREAD_BARRIER_FALSE}"; then +- as_fn_error "conditional \"HAVE_PTHREAD_BARRIER\" was never defined. ++ as_fn_error $? "conditional \"HAVE_PTHREAD_BARRIER\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_PTHREAD_MUTEX_TIMEDLOCK_TRUE}" && test -z "${HAVE_PTHREAD_MUTEX_TIMEDLOCK_FALSE}"; then +- as_fn_error "conditional \"HAVE_PTHREAD_MUTEX_TIMEDLOCK\" was never defined. ++ as_fn_error $? "conditional \"HAVE_PTHREAD_MUTEX_TIMEDLOCK\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_PTHREAD_SPINLOCK_TRUE}" && test -z "${HAVE_PTHREAD_SPINLOCK_FALSE}"; then +- as_fn_error "conditional \"HAVE_PTHREAD_SPINLOCK\" was never defined. ++ as_fn_error $? "conditional \"HAVE_PTHREAD_SPINLOCK\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${BUILD_MPIWRAP_PRI_TRUE}" && test -z "${BUILD_MPIWRAP_PRI_FALSE}"; then +- as_fn_error "conditional \"BUILD_MPIWRAP_PRI\" was never defined. ++ as_fn_error $? "conditional \"BUILD_MPIWRAP_PRI\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${BUILD_MPIWRAP_SEC_TRUE}" && test -z "${BUILD_MPIWRAP_SEC_FALSE}"; then +- as_fn_error "conditional \"BUILD_MPIWRAP_SEC\" was never defined. ++ as_fn_error $? "conditional \"BUILD_MPIWRAP_SEC\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_QTCORE_TRUE}" && test -z "${HAVE_QTCORE_FALSE}"; then +- as_fn_error "conditional \"HAVE_QTCORE\" was never defined. ++ as_fn_error $? "conditional \"HAVE_QTCORE\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_QTCORE_QATOMICINT_TRUE}" && test -z "${HAVE_QTCORE_QATOMICINT_FALSE}"; then +- as_fn_error "conditional \"HAVE_QTCORE_QATOMICINT\" was never defined. ++ as_fn_error $? "conditional \"HAVE_QTCORE_QATOMICINT\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_BOOST_1_35_TRUE}" && test -z "${HAVE_BOOST_1_35_FALSE}"; then +- as_fn_error "conditional \"HAVE_BOOST_1_35\" was never defined. ++ as_fn_error $? "conditional \"HAVE_BOOST_1_35\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_OPENMP_TRUE}" && test -z "${HAVE_OPENMP_FALSE}"; then +- as_fn_error "conditional \"HAVE_OPENMP\" was never defined. ++ as_fn_error $? "conditional \"HAVE_OPENMP\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_BUILTIN_ATOMIC_TRUE}" && test -z "${HAVE_BUILTIN_ATOMIC_FALSE}"; then +- as_fn_error "conditional \"HAVE_BUILTIN_ATOMIC\" was never defined. ++ as_fn_error $? "conditional \"HAVE_BUILTIN_ATOMIC\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + +-: ${CONFIG_STATUS=./config.status} ++: "${CONFIG_STATUS=./config.status}" + ac_write_fail=0 + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +@@ -9524,6 +9558,7 @@ + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. ++as_myself= + case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -9569,19 +9604,19 @@ + (unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +-# as_fn_error ERROR [LINENO LOG_FD] +-# --------------------------------- ++# as_fn_error STATUS ERROR [LINENO LOG_FD] ++# ---------------------------------------- + # Output "`basename $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. ++# script with STATUS, using 1 if that was 0. + as_fn_error () + { +- as_status=$?; test $as_status -eq 0 && as_status=1 +- if test "$3"; then +- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ 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: $1" >&2 ++ $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status + } # as_fn_error + +@@ -9777,7 +9812,7 @@ + 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" ++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + + } # as_fn_mkdir_p +@@ -9830,8 +9865,8 @@ + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. + ac_log=" +-This file was extended by Valgrind $as_me 3.6.1, which was +-generated by GNU Autoconf 2.65. Invocation command line was ++This file was extended by Valgrind $as_me 3.6.1-Debian, which was ++generated by GNU Autoconf 2.68. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -9896,11 +9931,11 @@ + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ +-Valgrind config.status 3.6.1 +-configured by $0, generated by GNU Autoconf 2.65, ++Valgrind config.status 3.6.1-Debian ++configured by $0, generated by GNU Autoconf 2.68, + with options \\"\$ac_cs_config\\" + +-Copyright (C) 2009 Free Software Foundation, Inc. ++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." + +@@ -9918,11 +9953,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 +@@ -9944,6 +9984,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;; +@@ -9956,7 +9997,7 @@ + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header +- as_fn_error "ambiguous option: \`$1' ++ as_fn_error $? "ambiguous option: \`$1' + Try \`$0 --help' for more information.";; + --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; +@@ -9965,7 +10006,7 @@ + ac_cs_silent=: ;; + + # This is an error. +- -*) as_fn_error "unrecognized option: \`$1' ++ -*) as_fn_error $? "unrecognized option: \`$1' + Try \`$0 --help' for more information." ;; + + *) as_fn_append ac_config_targets " $1" +@@ -10091,7 +10132,7 @@ + "coregrind/link_tool_exe_darwin") CONFIG_FILES="$CONFIG_FILES coregrind/link_tool_exe_darwin" ;; + "coregrind/link_tool_exe_aix5") CONFIG_FILES="$CONFIG_FILES coregrind/link_tool_exe_aix5" ;; + +- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; ++ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac + done + +@@ -10114,9 +10155,10 @@ + # after its creation but before its name has been assigned to `$tmp'. + $debug || + { +- tmp= ++ tmp= ac_tmp= + trap 'exit_status=$? +- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ++ : "${ac_tmp:=$tmp}" ++ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status + ' 0 + trap 'as_fn_exit 1' 1 2 13 15 + } +@@ -10124,12 +10166,13 @@ + + { + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && +- test -n "$tmp" && test -d "$tmp" ++ test -d "$tmp" + } || + { + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 ++} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 ++ac_tmp=$tmp + + # Set up the scripts for CONFIG_FILES section. + # No need to generate them if there are no CONFIG_FILES. +@@ -10146,12 +10189,12 @@ + fi + ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` + if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then +- ac_cs_awk_cr='\r' ++ ac_cs_awk_cr='\\r' + else + ac_cs_awk_cr=$ac_cr + fi + +-echo 'BEGIN {' >"$tmp/subs1.awk" && ++echo 'BEGIN {' >"$ac_tmp/subs1.awk" && + _ACEOF + + +@@ -10160,18 +10203,18 @@ + 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 '$'` ++ 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 ++ 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 ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -10179,7 +10222,7 @@ + rm -f conf$$subs.sh + + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-cat >>"\$tmp/subs1.awk" <<\\_ACAWK && ++cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && + _ACEOF + sed -n ' + h +@@ -10227,7 +10270,7 @@ + rm -f conf$$subs.awk + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + _ACAWK +-cat >>"\$tmp/subs1.awk" <<_ACAWK && ++cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + +@@ -10259,21 +10302,29 @@ + 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 ++fi < "$ac_tmp/subs1.awk" > "$ac_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 $(srcdir), +-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and ++# 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[ ]*=/{ +-s/:*\$(srcdir):*/:/ +-s/:*\${srcdir}:*/:/ +-s/:*@srcdir@:*/:/ +-s/^\([^=]*=[ ]*\):*/\1/ ++ 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 +@@ -10285,7 +10336,7 @@ + # 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 || ++cat >"$ac_tmp/defines.awk" <<\_ACAWK || + BEGIN { + _ACEOF + +@@ -10297,11 +10348,11 @@ + # 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 ++ ac_tt=`sed -n "/$ac_delim/p" confdefs.h` ++ if test -z "$ac_tt"; then + break + elif $ac_last_try; then +- as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 ++ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -10386,7 +10437,7 @@ + _ACAWK + _ACEOF + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +- as_fn_error "could not setup config headers machinery" "$LINENO" 5 ++ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 + fi # test -n "$CONFIG_HEADERS" + + +@@ -10399,7 +10450,7 @@ + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; +- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; ++ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac +@@ -10418,7 +10469,7 @@ + for ac_f + do + case $ac_f in +- -) ac_f="$tmp/stdin";; ++ -) ac_f="$ac_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 `:'. +@@ -10427,7 +10478,7 @@ + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || +- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; ++ 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'" +@@ -10453,8 +10504,8 @@ + esac + + case $ac_tag in +- *:-:* | *:-) cat >"$tmp/stdin" \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; ++ *:-:* | *:-) cat >"$ac_tmp/stdin" \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac +@@ -10590,23 +10641,24 @@ + 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 ++eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ ++ >$ac_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"; } && ++ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && ++ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ ++ "$ac_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 ++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;} ++which seems to be undefined. Please make sure it is defined" >&2;} + +- rm -f "$tmp/stdin" ++ rm -f "$ac_tmp/stdin" + case $ac_file in +- -) cat "$tmp/out" && rm -f "$tmp/out";; +- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; ++ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; ++ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; + esac \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + ;; + :H) + # +@@ -10615,21 +10667,21 @@ + 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 ++ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" ++ } >"$ac_tmp/config.h" \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ++ if diff "$ac_file" "$ac_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 ++ mv "$ac_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 ++ && eval '$AWK -f "$ac_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" +@@ -10782,7 +10834,7 @@ + ac_clean_files=$ac_clean_files_save + + test $ac_write_fail = 0 || +- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 ++ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + + + # configure is writing to config.log, and then calls config.status. +@@ -10803,7 +10855,7 @@ + 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 $? ++ $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 +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/coregrind/Makefile.in valgrind-3.6.1/coregrind/Makefile.in +--- valgrind-3.6.1~/coregrind/Makefile.in 2011-02-15 18:34:10.000000000 +0100 ++++ valgrind-3.6.1/coregrind/Makefile.in 2011-10-05 12:25:18.279879241 +0200 +@@ -599,6 +599,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/docs/Makefile.in valgrind-3.6.1/docs/Makefile.in +--- valgrind-3.6.1~/docs/Makefile.in 2011-02-15 18:34:10.000000000 +0100 ++++ valgrind-3.6.1/docs/Makefile.in 2011-10-05 12:25:18.283879260 +0200 +@@ -117,6 +117,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/drd/Makefile.in valgrind-3.6.1/drd/Makefile.in +--- valgrind-3.6.1~/drd/Makefile.in 2011-02-15 18:34:10.000000000 +0100 ++++ valgrind-3.6.1/drd/Makefile.in 2011-10-05 12:25:18.283879260 +0200 +@@ -288,6 +288,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/drd/tests/Makefile.in valgrind-3.6.1/drd/tests/Makefile.in +--- valgrind-3.6.1~/drd/tests/Makefile.in 2011-02-15 18:34:11.000000000 +0100 ++++ valgrind-3.6.1/drd/tests/Makefile.in 2011-10-05 12:25:18.283879260 +0200 +@@ -506,6 +506,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/exp-bbv/Makefile.in valgrind-3.6.1/exp-bbv/Makefile.in +--- valgrind-3.6.1~/exp-bbv/Makefile.in 2011-02-15 18:34:11.000000000 +0100 ++++ valgrind-3.6.1/exp-bbv/Makefile.in 2011-10-05 12:25:18.283879260 +0200 +@@ -194,6 +194,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/exp-bbv/tests/Makefile.in valgrind-3.6.1/exp-bbv/tests/Makefile.in +--- valgrind-3.6.1~/exp-bbv/tests/Makefile.in 2011-02-15 18:34:11.000000000 +0100 ++++ valgrind-3.6.1/exp-bbv/tests/Makefile.in 2011-10-05 12:25:18.283879260 +0200 +@@ -177,6 +177,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/exp-bbv/tests/amd64-linux/Makefile.in valgrind-3.6.1/exp-bbv/tests/amd64-linux/Makefile.in +--- valgrind-3.6.1~/exp-bbv/tests/amd64-linux/Makefile.in 2011-02-15 18:34:11.000000000 +0100 ++++ valgrind-3.6.1/exp-bbv/tests/amd64-linux/Makefile.in 2011-10-05 12:25:18.283879260 +0200 +@@ -166,6 +166,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/exp-bbv/tests/arm-linux/Makefile.in valgrind-3.6.1/exp-bbv/tests/arm-linux/Makefile.in +--- valgrind-3.6.1~/exp-bbv/tests/arm-linux/Makefile.in 2011-02-15 18:34:11.000000000 +0100 ++++ valgrind-3.6.1/exp-bbv/tests/arm-linux/Makefile.in 2011-10-05 12:25:18.287879285 +0200 +@@ -149,6 +149,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/exp-bbv/tests/ppc32-linux/Makefile.in valgrind-3.6.1/exp-bbv/tests/ppc32-linux/Makefile.in +--- valgrind-3.6.1~/exp-bbv/tests/ppc32-linux/Makefile.in 2011-02-15 18:34:11.000000000 +0100 ++++ valgrind-3.6.1/exp-bbv/tests/ppc32-linux/Makefile.in 2011-10-05 12:25:18.287879285 +0200 +@@ -149,6 +149,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/exp-bbv/tests/x86/Makefile.in valgrind-3.6.1/exp-bbv/tests/x86/Makefile.in +--- valgrind-3.6.1~/exp-bbv/tests/x86/Makefile.in 2011-02-15 18:34:11.000000000 +0100 ++++ valgrind-3.6.1/exp-bbv/tests/x86/Makefile.in 2011-10-05 12:25:18.287879285 +0200 +@@ -158,6 +158,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/exp-bbv/tests/x86-linux/Makefile.in valgrind-3.6.1/exp-bbv/tests/x86-linux/Makefile.in +--- valgrind-3.6.1~/exp-bbv/tests/x86-linux/Makefile.in 2011-02-15 18:34:11.000000000 +0100 ++++ valgrind-3.6.1/exp-bbv/tests/x86-linux/Makefile.in 2011-10-05 12:25:18.287879285 +0200 +@@ -149,6 +149,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/exp-dhat/Makefile.in valgrind-3.6.1/exp-dhat/Makefile.in +--- valgrind-3.6.1~/exp-dhat/Makefile.in 2011-02-15 18:34:11.000000000 +0100 ++++ valgrind-3.6.1/exp-dhat/Makefile.in 2011-10-05 12:25:18.287879285 +0200 +@@ -218,6 +218,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/exp-dhat/tests/Makefile.in valgrind-3.6.1/exp-dhat/tests/Makefile.in +--- valgrind-3.6.1~/exp-dhat/tests/Makefile.in 2011-02-15 18:34:11.000000000 +0100 ++++ valgrind-3.6.1/exp-dhat/tests/Makefile.in 2011-10-05 12:25:18.287879285 +0200 +@@ -117,6 +117,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/exp-ptrcheck/Makefile.in valgrind-3.6.1/exp-ptrcheck/Makefile.in +--- valgrind-3.6.1~/exp-ptrcheck/Makefile.in 2011-02-15 18:34:11.000000000 +0100 ++++ valgrind-3.6.1/exp-ptrcheck/Makefile.in 2011-10-05 12:25:18.287879285 +0200 +@@ -239,6 +239,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/exp-ptrcheck/tests/Makefile.in valgrind-3.6.1/exp-ptrcheck/tests/Makefile.in +--- valgrind-3.6.1~/exp-ptrcheck/tests/Makefile.in 2011-02-15 18:34:11.000000000 +0100 ++++ valgrind-3.6.1/exp-ptrcheck/tests/Makefile.in 2011-10-05 12:25:18.287879285 +0200 +@@ -288,6 +288,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/helgrind/Makefile.in valgrind-3.6.1/helgrind/Makefile.in +--- valgrind-3.6.1~/helgrind/Makefile.in 2011-02-15 18:34:12.000000000 +0100 ++++ valgrind-3.6.1/helgrind/Makefile.in 2011-10-05 12:25:18.291879300 +0200 +@@ -261,6 +261,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/helgrind/tests/Makefile.in valgrind-3.6.1/helgrind/tests/Makefile.in +--- valgrind-3.6.1~/helgrind/tests/Makefile.in 2011-02-15 18:34:12.000000000 +0100 ++++ valgrind-3.6.1/helgrind/tests/Makefile.in 2011-10-05 12:25:18.291879300 +0200 +@@ -350,6 +350,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/include/Makefile.in valgrind-3.6.1/include/Makefile.in +--- valgrind-3.6.1~/include/Makefile.in 2011-02-15 18:34:12.000000000 +0100 ++++ valgrind-3.6.1/include/Makefile.in 2011-10-05 12:25:18.291879300 +0200 +@@ -144,6 +144,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/lackey/Makefile.in valgrind-3.6.1/lackey/Makefile.in +--- valgrind-3.6.1~/lackey/Makefile.in 2011-02-15 18:34:12.000000000 +0100 ++++ valgrind-3.6.1/lackey/Makefile.in 2011-10-05 12:25:18.291879300 +0200 +@@ -194,6 +194,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/lackey/tests/Makefile.in valgrind-3.6.1/lackey/tests/Makefile.in +--- valgrind-3.6.1~/lackey/tests/Makefile.in 2011-02-15 18:34:12.000000000 +0100 ++++ valgrind-3.6.1/lackey/tests/Makefile.in 2011-10-05 12:25:18.291879300 +0200 +@@ -120,6 +120,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/massif/Makefile.in valgrind-3.6.1/massif/Makefile.in +--- valgrind-3.6.1~/massif/Makefile.in 2011-02-15 18:34:12.000000000 +0100 ++++ valgrind-3.6.1/massif/Makefile.in 2011-10-05 12:25:18.291879300 +0200 +@@ -243,6 +243,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/massif/perf/Makefile.in valgrind-3.6.1/massif/perf/Makefile.in +--- valgrind-3.6.1~/massif/perf/Makefile.in 2011-02-15 18:34:12.000000000 +0100 ++++ valgrind-3.6.1/massif/perf/Makefile.in 2011-10-05 12:25:18.291879300 +0200 +@@ -142,6 +142,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/massif/tests/Makefile.in valgrind-3.6.1/massif/tests/Makefile.in +--- valgrind-3.6.1~/massif/tests/Makefile.in 2011-02-15 18:34:12.000000000 +0100 ++++ valgrind-3.6.1/massif/tests/Makefile.in 2011-10-05 12:25:18.291879300 +0200 +@@ -223,6 +223,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/memcheck/Makefile.in valgrind-3.6.1/memcheck/Makefile.in +--- valgrind-3.6.1~/memcheck/Makefile.in 2011-02-15 18:34:12.000000000 +0100 ++++ valgrind-3.6.1/memcheck/Makefile.in 2011-10-05 12:25:18.295879325 +0200 +@@ -261,6 +261,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/memcheck/perf/Makefile.in valgrind-3.6.1/memcheck/perf/Makefile.in +--- valgrind-3.6.1~/memcheck/perf/Makefile.in 2011-02-15 18:34:12.000000000 +0100 ++++ valgrind-3.6.1/memcheck/perf/Makefile.in 2011-10-05 12:25:18.295879325 +0200 +@@ -142,6 +142,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/memcheck/tests/Makefile.in valgrind-3.6.1/memcheck/tests/Makefile.in +--- valgrind-3.6.1~/memcheck/tests/Makefile.in 2011-02-15 18:34:12.000000000 +0100 ++++ valgrind-3.6.1/memcheck/tests/Makefile.in 2011-10-05 12:25:18.295879325 +0200 +@@ -699,6 +699,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/memcheck/tests/amd64/Makefile.in valgrind-3.6.1/memcheck/tests/amd64/Makefile.in +--- valgrind-3.6.1~/memcheck/tests/amd64/Makefile.in 2011-02-15 18:34:12.000000000 +0100 ++++ valgrind-3.6.1/memcheck/tests/amd64/Makefile.in 2011-10-05 12:25:18.295879325 +0200 +@@ -165,6 +165,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/memcheck/tests/amd64-linux/Makefile.in valgrind-3.6.1/memcheck/tests/amd64-linux/Makefile.in +--- valgrind-3.6.1~/memcheck/tests/amd64-linux/Makefile.in 2011-02-15 18:34:12.000000000 +0100 ++++ valgrind-3.6.1/memcheck/tests/amd64-linux/Makefile.in 2011-10-05 12:25:18.295879325 +0200 +@@ -149,6 +149,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/memcheck/tests/darwin/Makefile.in valgrind-3.6.1/memcheck/tests/darwin/Makefile.in +--- valgrind-3.6.1~/memcheck/tests/darwin/Makefile.in 2011-02-15 18:34:13.000000000 +0100 ++++ valgrind-3.6.1/memcheck/tests/darwin/Makefile.in 2011-10-05 12:25:18.295879325 +0200 +@@ -169,6 +169,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/memcheck/tests/linux/Makefile.in valgrind-3.6.1/memcheck/tests/linux/Makefile.in +--- valgrind-3.6.1~/memcheck/tests/linux/Makefile.in 2011-02-15 18:34:13.000000000 +0100 ++++ valgrind-3.6.1/memcheck/tests/linux/Makefile.in 2011-10-05 12:25:18.295879325 +0200 +@@ -169,6 +169,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/memcheck/tests/ppc32/Makefile.in valgrind-3.6.1/memcheck/tests/ppc32/Makefile.in +--- valgrind-3.6.1~/memcheck/tests/ppc32/Makefile.in 2011-02-15 18:34:13.000000000 +0100 ++++ valgrind-3.6.1/memcheck/tests/ppc32/Makefile.in 2011-10-05 12:25:18.299879340 +0200 +@@ -146,6 +146,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/memcheck/tests/ppc64/Makefile.in valgrind-3.6.1/memcheck/tests/ppc64/Makefile.in +--- valgrind-3.6.1~/memcheck/tests/ppc64/Makefile.in 2011-02-15 18:34:13.000000000 +0100 ++++ valgrind-3.6.1/memcheck/tests/ppc64/Makefile.in 2011-10-05 12:25:18.299879340 +0200 +@@ -146,6 +146,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/memcheck/tests/x86/Makefile.in valgrind-3.6.1/memcheck/tests/x86/Makefile.in +--- valgrind-3.6.1~/memcheck/tests/x86/Makefile.in 2011-02-15 18:34:13.000000000 +0100 ++++ valgrind-3.6.1/memcheck/tests/x86/Makefile.in 2011-10-05 12:25:18.299879340 +0200 +@@ -191,6 +191,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/memcheck/tests/x86-linux/Makefile.in valgrind-3.6.1/memcheck/tests/x86-linux/Makefile.in +--- valgrind-3.6.1~/memcheck/tests/x86-linux/Makefile.in 2011-02-15 18:34:13.000000000 +0100 ++++ valgrind-3.6.1/memcheck/tests/x86-linux/Makefile.in 2011-10-05 12:25:18.299879340 +0200 +@@ -169,6 +169,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/mpi/Makefile.in valgrind-3.6.1/mpi/Makefile.in +--- valgrind-3.6.1~/mpi/Makefile.in 2011-02-15 18:34:13.000000000 +0100 ++++ valgrind-3.6.1/mpi/Makefile.in 2011-10-05 12:25:18.299879340 +0200 +@@ -170,6 +170,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/none/Makefile.in valgrind-3.6.1/none/Makefile.in +--- valgrind-3.6.1~/none/Makefile.in 2011-02-15 18:34:13.000000000 +0100 ++++ valgrind-3.6.1/none/Makefile.in 2011-10-05 12:25:18.299879340 +0200 +@@ -192,6 +192,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/none/tests/Makefile.in valgrind-3.6.1/none/tests/Makefile.in +--- valgrind-3.6.1~/none/tests/Makefile.in 2011-02-15 18:34:13.000000000 +0100 ++++ valgrind-3.6.1/none/tests/Makefile.in 2011-10-05 12:25:18.299879340 +0200 +@@ -506,6 +506,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/none/tests/amd64/Makefile.in valgrind-3.6.1/none/tests/amd64/Makefile.in +--- valgrind-3.6.1~/none/tests/amd64/Makefile.in 2011-02-15 18:34:13.000000000 +0100 ++++ valgrind-3.6.1/none/tests/amd64/Makefile.in 2011-10-05 12:25:18.299879340 +0200 +@@ -288,6 +288,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/none/tests/arm/Makefile.in valgrind-3.6.1/none/tests/arm/Makefile.in +--- valgrind-3.6.1~/none/tests/arm/Makefile.in 2011-02-15 18:34:13.000000000 +0100 ++++ valgrind-3.6.1/none/tests/arm/Makefile.in 2011-10-05 12:25:18.303879365 +0200 +@@ -173,6 +173,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/none/tests/darwin/Makefile.in valgrind-3.6.1/none/tests/darwin/Makefile.in +--- valgrind-3.6.1~/none/tests/darwin/Makefile.in 2011-02-15 18:34:13.000000000 +0100 ++++ valgrind-3.6.1/none/tests/darwin/Makefile.in 2011-10-05 12:25:18.303879365 +0200 +@@ -151,6 +151,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/none/tests/linux/Makefile.in valgrind-3.6.1/none/tests/linux/Makefile.in +--- valgrind-3.6.1~/none/tests/linux/Makefile.in 2011-02-15 18:34:13.000000000 +0100 ++++ valgrind-3.6.1/none/tests/linux/Makefile.in 2011-10-05 12:25:18.303879365 +0200 +@@ -150,6 +150,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/none/tests/ppc32/Makefile.in valgrind-3.6.1/none/tests/ppc32/Makefile.in +--- valgrind-3.6.1~/none/tests/ppc32/Makefile.in 2011-02-15 18:34:14.000000000 +0100 ++++ valgrind-3.6.1/none/tests/ppc32/Makefile.in 2011-10-05 12:25:18.303879365 +0200 +@@ -203,6 +203,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/none/tests/ppc64/Makefile.in valgrind-3.6.1/none/tests/ppc64/Makefile.in +--- valgrind-3.6.1~/none/tests/ppc64/Makefile.in 2011-02-15 18:34:14.000000000 +0100 ++++ valgrind-3.6.1/none/tests/ppc64/Makefile.in 2011-10-05 12:25:18.303879365 +0200 +@@ -171,6 +171,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/none/tests/x86/Makefile.in valgrind-3.6.1/none/tests/x86/Makefile.in +--- valgrind-3.6.1~/none/tests/x86/Makefile.in 2011-02-15 18:34:14.000000000 +0100 ++++ valgrind-3.6.1/none/tests/x86/Makefile.in 2011-10-05 12:25:18.303879365 +0200 +@@ -317,6 +317,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/none/tests/x86-linux/Makefile.in valgrind-3.6.1/none/tests/x86-linux/Makefile.in +--- valgrind-3.6.1~/none/tests/x86-linux/Makefile.in 2011-02-15 18:34:14.000000000 +0100 ++++ valgrind-3.6.1/none/tests/x86-linux/Makefile.in 2011-10-05 12:25:18.303879365 +0200 +@@ -147,6 +147,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/perf/Makefile.in valgrind-3.6.1/perf/Makefile.in +--- valgrind-3.6.1~/perf/Makefile.in 2011-02-15 18:34:14.000000000 +0100 ++++ valgrind-3.6.1/perf/Makefile.in 2011-10-05 12:25:18.303879365 +0200 +@@ -171,6 +171,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/tests/Makefile.in valgrind-3.6.1/tests/Makefile.in +--- valgrind-3.6.1~/tests/Makefile.in 2011-02-15 18:34:14.000000000 +0100 ++++ valgrind-3.6.1/tests/Makefile.in 2011-10-05 12:25:18.307879380 +0200 +@@ -160,6 +160,8 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + PREFERRED_STACK_BOUNDARY = @PREFERRED_STACK_BOUNDARY@ + QTCORE_CFLAGS = @QTCORE_CFLAGS@ + QTCORE_LIBS = @QTCORE_LIBS@ --- valgrind-3.6.1.orig/debian/patches/02_version.dpatch +++ valgrind-3.6.1/debian/patches/02_version.dpatch @@ -0,0 +1,31 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## Description: add some description +## Origin/Author: add some origin or author +## Bug: bug URL +## 02_version.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' valgrind-3.6.1~/configure.in valgrind-3.6.1/configure.in +--- valgrind-3.6.1~/configure.in 2011-02-15 19:31:17.000000000 +0200 ++++ valgrind-3.6.1/configure.in 2011-02-27 20:27:28.001038336 +0200 +@@ -8,7 +8,7 @@ + ##------------------------------------------------------------## + + # Process this file with autoconf to produce a configure script. +-AC_INIT(Valgrind, 3.6.1, valgrind-users@lists.sourceforge.net) ++AC_INIT(Valgrind, 3.6.1-Debian, valgrind-users@lists.sourceforge.net) + AC_CONFIG_SRCDIR(coregrind/m_main.c) + AM_CONFIG_HEADER(config.h) + AM_INIT_AUTOMAKE([foreign]) +@@ -207,7 +207,7 @@ + AC_MSG_CHECKING([for a supported OS]) + AC_SUBST(VGCONF_OS) + +-DEFAULT_SUPP="" ++DEFAULT_SUPP="debian.supp" + + case "${host_os}" in + *linux*) --- valgrind-3.6.1.orig/debian/patches/01_ipc_stuff.dpatch +++ valgrind-3.6.1/debian/patches/01_ipc_stuff.dpatch @@ -0,0 +1,51 @@ +#! /bin/sh -e +## +## All lines beginning with `## DP:\' are a description of the patch. +## DP: Solves the FTBFS bugs. Updated for valgrind-2.2.0. + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 +@DPATCH@ + +diff -urN valgrind-2.2.0.orig/coregrind/vg_unsafe.h valgrind-2.2.0/coregrind/vg_unsafe.h +--- valgrind-2.2.0.orig/coregrind/vg_unsafe.h 2004-08-29 21:02:28.000000000 +0000 ++++ valgrind-2.2.0/coregrind/vg_unsafe.h 2004-09-01 23:28:42.000000000 +0000 +@@ -54,7 +54,6 @@ + #include /* for __user definition */ + #endif + #include /* for struct msgbuf */ +-#include /* for struct ipc_kludge */ + #include /* for struct sembuf */ + + #include /* for the SG_* ioctls */ +diff -urN valgrind-2.2.0.orig/include/vg_kerneliface.h valgrind-2.2.0/include/vg_kerneliface.h +--- valgrind-2.2.0.orig/include/vg_kerneliface.h 2004-08-31 00:08:37.000000000 +0000 ++++ valgrind-2.2.0/include/vg_kerneliface.h 2004-09-01 23:29:21.000000000 +0000 +@@ -663,6 +663,13 @@ + #define VKI_MODIFY_LDT_CONTENTS_STACK 1 + #define VKI_MODIFY_LDT_CONTENTS_CODE 2 + ++/* IPC stuff, from 2.6.3 asm/ipc.h: */ ++ ++struct ipc_kludge { ++ struct msgbuf *msgp; ++ long msgtyp; ++}; ++ + #define VKI_GDT_TLS_ENTRIES 3 + #define VKI_GDT_TLS_MIN 6 + #define VKI_GDT_TLS_MAX (VKI_GDT_TLS_MIN + VKI_GDT_TLS_ENTRIES) --- valgrind-3.6.1.orig/debian/patches/14_ioctls.dpatch +++ valgrind-3.6.1/debian/patches/14_ioctls.dpatch @@ -0,0 +1,133 @@ +#! /bin/sh -e +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Adds support for readdir syscall. Bug#237996 + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 +@DPATCH@ + +diff -urN valgrind-2.2.0.orig/coregrind/vg_syscalls.c valgrind-2.2.0/coregrind/vg_syscalls.c +--- valgrind-2.2.0.orig/coregrind/vg_syscalls.c 2004-09-10 21:35:49.000000000 +0000 ++++ valgrind-2.2.0/coregrind/vg_syscalls.c 2004-09-10 21:40:02.000000000 +0000 +@@ -2912,6 +2912,14 @@ + SYSCALL_TRACK( pre_mem_read, tid, "ioctl(TIOCSWINSZ)", arg3, + sizeof(struct winsize) ); + break; ++ case TIOCMBIS: ++ SYSCALL_TRACK( pre_mem_read, tid, "ioctl(TIOCMBIS)", ++ arg3, sizeof(int) ); ++ break; ++ case TIOCMBIC: ++ SYSCALL_TRACK( pre_mem_read, tid, "ioctl(TIOCMBIC)", ++ arg3, sizeof(int) ); ++ break; + case TIOCLINUX: + SYSCALL_TRACK( pre_mem_read, tid, "ioctl(TIOCLINUX)", arg3, + sizeof(char *) ); +@@ -2994,6 +3002,16 @@ + SYSCALL_TRACK( pre_mem_read, tid, "ioctl(SG_GET_VERSION_NUM)", + arg3, sizeof(int) ); + break; ++ case SG_EMULATED_HOST: /* 0x2203 */ ++ SYSCALL_TRACK( pre_mem_write, tid, ++ "ioctl(SG_EMULATED_HOST)", arg3, ++ sizeof(int) ); ++ break; ++ case SG_GET_SG_TABLESIZE: /* 0x227f */ ++ SYSCALL_TRACK( pre_mem_write, tid, ++ "ioctl(SG_GET_SG_TABLESIZE)", ++ arg3, sizeof(int) ); ++ break; + # endif + + case VKI_IIOCGETCPS: +@@ -3383,6 +3401,26 @@ + "ioctl(CDROMREADTOCENTRY)", arg3, + sizeof(struct cdrom_tocentry)); + break; ++ case CDROMMULTISESSION: /* 0x5310 */ ++ SYSCALL_TRACK( pre_mem_write,tid, ++ "ioctl(CDROMMULTISESSION)", arg3, ++ sizeof(struct cdrom_multisession)); ++ break; ++ case CDROMVOLREAD: /* 0x5313 */ ++ SYSCALL_TRACK( pre_mem_write,tid, ++ "ioctl(CDROMVOLREAD)", arg3, ++ sizeof(struct cdrom_volctrl)); ++ break; ++ case CDROMREADAUDIO: /* 0x530e */ ++ SYSCALL_TRACK( pre_mem_read,tid, ++ "ioctl(CDROMREADAUDIO)", arg3, ++ sizeof (struct cdrom_read_audio)); ++ if ( arg3 ) { ++ struct cdrom_read_audio *cra = (struct cdrom_read_audio *) arg3; ++ SYSCALL_TRACK( pre_mem_write, tid, "ioctl(CDROMREADAUDIO).buf", ++ (Addr)(cra->buf), (UInt)(cra->nframes * CD_FRAMESIZE_RAW)); ++ } ++ break; + case CDROMPLAYMSF: + SYSCALL_TRACK( pre_mem_read,tid, "ioctl(CDROMPLAYMSF)", arg3, + sizeof(struct cdrom_msf)); +@@ -3586,6 +3624,9 @@ + break; + case TIOCSWINSZ: + break; ++ case TIOCMBIS: ++ case TIOCMBIC: ++ break; + case TIOCLINUX: + if (res == 0) + VG_TRACK( post_mem_write, arg3, sizeof(char *) ); +@@ -3647,6 +3688,14 @@ + break; + case SG_GET_VERSION_NUM: + break; ++ case SG_EMULATED_HOST: ++ if (res == 0) ++ VG_TRACK( post_mem_write,arg3, sizeof(int)); ++ break; ++ case SG_GET_SG_TABLESIZE: ++ if (res == 0) ++ VG_TRACK( post_mem_write,arg3, sizeof(int)); ++ break; + # endif + + case VKI_IIOCGETCPS: +@@ -3908,6 +3957,22 @@ + if (res == 0) + VG_TRACK( post_mem_write,arg3, sizeof(struct cdrom_tochdr)); + break; ++ case CDROMMULTISESSION: ++ if (res == 0) ++ VG_TRACK( post_mem_write,arg3, sizeof(struct cdrom_multisession)); ++ break; ++ case CDROMVOLREAD: ++ if (res == 0) ++ VG_TRACK( post_mem_write,arg3, sizeof(struct cdrom_volctrl)); ++ break; ++ case CDROMREADAUDIO: ++ if (res == 0 && arg3 ) { ++ struct cdrom_read_audio *cra = (struct cdrom_read_audio *) arg3; ++ if (cra->buf != NULL) ++ VG_TRACK( post_mem_write, (Addr)(cra->buf), ++ (UInt)(cra->nframes * CD_FRAMESIZE_RAW)); ++ } ++ break; + case CDROMPLAYMSF: + break; + /* The following two are probably bogus (should check args --- valgrind-3.6.1.orig/debian/patches/03_valgrind-libc6-2.6.dpatch +++ valgrind-3.6.1/debian/patches/03_valgrind-libc6-2.6.dpatch @@ -0,0 +1,10022 @@ +#! /bin/sh -e +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Make valgrind compiles under glibc 2.6 + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 +@DPATCH@ + +diff -urN valgrind-3.2.3.orig/configure valgrind-3.2.3/configure +--- valgrind-3.2.3.orig/configure 2007-08-17 02:50:19.000000000 +0000 ++++ valgrind-3.2.3/configure 2007-08-17 02:51:27.000000000 +0000 +@@ -1,27 +1,56 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.59 for Valgrind 3.2.3. ++# Generated by GNU Autoconf 2.61 for Valgrind 3.2.3-Debian. + # + # Report bugs to . + # +-# Copyright (C) 2003 Free Software Foundation, Inc. ++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, ++# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. + ## --------------------- ## + ## M4sh Initialization. ## + ## --------------------- ## + +-# Be Bourne compatible ++# Be more Bourne compatible ++DUALCASE=1; export DUALCASE # for MKS sh + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' +-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then +- set -o posix ++ setopt NO_GLOB_SUBST ++else ++ case `(set -o) 2>/dev/null` in ++ *posix*) set -o posix ;; ++esac ++ ++fi ++ ++ ++ ++ ++# PATH needs CR ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits ++ ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ echo "#! /bin/sh" >conf$$.sh ++ echo "exit 0" >>conf$$.sh ++ chmod +x conf$$.sh ++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then ++ PATH_SEPARATOR=';' ++ else ++ PATH_SEPARATOR=: ++ fi ++ rm -f conf$$.sh + fi +-DUALCASE=1; export DUALCASE # for MKS sh + + # Support unset when possible. + if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +@@ -31,8 +60,43 @@ + fi + + ++# IFS ++# We need space, tab and new line, in precisely that order. Quoting is ++# there to prevent editors from complaining about space-tab. ++# (If _AS_PATH_WALK were called with IFS unset, it would disable word ++# splitting by setting IFS to empty value.) ++as_nl=' ++' ++IFS=" "" $as_nl" ++ ++# Find who we are. Look in the path if we contain no directory separator. ++case $0 in ++ *[\\/]* ) as_myself=$0 ;; ++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++# We did not find ourselves, most probably we were run as `sh COMMAND' ++# in which case we are not to be found in the path. ++if test "x$as_myself" = x; then ++ as_myself=$0 ++fi ++if test ! -f "$as_myself"; then ++ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ { (exit 1); exit 1; } ++fi ++ + # Work around bugs in pre-3.0 UWIN ksh. +-$as_unset ENV MAIL MAILPATH ++for as_var in ENV MAIL MAILPATH ++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++done + PS1='$ ' + PS2='> ' + PS4='+ ' +@@ -46,18 +110,19 @@ + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else +- $as_unset $as_var ++ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + fi + done + + # Required to use basename. +-if expr a : '\(a\)' >/dev/null 2>&1; then ++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 ++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename + else + as_basename=false +@@ -65,157 +130,388 @@ + + + # Name of the executable. +-as_me=`$as_basename "$0" || ++as_me=`$as_basename -- "$0" || + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)$' \| \ +- . : '\(.\)' 2>/dev/null || ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || + echo X/"$0" | +- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } +- /^X\/\(\/\/\)$/{ s//\1/; q; } +- /^X\/\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` + ++# CDPATH. ++$as_unset CDPATH + +-# PATH needs CR, and LINENO needs CR and PATH. +-# Avoid depending upon Character Ranges. +-as_cr_letters='abcdefghijklmnopqrstuvwxyz' +-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +-as_cr_Letters=$as_cr_letters$as_cr_LETTERS +-as_cr_digits='0123456789' +-as_cr_alnum=$as_cr_Letters$as_cr_digits + +-# The user is always right. +-if test "${PATH_SEPARATOR+set}" != set; then +- echo "#! /bin/sh" >conf$$.sh +- echo "exit 0" >>conf$$.sh +- chmod +x conf$$.sh +- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then +- PATH_SEPARATOR=';' +- else +- PATH_SEPARATOR=: +- fi +- rm -f conf$$.sh ++if test "x$CONFIG_SHELL" = x; then ++ if (eval ":") 2>/dev/null; then ++ as_have_required=yes ++else ++ as_have_required=no ++fi ++ ++ if test $as_have_required = yes && (eval ": ++(as_func_return () { ++ (exit \$1) ++} ++as_func_success () { ++ as_func_return 0 ++} ++as_func_failure () { ++ as_func_return 1 ++} ++as_func_ret_success () { ++ return 0 ++} ++as_func_ret_failure () { ++ return 1 ++} ++ ++exitcode=0 ++if as_func_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_success failed. + fi + ++if as_func_failure; then ++ exitcode=1 ++ echo as_func_failure succeeded. ++fi + +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x$as_lineno_3" = "x$as_lineno_2" || { +- # Find who we are. Look in the path if we contain no path at all +- # relative or not. +- 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 ++if as_func_ret_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_ret_success failed. ++fi + +- ;; +- esac +- # We did not find ourselves, most probably we were run as `sh COMMAND' +- # in which case we are not to be found in the path. +- if test "x$as_myself" = x; then +- as_myself=$0 +- fi +- if test ! -f "$as_myself"; then +- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 +- { (exit 1); exit 1; }; } +- fi +- case $CONFIG_SHELL in +- '') ++if as_func_ret_failure; then ++ exitcode=1 ++ echo as_func_ret_failure succeeded. ++fi ++ ++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then ++ : ++else ++ exitcode=1 ++ echo positional parameters were not saved. ++fi ++ ++test \$exitcode = 0) || { (exit 1); exit 1; } ++ ++( ++ as_lineno_1=\$LINENO ++ as_lineno_2=\$LINENO ++ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && ++ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } ++") 2> /dev/null; then ++ : ++else ++ as_candidate_shells= + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for as_base in sh bash ksh sh5; do +- case $as_dir in ++ case $as_dir in + /*) +- if ("$as_dir/$as_base" -c ' ++ for as_base in sh bash ksh sh5; do ++ as_candidate_shells="$as_candidate_shells $as_dir/$as_base" ++ done;; ++ esac ++done ++IFS=$as_save_IFS ++ ++ ++ for as_shell in $as_candidate_shells $SHELL; do ++ # Try only shells that exist, to save several forks. ++ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && ++ { ("$as_shell") 2> /dev/null <<\_ASEOF ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++ emulate sh ++ NULLCMD=: ++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '${1+"$@"}'='"$@"' ++ setopt NO_GLOB_SUBST ++else ++ case `(set -o) 2>/dev/null` in ++ *posix*) set -o posix ;; ++esac ++ ++fi ++ ++ ++: ++_ASEOF ++}; then ++ CONFIG_SHELL=$as_shell ++ as_have_required=yes ++ if { "$as_shell" 2> /dev/null <<\_ASEOF ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++ emulate sh ++ NULLCMD=: ++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '${1+"$@"}'='"$@"' ++ setopt NO_GLOB_SUBST ++else ++ case `(set -o) 2>/dev/null` in ++ *posix*) set -o posix ;; ++esac ++ ++fi ++ ++ ++: ++(as_func_return () { ++ (exit $1) ++} ++as_func_success () { ++ as_func_return 0 ++} ++as_func_failure () { ++ as_func_return 1 ++} ++as_func_ret_success () { ++ return 0 ++} ++as_func_ret_failure () { ++ return 1 ++} ++ ++exitcode=0 ++if as_func_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_success failed. ++fi ++ ++if as_func_failure; then ++ exitcode=1 ++ echo as_func_failure succeeded. ++fi ++ ++if as_func_ret_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_ret_success failed. ++fi ++ ++if as_func_ret_failure; then ++ exitcode=1 ++ echo as_func_ret_failure succeeded. ++fi ++ ++if ( set x; as_func_ret_success y && test x = "$1" ); then ++ : ++else ++ exitcode=1 ++ echo positional parameters were not saved. ++fi ++ ++test $exitcode = 0) || { (exit 1); exit 1; } ++ ++( + as_lineno_1=$LINENO + as_lineno_2=$LINENO +- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then +- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } +- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } +- CONFIG_SHELL=$as_dir/$as_base +- export CONFIG_SHELL +- exec "$CONFIG_SHELL" "$0" ${1+"$@"} +- fi;; +- esac +- done +-done +-;; +- esac ++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } ++ ++_ASEOF ++}; then ++ break ++fi ++ ++fi ++ ++ done ++ ++ if test "x$CONFIG_SHELL" != x; then ++ for as_var in BASH_ENV ENV ++ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++ done ++ export CONFIG_SHELL ++ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} ++fi ++ ++ ++ if test $as_have_required = no; then ++ echo This script requires a shell more modern than all the ++ echo shells that I found on your system. Please install a ++ echo modern shell, or manually run the script under such a ++ echo shell if you do have one. ++ { (exit 1); exit 1; } ++fi ++ ++ ++fi ++ ++fi ++ ++ ++ ++(eval "as_func_return () { ++ (exit \$1) ++} ++as_func_success () { ++ as_func_return 0 ++} ++as_func_failure () { ++ as_func_return 1 ++} ++as_func_ret_success () { ++ return 0 ++} ++as_func_ret_failure () { ++ return 1 ++} ++ ++exitcode=0 ++if as_func_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_success failed. ++fi ++ ++if as_func_failure; then ++ exitcode=1 ++ echo as_func_failure succeeded. ++fi ++ ++if as_func_ret_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_ret_success failed. ++fi ++ ++if as_func_ret_failure; then ++ exitcode=1 ++ echo as_func_ret_failure succeeded. ++fi ++ ++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then ++ : ++else ++ exitcode=1 ++ echo positional parameters were not saved. ++fi ++ ++test \$exitcode = 0") || { ++ echo No shell found that supports shell functions. ++ echo Please tell autoconf@gnu.org about your system, ++ echo including any error possibly output before this ++ echo message ++} ++ ++ ++ ++ as_lineno_1=$LINENO ++ as_lineno_2=$LINENO ++ test "x$as_lineno_1" != "x$as_lineno_2" && ++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a +- # line-number line before each line; the second 'sed' does the real +- # work. The second script uses 'N' to pair each line-number line +- # with the numbered line, and appends trailing '-' during +- # substitution so that $LINENO is not a special case at line end. ++ # line-number line after each line using $LINENO; the second 'sed' ++ # does the real work. The second script uses 'N' to pair each ++ # line-number line with the line containing $LINENO, and appends ++ # trailing '-' during substitution so that $LINENO is not a special ++ # case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) +- sed '=' <$as_myself | ++ # scripts with optimization help from Paolo Bonzini. Blame Lee ++ # E. McMahon (1931-1989) for sed's syntax. :-) ++ sed -n ' ++ p ++ /[$]LINENO/= ++ ' <$as_myself | + sed ' ++ s/[$]LINENO.*/&-/ ++ t lineno ++ b ++ :lineno + N +- s,$,-, +- : loop +- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, ++ :loop ++ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop +- s,-$,, +- s,^['$as_cr_digits']*\n,, ++ s/-\n.*// + ' >$as_me.lineno && +- chmod +x $as_me.lineno || ++ chmod +x "$as_me.lineno" || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the +- # original and so on. Autoconf is especially sensible to this). +- . ./$as_me.lineno ++ # original and so on. Autoconf is especially sensitive to this). ++ . "./$as_me.lineno" + # Exit status is that of the last command. + exit + } + + +-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in +- *c*,-n*) ECHO_N= ECHO_C=' +-' ECHO_T=' ' ;; +- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; +- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi ++ ++ECHO_C= ECHO_N= ECHO_T= ++case `echo -n x` in ++-n*) ++ case `echo 'x\c'` in ++ *c*) ECHO_T=' ';; # ECHO_T is single tab character. ++ *) ECHO_C='\c';; ++ esac;; ++*) ++ ECHO_N='-n';; + esac + +-if expr a : '\(a\)' >/dev/null 2>&1; then ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr + else + as_expr=false + fi + + rm -f conf$$ conf$$.exe conf$$.file ++if test -d conf$$.dir; then ++ rm -f conf$$.dir/conf$$.file ++else ++ rm -f conf$$.dir ++ mkdir conf$$.dir ++fi + echo >conf$$.file + if ln -s conf$$.file conf$$ 2>/dev/null; then +- # We could just check for DJGPP; but this test a) works b) is more generic +- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). +- if test -f conf$$.exe; then +- # Don't use ln at all; we don't have any links ++ 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' +- else +- as_ln_s='ln -s' +- fi + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -p' + fi +-rm -f conf$$ conf$$.exe conf$$.file ++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=: +@@ -224,7 +520,28 @@ + as_mkdir_p=false + fi + +-as_executable_p="test -f" ++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'" +@@ -233,86 +550,217 @@ + as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +-# IFS +-# We need space, tab and new line, in precisely that order. +-as_nl=' +-' +-IFS=" $as_nl" +- +-# CDPATH. +-$as_unset CDPATH + ++exec 7<&0 &1 + + # Name of the host. + # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, + # so uname gets run too. + ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +-exec 6>&1 +- + # + # Initializations. + # + ac_default_prefix=/usr/local ++ac_clean_files= + ac_config_libobj_dir=. ++LIBOBJS= + cross_compiling=no + subdirs= + MFLAGS= + MAKEFLAGS= + SHELL=${CONFIG_SHELL-/bin/sh} + +-# Maximum number of lines to put in a shell here document. +-# This variable seems obsolete. It should probably be removed, and +-# only ac_max_sed_lines should be used. +-: ${ac_max_here_lines=38} +- + # Identity of this package. + PACKAGE_NAME='Valgrind' + PACKAGE_TARNAME='valgrind' + PACKAGE_VERSION='3.2.3-Debian' +-PACKAGE_STRING='Valgrind 3.2.3 Debian GNU/Linux' +-PACKAGE_BUGREPORT='valgrind-users@lists.sourceforge.net | valgrind@packages.debian.org' ++PACKAGE_STRING='Valgrind 3.2.3-Debian' ++PACKAGE_BUGREPORT='valgrind-users@lists.sourceforge.net' + + ac_unique_file="coregrind/m_main.c" + # Factoring default headers for most tests. + ac_includes_default="\ + #include +-#if HAVE_SYS_TYPES_H ++#ifdef HAVE_SYS_TYPES_H + # include + #endif +-#if HAVE_SYS_STAT_H ++#ifdef HAVE_SYS_STAT_H + # include + #endif +-#if STDC_HEADERS ++#ifdef STDC_HEADERS + # include + # include + #else +-# if HAVE_STDLIB_H ++# ifdef HAVE_STDLIB_H + # include + # endif + #endif +-#if HAVE_STRING_H +-# if !STDC_HEADERS && HAVE_MEMORY_H ++#ifdef HAVE_STRING_H ++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H + # include + # endif + # include + #endif +-#if HAVE_STRINGS_H ++#ifdef HAVE_STRINGS_H + # include + #endif +-#if HAVE_INTTYPES_H ++#ifdef HAVE_INTTYPES_H + # include +-#else +-# if HAVE_STDINT_H +-# include +-# endif + #endif +-#if HAVE_UNISTD_H ++#ifdef HAVE_STDINT_H ++# include ++#endif ++#ifdef HAVE_UNISTD_H + # include + #endif" + +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT VEX_DIR DISTCHECK_CONFIGURE_FLAGS LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB PERL GDB CCAS CCASFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os VG_ARCH VG_ARCH_ALL VALT_LOAD_ADDRESS VG_OS VG_PLATFORM_PRI VG_PLATFORM_SEC VG_X86_LINUX_TRUE VG_X86_LINUX_FALSE VG_AMD64_LINUX_TRUE VG_AMD64_LINUX_FALSE VG_PPC32_LINUX_TRUE VG_PPC32_LINUX_FALSE VG_PPC64_LINUX_TRUE VG_PPC64_LINUX_FALSE DEFAULT_SUPP EGREP FLAG_M32 FLAG_M64 FLAG_MMMX FLAG_MSSE PREFERRED_STACK_BOUNDARY FLAG_WDECL_AFTER_STMT LIBOBJS BUILD_MPIWRAP_TRUE BUILD_MPIWRAP_FALSE MPI_CC LTLIBOBJS' ++ac_subst_vars='SHELL ++PATH_SEPARATOR ++PACKAGE_NAME ++PACKAGE_TARNAME ++PACKAGE_VERSION ++PACKAGE_STRING ++PACKAGE_BUGREPORT ++exec_prefix ++prefix ++program_transform_name ++bindir ++sbindir ++libexecdir ++datarootdir ++datadir ++sysconfdir ++sharedstatedir ++localstatedir ++includedir ++oldincludedir ++docdir ++infodir ++htmldir ++dvidir ++pdfdir ++psdir ++libdir ++localedir ++mandir ++DEFS ++ECHO_C ++ECHO_N ++ECHO_T ++LIBS ++build_alias ++host_alias ++target_alias ++INSTALL_PROGRAM ++INSTALL_SCRIPT ++INSTALL_DATA ++CYGPATH_W ++PACKAGE ++VERSION ++ACLOCAL ++AUTOCONF ++AUTOMAKE ++AUTOHEADER ++MAKEINFO ++install_sh ++STRIP ++INSTALL_STRIP_PROGRAM ++mkdir_p ++AWK ++SET_MAKE ++am__leading_dot ++AMTAR ++am__tar ++am__untar ++MAINTAINER_MODE_TRUE ++MAINTAINER_MODE_FALSE ++MAINT ++VEX_DIR ++DISTCHECK_CONFIGURE_FLAGS ++LN_S ++CC ++CFLAGS ++LDFLAGS ++CPPFLAGS ++ac_ct_CC ++EXEEXT ++OBJEXT ++DEPDIR ++am__include ++am__quote ++AMDEP_TRUE ++AMDEP_FALSE ++AMDEPBACKSLASH ++CCDEPMODE ++am__fastdepCC_TRUE ++am__fastdepCC_FALSE ++CPP ++CXX ++CXXFLAGS ++ac_ct_CXX ++CXXDEPMODE ++am__fastdepCXX_TRUE ++am__fastdepCXX_FALSE ++RANLIB ++PERL ++GDB ++CCAS ++CCASFLAGS ++build ++build_cpu ++build_vendor ++build_os ++host ++host_cpu ++host_vendor ++host_os ++VG_ARCH ++VG_ARCH_ALL ++VALT_LOAD_ADDRESS ++VG_OS ++VG_PLATFORM_PRI ++VG_PLATFORM_SEC ++VG_X86_LINUX_TRUE ++VG_X86_LINUX_FALSE ++VG_AMD64_LINUX_TRUE ++VG_AMD64_LINUX_FALSE ++VG_PPC32_LINUX_TRUE ++VG_PPC32_LINUX_FALSE ++VG_PPC64_LINUX_TRUE ++VG_PPC64_LINUX_FALSE ++DEFAULT_SUPP ++GREP ++EGREP ++XMKMF ++FLAG_M32 ++FLAG_M64 ++FLAG_MMMX ++FLAG_MSSE ++PREFERRED_STACK_BOUNDARY ++FLAG_WDECL_AFTER_STMT ++LIBOBJS ++BUILD_MPIWRAP_TRUE ++BUILD_MPIWRAP_FALSE ++MPI_CC ++LTLIBOBJS' + ac_subst_files='' ++ ac_precious_vars='build_alias ++host_alias ++target_alias ++CC ++CFLAGS ++LDFLAGS ++LIBS ++CPPFLAGS ++CPP ++CXX ++CXXFLAGS ++CCC ++CCAS ++CCASFLAGS ++XMKMF' ++ + + # Initialize some variables set by options. + ac_init_help= +@@ -339,34 +787,48 @@ + # 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' +-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' ++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" ++ eval $ac_prev=\$ac_option + ac_prev= + continue + fi + +- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` ++ case $ac_option in ++ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; ++ *) ac_optarg=yes ;; ++ esac + + # Accept the important Cygnus configure options, so we can diagnose typos. + +- case $ac_option in ++ case $ac_dashdash$ac_option in ++ --) ++ ac_dashdash=yes ;; + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; +@@ -388,33 +850,45 @@ + --config-cache | -C) + cache_file=config.cache ;; + +- -datadir | --datadir | --datadi | --datad | --data | --dat | --da) ++ -datadir | --datadir | --datadi | --datad) + ac_prev=datadir ;; +- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ +- | --da=*) ++ -datadir=* | --datadir=* | --datadi=* | --datad=*) + datadir=$ac_optarg ;; + ++ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ ++ | --dataroo | --dataro | --datar) ++ ac_prev=datarootdir ;; ++ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ ++ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) ++ datarootdir=$ac_optarg ;; ++ + -disable-* | --disable-*) + ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } +- ac_feature=`echo $ac_feature | sed 's/-/_/g'` +- eval "enable_$ac_feature=no" ;; ++ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` ++ eval enable_$ac_feature=no ;; ++ ++ -docdir | --docdir | --docdi | --doc | --do) ++ ac_prev=docdir ;; ++ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) ++ docdir=$ac_optarg ;; ++ ++ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) ++ ac_prev=dvidir ;; ++ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) ++ dvidir=$ac_optarg ;; + + -enable-* | --enable-*) + ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } +- ac_feature=`echo $ac_feature | sed 's/-/_/g'` +- case $ac_option in +- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; +- *) ac_optarg=yes ;; +- esac +- eval "enable_$ac_feature='$ac_optarg'" ;; ++ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` ++ eval enable_$ac_feature=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ +@@ -441,6 +915,12 @@ + -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 ;; +@@ -465,13 +945,16 @@ + | --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 | --local | --loca | --loc | --lo) ++ | --localstate | --localstat | --localsta | --localst | --locals) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ +- | --localstate=* | --localstat=* | --localsta=* | --localst=* \ +- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) ++ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) + localstatedir=$ac_optarg ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) +@@ -536,6 +1019,16 @@ + | --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 ;; +@@ -588,24 +1081,20 @@ + -with-* | --with-*) + ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } +- ac_package=`echo $ac_package| sed 's/-/_/g'` +- case $ac_option in +- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; +- *) ac_optarg=yes ;; +- esac +- eval "with_$ac_package='$ac_optarg'" ;; ++ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` ++ eval with_$ac_package=\$ac_optarg ;; + + -without-* | --without-*) + ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } +- ac_package=`echo $ac_package | sed 's/-/_/g'` +- eval "with_$ac_package=no" ;; ++ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` ++ eval with_$ac_package=no ;; + + --x) + # Obsolete; use --with-x. +@@ -636,8 +1125,7 @@ + expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { (exit 1); exit 1; }; } +- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` +- eval "$ac_envvar='$ac_optarg'" ++ eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + + *) +@@ -657,27 +1145,19 @@ + { (exit 1); exit 1; }; } + fi + +-# Be sure to have absolute paths. +-for ac_var in exec_prefix prefix +-do +- eval ac_val=$`echo $ac_var` +- case $ac_val in +- [\\/$]* | ?:[\\/]* | NONE | '' ) ;; +- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 +- { (exit 1); exit 1; }; };; +- esac +-done +- +-# Be sure to have absolute paths. +-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ +- localstatedir libdir includedir oldincludedir infodir mandir ++# Be sure to have absolute directory names. ++for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ ++ datadir sysconfdir sharedstatedir localstatedir includedir \ ++ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ ++ libdir localedir mandir + do +- eval ac_val=$`echo $ac_var` ++ eval ac_val=\$$ac_var + case $ac_val in +- [\\/$]* | ?:[\\/]* ) ;; +- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 +- { (exit 1); exit 1; }; };; ++ [\\/$]* | ?:[\\/]* ) continue;; ++ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac ++ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 ++ { (exit 1); exit 1; }; } + done + + # There might be people who depend on the old broken behavior: `$host' +@@ -704,90 +1184,76 @@ + test "$silent" = yes && exec 6>/dev/null + + ++ac_pwd=`pwd` && test -n "$ac_pwd" && ++ac_ls_di=`ls -di .` && ++ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || ++ { echo "$as_me: error: Working directory cannot be determined" >&2 ++ { (exit 1); exit 1; }; } ++test "X$ac_ls_di" = "X$ac_pwd_ls_di" || ++ { echo "$as_me: error: pwd does not report name of working directory" >&2 ++ { (exit 1); exit 1; }; } ++ ++ + # Find the source files, if location was not specified. + if test -z "$srcdir"; then + ac_srcdir_defaulted=yes +- # Try the directory containing this script, then its parent. +- ac_confdir=`(dirname "$0") 2>/dev/null || ++ # Try the directory containing this script, then the parent directory. ++ ac_confdir=`$as_dirname -- "$0" || + $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || + echo X"$0" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` ++ 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 ++ if test ! -r "$srcdir/$ac_unique_file"; then + srcdir=.. + fi + else + ac_srcdir_defaulted=no + fi +-if test ! -r $srcdir/$ac_unique_file; then +- if test "$ac_srcdir_defaulted" = yes; then +- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 +- { (exit 1); exit 1; }; } +- else +- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 +- { (exit 1); exit 1; }; } +- fi +-fi +-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || +- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 +- { (exit 1); exit 1; }; } +-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` +-ac_env_build_alias_set=${build_alias+set} +-ac_env_build_alias_value=$build_alias +-ac_cv_env_build_alias_set=${build_alias+set} +-ac_cv_env_build_alias_value=$build_alias +-ac_env_host_alias_set=${host_alias+set} +-ac_env_host_alias_value=$host_alias +-ac_cv_env_host_alias_set=${host_alias+set} +-ac_cv_env_host_alias_value=$host_alias +-ac_env_target_alias_set=${target_alias+set} +-ac_env_target_alias_value=$target_alias +-ac_cv_env_target_alias_set=${target_alias+set} +-ac_cv_env_target_alias_value=$target_alias +-ac_env_CC_set=${CC+set} +-ac_env_CC_value=$CC +-ac_cv_env_CC_set=${CC+set} +-ac_cv_env_CC_value=$CC +-ac_env_CFLAGS_set=${CFLAGS+set} +-ac_env_CFLAGS_value=$CFLAGS +-ac_cv_env_CFLAGS_set=${CFLAGS+set} +-ac_cv_env_CFLAGS_value=$CFLAGS +-ac_env_LDFLAGS_set=${LDFLAGS+set} +-ac_env_LDFLAGS_value=$LDFLAGS +-ac_cv_env_LDFLAGS_set=${LDFLAGS+set} +-ac_cv_env_LDFLAGS_value=$LDFLAGS +-ac_env_CPPFLAGS_set=${CPPFLAGS+set} +-ac_env_CPPFLAGS_value=$CPPFLAGS +-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} +-ac_cv_env_CPPFLAGS_value=$CPPFLAGS +-ac_env_CPP_set=${CPP+set} +-ac_env_CPP_value=$CPP +-ac_cv_env_CPP_set=${CPP+set} +-ac_cv_env_CPP_value=$CPP +-ac_env_CXX_set=${CXX+set} +-ac_env_CXX_value=$CXX +-ac_cv_env_CXX_set=${CXX+set} +-ac_cv_env_CXX_value=$CXX +-ac_env_CXXFLAGS_set=${CXXFLAGS+set} +-ac_env_CXXFLAGS_value=$CXXFLAGS +-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} +-ac_cv_env_CXXFLAGS_value=$CXXFLAGS +-ac_env_CCAS_set=${CCAS+set} +-ac_env_CCAS_value=$CCAS +-ac_cv_env_CCAS_set=${CCAS+set} +-ac_cv_env_CCAS_value=$CCAS +-ac_env_CCASFLAGS_set=${CCASFLAGS+set} +-ac_env_CCASFLAGS_value=$CCASFLAGS +-ac_cv_env_CCASFLAGS_set=${CCASFLAGS+set} +-ac_cv_env_CCASFLAGS_value=$CCASFLAGS ++if test ! -r "$srcdir/$ac_unique_file"; then ++ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." ++ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 ++ { (exit 1); exit 1; }; } ++fi ++ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ++ac_abs_confdir=`( ++ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 ++ { (exit 1); exit 1; }; } ++ pwd)` ++# When building in place, set srcdir=. ++if test "$ac_abs_confdir" = "$ac_pwd"; then ++ srcdir=. ++fi ++# Remove unnecessary trailing slashes from srcdir. ++# Double slashes in file names in object file debugging info ++# mess up M-x gdb in Emacs. ++case $srcdir in ++*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; ++esac ++for ac_var in $ac_precious_vars; do ++ eval ac_env_${ac_var}_set=\${${ac_var}+set} ++ eval ac_env_${ac_var}_value=\$${ac_var} ++ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} ++ eval ac_cv_env_${ac_var}_value=\$${ac_var} ++done + + # + # Report the --help message. +@@ -796,7 +1262,7 @@ + # 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 Valgrind 3.2.3 to adapt to many kinds of systems. ++\`configure' configures Valgrind 3.2.3-Debian to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -816,9 +1282,6 @@ + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or \`..'] + +-_ACEOF +- +- cat <<_ACEOF + Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] +@@ -836,15 +1299,22 @@ + --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] + --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] ++ --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/valgrind] ++ --htmldir=DIR html documentation [DOCDIR] ++ --dvidir=DIR dvi documentation [DOCDIR] ++ --pdfdir=DIR pdf documentation [DOCDIR] ++ --psdir=DIR ps documentation [DOCDIR] + _ACEOF + + cat <<\_ACEOF +@@ -866,7 +1336,7 @@ + + if test -n "$ac_init_help"; then + case $ac_init_help in +- short | recursive ) echo "Configuration of Valgrind 3.2.3:";; ++ short | recursive ) echo "Configuration of Valgrind 3.2.3-Debian:";; + esac + cat <<\_ACEOF + +@@ -894,133 +1364,101 @@ + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory +- CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have +- headers in a nonstandard directory ++ LIBS libraries to pass to the linker, e.g. -l ++ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if ++ you have headers in a nonstandard directory + CPP C preprocessor + CXX C++ compiler command + CXXFLAGS C++ compiler flags + CCAS assembler compiler command (defaults to CC) + CCASFLAGS assembler compiler flags (defaults to CFLAGS) ++ XMKMF Path to xmkmf, Makefile generator for X Window System + + 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 . + _ACEOF ++ac_status=$? + fi + + if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. +- ac_popdir=`pwd` + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue +- test -d $ac_dir || continue ++ test -d "$ac_dir" || continue + ac_builddir=. + +-if test "$ac_dir" != .; then ++case "$ac_dir" in ++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; ++*) + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` +- # A "../" for each directory in $ac_dir_suffix. +- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +-else +- ac_dir_suffix= ac_top_builddir= +-fi ++ # A ".." for each directory in $ac_dir_suffix. ++ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` ++ case $ac_top_builddir_sub in ++ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; ++ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; ++ esac ;; ++esac ++ac_abs_top_builddir=$ac_pwd ++ac_abs_builddir=$ac_pwd$ac_dir_suffix ++# for backward compatibility: ++ac_top_builddir=$ac_top_build_prefix + + case $srcdir in +- .) # No --srcdir option. We are building in place. ++ .) # We are building in place. + ac_srcdir=. +- if test -z "$ac_top_builddir"; then +- ac_top_srcdir=. +- else +- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` +- fi ;; +- [\\/]* | ?:[\\/]* ) # Absolute path. ++ 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 ;; +- *) # Relative path. +- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix +- ac_top_srcdir=$ac_top_builddir$srcdir ;; +-esac +- +-# Do not use `cd foo && pwd` to compute absolute paths, because +-# the directories may not exist. +-case `pwd` in +-.) ac_abs_builddir="$ac_dir";; +-*) +- case "$ac_dir" in +- .) ac_abs_builddir=`pwd`;; +- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; +- *) ac_abs_builddir=`pwd`/"$ac_dir";; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_top_builddir=${ac_top_builddir}.;; +-*) +- case ${ac_top_builddir}. in +- .) ac_abs_top_builddir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; +- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_srcdir=$ac_srcdir;; +-*) +- case $ac_srcdir in +- .) ac_abs_srcdir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; +- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_top_srcdir=$ac_top_srcdir;; +-*) +- case $ac_top_srcdir in +- .) ac_abs_top_srcdir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; +- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; +- esac;; ++ 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 +- # Check for guested configure; otherwise get Cygnus style 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 +- elif test -f $ac_srcdir/configure.ac || +- test -f $ac_srcdir/configure.in; then +- echo +- $ac_configure --help ++ cd "$ac_dir" || { ac_status=$?; continue; } ++ # Check for guested configure. ++ if test -f "$ac_srcdir/configure.gnu"; then ++ echo && ++ $SHELL "$ac_srcdir/configure.gnu" --help=recursive ++ elif test -f "$ac_srcdir/configure"; then ++ echo && ++ $SHELL "$ac_srcdir/configure" --help=recursive + else + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 +- fi +- cd $ac_popdir ++ fi || ac_status=$? ++ cd "$ac_pwd" || { ac_status=$?; break; } + done + fi + +-test -n "$ac_init_help" && exit 0 ++test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF +-Valgrind configure 3.2.3 +-generated by GNU Autoconf 2.59 ++Valgrind configure 3.2.3-Debian ++generated by GNU Autoconf 2.61 + +-Copyright (C) 2003 Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, ++2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + _ACEOF +- exit 0 ++ exit + fi +-exec 5>config.log +-cat >&5 <<_ACEOF ++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 Valgrind $as_me 3.2.3, which was +-generated by GNU Autoconf 2.59. Invocation command line was ++It was created by Valgrind $as_me 3.2.3-Debian, which was ++generated by GNU Autoconf 2.61. Invocation command line was + + $ $0 $@ + + _ACEOF ++exec 5>>config.log + { + cat <<_ASUNAME + ## --------- ## +@@ -1039,7 +1477,7 @@ + /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` +-hostinfo = `(hostinfo) 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` +@@ -1053,6 +1491,7 @@ + test -z "$as_dir" && as_dir=. + echo "PATH: $as_dir" + done ++IFS=$as_save_IFS + + } >&5 + +@@ -1074,7 +1513,6 @@ + ac_configure_args= + ac_configure_args0= + ac_configure_args1= +-ac_sep= + ac_must_keep_next=false + for ac_pass in 1 2 + do +@@ -1085,7 +1523,7 @@ + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; +- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) ++ *\'*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in +@@ -1107,9 +1545,7 @@ + -* ) ac_must_keep_next=true ;; + esac + fi +- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" +- # Get rid of the leading space. +- ac_sep=" " ++ ac_configure_args="$ac_configure_args '$ac_arg'" + ;; + esac + done +@@ -1120,8 +1556,8 @@ + # 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: Be sure not to use single quotes in there, as some shells, +-# such as our DU 5.0 friend, will then `close' the trap. ++# 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. + { +@@ -1134,20 +1570,34 @@ + _ASBOX + echo + # The following way of writing the cache mishandles newlines in values, +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 ++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ *) $as_unset $ac_var ;; ++ esac ;; ++ esac ++ done + (set) 2>&1 | +- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in +- *ac_space=\ *) ++ 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" +- ;; ++ "s/'\''/'\''\\\\'\'''\''/g; ++ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" ++ ;; #( + *) +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; +- esac; +-} ++ esac | ++ sort ++) + echo + + cat <<\_ASBOX +@@ -1158,22 +1608,28 @@ + echo + for ac_var in $ac_subst_vars + do +- eval ac_val=$`echo $ac_var` +- echo "$ac_var='"'"'$ac_val'"'"'" ++ eval ac_val=\$$ac_var ++ case $ac_val in ++ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ esac ++ echo "$ac_var='\''$ac_val'\''" + done | sort + echo + + if test -n "$ac_subst_files"; then + cat <<\_ASBOX +-## ------------- ## +-## Output files. ## +-## ------------- ## ++## ------------------- ## ++## File substitutions. ## ++## ------------------- ## + _ASBOX + echo + for ac_var in $ac_subst_files + do +- eval ac_val=$`echo $ac_var` +- echo "$ac_var='"'"'$ac_val'"'"'" ++ eval ac_val=\$$ac_var ++ case $ac_val in ++ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ esac ++ echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi +@@ -1185,26 +1641,24 @@ + ## ----------- ## + _ASBOX + echo +- sed "/^$/d" confdefs.h | sort ++ cat confdefs.h + echo + fi + test "$ac_signal" != 0 && + echo "$as_me: caught signal $ac_signal" + echo "$as_me: exit $exit_status" + } >&5 +- rm -f core *.core && +- rm -rf conftest* confdefs* conf$$* $ac_clean_files && ++ rm -f core *.core core.conftest.* && ++ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status +- ' 0 ++' 0 + for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal + done + ac_signal=0 + + # confdefs.h avoids OS command line length limits that DEFS can exceed. +-rm -rf conftest* confdefs.h +-# AIX cpp loses on an empty file, so make sure it contains at least a newline. +-echo >confdefs.h ++rm -f -r conftest* confdefs.h + + # Predefined preprocessor variables. + +@@ -1235,14 +1689,17 @@ + + # Let the site file select an alternate cache file if it wants to. + # Prefer explicitly selected file to automatically selected ones. +-if test -z "$CONFIG_SITE"; then +- if test "x$prefix" != xNONE; then +- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" +- else +- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" +- fi ++if test -n "$CONFIG_SITE"; then ++ set x "$CONFIG_SITE" ++elif test "x$prefix" != xNONE; then ++ set x "$prefix/share/config.site" "$prefix/etc/config.site" ++else ++ set x "$ac_default_prefix/share/config.site" \ ++ "$ac_default_prefix/etc/config.site" + fi +-for ac_site_file in $CONFIG_SITE; do ++shift ++for ac_site_file ++do + if test -r "$ac_site_file"; then + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 + echo "$as_me: loading site script $ac_site_file" >&6;} +@@ -1258,8 +1715,8 @@ + { echo "$as_me:$LINENO: loading cache $cache_file" >&5 + echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in +- [\\/]* | ?:[\\/]* ) . $cache_file;; +- *) . ./$cache_file;; ++ [\\/]* | ?:[\\/]* ) . "$cache_file";; ++ *) . "./$cache_file";; + esac + fi + else +@@ -1271,12 +1728,11 @@ + # Check that the precious variables saved in the cache have kept the same + # value. + ac_cache_corrupted=false +-for ac_var in `(set) 2>&1 | +- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do ++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" ++ eval ac_old_val=\$ac_cv_env_${ac_var}_value ++ eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +@@ -1301,8 +1757,7 @@ + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in +- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) +- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; ++ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in +@@ -1319,12 +1774,6 @@ + { (exit 1); exit 1; }; } + fi + +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- + + + +@@ -1349,36 +1798,47 @@ + + + ++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_config_headers="$ac_config_headers config.h" ++ac_config_headers="$ac_config_headers config.h" + + am__api_version="1.9" + ac_aux_dir= +-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do +- if test -f $ac_dir/install-sh; then ++for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do ++ if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break +- elif test -f $ac_dir/install.sh; then ++ 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 ++ elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi + done + if test -z "$ac_aux_dir"; then +- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 +-echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} ++ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 ++echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} + { (exit 1); exit 1; }; } + fi +-ac_config_guess="$SHELL $ac_aux_dir/config.guess" +-ac_config_sub="$SHELL $ac_aux_dir/config.sub" +-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. ++ ++# These three variables are undocumented and unsupported, ++# and are intended to be withdrawn in a future Autoconf release. ++# They can cause serious problems if a builder's source tree is in a directory ++# whose full name contains unusual characters. ++ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. ++ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. ++ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. ++ + + # Find a good install program. We prefer a C program (faster), + # so one script is as good as another. But avoid the broken or +@@ -1393,8 +1853,8 @@ + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # OS/2's system install, which has a completely different semantic + # ./install, which can be erroneously created by make from ./install.sh. +-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 ++echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } + if test -z "$INSTALL"; then + if test "${ac_cv_path_install+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1416,7 +1876,7 @@ + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then ++ 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. +@@ -1435,21 +1895,22 @@ + ;; + esac + done ++IFS=$as_save_IFS + + + fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else +- # As a last resort, use the slow shell script. We don't cache a +- # path for INSTALL within a source directory, because that will ++ # 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 path is relative. ++ # removed, or if the value is a relative name. + INSTALL=$ac_install_sh + fi + fi +-echo "$as_me:$LINENO: result: $INSTALL" >&5 +-echo "${ECHO_T}$INSTALL" >&6 ++{ echo "$as_me:$LINENO: result: $INSTALL" >&5 ++echo "${ECHO_T}$INSTALL" >&6; } + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. + # It thinks the first close brace ends the variable substitution. +@@ -1459,8 +1920,8 @@ + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +-echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 ++echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } + # Just in case + sleep 1 + echo timestamp > conftest.file +@@ -1502,20 +1963,20 @@ + Check your system clock" >&2;} + { (exit 1); exit 1; }; } + fi +-echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++{ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + test "$program_prefix" != NONE && +- program_transform_name="s,^,$program_prefix,;$program_transform_name" ++ 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" ++ program_transform_name="s&\$&$program_suffix&;$program_transform_name" + # Double any \ or $. echo might interpret backslashes. + # By default was `s,x,x', remove it if useless. + cat <<\_ACEOF >conftest.sed + s/[\\$]/&&/g;s/;s,x,x,$// + _ACEOF + program_transform_name=`echo $program_transform_name | sed -f conftest.sed` +-rm conftest.sed ++rm -f conftest.sed + + # expand $ac_aux_dir to an absolute path + am_aux_dir=`cd $ac_aux_dir && pwd` +@@ -1567,8 +2028,8 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_AWK+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -1581,54 +2042,57 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AWK="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + fi + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then +- echo "$as_me:$LINENO: result: $AWK" >&5 +-echo "${ECHO_T}$AWK" >&6 ++ { echo "$as_me:$LINENO: result: $AWK" >&5 ++echo "${ECHO_T}$AWK" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + test -n "$AWK" && break + done + +-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 +-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` +-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then ++{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } ++set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` ++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.make <<\_ACEOF ++SHELL = /bin/sh + all: +- @echo 'ac_maketemp="$(MAKE)"' ++ @echo '@@@%%%=$(MAKE)=@@@%%%' + _ACEOF + # GNU make sometimes prints "make[1]: Entering...", which would confuse us. +-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` +-if test -n "$ac_maketemp"; then +- eval ac_cv_prog_make_${ac_make}_set=yes +-else +- eval ac_cv_prog_make_${ac_make}_set=no +-fi ++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 \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + SET_MAKE= + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" + fi + +@@ -1699,8 +2163,8 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -1713,32 +2177,34 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + fi + fi + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then +- echo "$as_me:$LINENO: result: $STRIP" >&5 +-echo "${ECHO_T}$STRIP" >&6 ++ { echo "$as_me:$LINENO: result: $STRIP" >&5 ++echo "${ECHO_T}$STRIP" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + fi + if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. + set dummy strip; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -1751,27 +2217,41 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + +- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" + fi + fi + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then +- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +-echo "${ECHO_T}$ac_ct_STRIP" >&6 ++ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 ++echo "${ECHO_T}$ac_ct_STRIP" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + +- STRIP=$ac_ct_STRIP ++ if test "x$ac_ct_STRIP" = x; then ++ STRIP=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ STRIP=$ac_ct_STRIP ++ fi + else + STRIP="$ac_cv_prog_STRIP" + fi +@@ -1792,17 +2272,17 @@ + + + +-echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 +-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6 +- # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. ++{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 ++echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } ++ # Check whether --enable-maintainer-mode was given. + if test "${enable_maintainer_mode+set}" = set; then +- enableval="$enable_maintainer_mode" +- USE_MAINTAINER_MODE=$enableval ++ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval + else + USE_MAINTAINER_MODE=no +-fi; +- echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 +-echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6 ++fi ++ ++ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 ++echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } + + + if test $USE_MAINTAINER_MODE = yes; then +@@ -1824,14 +2304,13 @@ + # AS_HELP_STRING([--with-vex], [Vex directory]), + # + +-# Check whether --with-vex or --without-vex was given. ++# Check whether --with-vex was given. + if test "${with_vex+set}" = set; then +- withval="$with_vex" +- ++ withval=$with_vex; + as_ac_File=`echo "ac_cv_file_$withval/pub/libvex.h" | $as_tr_sh` +-echo "$as_me:$LINENO: checking for $withval/pub/libvex.h" >&5 +-echo $ECHO_N "checking for $withval/pub/libvex.h... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_File+set}\" = set"; then ++{ echo "$as_me:$LINENO: checking for $withval/pub/libvex.h" >&5 ++echo $ECHO_N "checking for $withval/pub/libvex.h... $ECHO_C" >&6; } ++if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + test "$cross_compiling" = yes && +@@ -1844,8 +2323,9 @@ + eval "$as_ac_File=no" + fi + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_File'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + if test `eval echo '${'$as_ac_File'}'` = yes; then + VEX_DIR=$withval + else +@@ -1859,7 +2339,8 @@ + + VEX_DIR='$(top_srcdir)/VEX' + +-fi; ++fi ++ + + + # "make distcheck" first builds a tarball, then extracts it. +@@ -1883,15 +2364,15 @@ + # Checks for programs. + CFLAGS="-Wno-long-long" + +-echo "$as_me:$LINENO: checking whether ln -s works" >&5 +-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: 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:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + else +- echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +-echo "${ECHO_T}no, using $LN_S" >&6 ++ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 ++echo "${ECHO_T}no, using $LN_S" >&6; } + fi + + ac_ext=c +@@ -1902,8 +2383,8 @@ + 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:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: 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 +@@ -1916,32 +2397,34 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ 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" + echo "$as_me:$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 +- echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: 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:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -1954,36 +2437,51 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ 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" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6 ++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++echo "${ECHO_T}$ac_ct_CC" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + +- CC=$ac_ct_CC ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ 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. ++ 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:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: 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 +@@ -1996,74 +2494,34 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ 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" + echo "$as_me:$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 +- echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 +-else +- echo "$as_me:$LINENO: 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:$LINENO: 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 +-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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_CC="cc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +-fi +-fi +-ac_ct_CC=$ac_cv_prog_ac_ct_CC +-if test -n "$ac_ct_CC"; then +- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6 ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + +- CC=$ac_ct_CC +-else +- CC="$ac_cv_prog_CC" +-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 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: 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 +@@ -2077,7 +2535,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ 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 +@@ -2088,6 +2546,7 @@ + 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. +@@ -2105,22 +2564,23 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: 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 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 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: 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 +@@ -2133,36 +2593,38 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ 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" + echo "$as_me:$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 +- echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + test -n "$CC" && break + done + fi + if test -z "$CC"; then + ac_ct_CC=$CC +- for ac_prog in cl ++ 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 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -2175,29 +2637,45 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ 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" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6 ++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++echo "${ECHO_T}$ac_ct_CC" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + test -n "$ac_ct_CC" && break + done + +- CC=$ac_ct_CC ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi + fi + + fi +@@ -2210,21 +2688,35 @@ + { (exit 1); exit 1; }; } + + # Provide some information about the compiler. +-echo "$as_me:$LINENO:" \ +- "checking for C compiler version" >&5 ++echo "$as_me:$LINENO: checking for C compiler version" >&5 + ac_compiler=`set X $ac_compile; echo $2` +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 +- (eval $ac_compiler --version &5) 2>&5 ++{ (ac_try="$ac_compiler --version >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 +- (eval $ac_compiler -v &5) 2>&5 ++{ (ac_try="$ac_compiler -v >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 +- (eval $ac_compiler -V &5) 2>&5 ++{ (ac_try="$ac_compiler -V >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +@@ -2249,47 +2741,77 @@ + # 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:$LINENO: checking for C compiler default output file name" >&5 +-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 ++echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } + ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 +- (eval $ac_link_default) 2>&5 ++# ++# List of possible output files, starting from the most likely. ++# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) ++# only as a last resort. b.out is created by i960 compilers. ++ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' ++# ++# The IRIX 6 linker writes into existing files which may not be ++# executable, retaining their permissions. Remove them first so a ++# subsequent execution test works. ++ac_rmfiles= ++for ac_file in $ac_files ++do ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link_default") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $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 +-# resort. +- +-# Be careful to initialize this variable, since it used to be cached. +-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. +-ac_cv_exeext= +-# b.out is created by i960 compilers. +-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out ++ # 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 | *.o | *.obj ) +- ;; +- conftest.$ac_ext ) +- # This is the source file. ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) +- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` +- # FIXME: I believe we export ac_cv_exeext for Libtool, +- # but it would be cool to find out if it's true. Does anybody +- # maintain Libtool? --akim. +- export ac_cv_exeext ++ 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 ++ ++{ echo "$as_me:$LINENO: result: $ac_file" >&5 ++echo "${ECHO_T}$ac_file" >&6; } ++if test -z "$ac_file"; then + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +@@ -2301,19 +2823,21 @@ + fi + + ac_exeext=$ac_cv_exeext +-echo "$as_me:$LINENO: result: $ac_file" >&5 +-echo "${ECHO_T}$ac_file" >&6 + +-# Check the compiler produces executables we can run. If not, either ++# Check that the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: 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:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -2332,22 +2856,27 @@ + fi + fi + fi +-echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++{ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + + rm -f a.out a.exe conftest$ac_cv_exeext b.out + ac_clean_files=$ac_clean_files_save +-# Check the compiler produces executables we can run. If not, either ++# Check that the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 +-echo "$as_me:$LINENO: result: $cross_compiling" >&5 +-echo "${ECHO_T}$cross_compiling" >&6 +- +-echo "$as_me:$LINENO: checking for suffix of executables" >&5 +-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 ++echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 ++echo "${ECHO_T}$cross_compiling" >&6; } ++ ++{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 ++echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +@@ -2358,9 +2887,8 @@ + 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 | *.o | *.obj ) ;; ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` +- export ac_cv_exeext + break;; + * ) break;; + esac +@@ -2374,14 +2902,14 @@ + fi + + rm -f conftest$ac_cv_exeext +-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +-echo "${ECHO_T}$ac_cv_exeext" >&6 ++{ echo "$as_me:$LINENO: 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:$LINENO: checking for suffix of object files" >&5 +-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 ++echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } + if test "${ac_cv_objext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -2401,14 +2929,20 @@ + } + _ACEOF + rm -f conftest.o conftest.obj +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do ++ 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 ) ;; ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +@@ -2426,12 +2960,12 @@ + + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +-echo "${ECHO_T}$ac_cv_objext" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 ++echo "${ECHO_T}$ac_cv_objext" >&6; } + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +-echo "$as_me:$LINENO: 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 ++{ echo "$as_me:$LINENO: 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 +@@ -2454,50 +2988,49 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_compiler_gnu=no ++ ac_compiler_gnu=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 ++{ echo "$as_me:$LINENO: 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:$LINENO: checking whether $CC accepts -g" >&5 +-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: 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 ++ ac_save_c_werror_flag=$ac_c_werror_flag ++ ac_c_werror_flag=yes ++ ac_cv_prog_cc_g=no ++ CFLAGS="-g" ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -2513,38 +3046,118 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ ac_cv_prog_cc_g=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ CFLAGS="" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ : ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_c_werror_flag=$ac_save_c_werror_flag ++ CFLAGS="-g" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_prog_cc_g=no ++ ++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 conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_c_werror_flag=$ac_save_c_werror_flag + fi +-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 ++{ echo "$as_me:$LINENO: 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 + elif test $ac_cv_prog_cc_g = yes; then +@@ -2560,12 +3173,12 @@ + CFLAGS= + fi + fi +-echo "$as_me:$LINENO: 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 "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 ++echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } ++if test "${ac_cv_prog_cc_c89+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_cv_prog_cc_stdc=no ++ ac_cv_prog_cc_c89=no + ac_save_CC=$CC + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -2599,12 +3212,17 @@ + /* 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 -std1 is added to get ++ 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 -std1. */ ++ 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);}; +@@ -2619,205 +3237,57 @@ + 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__" ++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ ++ -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:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_prog_cc_stdc=$ac_arg +-break ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ ac_cv_prog_cc_c89=$ac_arg + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + ++ + fi +-rm -f conftest.err conftest.$ac_objext ++ ++rm -f core conftest.err conftest.$ac_objext ++ test "x$ac_cv_prog_cc_c89" != "xno" && break + done +-rm -f conftest.$ac_ext conftest.$ac_objext ++rm -f conftest.$ac_ext + CC=$ac_save_CC + + fi +- +-case "x$ac_cv_prog_cc_stdc" in +- x|xno) +- echo "$as_me:$LINENO: result: none needed" >&5 +-echo "${ECHO_T}none needed" >&6 ;; ++# AC_CACHE_VAL ++case "x$ac_cv_prog_cc_c89" in ++ x) ++ { echo "$as_me:$LINENO: result: none needed" >&5 ++echo "${ECHO_T}none needed" >&6; } ;; ++ xno) ++ { echo "$as_me:$LINENO: result: unsupported" >&5 ++echo "${ECHO_T}unsupported" >&6; } ;; + *) +- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 +-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 +- CC="$CC $ac_cv_prog_cc_stdc" ;; ++ CC="$CC $ac_cv_prog_cc_c89" ++ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 ++echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; + esac + +-# Some people use a C++ compiler to compile C. Since we use `exit', +-# in C++ we need to declare it. In case someone uses the same compiler +-# for both compiling C and C++ we need to have the C++ compiler decide +-# the declaration of exit, since it's the most demanding environment. +-cat >conftest.$ac_ext <<_ACEOF +-#ifndef __cplusplus +- choke me +-#endif +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- for ac_declaration in \ +- '' \ +- 'extern "C" void std::exit (int) throw (); using std::exit;' \ +- 'extern "C" void std::exit (int); using std::exit;' \ +- 'extern "C" void exit (int) throw ();' \ +- 'extern "C" void exit (int);' \ +- 'void exit (int);' +-do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_declaration +-#include +-int +-main () +-{ +-exit (42); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- : +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +-continue +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_declaration +-int +-main () +-{ +-exit (42); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-done +-rm -f conftest* +-if test -n "$ac_declaration"; then +- echo '#ifdef __cplusplus' >>confdefs.h +- echo $ac_declaration >>confdefs.h +- echo '#endif' >>confdefs.h +-fi +- +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -2825,7 +3295,7 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + DEPDIR="${am__leading_dot}deps" + +- ac_config_commands="$ac_config_commands depfiles" ++ac_config_commands="$ac_config_commands depfiles" + + + am_make=${MAKE-make} +@@ -2835,8 +3305,8 @@ + .PHONY: am__doit + END + # If we don't find an include directive, just comment out the code. +-echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 ++echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } + am__include="#" + am__quote= + _am_result=none +@@ -2863,15 +3333,15 @@ + fi + + +-echo "$as_me:$LINENO: result: $_am_result" >&5 +-echo "${ECHO_T}$_am_result" >&6 ++{ echo "$as_me:$LINENO: result: $_am_result" >&5 ++echo "${ECHO_T}$_am_result" >&6; } + rm -f confinc confmf + +-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. ++# Check whether --enable-dependency-tracking was given. + if test "${enable_dependency_tracking+set}" = set; then +- enableval="$enable_dependency_tracking" ++ enableval=$enable_dependency_tracking; ++fi + +-fi; + if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +@@ -2891,8 +3361,8 @@ + + depcc="$CC" am_compiler_list= + +-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } + if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -2981,8 +3451,8 @@ + fi + + fi +-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 ++{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 ++echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } + CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + +@@ -3004,8 +3474,8 @@ + 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 +-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: 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 + CPP= +@@ -3039,24 +3509,22 @@ + #endif + Syntax error + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -3065,9 +3533,10 @@ + # Broken: fails on valid input. + continue + fi ++ + rm -f conftest.err conftest.$ac_ext + +- # OK, works on sane cases. Now check whether non-existent headers ++ # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -3077,24 +3546,22 @@ + /* end confdefs.h. */ + #include + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + # Broken: success on invalid input. + continue + else +@@ -3105,6 +3572,7 @@ + ac_preproc_ok=: + break + fi ++ + rm -f conftest.err conftest.$ac_ext + + done +@@ -3122,8 +3590,8 @@ + else + ac_cv_prog_CPP=$CPP + fi +-echo "$as_me:$LINENO: result: $CPP" >&5 +-echo "${ECHO_T}$CPP" >&6 ++{ echo "$as_me:$LINENO: result: $CPP" >&5 ++echo "${ECHO_T}$CPP" >&6; } + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes + do +@@ -3146,24 +3614,22 @@ + #endif + Syntax error + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -3172,9 +3638,10 @@ + # Broken: fails on valid input. + continue + fi ++ + rm -f conftest.err conftest.$ac_ext + +- # OK, works on sane cases. Now check whether non-existent headers ++ # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -3184,24 +3651,22 @@ + /* end confdefs.h. */ + #include + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + # Broken: success on invalid input. + continue + else +@@ -3212,6 +3677,7 @@ + ac_preproc_ok=: + break + fi ++ + rm -f conftest.err conftest.$ac_ext + + done +@@ -3233,18 +3699,22 @@ + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + +-ac_ext=cc ++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 +-if test -n "$ac_tool_prefix"; then +- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC ++if test -z "$CXX"; then ++ if test -n "$CCC"; then ++ CXX=$CCC ++ else ++ if test -n "$ac_tool_prefix"; then ++ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + 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:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: 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 + else +@@ -3257,36 +3727,38 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + fi + fi + CXX=$ac_cv_prog_CXX + if test -n "$CXX"; then +- echo "$as_me:$LINENO: result: $CXX" >&5 +-echo "${ECHO_T}$CXX" >&6 ++ { echo "$as_me:$LINENO: result: $CXX" >&5 ++echo "${ECHO_T}$CXX" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + test -n "$CXX" && break + done + fi + if test -z "$CXX"; then + ac_ct_CXX=$CXX +- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC ++ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -3299,55 +3771,85 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ 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_CXX="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + fi + fi + ac_ct_CXX=$ac_cv_prog_ac_ct_CXX + if test -n "$ac_ct_CXX"; then +- echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +-echo "${ECHO_T}$ac_ct_CXX" >&6 ++ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 ++echo "${ECHO_T}$ac_ct_CXX" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + test -n "$ac_ct_CXX" && break + done +-test -n "$ac_ct_CXX" || ac_ct_CXX="g++" + +- CXX=$ac_ct_CXX ++ if test "x$ac_ct_CXX" = x; then ++ CXX="g++" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ CXX=$ac_ct_CXX ++ fi + fi + +- ++ fi ++fi + # Provide some information about the compiler. +-echo "$as_me:$LINENO:" \ +- "checking for C++ compiler version" >&5 ++echo "$as_me:$LINENO: checking for C++ compiler version" >&5 + ac_compiler=`set X $ac_compile; echo $2` +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 +- (eval $ac_compiler --version &5) 2>&5 ++{ (ac_try="$ac_compiler --version >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 +- (eval $ac_compiler -v &5) 2>&5 ++{ (ac_try="$ac_compiler -v >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 +- (eval $ac_compiler -V &5) 2>&5 ++{ (ac_try="$ac_compiler -V >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + +-echo "$as_me:$LINENO: 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 ++{ echo "$as_me:$LINENO: 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 +@@ -3370,50 +3872,49 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_compiler_gnu=no ++ ac_compiler_gnu=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_cxx_compiler_gnu=$ac_compiler_gnu + + fi +-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 ++{ echo "$as_me:$LINENO: 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:$LINENO: checking whether $CXX accepts -g" >&5 +-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: 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 ++ ac_save_cxx_werror_flag=$ac_cxx_werror_flag ++ ac_cxx_werror_flag=yes ++ ac_cv_prog_cxx_g=no ++ CXXFLAGS="-g" ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -3429,159 +3930,133 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_prog_cxx_g=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-echo "$as_me:$LINENO: 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 +-elif test $ac_cv_prog_cxx_g = yes; then +- if test "$GXX" = yes; then +- CXXFLAGS="-g -O2" +- else +- CXXFLAGS="-g" +- fi +-else +- if test "$GXX" = yes; then +- CXXFLAGS="-O2" +- else +- CXXFLAGS= +- fi +-fi +-for ac_declaration in \ +- '' \ +- 'extern "C" void std::exit (int) throw (); using std::exit;' \ +- 'extern "C" void std::exit (int); using std::exit;' \ +- 'extern "C" void exit (int) throw ();' \ +- 'extern "C" void exit (int);' \ +- 'void exit (int);' +-do +- cat >conftest.$ac_ext <<_ACEOF ++ CXXFLAGS="" ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-$ac_declaration +-#include ++ + int + main () + { +-exit (42); ++ + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + : + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-continue +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- cat >conftest.$ac_ext <<_ACEOF ++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag ++ CXXFLAGS="-g" ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-$ac_declaration ++ + int + main () + { +-exit (42); ++ + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- break ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ ac_cv_prog_cxx_g=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + ++ + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-done +-rm -f conftest* +-if test -n "$ac_declaration"; then +- echo '#ifdef __cplusplus' >>confdefs.h +- echo $ac_declaration >>confdefs.h +- echo '#endif' >>confdefs.h ++ ++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_cxx_werror_flag=$ac_save_cxx_werror_flag ++fi ++{ echo "$as_me:$LINENO: 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 ++elif test $ac_cv_prog_cxx_g = yes; then ++ if test "$GXX" = yes; then ++ CXXFLAGS="-g -O2" ++ else ++ CXXFLAGS="-g" ++ fi ++else ++ if test "$GXX" = yes; then ++ CXXFLAGS="-O2" ++ else ++ CXXFLAGS= ++ fi ++fi + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -3590,8 +4065,8 @@ + + depcc="$CXX" am_compiler_list= + +-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } + if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -3680,8 +4155,8 @@ + fi + + fi +-echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6 ++{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 ++echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } + CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + + +@@ -3700,8 +4175,8 @@ + 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:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: 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 + else +@@ -3714,32 +4189,34 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ 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" + echo "$as_me:$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 +- echo "$as_me:$LINENO: result: $RANLIB" >&5 +-echo "${ECHO_T}$RANLIB" >&6 ++ { echo "$as_me:$LINENO: result: $RANLIB" >&5 ++echo "${ECHO_T}$RANLIB" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}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 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -3752,27 +4229,41 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ 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" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + +- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" + fi + fi + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB + if test -n "$ac_ct_RANLIB"; then +- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +-echo "${ECHO_T}$ac_ct_RANLIB" >&6 ++ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 ++echo "${ECHO_T}$ac_ct_RANLIB" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + +- RANLIB=$ac_ct_RANLIB ++ if test "x$ac_ct_RANLIB" = x; then ++ RANLIB=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ RANLIB=$ac_ct_RANLIB ++ fi + else + RANLIB="$ac_cv_prog_RANLIB" + fi +@@ -3788,8 +4279,8 @@ + # figure out where perl lives + # Extract the first word of "perl", so it can be a program name with args. + set dummy perl; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_PERL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -3804,33 +4295,34 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + ;; + esac + fi + PERL=$ac_cv_path_PERL +- + if test -n "$PERL"; then +- echo "$as_me:$LINENO: result: $PERL" >&5 +-echo "${ECHO_T}$PERL" >&6 ++ { echo "$as_me:$LINENO: result: $PERL" >&5 ++echo "${ECHO_T}$PERL" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + ++ + # figure out where gdb lives + # Extract the first word of "gdb", so it can be a program name with args. + set dummy gdb; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_GDB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -3845,28 +4337,29 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GDB="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + ;; + esac + fi + GDB=$ac_cv_path_GDB +- + if test -n "$GDB"; then +- echo "$as_me:$LINENO: result: $GDB" >&5 +-echo "${ECHO_T}$GDB" >&6 ++ { echo "$as_me:$LINENO: result: $GDB" >&5 ++echo "${ECHO_T}$GDB" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + ++ + cat >>confdefs.h <<_ACEOF + #define GDB_PATH "$GDB" + _ACEOF +@@ -3883,99 +4376,128 @@ + + + # We don't want gcc < 3.0 +-echo "$as_me:$LINENO: checking for a supported version of gcc" >&5 +-echo $ECHO_N "checking for a supported version of gcc... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for a supported version of gcc" >&5 ++echo $ECHO_N "checking for a supported version of gcc... $ECHO_C" >&6; } + + gcc_version=`${CC} --version | head -n 1` + + case "${gcc_version}" in + gcc-2.7.*) +- echo "$as_me:$LINENO: result: no (${gcc_version})" >&5 +-echo "${ECHO_T}no (${gcc_version})" >&6 ++ { echo "$as_me:$LINENO: result: no (${gcc_version})" >&5 ++echo "${ECHO_T}no (${gcc_version})" >&6; } + { { echo "$as_me:$LINENO: error: please use a recent (>= gcc-3.0) version of gcc" >&5 + echo "$as_me: error: please use a recent (>= gcc-3.0) version of gcc" >&2;} + { (exit 1); exit 1; }; } + ;; + gcc-2.8.*) +- echo "$as_me:$LINENO: result: no (${gcc_version})" >&5 +-echo "${ECHO_T}no (${gcc_version})" >&6 ++ { echo "$as_me:$LINENO: result: no (${gcc_version})" >&5 ++echo "${ECHO_T}no (${gcc_version})" >&6; } + { { echo "$as_me:$LINENO: error: please use a recent (>= gcc-3.0) version of gcc" >&5 + echo "$as_me: error: please use a recent (>= gcc-3.0) version of gcc" >&2;} + { (exit 1); exit 1; }; } + ;; + gcc-2.9*) +- echo "$as_me:$LINENO: result: no (${gcc_version})" >&5 +-echo "${ECHO_T}no (${gcc_version})" >&6 ++ { echo "$as_me:$LINENO: result: no (${gcc_version})" >&5 ++echo "${ECHO_T}no (${gcc_version})" >&6; } + { { echo "$as_me:$LINENO: error: please use a recent (>= gcc-3.0) version of gcc" >&5 + echo "$as_me: error: please use a recent (>= gcc-3.0) version of gcc" >&2;} + { (exit 1); exit 1; }; } + ;; + + *) +- echo "$as_me:$LINENO: result: ok (${gcc_version})" >&5 +-echo "${ECHO_T}ok (${gcc_version})" >&6 ++ { echo "$as_me:$LINENO: result: ok (${gcc_version})" >&5 ++echo "${ECHO_T}ok (${gcc_version})" >&6; } + ;; + esac + + + # Checks for the platform + # Make sure we can run config.sub. +-$ac_config_sub sun4 >/dev/null 2>&1 || +- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 +-echo "$as_me: error: cannot run $ac_config_sub" >&2;} ++$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || ++ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 ++echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} + { (exit 1); exit 1; }; } + +-echo "$as_me:$LINENO: checking build system type" >&5 +-echo $ECHO_N "checking build system type... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: 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 + else +- ac_cv_build_alias=$build_alias +-test -z "$ac_cv_build_alias" && +- ac_cv_build_alias=`$ac_config_guess` +-test -z "$ac_cv_build_alias" && ++ 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 && + { { echo "$as_me:$LINENO: 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:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 +-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} ++ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || ++ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 ++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +-echo "${ECHO_T}$ac_cv_build" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 ++echo "${ECHO_T}$ac_cv_build" >&6; } ++case $ac_cv_build in ++*-*-*) ;; ++*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 ++echo "$as_me: error: invalid value of canonical build" >&2;} ++ { (exit 1); exit 1; }; };; ++esac + 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/'` ++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 + + +-echo "$as_me:$LINENO: checking host system type" >&5 +-echo $ECHO_N "checking host system type... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: 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 + else +- ac_cv_host_alias=$host_alias +-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:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 +-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} ++ 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` || ++ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 ++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} + { (exit 1); exit 1; }; } ++fi + + fi +-echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +-echo "${ECHO_T}$ac_cv_host" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 ++echo "${ECHO_T}$ac_cv_host" >&6; } ++case $ac_cv_host in ++*-*-*) ;; ++*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 ++echo "$as_me: error: invalid value of canonical host" >&2;} ++ { (exit 1); exit 1; }; };; ++esac + host=$ac_cv_host +-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` ++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 + + + +-echo "$as_me:$LINENO: checking for a supported CPU" >&5 +-echo $ECHO_N "checking for a supported CPU... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for a supported CPU" >&5 ++echo $ECHO_N "checking for a supported CPU... $ECHO_C" >&6; } + + + +@@ -3985,40 +4507,40 @@ + + case "${host_cpu}" in + i?86) +- echo "$as_me:$LINENO: result: ok (${host_cpu})" >&5 +-echo "${ECHO_T}ok (${host_cpu})" >&6 ++ { echo "$as_me:$LINENO: result: ok (${host_cpu})" >&5 ++echo "${ECHO_T}ok (${host_cpu})" >&6; } + VG_ARCH="x86" + valt_load_address_normal="0x38000000" + valt_load_address_inner="0x28000000" + ;; + + x86_64) +- echo "$as_me:$LINENO: result: ok (${host_cpu})" >&5 +-echo "${ECHO_T}ok (${host_cpu})" >&6 ++ { echo "$as_me:$LINENO: result: ok (${host_cpu})" >&5 ++echo "${ECHO_T}ok (${host_cpu})" >&6; } + VG_ARCH="amd64" + valt_load_address_normal="0x38000000" + valt_load_address_inner="0x28000000" + ;; + + powerpc64) +- echo "$as_me:$LINENO: result: ok (${host_cpu})" >&5 +-echo "${ECHO_T}ok (${host_cpu})" >&6 ++ { echo "$as_me:$LINENO: result: ok (${host_cpu})" >&5 ++echo "${ECHO_T}ok (${host_cpu})" >&6; } + VG_ARCH="ppc64" + valt_load_address_normal="0x38000000" + valt_load_address_inner="0x28000000" + ;; + + powerpc) +- echo "$as_me:$LINENO: result: ok (${host_cpu})" >&5 +-echo "${ECHO_T}ok (${host_cpu})" >&6 ++ { echo "$as_me:$LINENO: result: ok (${host_cpu})" >&5 ++echo "${ECHO_T}ok (${host_cpu})" >&6; } + VG_ARCH="ppc32" + valt_load_address_normal="0x38000000" + valt_load_address_inner="0x28000000" + ;; + + *) +- echo "$as_me:$LINENO: result: no (${host_cpu})" >&5 +-echo "${ECHO_T}no (${host_cpu})" >&6 ++ { echo "$as_me:$LINENO: result: no (${host_cpu})" >&5 ++echo "${ECHO_T}no (${host_cpu})" >&6; } + { { echo "$as_me:$LINENO: error: Unsupported host architecture. Sorry" >&5 + echo "$as_me: error: Unsupported host architecture. Sorry" >&2;} + { (exit 1); exit 1; }; } +@@ -4027,21 +4549,21 @@ + + # Check if this should be built as an inner Valgrind, to be run within + # another Valgrind. Choose the load address accordingly. +-echo "$as_me:$LINENO: checking for use as an inner Valgrind" >&5 +-echo $ECHO_N "checking for use as an inner Valgrind... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for use as an inner Valgrind" >&5 ++echo $ECHO_N "checking for use as an inner Valgrind... $ECHO_C" >&6; } + if test "${vg_cv_inner+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- # Check whether --enable-inner or --disable-inner was given. ++ # Check whether --enable-inner was given. + if test "${enable_inner+set}" = set; then +- enableval="$enable_inner" +- vg_cv_inner=$enableval ++ enableval=$enable_inner; vg_cv_inner=$enableval + else + vg_cv_inner=no +-fi; + fi +-echo "$as_me:$LINENO: result: $vg_cv_inner" >&5 +-echo "${ECHO_T}$vg_cv_inner" >&6 ++ ++fi ++{ echo "$as_me:$LINENO: result: $vg_cv_inner" >&5 ++echo "${ECHO_T}$vg_cv_inner" >&6; } + if test "$vg_cv_inner" = yes; then + + cat >>confdefs.h <<\_ACEOF +@@ -4059,38 +4581,38 @@ + # --enable-only32bit. Complain if both are issued :-) + + # Check if a 64-bit only build has been requested +-echo "$as_me:$LINENO: checking for a 64-bit only build" >&5 +-echo $ECHO_N "checking for a 64-bit only build... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for a 64-bit only build" >&5 ++echo $ECHO_N "checking for a 64-bit only build... $ECHO_C" >&6; } + if test "${vg_cv_only64bit+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- # Check whether --enable-only64bit or --disable-only64bit was given. ++ # Check whether --enable-only64bit was given. + if test "${enable_only64bit+set}" = set; then +- enableval="$enable_only64bit" +- vg_cv_only64bit=$enableval ++ enableval=$enable_only64bit; vg_cv_only64bit=$enableval + else + vg_cv_only64bit=no +-fi; + fi +-echo "$as_me:$LINENO: result: $vg_cv_only64bit" >&5 +-echo "${ECHO_T}$vg_cv_only64bit" >&6 ++ ++fi ++{ echo "$as_me:$LINENO: result: $vg_cv_only64bit" >&5 ++echo "${ECHO_T}$vg_cv_only64bit" >&6; } + + # Check if a 32-bit only build has been requested +-echo "$as_me:$LINENO: checking for a 32-bit only build" >&5 +-echo $ECHO_N "checking for a 32-bit only build... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for a 32-bit only build" >&5 ++echo $ECHO_N "checking for a 32-bit only build... $ECHO_C" >&6; } + if test "${vg_cv_only32bit+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- # Check whether --enable-only32bit or --disable-only32bit was given. ++ # Check whether --enable-only32bit was given. + if test "${enable_only32bit+set}" = set; then +- enableval="$enable_only32bit" +- vg_cv_only32bit=$enableval ++ enableval=$enable_only32bit; vg_cv_only32bit=$enableval + else + vg_cv_only32bit=no +-fi; + fi +-echo "$as_me:$LINENO: result: $vg_cv_only32bit" >&5 +-echo "${ECHO_T}$vg_cv_only32bit" >&6 ++ ++fi ++{ echo "$as_me:$LINENO: result: $vg_cv_only32bit" >&5 ++echo "${ECHO_T}$vg_cv_only32bit" >&6; } + + # Stay sane + if test x$vg_cv_only64bit = xyes -a x$vg_cv_only32bit = xyes; then +@@ -4101,26 +4623,26 @@ + + + +-echo "$as_me:$LINENO: checking for a supported OS" >&5 +-echo $ECHO_N "checking for a supported OS... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for a supported OS" >&5 ++echo $ECHO_N "checking for a supported OS... $ECHO_C" >&6; } + + + case "${host_os}" in + *linux*) +- echo "$as_me:$LINENO: result: ok (${host_os})" >&5 +-echo "${ECHO_T}ok (${host_os})" >&6 ++ { echo "$as_me:$LINENO: result: ok (${host_os})" >&5 ++echo "${ECHO_T}ok (${host_os})" >&6; } + VG_OS="linux" + + # Ok, this is linux. Check the kernel version +- echo "$as_me:$LINENO: checking for the kernel version" >&5 +-echo $ECHO_N "checking for the kernel version... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for the kernel version" >&5 ++echo $ECHO_N "checking for the kernel version... $ECHO_C" >&6; } + + kernel=`uname -r` + + case "${kernel}" in + 2.6.*) +- echo "$as_me:$LINENO: result: 2.6 family (${kernel})" >&5 +-echo "${ECHO_T}2.6 family (${kernel})" >&6 ++ { echo "$as_me:$LINENO: result: 2.6 family (${kernel})" >&5 ++echo "${ECHO_T}2.6 family (${kernel})" >&6; } + + cat >>confdefs.h <<\_ACEOF + #define KERNEL_2_6 1 +@@ -4129,8 +4651,8 @@ + ;; + + 2.4.*) +- echo "$as_me:$LINENO: result: 2.4 family (${kernel})" >&5 +-echo "${ECHO_T}2.4 family (${kernel})" >&6 ++ { echo "$as_me:$LINENO: result: 2.4 family (${kernel})" >&5 ++echo "${ECHO_T}2.4 family (${kernel})" >&6; } + + cat >>confdefs.h <<\_ACEOF + #define KERNEL_2_4 1 +@@ -4139,8 +4661,8 @@ + ;; + + *) +- echo "$as_me:$LINENO: result: unsupported (${kernel})" >&5 +-echo "${ECHO_T}unsupported (${kernel})" >&6 ++ { echo "$as_me:$LINENO: result: unsupported (${kernel})" >&5 ++echo "${ECHO_T}unsupported (${kernel})" >&6; } + { { echo "$as_me:$LINENO: error: Valgrind works on kernels 2.4, 2.6" >&5 + echo "$as_me: error: Valgrind works on kernels 2.4, 2.6" >&2;} + { (exit 1); exit 1; }; } +@@ -4150,14 +4672,14 @@ + ;; + + *freebsd*) +- echo "$as_me:$LINENO: result: ok (${host_os})" >&5 +-echo "${ECHO_T}ok (${host_os})" >&6 ++ { echo "$as_me:$LINENO: result: ok (${host_os})" >&5 ++echo "${ECHO_T}ok (${host_os})" >&6; } + VG_OS="freebsd" + ;; + + *) +- echo "$as_me:$LINENO: result: no (${host_os})" >&5 +-echo "${ECHO_T}no (${host_os})" >&6 ++ { echo "$as_me:$LINENO: result: no (${host_os})" >&5 ++echo "${ECHO_T}no (${host_os})" >&6; } + { { echo "$as_me:$LINENO: error: Valgrind is operating system specific. Sorry. Please consider doing a port." >&5 + echo "$as_me: error: Valgrind is operating system specific. Sorry. Please consider doing a port." >&2;} + { (exit 1); exit 1; }; } +@@ -4173,8 +4695,8 @@ + # possible. The system will also be built for this target, but not + # the regression or performance tests. + # +-echo "$as_me:$LINENO: checking for a supported CPU/OS combination" >&5 +-echo $ECHO_N "checking for a supported CPU/OS combination... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for a supported CPU/OS combination" >&5 ++echo $ECHO_N "checking for a supported CPU/OS combination... $ECHO_C" >&6; } + + + +@@ -4183,8 +4705,8 @@ + x86-linux) + VG_PLATFORM_PRI="X86_LINUX" + VG_PLATFORM_SEC="" +- echo "$as_me:$LINENO: result: ok (${host_cpu}-${host_os})" >&5 +-echo "${ECHO_T}ok (${host_cpu}-${host_os})" >&6 ++ { echo "$as_me:$LINENO: result: ok (${host_cpu}-${host_os})" >&5 ++echo "${ECHO_T}ok (${host_cpu}-${host_os})" >&6; } + ;; + amd64-linux) + if test x$vg_cv_only64bit = xyes; then +@@ -4197,14 +4719,14 @@ + VG_PLATFORM_PRI="AMD64_LINUX" + VG_PLATFORM_SEC="X86_LINUX" + fi +- echo "$as_me:$LINENO: result: ok (${host_cpu}-${host_os})" >&5 +-echo "${ECHO_T}ok (${host_cpu}-${host_os})" >&6 ++ { echo "$as_me:$LINENO: result: ok (${host_cpu}-${host_os})" >&5 ++echo "${ECHO_T}ok (${host_cpu}-${host_os})" >&6; } + ;; + ppc32-linux) + VG_PLATFORM_PRI="PPC32_LINUX" + VG_PLATFORM_SEC="" +- echo "$as_me:$LINENO: result: ok (${host_cpu}-${host_os})" >&5 +-echo "${ECHO_T}ok (${host_cpu}-${host_os})" >&6 ++ { echo "$as_me:$LINENO: result: ok (${host_cpu}-${host_os})" >&5 ++echo "${ECHO_T}ok (${host_cpu}-${host_os})" >&6; } + ;; + ppc64-linux) + if test x$vg_cv_only64bit = xyes; then +@@ -4217,14 +4739,14 @@ + VG_PLATFORM_PRI="PPC64_LINUX" + VG_PLATFORM_SEC="PPC32_LINUX" + fi +- echo "$as_me:$LINENO: result: ok (${host_cpu}-${host_os})" >&5 +-echo "${ECHO_T}ok (${host_cpu}-${host_os})" >&6 ++ { echo "$as_me:$LINENO: result: ok (${host_cpu}-${host_os})" >&5 ++echo "${ECHO_T}ok (${host_cpu}-${host_os})" >&6; } + ;; + *) + VG_PLATFORM_PRI="unknown" + VG_PLATFORM_SEC="unknown" +- echo "$as_me:$LINENO: result: no (${host_cpu}-${host_os})" >&5 +-echo "${ECHO_T}no (${host_cpu}-${host_os})" >&6 ++ { echo "$as_me:$LINENO: result: no (${host_cpu}-${host_os})" >&5 ++echo "${ECHO_T}no (${host_cpu}-${host_os})" >&6; } + { { echo "$as_me:$LINENO: error: Valgrind is platform specific. Sorry. Please consider doing a port." >&5 + echo "$as_me: error: Valgrind is platform specific. Sorry. Please consider doing a port." >&2;} + { (exit 1); exit 1; }; } +@@ -4279,7 +4801,7 @@ + + # This variable will collect the individual suppression files + # depending on the results of autoconf +-DEFAULT_SUPP="debian.supp" ++DEFAULT_SUPP="" + + + +@@ -4287,19 +4809,166 @@ + + + +-echo "$as_me:$LINENO: checking for egrep" >&5 +-echo $ECHO_N "checking for egrep... $ECHO_C" >&6 +-if test "${ac_cv_prog_egrep+set}" = set; then ++{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 ++echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } ++if test "${ac_cv_path_GREP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ # Extract the first word of "grep ggrep" to use in msg output ++if test -z "$GREP"; then ++set dummy grep ggrep; ac_prog_name=$2 ++if test "${ac_cv_path_GREP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ 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 ++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ 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 ++ ac_count=`expr $ac_count + 1` ++ 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 ++ ++ ++fi ++ ++GREP="$ac_cv_path_GREP" ++if test -z "$GREP"; then ++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 ++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++else ++ ac_cv_path_GREP=$GREP ++fi ++ ++ ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 ++echo "${ECHO_T}$ac_cv_path_GREP" >&6; } ++ GREP="$ac_cv_path_GREP" ++ ++ ++{ echo "$as_me:$LINENO: checking for egrep" >&5 ++echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } ++if test "${ac_cv_path_EGREP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 ++ then ac_cv_path_EGREP="$GREP -E" ++ else ++ # Extract the first word of "egrep" to use in msg output ++if test -z "$EGREP"; then ++set dummy egrep; ac_prog_name=$2 ++if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- if echo a | (grep -E '(a|b)') >/dev/null 2>&1 +- then ac_cv_prog_egrep='grep -E' +- else ac_cv_prog_egrep='egrep' ++ 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 ++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ 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 ++ ac_count=`expr $ac_count + 1` ++ 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 ++ ++ ++fi ++ ++EGREP="$ac_cv_path_EGREP" ++if test -z "$EGREP"; then ++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 ++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++else ++ ac_cv_path_EGREP=$EGREP ++fi ++ ++ ++ fi + fi +-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 +-echo "${ECHO_T}$ac_cv_prog_egrep" >&6 +- EGREP=$ac_cv_prog_egrep ++{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 ++echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } ++ EGREP="$ac_cv_path_EGREP" + + + cat >conftest.$ac_ext <<_ACEOF +@@ -4390,24 +5059,46 @@ + rm -f conftest* + + +-echo "$as_me:$LINENO: checking the glibc version" >&5 +-echo $ECHO_N "checking the glibc version... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + +-case "${glibc}" in +- 2.2) +- echo "$as_me:$LINENO: result: 2.2 family" >&5 +-echo "${ECHO_T}2.2 family" >&6 ++#include ++#ifdef __GNU_LIBRARY__ ++ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 6) ++ GLIBC_26 ++ #endif ++#endif + +-cat >>confdefs.h <<\_ACEOF +-#define GLIBC_2_2 1 + _ACEOF +- +- DEFAULT_SUPP="glibc-2.2.supp ${DEFAULT_SUPP}" ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "GLIBC_26" >/dev/null 2>&1; then ++ glibc="2.6" ++fi ++rm -f conftest* ++ ++ ++{ echo "$as_me:$LINENO: checking the glibc version" >&5 ++echo $ECHO_N "checking the glibc version... $ECHO_C" >&6; } ++ ++case "${glibc}" in ++ 2.2) ++ { echo "$as_me:$LINENO: result: 2.2 family" >&5 ++echo "${ECHO_T}2.2 family" >&6; } ++ ++cat >>confdefs.h <<\_ACEOF ++#define GLIBC_2_2 1 ++_ACEOF ++ ++ DEFAULT_SUPP="glibc-2.2.supp ${DEFAULT_SUPP}" + ;; + + 2.3) +- echo "$as_me:$LINENO: result: 2.3 family" >&5 +-echo "${ECHO_T}2.3 family" >&6 ++ { echo "$as_me:$LINENO: result: 2.3 family" >&5 ++echo "${ECHO_T}2.3 family" >&6; } + + cat >>confdefs.h <<\_ACEOF + #define GLIBC_2_3 1 +@@ -4417,8 +5108,8 @@ + ;; + + 2.4) +- echo "$as_me:$LINENO: result: 2.4 family" >&5 +-echo "${ECHO_T}2.4 family" >&6 ++ { echo "$as_me:$LINENO: result: 2.4 family" >&5 ++echo "${ECHO_T}2.4 family" >&6; } + + cat >>confdefs.h <<\_ACEOF + #define GLIBC_2_4 1 +@@ -4428,8 +5119,8 @@ + ;; + + 2.5) +- echo "$as_me:$LINENO: result: 2.5 family" >&5 +-echo "${ECHO_T}2.5 family" >&6 ++ { echo "$as_me:$LINENO: result: 2.5 family" >&5 ++echo "${ECHO_T}2.5 family" >&6; } + + cat >>confdefs.h <<\_ACEOF + #define GLIBC_2_5 1 +@@ -4438,11 +5129,22 @@ + DEFAULT_SUPP="glibc-2.5.supp ${DEFAULT_SUPP}" + ;; + ++ 2.6) ++ { echo "$as_me:$LINENO: result: 2.6 family" >&5 ++echo "${ECHO_T}2.6 family" >&6; } ++ ++cat >>confdefs.h <<\_ACEOF ++#define GLIBC_2_6 1 ++_ACEOF ++ ++ DEFAULT_SUPP="glibc-2.6.supp ${DEFAULT_SUPP}" ++ ;; ++ + *) +- echo "$as_me:$LINENO: result: unsupported version" >&5 +-echo "${ECHO_T}unsupported version" >&6 +- { { echo "$as_me:$LINENO: error: Valgrind requires glibc version 2.2 - 2.5" >&5 +-echo "$as_me: error: Valgrind requires glibc version 2.2 - 2.5" >&2;} ++ { echo "$as_me:$LINENO: result: unsupported version" >&5 ++echo "${ECHO_T}unsupported version" >&6; } ++ { { echo "$as_me:$LINENO: error: Valgrind requires glibc version 2.2 - 2.6" >&5 ++echo "$as_me: error: Valgrind requires glibc version 2.2 - 2.6" >&2;} + { (exit 1); exit 1; }; } + ;; + esac +@@ -4452,44 +5154,49 @@ + # (detecting the server version is easy, bu no help). So we + # just use a hack: always include the suppressions for both + # versions 3 and 4. +-echo "$as_me:$LINENO: checking for X" >&5 +-echo $ECHO_N "checking for X... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for X" >&5 ++echo $ECHO_N "checking for X... $ECHO_C" >&6; } + + +-# Check whether --with-x or --without-x was given. ++# Check whether --with-x was given. + if test "${with_x+set}" = set; then +- withval="$with_x" ++ withval=$with_x; ++fi + +-fi; + # $have_x is `yes', `no', `disabled', or empty when we do not yet know. + if test "x$with_x" = xno; then + # The user explicitly disabled X. + have_x=disabled + else +- if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then +- # Both variables are already set. +- have_x=yes +- else +- if test "${ac_cv_have_x+set}" = set; then ++ case $x_includes,$x_libraries in #( ++ *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5 ++echo "$as_me: error: Cannot use X directory names containing '" >&2;} ++ { (exit 1); exit 1; }; };; #( ++ *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + # One or both of the vars are not set, and there is no cached value. + ac_x_includes=no ac_x_libraries=no +-rm -fr conftest.dir ++rm -f -r conftest.dir + if mkdir conftest.dir; then + cd conftest.dir +- # Make sure to not put "make" in the Imakefile rules, since we grep it out. + cat >Imakefile <<'_ACEOF' +-acfindx: +- @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' ++incroot: ++ @echo incroot='${INCROOT}' ++usrlibdir: ++ @echo usrlibdir='${USRLIBDIR}' ++libdir: ++ @echo libdir='${LIBDIR}' + _ACEOF +- if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then ++ if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then + # GNU make sometimes prints "make[1]: Entering...", which would confuse us. +- eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` ++ for ac_var in incroot usrlibdir libdir; do ++ eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" ++ done + # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. + for ac_extension in a so sl; do +- if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && +- test -f $ac_im_libdir/libX11.$ac_extension; then ++ if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && ++ test -f "$ac_im_libdir/libX11.$ac_extension"; then + ac_im_usrlibdir=$ac_im_libdir; break + fi + done +@@ -4497,7 +5204,7 @@ + # bogus both because they are the default anyway, and because + # using them would break gcc on systems where it needs fixed includes. + case $ac_im_incroot in +- /usr/include) ;; ++ /usr/include) ac_x_includes= ;; + *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; + esac + case $ac_im_usrlibdir in +@@ -4506,7 +5213,7 @@ + esac + fi + cd .. +- rm -fr conftest.dir ++ rm -f -r conftest.dir + fi + + # Standard set of common directories for X headers. +@@ -4547,7 +5254,7 @@ + /usr/openwin/share/include' + + if test "$ac_x_includes" = no; then +- # Guess where to find include files, by looking for Intrinsic.h. ++ # Guess where to find include files, by looking for Xlib.h. + # First, try using that file with no special directory specified. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -4555,26 +5262,24 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include ++#include + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + # We can compile using X headers with no special include directory. + ac_x_includes= + else +@@ -4582,12 +5287,13 @@ + sed 's/^/| /' conftest.$ac_ext >&5 + + for ac_dir in $ac_x_header_dirs; do +- if test -r "$ac_dir/X11/Intrinsic.h"; then ++ if test -r "$ac_dir/X11/Xlib.h"; then + ac_x_includes=$ac_dir + break + fi + done + fi ++ + rm -f conftest.err conftest.$ac_ext + fi # $ac_x_includes = no + +@@ -4596,44 +5302,40 @@ + # See if we find them without any special options. + # Don't add to $LIBS permanently. + ac_save_LIBS=$LIBS +- LIBS="-lXt $LIBS" ++ LIBS="-lX11 $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include ++#include + int + main () + { +-XtMalloc (0) ++XrmInitialize () + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + LIBS=$ac_save_LIBS + # We can link X programs with no special library path. + ac_x_libraries= +@@ -4641,49 +5343,54 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-LIBS=$ac_save_LIBS ++ LIBS=$ac_save_LIBS + for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` + do + # Don't even attempt the hair of trying to link an X program! + for ac_extension in a so sl; do +- if test -r $ac_dir/libXt.$ac_extension; then ++ if test -r "$ac_dir/libX11.$ac_extension"; then + ac_x_libraries=$ac_dir + break 2 + fi + done + done + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi # $ac_x_libraries = no + +-if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then +- # Didn't find X anywhere. Cache the known absence of X. +- ac_cv_have_x="have_x=no" +-else +- # Record where we found X for the cache. +- ac_cv_have_x="have_x=yes \ +- ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" +-fi ++case $ac_x_includes,$ac_x_libraries in #( ++ no,* | *,no | *\'*) ++ # Didn't find X, or a directory has "'" in its name. ++ ac_cv_have_x="have_x=no";; #( ++ *) ++ # Record where we found X for the cache. ++ ac_cv_have_x="have_x=yes\ ++ ac_x_includes='$ac_x_includes'\ ++ ac_x_libraries='$ac_x_libraries'" ++esac + fi +- +- fi ++;; #( ++ *) have_x=yes;; ++ esac + eval "$ac_cv_have_x" + fi # $with_x != no + + if test "$have_x" != yes; then +- echo "$as_me:$LINENO: result: $have_x" >&5 +-echo "${ECHO_T}$have_x" >&6 ++ { echo "$as_me:$LINENO: result: $have_x" >&5 ++echo "${ECHO_T}$have_x" >&6; } + no_x=yes + else + # If each of the values was on the command line, it overrides each guess. + test "x$x_includes" = xNONE && x_includes=$ac_x_includes + test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries + # 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:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 +-echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 ++ ac_cv_have_x="have_x=yes\ ++ ac_x_includes='$x_includes'\ ++ ac_x_libraries='$x_libraries'" ++ { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 ++echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; } + fi + + if test "${no_x}" != 'yes' ; then +@@ -4693,8 +5400,8 @@ + + + # does this compiler support -m32 ? +-echo "$as_me:$LINENO: checking if gcc accepts -m32" >&5 +-echo $ECHO_N "checking if gcc accepts -m32... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking if gcc accepts -m32" >&5 ++echo $ECHO_N "checking if gcc accepts -m32... $ECHO_C" >&6; } + + safe_CFLAGS=$CFLAGS + CFLAGS="-m32" +@@ -4717,31 +5424,26 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + + FLAG_M32="-m32" +-echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++{ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + + else + echo "$as_me: failed program was:" >&5 +@@ -4749,19 +5451,20 @@ + + + FLAG_M32="" +-echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++{ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$safe_CFLAGS + + + + + # does this compiler support -m64 ? +-echo "$as_me:$LINENO: checking if gcc accepts -m64" >&5 +-echo $ECHO_N "checking if gcc accepts -m64... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking if gcc accepts -m64" >&5 ++echo $ECHO_N "checking if gcc accepts -m64... $ECHO_C" >&6; } + + safe_CFLAGS=$CFLAGS + CFLAGS="-m64" +@@ -4784,31 +5487,26 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + + FLAG_M64="-m64" +-echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++{ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + + else + echo "$as_me: failed program was:" >&5 +@@ -4816,19 +5514,20 @@ + + + FLAG_M64="" +-echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++{ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$safe_CFLAGS + + + + + # does this compiler support -mmmx ? +-echo "$as_me:$LINENO: checking if gcc accepts -mmmx" >&5 +-echo $ECHO_N "checking if gcc accepts -mmmx... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking if gcc accepts -mmmx" >&5 ++echo $ECHO_N "checking if gcc accepts -mmmx... $ECHO_C" >&6; } + + safe_CFLAGS=$CFLAGS + CFLAGS="-mmmx" +@@ -4851,31 +5550,26 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + + FLAG_MMMX="-mmmx" +-echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++{ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + + else + echo "$as_me: failed program was:" >&5 +@@ -4883,19 +5577,20 @@ + + + FLAG_MMMX="" +-echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++{ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$safe_CFLAGS + + + + + # does this compiler support -msse ? +-echo "$as_me:$LINENO: checking if gcc accepts -msse" >&5 +-echo $ECHO_N "checking if gcc accepts -msse... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking if gcc accepts -msse" >&5 ++echo $ECHO_N "checking if gcc accepts -msse... $ECHO_C" >&6; } + + safe_CFLAGS=$CFLAGS + CFLAGS="-msse" +@@ -4918,31 +5613,26 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + + FLAG_MSSE="-msse" +-echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++{ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + + else + echo "$as_me: failed program was:" >&5 +@@ -4950,19 +5640,20 @@ + + + FLAG_MSSE="" +-echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++{ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$safe_CFLAGS + + + + + # does this compiler support -mpreferred-stack-boundary=2 ? +-echo "$as_me:$LINENO: checking if gcc accepts -mpreferred-stack-boundary" >&5 +-echo $ECHO_N "checking if gcc accepts -mpreferred-stack-boundary... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking if gcc accepts -mpreferred-stack-boundary" >&5 ++echo $ECHO_N "checking if gcc accepts -mpreferred-stack-boundary... $ECHO_C" >&6; } + + safe_CFLAGS=$CFLAGS + CFLAGS="-mpreferred-stack-boundary=2" +@@ -4985,31 +5676,26 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + + PREFERRED_STACK_BOUNDARY="-mpreferred-stack-boundary=2" +-echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++{ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + + else + echo "$as_me: failed program was:" >&5 +@@ -5017,19 +5703,20 @@ + + + PREFERRED_STACK_BOUNDARY="" +-echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++{ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$safe_CFLAGS + + + + + # does this compiler support -Wno-pointer-sign ? +-echo "$as_me:$LINENO: checking if gcc accepts -Wno-pointer-sign " >&5 +-echo $ECHO_N "checking if gcc accepts -Wno-pointer-sign ... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking if gcc accepts -Wno-pointer-sign " >&5 ++echo $ECHO_N "checking if gcc accepts -Wno-pointer-sign ... $ECHO_C" >&6; } + + safe_CFLAGS=$CFLAGS + CFLAGS="-Wno-pointer-sign" +@@ -5052,31 +5739,26 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + + no_pointer_sign=yes +-echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++{ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + + else + echo "$as_me: failed program was:" >&5 +@@ -5084,11 +5766,12 @@ + + + no_pointer_sign=no +-echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++{ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$safe_CFLAGS + + if test x$no_pointer_sign = xyes; then +@@ -5097,8 +5780,8 @@ + + + # does this compiler support -Wdeclaration-after-statement ? +-echo "$as_me:$LINENO: checking if gcc accepts -Wdeclaration-after-statement " >&5 +-echo $ECHO_N "checking if gcc accepts -Wdeclaration-after-statement ... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking if gcc accepts -Wdeclaration-after-statement " >&5 ++echo $ECHO_N "checking if gcc accepts -Wdeclaration-after-statement ... $ECHO_C" >&6; } + + safe_CFLAGS=$CFLAGS + CFLAGS="-Wdeclaration-after-statement" +@@ -5121,32 +5804,27 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + + declaration_after_statement=yes + FLAG_WDECL_AFTER_STMT="-Wdeclaration-after-statement" +-echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++{ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + + else + echo "$as_me: failed program was:" >&5 +@@ -5155,11 +5833,12 @@ + + declaration_after_statement=no + FLAG_WDECL_AFTER_STMT="" +-echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++{ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$safe_CFLAGS + + +@@ -5170,8 +5849,8 @@ + + + # does this compiler support __builtin_expect? +-echo "$as_me:$LINENO: checking if gcc supports __builtin_expect" >&5 +-echo $ECHO_N "checking if gcc supports __builtin_expect... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking if gcc supports __builtin_expect" >&5 ++echo $ECHO_N "checking if gcc supports __builtin_expect... $ECHO_C" >&6; } + + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -5191,31 +5870,27 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + ac_have_builtin_expect=yes +-echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++{ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + + else + echo "$as_me: failed program was:" >&5 +@@ -5223,11 +5898,12 @@ + + + ac_have_builtin_expect=no +-echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++{ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test x$ac_have_builtin_expect = xyes ; then + +@@ -5239,8 +5915,8 @@ + + + # does the ppc assembler support "mtocrf" et al? +-echo "$as_me:$LINENO: checking if ppc32/64 as supports mtocrf/mfocrf" >&5 +-echo $ECHO_N "checking if ppc32/64 as supports mtocrf/mfocrf... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking if ppc32/64 as supports mtocrf/mfocrf" >&5 ++echo $ECHO_N "checking if ppc32/64 as supports mtocrf/mfocrf... $ECHO_C" >&6; } + + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -5261,31 +5937,26 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + + ac_have_as_ppc_mftocrf=yes +-echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++{ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + + else + echo "$as_me: failed program was:" >&5 +@@ -5293,11 +5964,12 @@ + + + ac_have_as_ppc_mftocrf=no +-echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++{ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test x$ac_have_as_ppc_mftocrf = xyes ; then + + cat >>confdefs.h <<\_ACEOF +@@ -5308,15 +5980,14 @@ + + + # Check for TLS support in the compiler and linker +-echo "$as_me:$LINENO: checking for TLS support" >&5 +-echo $ECHO_N "checking for TLS support... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for TLS support" >&5 ++echo $ECHO_N "checking for TLS support... $ECHO_C" >&6; } + if test "${vg_cv_tls+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- # Check whether --enable-tls or --disable-tls was given. ++ # Check whether --enable-tls was given. + if test "${enable_tls+set}" = set; then +- enableval="$enable_tls" +- vg_cv_tls=$enableval ++ enableval=$enable_tls; vg_cv_tls=$enableval + else + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +@@ -5341,13 +6012,22 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -5360,12 +6040,15 @@ + ( exit $ac_status ) + vg_cv_tls=no + fi +-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++fi ++ ++ + fi +-fi; ++ + fi +-echo "$as_me:$LINENO: result: $vg_cv_tls" >&5 +-echo "${ECHO_T}$vg_cv_tls" >&6 ++{ echo "$as_me:$LINENO: result: $vg_cv_tls" >&5 ++echo "${ECHO_T}$vg_cv_tls" >&6; } + + if test "$vg_cv_tls" = yes; then + +@@ -5377,8 +6060,8 @@ + + + # Checks for header files. +-echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: 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 +@@ -5402,35 +6085,31 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_header_stdc=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_header_stdc=no ++ ac_cv_header_stdc=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++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. +@@ -5486,6 +6165,7 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include ++#include + #if ((' ' & 0x0FF) == 0x020) + # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') + # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +@@ -5505,18 +6185,27 @@ + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) +- exit(2); +- exit (0); ++ return 2; ++ return 0; + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -5529,12 +6218,14 @@ + ( exit $ac_status ) + ac_cv_header_stdc=no + fi +-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi ++ ++ + fi + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +-echo "${ECHO_T}$ac_cv_header_stdc" >&6 ++{ echo "$as_me:$LINENO: 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 <<\_ACEOF +@@ -5557,9 +6248,9 @@ + inttypes.h stdint.h unistd.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:$LINENO: 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 "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +@@ -5573,38 +6264,35 @@ + #include <$ac_header> + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + eval "$as_ac_Header=yes" + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-eval "$as_ac_Header=no" ++ eval "$as_ac_Header=no" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +@@ -5621,18 +6309,19 @@ + for ac_header in sys/endian.h endian.h mqueue.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + else + # Is the header compilable? +-echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -5643,41 +6332,37 @@ + #include <$ac_header> + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_header_compiler=no ++ ac_header_compiler=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -5686,24 +6371,22 @@ + /* end confdefs.h. */ + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -5711,9 +6394,10 @@ + + ac_header_preproc=no + fi ++ + rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +@@ -5737,25 +6421,24 @@ + echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 + echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( +- cat <<\_ASBOX ++ ( cat <<\_ASBOX + ## --------------------------------------------------- ## + ## Report this to valgrind-users@lists.sourceforge.net ## + ## --------------------------------------------------- ## + _ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-echo "$as_me:$LINENO: 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 "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + eval "$as_ac_Header=\$ac_header_preproc" + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + + fi + if test `eval echo '${'$as_ac_Header'}'` = yes; then +@@ -5770,8 +6453,8 @@ + + + # Checks for typedefs, structures, and compiler characteristics. +-echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 +-echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 ++echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; } + if test "${ac_cv_type_uid_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -5793,8 +6476,8 @@ + rm -f conftest* + + fi +-echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 +-echo "${ECHO_T}$ac_cv_type_uid_t" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 ++echo "${ECHO_T}$ac_cv_type_uid_t" >&6; } + if test $ac_cv_type_uid_t = no; then + + cat >>confdefs.h <<\_ACEOF +@@ -5808,8 +6491,8 @@ + + fi + +-echo "$as_me:$LINENO: checking for off_t" >&5 +-echo $ECHO_N "checking for off_t... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for off_t" >&5 ++echo $ECHO_N "checking for off_t... $ECHO_C" >&6; } + if test "${ac_cv_type_off_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -5820,62 +6503,59 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default ++typedef off_t ac__type_new_; + int + main () + { +-if ((off_t *) 0) ++if ((ac__type_new_ *) 0) + return 0; +-if (sizeof (off_t)) ++if (sizeof (ac__type_new_)) + return 0; + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_type_off_t=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_type_off_t=no ++ ac_cv_type_off_t=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 +-echo "${ECHO_T}$ac_cv_type_off_t" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 ++echo "${ECHO_T}$ac_cv_type_off_t" >&6; } + if test $ac_cv_type_off_t = yes; then + : + else + + cat >>confdefs.h <<_ACEOF +-#define off_t long ++#define off_t long int + _ACEOF + + fi + +-echo "$as_me:$LINENO: checking for size_t" >&5 +-echo $ECHO_N "checking for size_t... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for size_t" >&5 ++echo $ECHO_N "checking for size_t... $ECHO_C" >&6; } + if test "${ac_cv_type_size_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -5886,62 +6566,59 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default ++typedef size_t ac__type_new_; + int + main () + { +-if ((size_t *) 0) ++if ((ac__type_new_ *) 0) + return 0; +-if (sizeof (size_t)) ++if (sizeof (ac__type_new_)) + return 0; + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_type_size_t=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_type_size_t=no ++ ac_cv_type_size_t=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 +-echo "${ECHO_T}$ac_cv_type_size_t" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 ++echo "${ECHO_T}$ac_cv_type_size_t" >&6; } + if test $ac_cv_type_size_t = yes; then + : + else + + cat >>confdefs.h <<_ACEOF +-#define size_t unsigned ++#define size_t unsigned int + _ACEOF + + fi + +-echo "$as_me:$LINENO: 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 ++{ echo "$as_me:$LINENO: 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 +@@ -5965,38 +6642,34 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_header_time=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_header_time=no ++ ac_cv_header_time=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 +-echo "${ECHO_T}$ac_cv_header_time" >&6 ++{ echo "$as_me:$LINENO: 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 <<\_ACEOF +@@ -6008,8 +6681,8 @@ + + + # Checks for library functions. +-echo "$as_me:$LINENO: checking for working memcmp" >&5 +-echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for working memcmp" >&5 ++echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6; } + if test "${ac_cv_func_memcmp_working+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -6028,9 +6701,9 @@ + { + + /* Some versions of memcmp are not 8-bit clean. */ +- char c0 = 0x40, c1 = 0x80, c2 = 0x81; ++ char c0 = '\100', c1 = '\200', c2 = '\201'; + if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0) +- exit (1); ++ return 1; + + /* The Next x86 OpenStep bug shows up only when comparing 16 bytes + or more and with at least one buffer not starting on a 4-byte boundary. +@@ -6046,9 +6719,9 @@ + strcpy (a, "--------01111111"); + strcpy (b, "--------10000000"); + if (memcmp (a, b, 16) >= 0) +- exit (1); ++ return 1; + } +- exit (0); ++ return 0; + } + + ; +@@ -6056,13 +6729,22 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -6075,17 +6757,17 @@ + ( exit $ac_status ) + ac_cv_func_memcmp_working=no + fi +-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi ++ ++ + fi +-echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5 +-echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6 +-test $ac_cv_func_memcmp_working = no && case $LIBOBJS in +- "memcmp.$ac_objext" | \ +- *" memcmp.$ac_objext" | \ +- "memcmp.$ac_objext "* | \ ++{ echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5 ++echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6; } ++test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in + *" memcmp.$ac_objext "* ) ;; +- *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" ;; ++ *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" ++ ;; + esac + + +@@ -6094,18 +6776,19 @@ + for ac_header in stdlib.h unistd.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + else + # Is the header compilable? +-echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -6116,41 +6799,37 @@ + #include <$ac_header> + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_header_compiler=no ++ ac_header_compiler=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -6159,24 +6838,22 @@ + /* end confdefs.h. */ + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -6184,9 +6861,10 @@ + + ac_header_preproc=no + fi ++ + rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +@@ -6210,25 +6888,24 @@ + echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 + echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( +- cat <<\_ASBOX ++ ( cat <<\_ASBOX + ## --------------------------------------------------- ## + ## Report this to valgrind-users@lists.sourceforge.net ## + ## --------------------------------------------------- ## + _ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-echo "$as_me:$LINENO: 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 "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + eval "$as_ac_Header=\$ac_header_preproc" + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + + fi + if test `eval echo '${'$as_ac_Header'}'` = yes; then +@@ -6244,9 +6921,9 @@ + for ac_func in getpagesize + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:$LINENO: 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 "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +@@ -6272,68 +6949,60 @@ + + #undef $ac_func + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* 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 +-/* 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 (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++#if defined __stub_$ac_func || defined __stub___$ac_func + choke me +-#else +-char (*f) () = $ac_func; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != $ac_func; ++return $ac_func (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-eval "$as_ac_var=no" ++ eval "$as_ac_var=no" + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +@@ -6342,8 +7011,8 @@ + fi + done + +-echo "$as_me:$LINENO: checking for working mmap" >&5 +-echo $ECHO_N "checking for working mmap... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for working mmap" >&5 ++echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; } + if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -6385,21 +7054,21 @@ + #include + #include + +-#if !STDC_HEADERS && !HAVE_STDLIB_H ++#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H + char *malloc (); + #endif + + /* This mess was copied from the GNU getpagesize.h. */ +-#if !HAVE_GETPAGESIZE ++#ifndef HAVE_GETPAGESIZE + /* Assume that all systems that can run configure have sys/param.h. */ +-# if !HAVE_SYS_PARAM_H ++# ifndef HAVE_SYS_PARAM_H + # define HAVE_SYS_PARAM_H 1 + # endif + + # ifdef _SC_PAGESIZE + # define getpagesize() sysconf(_SC_PAGESIZE) + # else /* no _SC_PAGESIZE */ +-# if HAVE_SYS_PARAM_H ++# ifdef HAVE_SYS_PARAM_H + # include + # ifdef EXEC_PAGESIZE + # define getpagesize() EXEC_PAGESIZE +@@ -6438,15 +7107,15 @@ + /* First, make a file with some known garbage in it. */ + data = (char *) malloc (pagesize); + if (!data) +- exit (1); ++ return 1; + for (i = 0; i < pagesize; ++i) + *(data + i) = rand (); + umask (0); + fd = creat ("conftest.mmap", 0600); + if (fd < 0) +- exit (1); ++ return 1; + if (write (fd, data, pagesize) != pagesize) +- exit (1); ++ return 1; + close (fd); + + /* Next, try to mmap the file at a fixed address which already has +@@ -6454,17 +7123,17 @@ + we see the same garbage. */ + fd = open ("conftest.mmap", O_RDWR); + if (fd < 0) +- exit (1); ++ return 1; + data2 = (char *) malloc (2 * pagesize); + if (!data2) +- exit (1); +- data2 += (pagesize - ((long) data2 & (pagesize - 1))) & (pagesize - 1); ++ return 1; ++ data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1); + if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_FIXED, fd, 0L)) +- exit (1); ++ return 1; + for (i = 0; i < pagesize; ++i) + if (*(data + i) != *(data2 + i)) +- exit (1); ++ return 1; + + /* 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 +@@ -6473,24 +7142,33 @@ + *(data2 + i) = *(data2 + i) + 1; + data3 = (char *) malloc (pagesize); + if (!data3) +- exit (1); ++ return 1; + if (read (fd, data3, pagesize) != pagesize) +- exit (1); ++ return 1; + for (i = 0; i < pagesize; ++i) + if (*(data + i) != *(data3 + i)) +- exit (1); ++ return 1; + close (fd); +- exit (0); ++ return 0; + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -6503,11 +7181,13 @@ + ( exit $ac_status ) + ac_cv_func_mmap_fixed_mapped=no + fi +-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi ++ ++ + fi +-echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 +-echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 ++echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; } + if test $ac_cv_func_mmap_fixed_mapped = yes; then + + cat >>confdefs.h <<\_ACEOF +@@ -6517,8 +7197,8 @@ + fi + rm -f conftest.mmap + +-echo "$as_me:$LINENO: checking return type of signal handlers" >&5 +-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: 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 +@@ -6530,56 +7210,44 @@ + /* end confdefs.h. */ + #include + #include +-#ifdef signal +-# undef signal +-#endif +-#ifdef __cplusplus +-extern "C" void (*signal (int, void (*)(int)))(int); +-#else +-void (*signal ()) (); +-#endif + + int + main () + { +-int i; ++return *(signal (0, 0)) (0) == 1; + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_type_signal=void ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ ac_cv_type_signal=int + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_type_signal=int ++ ac_cv_type_signal=void + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 +-echo "${ECHO_T}$ac_cv_type_signal" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 ++echo "${ECHO_T}$ac_cv_type_signal" >&6; } + + cat >>confdefs.h <<_ACEOF + #define RETSIGTYPE $ac_cv_type_signal +@@ -6600,9 +7268,9 @@ + for ac_func in floor memchr memset mkdir strchr strdup strpbrk strrchr strstr semtimedop + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:$LINENO: 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 "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +@@ -6628,68 +7296,60 @@ + + #undef $ac_func + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* 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 +-/* 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 (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++#if defined __stub_$ac_func || defined __stub___$ac_func + choke me +-#else +-char (*f) () = $ac_func; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != $ac_func; ++return $ac_func (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-eval "$as_ac_var=no" ++ eval "$as_ac_var=no" + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +@@ -6715,14 +7375,14 @@ + fi + + +-# Check whether --with-mpicc or --without-mpicc was given. ++# Check whether --with-mpicc was given. + if test "${with_mpicc+set}" = set; then +- withval="$with_mpicc" +- MPI_CC=$withval ++ withval=$with_mpicc; MPI_CC=$withval ++ ++fi + +-fi; +-echo "$as_me:$LINENO: checking for usable MPI2-compliant mpicc and mpi.h" >&5 +-echo $ECHO_N "checking for usable MPI2-compliant mpicc and mpi.h... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for usable MPI2-compliant mpicc and mpi.h" >&5 ++echo $ECHO_N "checking for usable MPI2-compliant mpicc and mpi.h... $ECHO_C" >&6; } + saved_CC=$CC + saved_CFLAGS=$CFLAGS + CC=$MPI_CC +@@ -6750,31 +7410,27 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + ac_have_mpi2=yes +-echo "$as_me:$LINENO: result: yes, $MPI_CC" >&5 +-echo "${ECHO_T}yes, $MPI_CC" >&6 ++{ echo "$as_me:$LINENO: result: yes, $MPI_CC" >&5 ++echo "${ECHO_T}yes, $MPI_CC" >&6; } + + else + echo "$as_me: failed program was:" >&5 +@@ -6782,11 +7438,12 @@ + + + ac_have_mpi2=no +-echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++{ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + CC=$saved_CC + CFLAGS=$saved_CFLAGS +@@ -6806,7 +7463,8 @@ + + # -------------------- ok. We're done. -------------------- + +- ac_config_files="$ac_config_files Makefile valgrind.spec valgrind.pc docs/Makefile docs/lib/Makefile docs/images/Makefile docs/internals/Makefile docs/xml/Makefile tests/Makefile tests/vg_regtest perf/Makefile perf/vg_perf include/Makefile auxprogs/Makefile coregrind/Makefile memcheck/Makefile memcheck/tests/Makefile memcheck/tests/amd64/Makefile memcheck/tests/ppc32/Makefile memcheck/tests/ppc64/Makefile memcheck/tests/x86/Makefile memcheck/docs/Makefile cachegrind/Makefile cachegrind/tests/Makefile cachegrind/tests/amd64/Makefile cachegrind/tests/ppc32/Makefile cachegrind/tests/ppc64/Makefile cachegrind/tests/x86/Makefile cachegrind/docs/Makefile cachegrind/cg_annotate callgrind/Makefile callgrind/callgrind_annotate callgrind/callgrind_control callgrind/tests/Makefile callgrind/docs/Makefile helgrind/Makefile helgrind/tests/Makefile helgrind/docs/Makefile massif/Makefile massif/hp2ps/Makefile massif/tests/Makefile massif/docs/Makefile lackey/Makefile lackey/tests/Makefile lackey/docs/Makefile none/Makefile none/tests/Makefile none/tests/amd64/Makefile none/tests/ppc32/Makefile none/tests/ppc64/Makefile none/tests/x86/Makefile none/docs/Makefile" ++ac_config_files="$ac_config_files Makefile valgrind.spec valgrind.pc docs/Makefile docs/lib/Makefile docs/images/Makefile docs/internals/Makefile docs/xml/Makefile tests/Makefile tests/vg_regtest perf/Makefile perf/vg_perf include/Makefile auxprogs/Makefile coregrind/Makefile memcheck/Makefile memcheck/tests/Makefile memcheck/tests/amd64/Makefile memcheck/tests/ppc32/Makefile memcheck/tests/ppc64/Makefile memcheck/tests/x86/Makefile memcheck/docs/Makefile cachegrind/Makefile cachegrind/tests/Makefile cachegrind/tests/amd64/Makefile cachegrind/tests/ppc32/Makefile cachegrind/tests/ppc64/Makefile cachegrind/tests/x86/Makefile cachegrind/docs/Makefile cachegrind/cg_annotate callgrind/Makefile callgrind/callgrind_annotate callgrind/callgrind_control callgrind/tests/Makefile callgrind/docs/Makefile helgrind/Makefile helgrind/tests/Makefile helgrind/docs/Makefile massif/Makefile massif/hp2ps/Makefile massif/tests/Makefile massif/docs/Makefile lackey/Makefile lackey/tests/Makefile lackey/docs/Makefile none/Makefile none/tests/Makefile none/tests/amd64/Makefile none/tests/ppc32/Makefile none/tests/ppc64/Makefile none/tests/x86/Makefile none/docs/Makefile" ++ + 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 +@@ -6825,39 +7483,58 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 ++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ *) $as_unset $ac_var ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) ++ 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 \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; +- esac; +-} | ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { echo "$as_me:$LINENO: updating cache $cache_file" >&5 ++echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 ++echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -6866,32 +7543,18 @@ + # Let make expand exec_prefix. + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +-# VPATH may cause trouble with some makes, so we remove $(srcdir), +-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +-# trailing colons and then remove the whole line if VPATH becomes empty +-# (actually we leave an empty line to preserve line numbers). +-if test "x$srcdir" = x.; then +- ac_vpsub='/^[ ]*VPATH[ ]*=/{ +-s/:*\$(srcdir):*/:/; +-s/:*\${srcdir}:*/:/; +-s/:*@srcdir@:*/:/; +-s/^\([^=]*=[ ]*\):*/\1/; +-s/:*$//; +-s/^[^=]*=[ ]*$//; +-}' +-fi +- + DEFS=-DHAVE_CONFIG_H + + ac_libobjs= + ac_ltlibobjs= + for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. +- ac_i=`echo "$ac_i" | +- sed 's/\$U\././;s/\.o$//;s/\.obj$//'` +- # 2. Add them. +- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" +- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' ++ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' ++ ac_i=`echo "$ac_i" | sed "$ac_script"` ++ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR ++ # will be set to the directory where LIBOBJS objects are built. ++ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" ++ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' + done + LIBOBJS=$ac_libobjs + +@@ -6985,17 +7648,45 @@ + ## M4sh Initialization. ## + ## --------------------- ## + +-# Be Bourne compatible ++# Be more Bourne compatible ++DUALCASE=1; export DUALCASE # for MKS sh + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' +-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then +- set -o posix ++ setopt NO_GLOB_SUBST ++else ++ case `(set -o) 2>/dev/null` in ++ *posix*) set -o posix ;; ++esac ++ ++fi ++ ++ ++ ++ ++# PATH needs CR ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits ++ ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ echo "#! /bin/sh" >conf$$.sh ++ echo "exit 0" >>conf$$.sh ++ chmod +x conf$$.sh ++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then ++ PATH_SEPARATOR=';' ++ else ++ PATH_SEPARATOR=: ++ fi ++ rm -f conf$$.sh + fi +-DUALCASE=1; export DUALCASE # for MKS sh + + # Support unset when possible. + if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +@@ -7005,8 +7696,43 @@ + fi + + ++# IFS ++# We need space, tab and new line, in precisely that order. Quoting is ++# there to prevent editors from complaining about space-tab. ++# (If _AS_PATH_WALK were called with IFS unset, it would disable word ++# splitting by setting IFS to empty value.) ++as_nl=' ++' ++IFS=" "" $as_nl" ++ ++# Find who we are. Look in the path if we contain no directory separator. ++case $0 in ++ *[\\/]* ) as_myself=$0 ;; ++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++# We did not find ourselves, most probably we were run as `sh COMMAND' ++# in which case we are not to be found in the path. ++if test "x$as_myself" = x; then ++ as_myself=$0 ++fi ++if test ! -f "$as_myself"; then ++ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ { (exit 1); exit 1; } ++fi ++ + # Work around bugs in pre-3.0 UWIN ksh. +-$as_unset ENV MAIL MAILPATH ++for as_var in ENV MAIL MAILPATH ++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++done + PS1='$ ' + PS2='> ' + PS4='+ ' +@@ -7020,18 +7746,19 @@ + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else +- $as_unset $as_var ++ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + fi + done + + # Required to use basename. +-if expr a : '\(a\)' >/dev/null 2>&1; then ++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 ++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename + else + as_basename=false +@@ -7039,159 +7766,120 @@ + + + # Name of the executable. +-as_me=`$as_basename "$0" || ++as_me=`$as_basename -- "$0" || + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)$' \| \ +- . : '\(.\)' 2>/dev/null || ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || + echo X/"$0" | +- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } +- /^X\/\(\/\/\)$/{ s//\1/; q; } +- /^X\/\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- +- +-# PATH needs CR, and LINENO needs CR and PATH. +-# 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 ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` + +-# The user is always right. +-if test "${PATH_SEPARATOR+set}" != set; then +- echo "#! /bin/sh" >conf$$.sh +- echo "exit 0" >>conf$$.sh +- chmod +x conf$$.sh +- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then +- PATH_SEPARATOR=';' +- else +- PATH_SEPARATOR=: +- fi +- rm -f conf$$.sh +-fi ++# CDPATH. ++$as_unset CDPATH + + +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x$as_lineno_3" = "x$as_lineno_2" || { +- # Find who we are. Look in the path if we contain no path at all +- # relative or not. +- 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 + +- ;; +- esac +- # We did not find ourselves, most probably we were run as `sh COMMAND' +- # in which case we are not to be found in the path. +- if test "x$as_myself" = x; then +- as_myself=$0 +- fi +- if test ! -f "$as_myself"; then +- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 +-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} +- { (exit 1); exit 1; }; } +- fi +- case $CONFIG_SHELL in +- '') +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for as_base in sh bash ksh sh5; do +- case $as_dir in +- /*) +- if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO +- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then +- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } +- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } +- CONFIG_SHELL=$as_dir/$as_base +- export CONFIG_SHELL +- exec "$CONFIG_SHELL" "$0" ${1+"$@"} +- fi;; +- esac +- done +-done +-;; +- esac ++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a +- # line-number line before each line; the second 'sed' does the real +- # work. The second script uses 'N' to pair each line-number line +- # with the numbered line, and appends trailing '-' during +- # substitution so that $LINENO is not a special case at line end. ++ # line-number line after each line using $LINENO; the second 'sed' ++ # does the real work. The second script uses 'N' to pair each ++ # line-number line with the line containing $LINENO, and appends ++ # trailing '-' during substitution so that $LINENO is not a special ++ # case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) +- sed '=' <$as_myself | ++ # scripts with optimization help from Paolo Bonzini. Blame Lee ++ # E. McMahon (1931-1989) for sed's syntax. :-) ++ sed -n ' ++ p ++ /[$]LINENO/= ++ ' <$as_myself | + sed ' ++ s/[$]LINENO.*/&-/ ++ t lineno ++ b ++ :lineno + N +- s,$,-, +- : loop +- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, ++ :loop ++ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop +- s,-$,, +- s,^['$as_cr_digits']*\n,, ++ s/-\n.*// + ' >$as_me.lineno && +- chmod +x $as_me.lineno || +- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 +-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} ++ chmod +x "$as_me.lineno" || ++ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the +- # original and so on. Autoconf is especially sensible to this). +- . ./$as_me.lineno ++ # original and so on. Autoconf is especially sensitive to this). ++ . "./$as_me.lineno" + # Exit status is that of the last command. + exit + } + + +-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in +- *c*,-n*) ECHO_N= ECHO_C=' +-' ECHO_T=' ' ;; +- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; +- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi ++ ++ECHO_C= ECHO_N= ECHO_T= ++case `echo -n x` in ++-n*) ++ case `echo 'x\c'` in ++ *c*) ECHO_T=' ';; # ECHO_T is single tab character. ++ *) ECHO_C='\c';; ++ esac;; ++*) ++ ECHO_N='-n';; + esac + +-if expr a : '\(a\)' >/dev/null 2>&1; then ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr + else + as_expr=false + fi + + rm -f conf$$ conf$$.exe conf$$.file ++if test -d conf$$.dir; then ++ rm -f conf$$.dir/conf$$.file ++else ++ rm -f conf$$.dir ++ mkdir conf$$.dir ++fi + echo >conf$$.file + if ln -s conf$$.file conf$$ 2>/dev/null; then +- # We could just check for DJGPP; but this test a) works b) is more generic +- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). +- if test -f conf$$.exe; then +- # Don't use ln at all; we don't have any links ++ 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' +- else +- as_ln_s='ln -s' +- fi + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -p' + fi +-rm -f conf$$ conf$$.exe conf$$.file ++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=: +@@ -7200,7 +7888,28 @@ + as_mkdir_p=false + fi + +-as_executable_p="test -f" ++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'" +@@ -7209,31 +7918,14 @@ + as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +-# IFS +-# We need space, tab and new line, in precisely that order. +-as_nl=' +-' +-IFS=" $as_nl" +- +-# CDPATH. +-$as_unset CDPATH +- + exec 6>&1 + +-# Open the log real soon, to keep \$[0] and so on meaningful, and to ++# 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. Logging --version etc. is OK. +-exec 5>>config.log +-{ +- echo +- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +-## Running $as_me. ## +-_ASBOX +-} >&5 +-cat >&5 <<_CSEOF +- +-This file was extended by Valgrind $as_me 3.2.3, which was +-generated by GNU Autoconf 2.59. Invocation command line was ++# values after options handling. ++ac_log=" ++This file was extended by Valgrind $as_me 3.2.3-Debian, which was ++generated by GNU Autoconf 2.61. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -7241,30 +7933,20 @@ + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +-_CSEOF +-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 +-echo >&5 ++on `(hostname || uname -n) 2>/dev/null | sed 1q` ++" ++ + _ACEOF + ++cat >>$CONFIG_STATUS <<_ACEOF + # Files that config.status was made for. +-if test -n "$ac_config_files"; then +- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS +-fi ++config_files="$ac_config_files" ++config_headers="$ac_config_headers" ++config_commands="$ac_config_commands" + +-if test -n "$ac_config_headers"; then +- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS +-fi +- +-if test -n "$ac_config_links"; then +- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS +-fi +- +-if test -n "$ac_config_commands"; then +- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS +-fi ++_ACEOF + + cat >>$CONFIG_STATUS <<\_ACEOF +- + ac_cs_usage="\ + \`$as_me' instantiates files from templates according to the + current configuration. +@@ -7272,7 +7954,7 @@ + Usage: $0 [OPTIONS] [FILE]... + + -h, --help print this help, then exit +- -V, --version print version number, then exit ++ -V, --version print version number and configuration settings, then exit + -q, --quiet do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions +@@ -7291,19 +7973,21 @@ + $config_commands + + Report bugs to ." +-_ACEOF + ++_ACEOF + cat >>$CONFIG_STATUS <<_ACEOF + ac_cs_version="\\ +-Valgrind config.status 3.2.3 +-configured by $0, generated by GNU Autoconf 2.59, +- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" ++Valgrind config.status 3.2.3-Debian ++configured by $0, generated by GNU Autoconf 2.61, ++ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" + +-Copyright (C) 2003 Free Software Foundation, Inc. ++Copyright (C) 2006 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." +-srcdir=$srcdir +-INSTALL="$INSTALL" ++ ++ac_pwd='$ac_pwd' ++srcdir='$srcdir' ++INSTALL='$INSTALL' + _ACEOF + + cat >>$CONFIG_STATUS <<\_ACEOF +@@ -7314,39 +7998,24 @@ + do + case $1 in + --*=*) +- ac_option=`expr "x$1" : 'x\([^=]*\)='` +- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` ++ ac_option=`expr "X$1" : 'X\([^=]*\)='` ++ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; +- -*) ++ *) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift + ;; +- *) # This is not an option, so the user has probably given explicit +- # arguments. +- ac_option=$1 +- ac_need_defaults=false;; + esac + + case $ac_option in + # Handling of the options. +-_ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; +- --version | --vers* | -V ) +- echo "$ac_cs_version"; exit 0 ;; +- --he | --h) +- # Conflict between --help and --header +- { { echo "$as_me:$LINENO: 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;} +- { (exit 1); exit 1; }; };; +- --help | --hel | -h ) +- echo "$ac_cs_usage"; exit 0 ;; +- --debug | --d* | -d ) ++ --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) ++ echo "$ac_cs_version"; exit ;; ++ --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift +@@ -7356,18 +8025,24 @@ + $ac_shift + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" + ac_need_defaults=false;; ++ --he | --h) ++ # Conflict between --help and --header ++ { echo "$as_me: error: ambiguous option: $1 ++Try \`$0 --help' for more information." >&2 ++ { (exit 1); exit 1; }; };; ++ --help | --hel | -h ) ++ echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. +- -*) { { echo "$as_me:$LINENO: 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;} ++ -*) { echo "$as_me: error: unrecognized option: $1 ++Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } ;; + +- *) ac_config_targets="$ac_config_targets $1" ;; ++ *) ac_config_targets="$ac_config_targets $1" ++ ac_need_defaults=false ;; + + esac + shift +@@ -7383,88 +8058,100 @@ + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF + if \$ac_cs_recheck; then +- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 +- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion ++ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 ++ CONFIG_SHELL=$SHELL ++ export CONFIG_SHELL ++ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + fi + + _ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF ++exec 5>>config.log ++{ ++ echo ++ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ++## Running $as_me. ## ++_ASBOX ++ echo "$ac_log" ++} >&5 + ++_ACEOF + cat >>$CONFIG_STATUS <<_ACEOF + # +-# INIT-COMMANDS section. ++# INIT-COMMANDS + # +- + AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" + + _ACEOF + +- +- + cat >>$CONFIG_STATUS <<\_ACEOF ++ ++# Handling of arguments. + for ac_config_target in $ac_config_targets + do +- case "$ac_config_target" in +- # Handling of arguments. +- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; +- "valgrind.spec" ) CONFIG_FILES="$CONFIG_FILES valgrind.spec" ;; +- "valgrind.pc" ) CONFIG_FILES="$CONFIG_FILES valgrind.pc" ;; +- "docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; +- "docs/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/lib/Makefile" ;; +- "docs/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/images/Makefile" ;; +- "docs/internals/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/internals/Makefile" ;; +- "docs/xml/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/xml/Makefile" ;; +- "tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; +- "tests/vg_regtest" ) CONFIG_FILES="$CONFIG_FILES tests/vg_regtest" ;; +- "perf/Makefile" ) CONFIG_FILES="$CONFIG_FILES perf/Makefile" ;; +- "perf/vg_perf" ) CONFIG_FILES="$CONFIG_FILES perf/vg_perf" ;; +- "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; +- "auxprogs/Makefile" ) CONFIG_FILES="$CONFIG_FILES auxprogs/Makefile" ;; +- "coregrind/Makefile" ) CONFIG_FILES="$CONFIG_FILES coregrind/Makefile" ;; +- "memcheck/Makefile" ) CONFIG_FILES="$CONFIG_FILES memcheck/Makefile" ;; +- "memcheck/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES memcheck/tests/Makefile" ;; +- "memcheck/tests/amd64/Makefile" ) CONFIG_FILES="$CONFIG_FILES memcheck/tests/amd64/Makefile" ;; +- "memcheck/tests/ppc32/Makefile" ) CONFIG_FILES="$CONFIG_FILES memcheck/tests/ppc32/Makefile" ;; +- "memcheck/tests/ppc64/Makefile" ) CONFIG_FILES="$CONFIG_FILES memcheck/tests/ppc64/Makefile" ;; +- "memcheck/tests/x86/Makefile" ) CONFIG_FILES="$CONFIG_FILES memcheck/tests/x86/Makefile" ;; +- "memcheck/docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES memcheck/docs/Makefile" ;; +- "cachegrind/Makefile" ) CONFIG_FILES="$CONFIG_FILES cachegrind/Makefile" ;; +- "cachegrind/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES cachegrind/tests/Makefile" ;; +- "cachegrind/tests/amd64/Makefile" ) CONFIG_FILES="$CONFIG_FILES cachegrind/tests/amd64/Makefile" ;; +- "cachegrind/tests/ppc32/Makefile" ) CONFIG_FILES="$CONFIG_FILES cachegrind/tests/ppc32/Makefile" ;; +- "cachegrind/tests/ppc64/Makefile" ) CONFIG_FILES="$CONFIG_FILES cachegrind/tests/ppc64/Makefile" ;; +- "cachegrind/tests/x86/Makefile" ) CONFIG_FILES="$CONFIG_FILES cachegrind/tests/x86/Makefile" ;; +- "cachegrind/docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES cachegrind/docs/Makefile" ;; +- "cachegrind/cg_annotate" ) CONFIG_FILES="$CONFIG_FILES cachegrind/cg_annotate" ;; +- "callgrind/Makefile" ) CONFIG_FILES="$CONFIG_FILES callgrind/Makefile" ;; +- "callgrind/callgrind_annotate" ) CONFIG_FILES="$CONFIG_FILES callgrind/callgrind_annotate" ;; +- "callgrind/callgrind_control" ) CONFIG_FILES="$CONFIG_FILES callgrind/callgrind_control" ;; +- "callgrind/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES callgrind/tests/Makefile" ;; +- "callgrind/docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES callgrind/docs/Makefile" ;; +- "helgrind/Makefile" ) CONFIG_FILES="$CONFIG_FILES helgrind/Makefile" ;; +- "helgrind/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES helgrind/tests/Makefile" ;; +- "helgrind/docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES helgrind/docs/Makefile" ;; +- "massif/Makefile" ) CONFIG_FILES="$CONFIG_FILES massif/Makefile" ;; +- "massif/hp2ps/Makefile" ) CONFIG_FILES="$CONFIG_FILES massif/hp2ps/Makefile" ;; +- "massif/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES massif/tests/Makefile" ;; +- "massif/docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES massif/docs/Makefile" ;; +- "lackey/Makefile" ) CONFIG_FILES="$CONFIG_FILES lackey/Makefile" ;; +- "lackey/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES lackey/tests/Makefile" ;; +- "lackey/docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES lackey/docs/Makefile" ;; +- "none/Makefile" ) CONFIG_FILES="$CONFIG_FILES none/Makefile" ;; +- "none/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES none/tests/Makefile" ;; +- "none/tests/amd64/Makefile" ) CONFIG_FILES="$CONFIG_FILES none/tests/amd64/Makefile" ;; +- "none/tests/ppc32/Makefile" ) CONFIG_FILES="$CONFIG_FILES none/tests/ppc32/Makefile" ;; +- "none/tests/ppc64/Makefile" ) CONFIG_FILES="$CONFIG_FILES none/tests/ppc64/Makefile" ;; +- "none/tests/x86/Makefile" ) CONFIG_FILES="$CONFIG_FILES none/tests/x86/Makefile" ;; +- "none/docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES none/docs/Makefile" ;; +- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; +- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; ++ case $ac_config_target in ++ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; ++ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; ++ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; ++ "valgrind.spec") CONFIG_FILES="$CONFIG_FILES valgrind.spec" ;; ++ "valgrind.pc") CONFIG_FILES="$CONFIG_FILES valgrind.pc" ;; ++ "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; ++ "docs/lib/Makefile") CONFIG_FILES="$CONFIG_FILES docs/lib/Makefile" ;; ++ "docs/images/Makefile") CONFIG_FILES="$CONFIG_FILES docs/images/Makefile" ;; ++ "docs/internals/Makefile") CONFIG_FILES="$CONFIG_FILES docs/internals/Makefile" ;; ++ "docs/xml/Makefile") CONFIG_FILES="$CONFIG_FILES docs/xml/Makefile" ;; ++ "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; ++ "tests/vg_regtest") CONFIG_FILES="$CONFIG_FILES tests/vg_regtest" ;; ++ "perf/Makefile") CONFIG_FILES="$CONFIG_FILES perf/Makefile" ;; ++ "perf/vg_perf") CONFIG_FILES="$CONFIG_FILES perf/vg_perf" ;; ++ "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; ++ "auxprogs/Makefile") CONFIG_FILES="$CONFIG_FILES auxprogs/Makefile" ;; ++ "coregrind/Makefile") CONFIG_FILES="$CONFIG_FILES coregrind/Makefile" ;; ++ "memcheck/Makefile") CONFIG_FILES="$CONFIG_FILES memcheck/Makefile" ;; ++ "memcheck/tests/Makefile") CONFIG_FILES="$CONFIG_FILES memcheck/tests/Makefile" ;; ++ "memcheck/tests/amd64/Makefile") CONFIG_FILES="$CONFIG_FILES memcheck/tests/amd64/Makefile" ;; ++ "memcheck/tests/ppc32/Makefile") CONFIG_FILES="$CONFIG_FILES memcheck/tests/ppc32/Makefile" ;; ++ "memcheck/tests/ppc64/Makefile") CONFIG_FILES="$CONFIG_FILES memcheck/tests/ppc64/Makefile" ;; ++ "memcheck/tests/x86/Makefile") CONFIG_FILES="$CONFIG_FILES memcheck/tests/x86/Makefile" ;; ++ "memcheck/docs/Makefile") CONFIG_FILES="$CONFIG_FILES memcheck/docs/Makefile" ;; ++ "cachegrind/Makefile") CONFIG_FILES="$CONFIG_FILES cachegrind/Makefile" ;; ++ "cachegrind/tests/Makefile") CONFIG_FILES="$CONFIG_FILES cachegrind/tests/Makefile" ;; ++ "cachegrind/tests/amd64/Makefile") CONFIG_FILES="$CONFIG_FILES cachegrind/tests/amd64/Makefile" ;; ++ "cachegrind/tests/ppc32/Makefile") CONFIG_FILES="$CONFIG_FILES cachegrind/tests/ppc32/Makefile" ;; ++ "cachegrind/tests/ppc64/Makefile") CONFIG_FILES="$CONFIG_FILES cachegrind/tests/ppc64/Makefile" ;; ++ "cachegrind/tests/x86/Makefile") CONFIG_FILES="$CONFIG_FILES cachegrind/tests/x86/Makefile" ;; ++ "cachegrind/docs/Makefile") CONFIG_FILES="$CONFIG_FILES cachegrind/docs/Makefile" ;; ++ "cachegrind/cg_annotate") CONFIG_FILES="$CONFIG_FILES cachegrind/cg_annotate" ;; ++ "callgrind/Makefile") CONFIG_FILES="$CONFIG_FILES callgrind/Makefile" ;; ++ "callgrind/callgrind_annotate") CONFIG_FILES="$CONFIG_FILES callgrind/callgrind_annotate" ;; ++ "callgrind/callgrind_control") CONFIG_FILES="$CONFIG_FILES callgrind/callgrind_control" ;; ++ "callgrind/tests/Makefile") CONFIG_FILES="$CONFIG_FILES callgrind/tests/Makefile" ;; ++ "callgrind/docs/Makefile") CONFIG_FILES="$CONFIG_FILES callgrind/docs/Makefile" ;; ++ "helgrind/Makefile") CONFIG_FILES="$CONFIG_FILES helgrind/Makefile" ;; ++ "helgrind/tests/Makefile") CONFIG_FILES="$CONFIG_FILES helgrind/tests/Makefile" ;; ++ "helgrind/docs/Makefile") CONFIG_FILES="$CONFIG_FILES helgrind/docs/Makefile" ;; ++ "massif/Makefile") CONFIG_FILES="$CONFIG_FILES massif/Makefile" ;; ++ "massif/hp2ps/Makefile") CONFIG_FILES="$CONFIG_FILES massif/hp2ps/Makefile" ;; ++ "massif/tests/Makefile") CONFIG_FILES="$CONFIG_FILES massif/tests/Makefile" ;; ++ "massif/docs/Makefile") CONFIG_FILES="$CONFIG_FILES massif/docs/Makefile" ;; ++ "lackey/Makefile") CONFIG_FILES="$CONFIG_FILES lackey/Makefile" ;; ++ "lackey/tests/Makefile") CONFIG_FILES="$CONFIG_FILES lackey/tests/Makefile" ;; ++ "lackey/docs/Makefile") CONFIG_FILES="$CONFIG_FILES lackey/docs/Makefile" ;; ++ "none/Makefile") CONFIG_FILES="$CONFIG_FILES none/Makefile" ;; ++ "none/tests/Makefile") CONFIG_FILES="$CONFIG_FILES none/tests/Makefile" ;; ++ "none/tests/amd64/Makefile") CONFIG_FILES="$CONFIG_FILES none/tests/amd64/Makefile" ;; ++ "none/tests/ppc32/Makefile") CONFIG_FILES="$CONFIG_FILES none/tests/ppc32/Makefile" ;; ++ "none/tests/ppc64/Makefile") CONFIG_FILES="$CONFIG_FILES none/tests/ppc64/Makefile" ;; ++ "none/tests/x86/Makefile") CONFIG_FILES="$CONFIG_FILES none/tests/x86/Makefile" ;; ++ "none/docs/Makefile") CONFIG_FILES="$CONFIG_FILES none/docs/Makefile" ;; ++ + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac + done + ++ + # If the user did not use the arguments to specify the items to instantiate, + # then the envvar interface is used. Set only those that are not. + # We use the long form for the default assignment because of an extremely +@@ -7476,625 +8163,615 @@ + fi + + # Have a temporary directory for convenience. Make it in the build tree +-# simply because there is no reason to put it here, and in addition, ++# simply because there is no reason against having it here, and in addition, + # creating and moving files from /tmp can sometimes cause problems. +-# Create a temporary directory, and hook for its removal unless debugging. ++# 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 || + { +- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 ++ tmp= ++ trap 'exit_status=$? ++ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ++' 0 + trap '{ (exit 1); exit 1; }' 1 2 13 15 + } +- + # Create a (secure) tmp directory for tmp files. + + { +- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && ++ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && + test -n "$tmp" && test -d "$tmp" + } || + { +- tmp=./confstat$$-$RANDOM +- (umask 077 && mkdir $tmp) ++ tmp=./conf$$-$RANDOM ++ (umask 077 && mkdir "$tmp") + } || + { + echo "$me: cannot create a temporary directory in ." >&2 + { (exit 1); exit 1; } + } + +-_ACEOF +- +-cat >>$CONFIG_STATUS <<_ACEOF +- + # +-# CONFIG_FILES section. ++# Set up the sed scripts for CONFIG_FILES section. + # + + # No need to generate the scripts if there are no CONFIG_FILES. + # This happens for instance when ./config.status config.h +-if test -n "\$CONFIG_FILES"; then +- # Protect against being on the right side of a sed subst in config.status. +- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; +- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF +-s,@SHELL@,$SHELL,;t t +-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t +-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t +-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t +-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t +-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t +-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t +-s,@exec_prefix@,$exec_prefix,;t t +-s,@prefix@,$prefix,;t t +-s,@program_transform_name@,$program_transform_name,;t t +-s,@bindir@,$bindir,;t t +-s,@sbindir@,$sbindir,;t t +-s,@libexecdir@,$libexecdir,;t t +-s,@datadir@,$datadir,;t t +-s,@sysconfdir@,$sysconfdir,;t t +-s,@sharedstatedir@,$sharedstatedir,;t t +-s,@localstatedir@,$localstatedir,;t t +-s,@libdir@,$libdir,;t t +-s,@includedir@,$includedir,;t t +-s,@oldincludedir@,$oldincludedir,;t t +-s,@infodir@,$infodir,;t t +-s,@mandir@,$mandir,;t t +-s,@build_alias@,$build_alias,;t t +-s,@host_alias@,$host_alias,;t t +-s,@target_alias@,$target_alias,;t t +-s,@DEFS@,$DEFS,;t t +-s,@ECHO_C@,$ECHO_C,;t t +-s,@ECHO_N@,$ECHO_N,;t t +-s,@ECHO_T@,$ECHO_T,;t t +-s,@LIBS@,$LIBS,;t t +-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t +-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t +-s,@INSTALL_DATA@,$INSTALL_DATA,;t t +-s,@CYGPATH_W@,$CYGPATH_W,;t t +-s,@PACKAGE@,$PACKAGE,;t t +-s,@VERSION@,$VERSION,;t t +-s,@ACLOCAL@,$ACLOCAL,;t t +-s,@AUTOCONF@,$AUTOCONF,;t t +-s,@AUTOMAKE@,$AUTOMAKE,;t t +-s,@AUTOHEADER@,$AUTOHEADER,;t t +-s,@MAKEINFO@,$MAKEINFO,;t t +-s,@install_sh@,$install_sh,;t t +-s,@STRIP@,$STRIP,;t t +-s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t +-s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t +-s,@mkdir_p@,$mkdir_p,;t t +-s,@AWK@,$AWK,;t t +-s,@SET_MAKE@,$SET_MAKE,;t t +-s,@am__leading_dot@,$am__leading_dot,;t t +-s,@AMTAR@,$AMTAR,;t t +-s,@am__tar@,$am__tar,;t t +-s,@am__untar@,$am__untar,;t t +-s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t +-s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t +-s,@MAINT@,$MAINT,;t t +-s,@VEX_DIR@,$VEX_DIR,;t t +-s,@DISTCHECK_CONFIGURE_FLAGS@,$DISTCHECK_CONFIGURE_FLAGS,;t t +-s,@LN_S@,$LN_S,;t t +-s,@CC@,$CC,;t t +-s,@CFLAGS@,$CFLAGS,;t t +-s,@LDFLAGS@,$LDFLAGS,;t t +-s,@CPPFLAGS@,$CPPFLAGS,;t t +-s,@ac_ct_CC@,$ac_ct_CC,;t t +-s,@EXEEXT@,$EXEEXT,;t t +-s,@OBJEXT@,$OBJEXT,;t t +-s,@DEPDIR@,$DEPDIR,;t t +-s,@am__include@,$am__include,;t t +-s,@am__quote@,$am__quote,;t t +-s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t +-s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t +-s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t +-s,@CCDEPMODE@,$CCDEPMODE,;t t +-s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t +-s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t +-s,@CPP@,$CPP,;t t +-s,@CXX@,$CXX,;t t +-s,@CXXFLAGS@,$CXXFLAGS,;t t +-s,@ac_ct_CXX@,$ac_ct_CXX,;t t +-s,@CXXDEPMODE@,$CXXDEPMODE,;t t +-s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t +-s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t +-s,@RANLIB@,$RANLIB,;t t +-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t +-s,@PERL@,$PERL,;t t +-s,@GDB@,$GDB,;t t +-s,@CCAS@,$CCAS,;t t +-s,@CCASFLAGS@,$CCASFLAGS,;t t +-s,@build@,$build,;t t +-s,@build_cpu@,$build_cpu,;t t +-s,@build_vendor@,$build_vendor,;t t +-s,@build_os@,$build_os,;t t +-s,@host@,$host,;t t +-s,@host_cpu@,$host_cpu,;t t +-s,@host_vendor@,$host_vendor,;t t +-s,@host_os@,$host_os,;t t +-s,@VG_ARCH@,$VG_ARCH,;t t +-s,@VG_ARCH_ALL@,$VG_ARCH_ALL,;t t +-s,@VALT_LOAD_ADDRESS@,$VALT_LOAD_ADDRESS,;t t +-s,@VG_OS@,$VG_OS,;t t +-s,@VG_PLATFORM_PRI@,$VG_PLATFORM_PRI,;t t +-s,@VG_PLATFORM_SEC@,$VG_PLATFORM_SEC,;t t +-s,@VG_X86_LINUX_TRUE@,$VG_X86_LINUX_TRUE,;t t +-s,@VG_X86_LINUX_FALSE@,$VG_X86_LINUX_FALSE,;t t +-s,@VG_AMD64_LINUX_TRUE@,$VG_AMD64_LINUX_TRUE,;t t +-s,@VG_AMD64_LINUX_FALSE@,$VG_AMD64_LINUX_FALSE,;t t +-s,@VG_PPC32_LINUX_TRUE@,$VG_PPC32_LINUX_TRUE,;t t +-s,@VG_PPC32_LINUX_FALSE@,$VG_PPC32_LINUX_FALSE,;t t +-s,@VG_PPC64_LINUX_TRUE@,$VG_PPC64_LINUX_TRUE,;t t +-s,@VG_PPC64_LINUX_FALSE@,$VG_PPC64_LINUX_FALSE,;t t +-s,@DEFAULT_SUPP@,$DEFAULT_SUPP,;t t +-s,@EGREP@,$EGREP,;t t +-s,@FLAG_M32@,$FLAG_M32,;t t +-s,@FLAG_M64@,$FLAG_M64,;t t +-s,@FLAG_MMMX@,$FLAG_MMMX,;t t +-s,@FLAG_MSSE@,$FLAG_MSSE,;t t +-s,@PREFERRED_STACK_BOUNDARY@,$PREFERRED_STACK_BOUNDARY,;t t +-s,@FLAG_WDECL_AFTER_STMT@,$FLAG_WDECL_AFTER_STMT,;t t +-s,@LIBOBJS@,$LIBOBJS,;t t +-s,@BUILD_MPIWRAP_TRUE@,$BUILD_MPIWRAP_TRUE,;t t +-s,@BUILD_MPIWRAP_FALSE@,$BUILD_MPIWRAP_FALSE,;t t +-s,@MPI_CC@,$MPI_CC,;t t +-s,@LTLIBOBJS@,$LTLIBOBJS,;t t +-CEOF +- +-_ACEOF +- +- cat >>$CONFIG_STATUS <<\_ACEOF +- # Split the substitutions into bite-sized pieces for seds with +- # small command number limits, like on Digital OSF/1 and HP-UX. +- ac_max_sed_lines=48 +- ac_sed_frag=1 # Number of current file. +- ac_beg=1 # First line for current file. +- ac_end=$ac_max_sed_lines # Line after last line for current file. +- ac_more_lines=: +- ac_sed_cmds= +- while $ac_more_lines; do +- if test $ac_beg -gt 1; then +- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag +- else +- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag +- fi +- if test ! -s $tmp/subs.frag; then +- ac_more_lines=false +- else +- # The purpose of the label and of the branching condition is to +- # speed up the sed processing (if there are no `@' at all, there +- # is no need to browse any of the substitutions). +- # These are the two extra sed commands mentioned above. +- (echo ':t +- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed +- if test -z "$ac_sed_cmds"; then +- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" +- else +- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" +- fi +- ac_sed_frag=`expr $ac_sed_frag + 1` +- ac_beg=$ac_end +- ac_end=`expr $ac_end + $ac_max_sed_lines` +- fi +- done +- if test -z "$ac_sed_cmds"; then +- ac_sed_cmds=cat ++if test -n "$CONFIG_FILES"; then ++ ++_ACEOF ++ ++ ++ ++ac_delim='%!_!# ' ++for ac_last_try in false false false false false :; do ++ cat >conf$$subs.sed <<_ACEOF ++SHELL!$SHELL$ac_delim ++PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim ++PACKAGE_NAME!$PACKAGE_NAME$ac_delim ++PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim ++PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim ++PACKAGE_STRING!$PACKAGE_STRING$ac_delim ++PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim ++exec_prefix!$exec_prefix$ac_delim ++prefix!$prefix$ac_delim ++program_transform_name!$program_transform_name$ac_delim ++bindir!$bindir$ac_delim ++sbindir!$sbindir$ac_delim ++libexecdir!$libexecdir$ac_delim ++datarootdir!$datarootdir$ac_delim ++datadir!$datadir$ac_delim ++sysconfdir!$sysconfdir$ac_delim ++sharedstatedir!$sharedstatedir$ac_delim ++localstatedir!$localstatedir$ac_delim ++includedir!$includedir$ac_delim ++oldincludedir!$oldincludedir$ac_delim ++docdir!$docdir$ac_delim ++infodir!$infodir$ac_delim ++htmldir!$htmldir$ac_delim ++dvidir!$dvidir$ac_delim ++pdfdir!$pdfdir$ac_delim ++psdir!$psdir$ac_delim ++libdir!$libdir$ac_delim ++localedir!$localedir$ac_delim ++mandir!$mandir$ac_delim ++DEFS!$DEFS$ac_delim ++ECHO_C!$ECHO_C$ac_delim ++ECHO_N!$ECHO_N$ac_delim ++ECHO_T!$ECHO_T$ac_delim ++LIBS!$LIBS$ac_delim ++build_alias!$build_alias$ac_delim ++host_alias!$host_alias$ac_delim ++target_alias!$target_alias$ac_delim ++INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim ++INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim ++INSTALL_DATA!$INSTALL_DATA$ac_delim ++CYGPATH_W!$CYGPATH_W$ac_delim ++PACKAGE!$PACKAGE$ac_delim ++VERSION!$VERSION$ac_delim ++ACLOCAL!$ACLOCAL$ac_delim ++AUTOCONF!$AUTOCONF$ac_delim ++AUTOMAKE!$AUTOMAKE$ac_delim ++AUTOHEADER!$AUTOHEADER$ac_delim ++MAKEINFO!$MAKEINFO$ac_delim ++install_sh!$install_sh$ac_delim ++STRIP!$STRIP$ac_delim ++INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim ++mkdir_p!$mkdir_p$ac_delim ++AWK!$AWK$ac_delim ++SET_MAKE!$SET_MAKE$ac_delim ++am__leading_dot!$am__leading_dot$ac_delim ++AMTAR!$AMTAR$ac_delim ++am__tar!$am__tar$ac_delim ++am__untar!$am__untar$ac_delim ++MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim ++MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim ++MAINT!$MAINT$ac_delim ++VEX_DIR!$VEX_DIR$ac_delim ++DISTCHECK_CONFIGURE_FLAGS!$DISTCHECK_CONFIGURE_FLAGS$ac_delim ++LN_S!$LN_S$ac_delim ++CC!$CC$ac_delim ++CFLAGS!$CFLAGS$ac_delim ++LDFLAGS!$LDFLAGS$ac_delim ++CPPFLAGS!$CPPFLAGS$ac_delim ++ac_ct_CC!$ac_ct_CC$ac_delim ++EXEEXT!$EXEEXT$ac_delim ++OBJEXT!$OBJEXT$ac_delim ++DEPDIR!$DEPDIR$ac_delim ++am__include!$am__include$ac_delim ++am__quote!$am__quote$ac_delim ++AMDEP_TRUE!$AMDEP_TRUE$ac_delim ++AMDEP_FALSE!$AMDEP_FALSE$ac_delim ++AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim ++CCDEPMODE!$CCDEPMODE$ac_delim ++am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim ++am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim ++CPP!$CPP$ac_delim ++CXX!$CXX$ac_delim ++CXXFLAGS!$CXXFLAGS$ac_delim ++ac_ct_CXX!$ac_ct_CXX$ac_delim ++CXXDEPMODE!$CXXDEPMODE$ac_delim ++am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim ++am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim ++RANLIB!$RANLIB$ac_delim ++PERL!$PERL$ac_delim ++GDB!$GDB$ac_delim ++CCAS!$CCAS$ac_delim ++CCASFLAGS!$CCASFLAGS$ac_delim ++build!$build$ac_delim ++build_cpu!$build_cpu$ac_delim ++build_vendor!$build_vendor$ac_delim ++build_os!$build_os$ac_delim ++host!$host$ac_delim ++_ACEOF ++ ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then ++ break ++ elif $ac_last_try; then ++ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 ++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} ++ { (exit 1); exit 1; }; } ++ else ++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +-fi # test -n "$CONFIG_FILES" ++done ++ ++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` ++if test -n "$ac_eof"; then ++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` ++ ac_eof=`expr $ac_eof + 1` ++fi ++ ++cat >>$CONFIG_STATUS <<_ACEOF ++cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof ++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b ++_ACEOF ++sed ' ++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g ++s/^/s,@/; s/!/@,|#_!!_#|/ ++:n ++t n ++s/'"$ac_delim"'$/,g/; t ++s/$/\\/; p ++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n ++' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF ++CEOF$ac_eof ++_ACEOF ++ ++ ++ac_delim='%!_!# ' ++for ac_last_try in false false false false false :; do ++ cat >conf$$subs.sed <<_ACEOF ++host_cpu!$host_cpu$ac_delim ++host_vendor!$host_vendor$ac_delim ++host_os!$host_os$ac_delim ++VG_ARCH!$VG_ARCH$ac_delim ++VG_ARCH_ALL!$VG_ARCH_ALL$ac_delim ++VALT_LOAD_ADDRESS!$VALT_LOAD_ADDRESS$ac_delim ++VG_OS!$VG_OS$ac_delim ++VG_PLATFORM_PRI!$VG_PLATFORM_PRI$ac_delim ++VG_PLATFORM_SEC!$VG_PLATFORM_SEC$ac_delim ++VG_X86_LINUX_TRUE!$VG_X86_LINUX_TRUE$ac_delim ++VG_X86_LINUX_FALSE!$VG_X86_LINUX_FALSE$ac_delim ++VG_AMD64_LINUX_TRUE!$VG_AMD64_LINUX_TRUE$ac_delim ++VG_AMD64_LINUX_FALSE!$VG_AMD64_LINUX_FALSE$ac_delim ++VG_PPC32_LINUX_TRUE!$VG_PPC32_LINUX_TRUE$ac_delim ++VG_PPC32_LINUX_FALSE!$VG_PPC32_LINUX_FALSE$ac_delim ++VG_PPC64_LINUX_TRUE!$VG_PPC64_LINUX_TRUE$ac_delim ++VG_PPC64_LINUX_FALSE!$VG_PPC64_LINUX_FALSE$ac_delim ++DEFAULT_SUPP!$DEFAULT_SUPP$ac_delim ++GREP!$GREP$ac_delim ++EGREP!$EGREP$ac_delim ++XMKMF!$XMKMF$ac_delim ++FLAG_M32!$FLAG_M32$ac_delim ++FLAG_M64!$FLAG_M64$ac_delim ++FLAG_MMMX!$FLAG_MMMX$ac_delim ++FLAG_MSSE!$FLAG_MSSE$ac_delim ++PREFERRED_STACK_BOUNDARY!$PREFERRED_STACK_BOUNDARY$ac_delim ++FLAG_WDECL_AFTER_STMT!$FLAG_WDECL_AFTER_STMT$ac_delim ++LIBOBJS!$LIBOBJS$ac_delim ++BUILD_MPIWRAP_TRUE!$BUILD_MPIWRAP_TRUE$ac_delim ++BUILD_MPIWRAP_FALSE!$BUILD_MPIWRAP_FALSE$ac_delim ++MPI_CC!$MPI_CC$ac_delim ++LTLIBOBJS!$LTLIBOBJS$ac_delim ++_ACEOF + ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 32; then ++ break ++ elif $ac_last_try; then ++ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 ++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} ++ { (exit 1); exit 1; }; } ++ else ++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " ++ fi ++done ++ ++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` ++if test -n "$ac_eof"; then ++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` ++ ac_eof=`expr $ac_eof + 1` ++fi ++ ++cat >>$CONFIG_STATUS <<_ACEOF ++cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof ++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end ++_ACEOF ++sed ' ++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g ++s/^/s,@/; s/!/@,|#_!!_#|/ ++:n ++t n ++s/'"$ac_delim"'$/,g/; t ++s/$/\\/; p ++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n ++' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF ++:end ++s/|#_!!_#|//g ++CEOF$ac_eof + _ACEOF ++ ++ ++# VPATH may cause trouble with some makes, so we remove $(srcdir), ++# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and ++# trailing colons and then remove the whole line if VPATH becomes empty ++# (actually we leave an empty line to preserve line numbers). ++if test "x$srcdir" = x.; then ++ ac_vpsub='/^[ ]*VPATH[ ]*=/{ ++s/:*\$(srcdir):*/:/ ++s/:*\${srcdir}:*/:/ ++s/:*@srcdir@:*/:/ ++s/^\([^=]*=[ ]*\):*/\1/ ++s/:*$// ++s/^[^=]*=[ ]*$// ++}' ++fi ++ + cat >>$CONFIG_STATUS <<\_ACEOF +-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue +- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". +- case $ac_file in +- - | *:- | *:-:* ) # input from stdin +- cat >$tmp/stdin +- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` +- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; +- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` +- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; +- * ) ac_file_in=$ac_file.in ;; ++fi # test -n "$CONFIG_FILES" ++ ++ ++for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS ++do ++ case $ac_tag in ++ :[FHLC]) ac_mode=$ac_tag; continue;; ++ esac ++ case $ac_mode$ac_tag in ++ :[FHL]*:*);; ++ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 ++echo "$as_me: error: Invalid tag $ac_tag." >&2;} ++ { (exit 1); exit 1; }; };; ++ :[FH]-) ac_tag=-:-;; ++ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; ++ esac ++ ac_save_IFS=$IFS ++ IFS=: ++ set x $ac_tag ++ IFS=$ac_save_IFS ++ shift ++ ac_file=$1 ++ shift ++ ++ case $ac_mode in ++ :L) ac_source=$1;; ++ :[FH]) ++ ac_file_inputs= ++ for ac_f ++ do ++ case $ac_f in ++ -) ac_f="$tmp/stdin";; ++ *) # Look for the file first in the build tree, then in the source tree ++ # (if the path is not absolute). The absolute path cannot be DOS-style, ++ # because $ac_f cannot contain `:'. ++ test -f "$ac_f" || ++ case $ac_f in ++ [\\/$]*) false;; ++ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; ++ esac || ++ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 ++echo "$as_me: error: cannot find input file: $ac_f" >&2;} ++ { (exit 1); exit 1; }; };; ++ esac ++ ac_file_inputs="$ac_file_inputs $ac_f" ++ done ++ ++ # Let's still pretend it is `configure' which instantiates (i.e., don't ++ # use $as_me), people would be surprised to read: ++ # /* config.h. Generated by config.status. */ ++ configure_input="Generated from "`IFS=: ++ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." ++ if test x"$ac_file" != x-; then ++ configure_input="$ac_file. $configure_input" ++ { echo "$as_me:$LINENO: creating $ac_file" >&5 ++echo "$as_me: creating $ac_file" >&6;} ++ fi ++ ++ case $ac_tag in ++ *:-:* | *:-) cat >"$tmp/stdin";; ++ esac ++ ;; + esac + +- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. +- ac_dir=`(dirname "$ac_file") 2>/dev/null || ++ 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 || ++ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || + echo X"$ac_file" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- { if $as_mkdir_p; then +- mkdir -p "$ac_dir" +- else +- as_dir="$ac_dir" ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ { as_dir="$ac_dir" ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { + as_dirs= +- while test ! -d "$as_dir"; do +- as_dirs="$as_dir $as_dirs" +- as_dir=`(dirname "$as_dir") 2>/dev/null || ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( ++ *) as_qdir=$as_dir;; ++ esac ++ as_dirs="'$as_qdir' $as_dirs" ++ as_dir=`$as_dirname -- "$as_dir" || + $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || + echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` ++ 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 ! -n "$as_dirs" || mkdir $as_dirs +- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} ++ test -z "$as_dirs" || eval "mkdir $as_dirs" ++ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 ++echo "$as_me: error: cannot create directory $as_dir" >&2;} + { (exit 1); exit 1; }; }; } +- + ac_builddir=. + +-if test "$ac_dir" != .; then ++case "$ac_dir" in ++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; ++*) + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` +- # A "../" for each directory in $ac_dir_suffix. +- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +-else +- ac_dir_suffix= ac_top_builddir= +-fi ++ # A ".." for each directory in $ac_dir_suffix. ++ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` ++ case $ac_top_builddir_sub in ++ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; ++ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; ++ esac ;; ++esac ++ac_abs_top_builddir=$ac_pwd ++ac_abs_builddir=$ac_pwd$ac_dir_suffix ++# for backward compatibility: ++ac_top_builddir=$ac_top_build_prefix + + case $srcdir in +- .) # No --srcdir option. We are building in place. ++ .) # We are building in place. + ac_srcdir=. +- if test -z "$ac_top_builddir"; then +- ac_top_srcdir=. +- else +- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` +- fi ;; +- [\\/]* | ?:[\\/]* ) # Absolute path. ++ 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 ;; +- *) # Relative path. +- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix +- ac_top_srcdir=$ac_top_builddir$srcdir ;; ++ 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 + +-# Do not use `cd foo && pwd` to compute absolute paths, because +-# the directories may not exist. +-case `pwd` in +-.) ac_abs_builddir="$ac_dir";; +-*) +- case "$ac_dir" in +- .) ac_abs_builddir=`pwd`;; +- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; +- *) ac_abs_builddir=`pwd`/"$ac_dir";; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_top_builddir=${ac_top_builddir}.;; +-*) +- case ${ac_top_builddir}. in +- .) ac_abs_top_builddir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; +- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_srcdir=$ac_srcdir;; +-*) +- case $ac_srcdir in +- .) ac_abs_srcdir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; +- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_top_srcdir=$ac_top_srcdir;; +-*) +- case $ac_top_srcdir in +- .) ac_abs_top_srcdir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; +- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; +- esac;; +-esac + ++ case $ac_mode in ++ :F) ++ # ++ # CONFIG_FILE ++ # + + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; +- *) ac_INSTALL=$ac_top_builddir$INSTALL ;; ++ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac ++_ACEOF + +- if test x"$ac_file" != x-; then +- { echo "$as_me:$LINENO: creating $ac_file" >&5 +-echo "$as_me: creating $ac_file" >&6;} +- rm -f "$ac_file" +- fi +- # 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. */ +- if test x"$ac_file" = x-; then +- configure_input= +- else +- configure_input="$ac_file. " +- fi +- configure_input=$configure_input"Generated from `echo $ac_file_in | +- sed 's,.*/,,'` by configure." +- +- # First look for the input files in the build tree, otherwise in the +- # src tree. +- ac_file_inputs=`IFS=: +- for f in $ac_file_in; do +- case $f in +- -) echo $tmp/stdin ;; +- [\\/$]*) +- # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +-echo "$as_me: error: cannot find input file: $f" >&2;} +- { (exit 1); exit 1; }; } +- echo "$f";; +- *) # Relative +- if test -f "$f"; then +- # Build tree +- echo "$f" +- elif test -f "$srcdir/$f"; then +- # Source tree +- echo "$srcdir/$f" +- else +- # /dev/null tree +- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +-echo "$as_me: error: cannot find input file: $f" >&2;} +- { (exit 1); exit 1; }; } +- fi;; +- esac +- done` || { (exit 1); exit 1; } ++cat >>$CONFIG_STATUS <<\_ACEOF ++# If the template does not know about datarootdir, expand it. ++# FIXME: This hack should be removed a few years after 2.60. ++ac_datarootdir_hack=; ac_datarootdir_seen= ++ ++case `sed -n '/datarootdir/ { ++ p ++ q ++} ++/@datadir@/p ++/@docdir@/p ++/@infodir@/p ++/@localedir@/p ++/@mandir@/p ++' $ac_file_inputs` in ++*datarootdir*) ac_datarootdir_seen=yes;; ++*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) ++ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 ++echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF ++ ac_datarootdir_hack=' ++ s&@datadir@&$datadir&g ++ s&@docdir@&$docdir&g ++ s&@infodir@&$infodir&g ++ s&@localedir@&$localedir&g ++ s&@mandir@&$mandir&g ++ s&\\\${datarootdir}&$datarootdir&g' ;; ++esac ++_ACEOF ++ ++# Neutralize VPATH when `$srcdir' = `.'. ++# Shell code in configure.ac might set extrasub. ++# FIXME: do we really want to maintain this feature? ++cat >>$CONFIG_STATUS <<_ACEOF + sed "$ac_vpsub + $extrasub + _ACEOF + cat >>$CONFIG_STATUS <<\_ACEOF + :t + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b +-s,@configure_input@,$configure_input,;t t +-s,@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,@top_builddir@,$ac_top_builddir,;t t +-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t +-s,@INSTALL@,$ac_INSTALL,;t t +-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out +- rm -f $tmp/stdin +- if test x"$ac_file" != x-; then +- mv $tmp/out $ac_file +- else +- cat $tmp/out +- rm -f $tmp/out +- fi +- +-done +-_ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF +- +-# +-# CONFIG_HEADER section. +-# ++s&@configure_input@&$configure_input&;t t ++s&@top_builddir@&$ac_top_builddir_sub&;t t ++s&@srcdir@&$ac_srcdir&;t t ++s&@abs_srcdir@&$ac_abs_srcdir&;t t ++s&@top_srcdir@&$ac_top_srcdir&;t t ++s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t ++s&@builddir@&$ac_builddir&;t t ++s&@abs_builddir@&$ac_abs_builddir&;t t ++s&@abs_top_builddir@&$ac_abs_top_builddir&;t t ++s&@INSTALL@&$ac_INSTALL&;t t ++$ac_datarootdir_hack ++" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out ++ ++test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && ++ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && ++ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && ++ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++which seems to be undefined. Please make sure it is defined." >&5 ++echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++which seems to be undefined. Please make sure it is defined." >&2;} + +-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where +-# NAME is the cpp macro being defined and VALUE is the value it is being given. +-# +-# ac_d sets the value in "#define NAME VALUE" lines. +-ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' +-ac_dB='[ ].*$,\1#\2' +-ac_dC=' ' +-ac_dD=',;t' +-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". +-ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +-ac_uB='$,\1#\2define\3' +-ac_uC=' ' +-ac_uD=',;t' +- +-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue +- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". ++ rm -f "$tmp/stdin" + case $ac_file in +- - | *:- | *:-:* ) # input from stdin +- cat >$tmp/stdin +- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` +- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; +- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` +- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; +- * ) ac_file_in=$ac_file.in ;; ++ -) cat "$tmp/out"; rm -f "$tmp/out";; ++ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; + esac ++ ;; ++ :H) ++ # ++ # CONFIG_HEADER ++ # ++_ACEOF ++ ++# Transform confdefs.h into a sed script `conftest.defines', that ++# substitutes the proper values into config.h.in to produce config.h. ++rm -f conftest.defines conftest.tail ++# First, append a space to every undef/define line, to ease matching. ++echo 's/$/ /' >conftest.defines ++# Then, protect against being on the right side of a sed subst, or in ++# an unquoted here document, in config.status. If some macros were ++# called several times there might be several #defines for the same ++# symbol, which is useless. But do not sort them, since the last ++# AC_DEFINE must be honored. ++ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* ++# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where ++# NAME is the cpp macro being defined, VALUE is the value it is being given. ++# PARAMS is the parameter list in the macro definition--in most cases, it's ++# just an empty string. ++ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' ++ac_dB='\\)[ (].*,\\1define\\2' ++ac_dC=' ' ++ac_dD=' ,' + +- test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 +-echo "$as_me: creating $ac_file" >&6;} +- +- # First look for the input files in the build tree, otherwise in the +- # src tree. +- ac_file_inputs=`IFS=: +- for f in $ac_file_in; do +- case $f in +- -) echo $tmp/stdin ;; +- [\\/$]*) +- # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +-echo "$as_me: error: cannot find input file: $f" >&2;} +- { (exit 1); exit 1; }; } +- # Do quote $f, to prevent DOS paths from being IFS'd. +- echo "$f";; +- *) # Relative +- if test -f "$f"; then +- # Build tree +- echo "$f" +- elif test -f "$srcdir/$f"; then +- # Source tree +- echo "$srcdir/$f" +- else +- # /dev/null tree +- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +-echo "$as_me: error: cannot find input file: $f" >&2;} +- { (exit 1); exit 1; }; } +- fi;; +- esac +- done` || { (exit 1); exit 1; } +- # Remove the trailing spaces. +- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in +- +-_ACEOF +- +-# Transform confdefs.h into two sed scripts, `conftest.defines' and +-# `conftest.undefs', that substitutes the proper values into +-# config.h.in to produce config.h. The first handles `#define' +-# templates, and the second `#undef' templates. +-# And first: Protect against being on the right side of a sed subst in +-# config.status. Protect against being in an unquoted here document +-# in config.status. +-rm -f conftest.defines conftest.undefs +-# Using a here document instead of a string reduces the quoting nightmare. +-# Putting comments in sed scripts is not portable. +-# +-# `end' is used to avoid that the second main sed command (meant for +-# 0-ary CPP macros) applies to n-ary macro definitions. +-# See the Autoconf documentation for `clear'. +-cat >confdef2sed.sed <<\_ACEOF +-s/[\\&,]/\\&/g +-s,[\\$`],\\&,g +-t clear +-: clear +-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp +-t end +-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp +-: end +-_ACEOF +-# If some macros were called several times there might be several times +-# the same #defines, which is useless. Nevertheless, we may not want to +-# sort them, since we want the *last* AC-DEFINE to be honored. +-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines +-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs +-rm -f confdef2sed.sed ++uniq confdefs.h | ++ sed -n ' ++ t rset ++ :rset ++ s/^[ ]*#[ ]*define[ ][ ]*// ++ t ok ++ d ++ :ok ++ s/[\\&,]/\\&/g ++ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p ++ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p ++ ' >>conftest.defines + +-# This sed command replaces #undef with comments. This is necessary, for ++# Remove the space that was appended to ease matching. ++# Then 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. +-cat >>conftest.undefs <<\_ACEOF +-s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, ++# (The regexp can be short, since the line contains either #define or #undef.) ++echo 's/ $// ++s,^[ #]*u.*,/* & */,' >>conftest.defines ++ ++# Break up conftest.defines: ++ac_max_sed_lines=50 ++ ++# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" ++# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" ++# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" ++# et cetera. ++ac_in='$ac_file_inputs' ++ac_out='"$tmp/out1"' ++ac_nxt='"$tmp/out2"' ++ ++while : ++do ++ # Write a here document: ++ cat >>$CONFIG_STATUS <<_ACEOF ++ # First, check the format of the line: ++ cat >"\$tmp/defines.sed" <<\\CEOF ++/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def ++/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def ++b ++:def + _ACEOF +- +-# Break up conftest.defines because some shells have a limit on the size +-# of here documents, and old seds have small limits too (100 cmds). +-echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS +-echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS +-echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS +-echo ' :' >>$CONFIG_STATUS +-rm -f conftest.tail +-while grep . conftest.defines >/dev/null +-do +- # Write a limited-size here document to $tmp/defines.sed. +- echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS +- # Speed up: don't consider the non `#define' lines. +- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS +- # Work around the forget-to-reset-the-flag bug. +- echo 't clr' >>$CONFIG_STATUS +- echo ': clr' >>$CONFIG_STATUS +- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS ++ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS + echo 'CEOF +- sed -f $tmp/defines.sed $tmp/in >$tmp/out +- rm -f $tmp/in +- mv $tmp/out $tmp/in +-' >>$CONFIG_STATUS +- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail ++ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS ++ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in ++ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail ++ grep . conftest.tail >/dev/null || break + rm -f conftest.defines + mv conftest.tail conftest.defines + done +-rm -f conftest.defines +-echo ' fi # grep' >>$CONFIG_STATUS +-echo >>$CONFIG_STATUS +- +-# Break up conftest.undefs because some shells have a limit on the size +-# of here documents, and old seds have small limits too (100 cmds). +-echo ' # Handle all the #undef templates' >>$CONFIG_STATUS +-rm -f conftest.tail +-while grep . conftest.undefs >/dev/null +-do +- # Write a limited-size here document to $tmp/undefs.sed. +- echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS +- # Speed up: don't consider the non `#undef' +- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS +- # Work around the forget-to-reset-the-flag bug. +- echo 't clr' >>$CONFIG_STATUS +- echo ': clr' >>$CONFIG_STATUS +- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS +- echo 'CEOF +- sed -f $tmp/undefs.sed $tmp/in >$tmp/out +- rm -f $tmp/in +- mv $tmp/out $tmp/in +-' >>$CONFIG_STATUS +- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail +- rm -f conftest.undefs +- mv conftest.tail conftest.undefs +-done +-rm -f conftest.undefs ++rm -f conftest.defines conftest.tail + ++echo "ac_result=$ac_in" >>$CONFIG_STATUS + cat >>$CONFIG_STATUS <<\_ACEOF +- # 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. */ +- if test x"$ac_file" = x-; then +- echo "/* Generated by configure. */" >$tmp/config.h +- else +- echo "/* $ac_file. Generated by configure. */" >$tmp/config.h +- fi +- cat $tmp/in >>$tmp/config.h +- rm -f $tmp/in + if test x"$ac_file" != x-; then +- if diff $ac_file $tmp/config.h >/dev/null 2>&1; then ++ echo "/* $configure_input */" >"$tmp/config.h" ++ cat "$ac_result" >>"$tmp/config.h" ++ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then + { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else +- ac_dir=`(dirname "$ac_file") 2>/dev/null || +-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$ac_file" : 'X\(//\)[^/]' \| \ +- X"$ac_file" : 'X\(//\)$' \| \ +- X"$ac_file" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X"$ac_file" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- { if $as_mkdir_p; then +- mkdir -p "$ac_dir" +- else +- as_dir="$ac_dir" +- as_dirs= +- while test ! -d "$as_dir"; do +- as_dirs="$as_dir $as_dirs" +- as_dir=`(dirname "$as_dir") 2>/dev/null || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- done +- test ! -n "$as_dirs" || mkdir $as_dirs +- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} +- { (exit 1); exit 1; }; }; } +- + rm -f $ac_file +- mv $tmp/config.h $ac_file ++ mv "$tmp/config.h" $ac_file + fi + else +- cat $tmp/config.h +- rm -f $tmp/config.h ++ echo "/* $configure_input */" ++ cat "$ac_result" + fi ++ rm -f "$tmp/out12" + # Compute $ac_file's index in $config_headers. + _am_stamp_count=1 + for _am_header in $config_headers :; do +@@ -8105,135 +8782,39 @@ + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac + done +-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || ++echo "timestamp for $ac_file" >`$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 || ++ X$ac_file : 'X\(/\)' \| . 2>/dev/null || + echo X$ac_file | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'`/stamp-h$_am_stamp_count +-done +-_ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF +- +-# +-# CONFIG_COMMANDS section. +-# +-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue +- ac_dest=`echo "$ac_file" | sed 's,:.*,,'` +- ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` +- ac_dir=`(dirname "$ac_dest") 2>/dev/null || +-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$ac_dest" : 'X\(//\)[^/]' \| \ +- X"$ac_dest" : 'X\(//\)$' \| \ +- X"$ac_dest" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X"$ac_dest" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- { if $as_mkdir_p; then +- mkdir -p "$ac_dir" +- else +- as_dir="$ac_dir" +- as_dirs= +- while test ! -d "$as_dir"; do +- as_dirs="$as_dir $as_dirs" +- as_dir=`(dirname "$as_dir") 2>/dev/null || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- done +- test ! -n "$as_dirs" || mkdir $as_dirs +- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} +- { (exit 1); exit 1; }; }; } +- +- ac_builddir=. +- +-if test "$ac_dir" != .; then +- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` +- # A "../" for each directory in $ac_dir_suffix. +- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +-else +- ac_dir_suffix= ac_top_builddir= +-fi +- +-case $srcdir in +- .) # No --srcdir option. We are building in place. +- ac_srcdir=. +- if test -z "$ac_top_builddir"; then +- ac_top_srcdir=. +- else +- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` +- fi ;; +- [\\/]* | ?:[\\/]* ) # Absolute path. +- ac_srcdir=$srcdir$ac_dir_suffix; +- ac_top_srcdir=$srcdir ;; +- *) # Relative path. +- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix +- ac_top_srcdir=$ac_top_builddir$srcdir ;; +-esac ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'`/stamp-h$_am_stamp_count ++ ;; + +-# Do not use `cd foo && pwd` to compute absolute paths, because +-# the directories may not exist. +-case `pwd` in +-.) ac_abs_builddir="$ac_dir";; +-*) +- case "$ac_dir" in +- .) ac_abs_builddir=`pwd`;; +- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; +- *) ac_abs_builddir=`pwd`/"$ac_dir";; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_top_builddir=${ac_top_builddir}.;; +-*) +- case ${ac_top_builddir}. in +- .) ac_abs_top_builddir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; +- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_srcdir=$ac_srcdir;; +-*) +- case $ac_srcdir in +- .) ac_abs_srcdir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; +- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_top_srcdir=$ac_top_srcdir;; +-*) +- case $ac_top_srcdir in +- .) ac_abs_top_srcdir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; +- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; +- esac;; +-esac ++ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 ++echo "$as_me: executing $ac_file commands" >&6;} ++ ;; ++ esac + + +- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 +-echo "$as_me: executing $ac_dest commands" >&6;} +- case $ac_dest in +- depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do ++ case $ac_file$ac_mode in ++ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; 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. +@@ -8243,18 +8824,29 @@ + # each Makefile.in and add a new line on top of each file to say so. + # So let's grep whole file. + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then +- dirpart=`(dirname "$mf") 2>/dev/null || ++ dirpart=`$as_dirname -- "$mf" || + $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ +- X"$mf" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || ++ X"$mf" : 'X\(/\)' \| . 2>/dev/null || + echo X"$mf" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` + else + continue + fi +@@ -8276,53 +8868,79 @@ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue +- fdir=`(dirname "$file") 2>/dev/null || ++ fdir=`$as_dirname -- "$file" || + $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ +- X"$file" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || ++ X"$file" : 'X\(/\)' \| . 2>/dev/null || + echo X"$file" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- { if $as_mkdir_p; then +- mkdir -p $dirpart/$fdir +- else +- as_dir=$dirpart/$fdir ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ { as_dir=$dirpart/$fdir ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { + as_dirs= +- while test ! -d "$as_dir"; do +- as_dirs="$as_dir $as_dirs" +- as_dir=`(dirname "$as_dir") 2>/dev/null || ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( ++ *) as_qdir=$as_dir;; ++ esac ++ as_dirs="'$as_qdir' $as_dirs" ++ as_dir=`$as_dirname -- "$as_dir" || + $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || + echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` ++ 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 ! -n "$as_dirs" || mkdir $as_dirs +- fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 +-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} ++ test -z "$as_dirs" || eval "mkdir $as_dirs" ++ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 ++echo "$as_me: error: cannot create directory $as_dir" >&2;} + { (exit 1); exit 1; }; }; } +- + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done + ;; ++ + esac +-done +-_ACEOF ++done # for ac_tag + +-cat >>$CONFIG_STATUS <<\_ACEOF + + { (exit 0); exit 0; } + _ACEOF +diff -urN valgrind-3.2.3.orig/configure.in valgrind-3.2.3/configure.in +--- valgrind-3.2.3.orig/configure.in 2007-01-29 19:42:52.000000000 +0000 ++++ valgrind-3.2.3/configure.in 2007-08-17 02:50:59.000000000 +0000 +@@ -8,7 +8,7 @@ + ##------------------------------------------------------------## + + # Process this file with autoconf to produce a configure script. +-AC_INIT(Valgrind, 3.2.3, valgrind-users@lists.sourceforge.net) ++AC_INIT(Valgrind, 3.2.3-Debian, valgrind-users@lists.sourceforge.net) + AC_CONFIG_SRCDIR(coregrind/m_main.c) + AM_CONFIG_HEADER(config.h) + AM_INIT_AUTOMAKE +@@ -359,6 +359,16 @@ + ], + glibc="2.5") + ++AC_EGREP_CPP([GLIBC_26], [ ++#include ++#ifdef __GNU_LIBRARY__ ++ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 6) ++ GLIBC_26 ++ #endif ++#endif ++], ++glibc="2.6") ++ + AC_MSG_CHECKING([the glibc version]) + + case "${glibc}" in +@@ -386,9 +396,15 @@ + DEFAULT_SUPP="glibc-2.5.supp ${DEFAULT_SUPP}" + ;; + ++ 2.6) ++ AC_MSG_RESULT(2.6 family) ++ AC_DEFINE([GLIBC_2_6], 1, [Define to 1 if you're using glibc 2.6.x]) ++ DEFAULT_SUPP="glibc-2.6.supp ${DEFAULT_SUPP}" ++ ;; ++ + *) + AC_MSG_RESULT(unsupported version) +- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.5]) ++ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.6]) + ;; + esac + +diff -urN valgrind-3.2.3.orig/glibc-2.6.supp valgrind-3.2.3/glibc-2.6.supp +--- valgrind-3.2.3.orig/glibc-2.6.supp 1970-01-01 00:00:00.000000000 +0000 ++++ valgrind-3.2.3/glibc-2.6.supp 2007-08-17 02:50:59.000000000 +0000 +@@ -0,0 +1,216 @@ ++ ++##----------------------------------------------------------------------## ++ ++# Errors to suppress by default with glibc 2.4.x ++ ++# Format of this file is: ++# { ++# name_of_suppression ++# tool_name:supp_kind ++# (optional extra info for some suppression types) ++# caller0 name, or /name/of/so/file.so ++# caller1 name, or ditto ++# (optionally: caller2 name) ++# (optionally: caller3 name) ++# } ++# ++# For Memcheck, the supp_kinds are: ++# ++# Param Value1 Value2 Value4 Value8 Value16 ++# Free Addr1 Addr2 Addr4 Addr8 Addr16 ++# Cond (previously known as Value0) ++# ++# and the optional extra info is: ++# if Param: name of system call param ++# if Free: name of free-ing fn) ++ ++{ ++ dl-hack1 ++ Memcheck:Cond ++ fun:_dl_start ++ fun:_start ++} ++ ++{ ++ dl-hack2 ++ Memcheck:Cond ++ obj:/lib*/ld-2.6*.so ++ obj:/lib*/ld-2.6*.so ++ obj:/lib*/ld-2.6*.so ++ obj:/lib*/ld-2.6*.so ++} ++ ++{ ++ dl-hack3 ++ Memcheck:Cond ++ obj:/lib*/ld-2.6*so* ++ obj:/lib*/ld-2.6*so* ++ obj:/lib*/ld-2.6*so* ++} ++ ++##----------------------------------------------------------------------## ++{ ++ glibc-2.5.x-on-SUSE-10.2-(PPC)-1 ++ Memcheck:Cond ++ fun:_dl_start_final ++ fun:_dl_start ++ fun:_start ++} ++{ ++ glibc-2.5.x-on-SUSE-10.2-(PPC)-2a ++ Memcheck:Cond ++ fun:index ++ obj:*ld-2.6.*.so ++} ++{ ++ glibc-2.5.x-on-SuSE-10.2-(PPC)-2b ++ Memcheck:Addr4 ++ fun:index ++ fun:expand_dynamic_string_token ++} ++{ ++ glibc-2.5.5-on-SuSE-10.2-(PPC)-2c ++ Memcheck:Addr4 ++ fun:index ++ obj:*ld-2.6.*.so ++} ++{ ++ glibc-2.3.5-on-SuSE-10.1-(PPC)-3 ++ Memcheck:Addr4 ++ fun:*wordcopy_fwd_dest_aligned* ++ fun:mem*cpy ++ obj:*lib*2.6.*.so ++} ++ ++##----------------------------------------------------------------------## ++## Various structure padding things on SUSE 10.2 ++## ++{ ++ X11-64bit-padding-1a ++ Memcheck:Param ++ write(buf) ++ fun:__write_nocancel ++ obj:/usr/lib*/libX11.so* ++ obj:/usr/lib*/libX11.so* ++ fun:X* ++} ++{ ++ X11-64bit-padding-1b ++ Memcheck:Param ++ write(buf) ++ fun:__write_nocancel ++ obj:/usr/lib*/libX11.so* ++ obj:/usr/lib*/libX11.so* ++ fun:_X* ++} ++{ ++ X11-64bit-padding-1c ++ Memcheck:Param ++ write(buf) ++ fun:__write_nocancel ++ obj:/usr/lib*/libX11.so* ++ obj:/usr/lib*/libX11.so* ++ obj:/usr/lib*/libX11.so* ++} ++{ ++ X11-64bit-padding-1d ++ Memcheck:Param ++ write(buf) ++ fun:__write_nocancel ++ obj:/usr/lib*/libICE.so* ++ obj:/usr/lib*/libICE.so* ++ obj:/usr/lib*/libICE.so* ++} ++{ ++ X11-64bit-padding-2a ++ Memcheck:Param ++ writev(vector[...]) ++ fun:do_writev ++ obj:/usr/lib*/libX11.so* ++ obj:/usr/lib*/libX11.so* ++ obj:/usr/lib*/libX11.so* ++} ++{ ++ X11-64bit-padding-2b ++ Memcheck:Param ++ writev(vector[...]) ++ fun:do_writev ++ fun:writev ++ obj:/usr/lib*/libX11.so* ++ obj:/usr/lib*/libX11.so* ++} ++ ++{ ++ glibc24-64bit-padding-1a ++ Memcheck:Param ++ socketcall.sendto(msg) ++ fun:send ++ fun:get_mapping ++ fun:__nscd_get_map_ref ++ fun:nscd* ++} ++{ ++ glibc24-64bit-padding-1b ++ Memcheck:Param ++ socketcall.sendto(msg) ++ fun:__sendto_nocancel ++ obj:/*libc-2.6.so ++ obj:/*libc-2.6.so ++ obj:/*libc-2.6.so ++} ++{ ++ glibc24-64bit-padding-1c ++ Memcheck:Param ++ socketcall.send(msg) ++ fun:send ++ fun:__nscd_get_map_ref ++ fun:nscd_get*_r ++ fun:*nscd* ++ obj:/*libc-2.6.so ++} ++ ++ ++{ ++ X11-64bit-padding-3a ++ Memcheck:Param ++ write(buf) ++ obj:/*libpthread-2.4.so* ++ obj:/usr/lib*/libX11.so* ++ obj:/usr/lib*/libX11.so* ++ obj:/usr/lib*/libX11.so* ++} ++ ++{ ++ X11-64bit-padding-4a ++ Memcheck:Param ++ socketcall.sendto(msg) ++ fun:send ++ obj:/*libc-2.6.so ++ obj:/*libc-2.6.so ++ obj:/*libc-2.6.so ++} ++{ ++ X11-64bit-padding-4b ++ Memcheck:Param ++ socketcall.send(msg) ++ fun:send ++ obj:/*libc-2.6.so ++ obj:/*libc-2.6.so ++ obj:/*libc-2.6.so ++} ++ ++##----------------------------------------------------------------------## ++# MontaVista Linux 4.0.1 on ppc32 ++{ ++ MVL-401-linuxthreads-pthread_create ++ Memcheck:Param ++ write(buf) ++ fun:pthread_create ++} ++{ ++ MVL-401-linuxthreads-pthread_create ++ Memcheck:Param ++ write(buf) ++ obj:/lib/libpthread-0.10.so ++ fun:pthread_create ++} +diff -urN valgrind-3.2.3.orig/Makefile.am valgrind-3.2.3/Makefile.am +--- valgrind-3.2.3.orig/Makefile.am 2007-01-02 14:52:30.000000000 +0000 ++++ valgrind-3.2.3/Makefile.am 2007-08-17 02:50:59.000000000 +0000 +@@ -17,7 +17,7 @@ + DIST_SUBDIRS = $(SUBDIRS) + + SUPP_FILES = \ +- glibc-2.2.supp glibc-2.3.supp glibc-2.4.supp glibc-2.5.supp \ ++ glibc-2.2.supp glibc-2.3.supp glibc-2.4.supp glibc-2.5.supp glibc-2.6.supp \ + xfree-3.supp xfree-4.supp + + dist_val_DATA = $(SUPP_FILES) default.supp --- valgrind-3.6.1.orig/debian/patches/10_ansi-vg.dpatch +++ valgrind-3.6.1/debian/patches/10_ansi-vg.dpatch @@ -0,0 +1,35 @@ +#! /bin/sh -e +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Make the valgrind.h file (almost) ANSI compliant. + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 +@DPATCH@ + +diff -urN valgrind-2.2.0+2.4.0rc1.orig/include/valgrind.h valgrind-2.2.0+2.4.0rc1/include/valgrind.h +--- valgrind-2.2.0+2.4.0rc1.orig/include/valgrind.h 2005-03-08 19:30:36.000000000 +0000 ++++ valgrind-2.2.0+2.4.0rc1/include/valgrind.h 2005-03-09 19:11:29.000000000 +0000 +@@ -119,7 +119,7 @@ + _zzq_args[2] = (unsigned int)(_zzq_arg2); \ + _zzq_args[3] = (unsigned int)(_zzq_arg3); \ + _zzq_args[4] = (unsigned int)(_zzq_arg4); \ +- asm volatile("roll $29, %%eax ; roll $3, %%eax\n\t" \ ++ __asm__ volatile("roll $29, %%eax ; roll $3, %%eax\n\t" \ + "rorl $27, %%eax ; rorl $5, %%eax\n\t" \ + "roll $13, %%eax ; roll $19, %%eax" \ + : "=d" (_zzq_rlval) \ --- valgrind-3.6.1.orig/debian/patches/18_cpp-stabs.dpatch +++ valgrind-3.6.1/debian/patches/18_cpp-stabs.dpatch @@ -0,0 +1,91 @@ +#! /bin/sh -e +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: This patch attempts to fix the parsing of C++ stabs involving +## DP: :: delimiters. + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 +@DPATCH@ + +diff -urN valgrind-2.2.0.orig/coregrind/vg_stabs.c valgrind-2.2.0/coregrind/vg_stabs.c +--- valgrind-2.2.0.orig/coregrind/vg_stabs.c 2004-08-29 21:02:28.000000000 +0000 ++++ valgrind-2.2.0/coregrind/vg_stabs.c 2004-11-16 18:18:27.000000000 +0000 +@@ -402,42 +402,12 @@ + return ret; + } + +-static Bool isoperator(Char op) +-{ +- switch(op) { +- case 'a'...'z': +- case 'A'...'Z': +- case '0'...'9': +- case '_': +- case ':': +- case '\'': +- case '"': +- case '$': +- return False; +- +- default: +- return True; +- } +-} +- + /* Skip a ':'-delimited name which may have ::, 'char' or other things in + <> brackets */ + static Char *templ_name(Char *p) + { + Int brac = 0; + +- /* Special case: if the name is "operatorX", where X is not an +- otherwise valid operator name, then just skip to the terminating +- ':' and ignore the '<>' bracketing stuff. That's because names +- like "operator<" and "operator<=" can appear here, and it can be +- terminated by ::. */ +- if (VG_(strncmp)(p, "operator", 8) == 0 && isoperator(p[8])) { +- p += 8; +- while(*p != ':') +- p++; +- return p; +- } +- + for(;;) { + if (*p == '<') + brac++; +@@ -862,7 +832,8 @@ + UInt off, sz; + SymType *fieldty; + +- end = templ_name(p); ++ // end = templ_name(p); ++ end = SKIPPAST(p, ':', "method name") - 1; + + if (end[1] == ':') { + /* c++ method names end in :: */ +@@ -1040,7 +1011,9 @@ + VG_(printf)("initSym(si=%p, tab=%p, sym=%p, kind=%d, name=%p \"%s\", val=%d)\n", + si, si->stab_typetab, sym, kind, name, name, val); + +- ty = templ_name(name); ++ // ty = templ_name(name); ++ ty = VG_(strchr)(name, ':'); ++ while (ty && ty[1] == ':') ty = VG_(strchr)(ty + 2, ':'); + + len = ty - name; + --- valgrind-3.6.1.orig/debian/patches/01_vgPlain_do_syscall.dpatch +++ valgrind-3.6.1/debian/patches/01_vgPlain_do_syscall.dpatch @@ -0,0 +1,92 @@ +#! /bin/sh -e +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Added patch that lets GDB backtrace through vgPlain_do_syscall. +## DP: Bug#225475 + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 +@DPATCH@ + +diff -urN valgrind-2.2.0+2.4.0rc1.orig/coregrind/x86-linux/syscall.S valgrind-2.2.0+2.4.0rc1/coregrind/x86-linux/syscall.S +--- valgrind-2.2.0+2.4.0rc1.orig/coregrind/x86-linux/syscall.S 2005-02-01 22:53:21.000000000 +0000 ++++ valgrind-2.2.0+2.4.0rc1/coregrind/x86-linux/syscall.S 2005-03-09 17:26:33.000000000 +0000 +@@ -46,10 +46,30 @@ + spill values.) + */ + VG_(do_syscall): +- push %esi +- push %edi +- push %ebx +- push %ebp ++#ifdef HAVE_GAS_CFI ++ .cfi_startproc ++ .cfi_def_cfa %esp, 4 ++#endif ++ push %esi ++#ifdef HAVE_GAS_CFI ++ .cfi_adjust_cfa_offset 4 ++ .cfi_rel_offset %esi, 0 ++#endif ++ push %edi ++#ifdef HAVE_GAS_CFI ++ .cfi_adjust_cfa_offset 4 ++ .cfi_rel_offset %edi, 0 ++#endif ++ push %ebx ++#ifdef HAVE_GAS_CFI ++ .cfi_adjust_cfa_offset 4 ++ .cfi_rel_offset %ebx, 0 ++#endif ++ push %ebp ++#ifdef HAVE_GAS_CFI ++ .cfi_adjust_cfa_offset 4 ++ .cfi_rel_offset %ebp, 0 ++#endif + movl 16+ 4(%esp),%eax + movl 16+ 8(%esp),%ebx + movl 16+12(%esp),%ecx +@@ -59,10 +79,25 @@ + movl 16+28(%esp),%ebp + int $0x80 + popl %ebp +- popl %ebx +- popl %edi +- popl %esi +- ret ++#ifdef HAVE_GAS_CFI ++ .cfi_adjust_cfa_offset -4 ++#endif ++ popl %ebx ++#ifdef HAVE_GAS_CFI ++ .cfi_adjust_cfa_offset -4 ++#endif ++ popl %edi ++#ifdef HAVE_GAS_CFI ++ .cfi_adjust_cfa_offset -4 ++#endif ++ popl %esi ++#ifdef HAVE_GAS_CFI ++ .cfi_adjust_cfa_offset -4 ++#endif ++ ret ++#ifdef HAVE_GAS_CFI ++ .cfi_endproc ++#endif + + /* + Perform a clone system call. clone is strange because it has --- valgrind-3.6.1.orig/debian/patches/17_statvfs64.dpatch +++ valgrind-3.6.1/debian/patches/17_statvfs64.dpatch @@ -0,0 +1,75 @@ +#! /bin/sh -e +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fixed the statfs64 wrapper to look at the right argument for the +## DP: stat buffer and added an fstatfs64 wrapper. + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 +@DPATCH@ + +diff -urN valgrind-2.2.0.orig/coregrind/vg_syscalls.c valgrind-2.2.0/coregrind/vg_syscalls.c +--- valgrind-2.2.0.orig/coregrind/vg_syscalls.c 2004-10-13 18:40:41.000000000 +0000 ++++ valgrind-2.2.0/coregrind/vg_syscalls.c 2004-10-14 13:34:10.000000000 +0000 +@@ -1637,6 +1637,18 @@ + VG_TRACK( post_mem_write, arg2, sizeof(struct vki_statfs) ); + } + ++PRE(fstatfs64) ++{ ++ /* int fstatfs64(int fd, size_t sz, struct statfs *buf); */ ++ MAYBE_PRINTF("fstatfs64 ( %d, %p )\n",arg1,arg2); ++ SYSCALL_TRACK( pre_mem_write, tid, "stat(buf)", arg3, arg2 ); ++} ++ ++POST(fstatfs64) ++{ ++ VG_TRACK( post_mem_write, arg3, arg2 ); ++} ++ + PRE(getsid) + { + /* pid_t getsid(pid_t pid); */ +@@ -5161,16 +5173,15 @@ + + PRE(statfs64) + { +- /* int statfs64(const char *path, struct statfs64 *buf); */ ++ /* int statfs64(const char *path, size_t sz, struct statfs64 *buf); */ + MAYBE_PRINTF("statfs64 ( %p, %p )\n",arg1,arg2); + SYSCALL_TRACK( pre_mem_read_asciiz, tid, "statfs64(path)", arg1 ); +- SYSCALL_TRACK( pre_mem_write, tid, "statfs64(buf)", +- arg2, sizeof(struct vki_statfs64) ); ++ SYSCALL_TRACK( pre_mem_write, tid, "statfs64(buf)", arg3, arg2 ); + } + + POST(statfs64) +-{ +- VG_TRACK( post_mem_write, arg2, sizeof(struct vki_statfs64) ); ++{ ++ VG_TRACK( post_mem_write, arg3, arg2 ); + } + + PRE(symlink) +@@ -6081,6 +6092,7 @@ + SYSB_(pwrite64, MayBlock), + SYSB_(sync, MayBlock), + SYSBA(fstatfs, 0), ++ SYSBA(fstatfs64, 0), + SYSB_(getsid, 0), + SYSBA(pread64, MayBlock), + SYSB_(mknod, 0), --- valgrind-3.6.1.orig/debian/patches/01_manpage.dpatch +++ valgrind-3.6.1/debian/patches/01_manpage.dpatch @@ -0,0 +1,35 @@ +#! /bin/sh -e +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Adds reference to AUTHORS file on valgrind.1 + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 +@DPATCH@ + +diff -urN valgrind-3.3.0.orig/docs/valgrind.1 valgrind-3.3.0/docs/valgrind.1 +--- valgrind-3.3.0.orig/docs/valgrind.1 2007-12-11 00:23:01.000000000 +0000 ++++ valgrind-3.3.0/docs/valgrind.1 2007-12-12 17:14:31.000000000 +0000 +@@ -720,6 +720,8 @@ + \fI/usr/share/doc/valgrind/html/index.html\fR, and/or + \fIhttp://www.valgrind.org/docs/manual/index.html\fR. + .SH "AUTHOR" ++Julian Seward is the original author of valgrind ++and there are other contributors listed on /usr/share/doc/valgrind/AUTHORS. + .PP + This manpage has been written by Andres Roldan for the Debian Project, but can be used for any other distribution. + .PP --- valgrind-3.6.1.orig/debian/patches/12_errhandling.dpatch +++ valgrind-3.6.1/debian/patches/12_errhandling.dpatch @@ -0,0 +1,45 @@ +#! /bin/sh -e +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: This patch stops the error handling code trying to match object +## DP: and function names against a suppression if it wasn't able to +## DP: obtain the relevant name. + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 +@DPATCH@ + +diff -urN valgrind-2.2.0+2.4.0rc1.orig/coregrind/vg_errcontext.c valgrind-2.2.0+2.4.0rc1/coregrind/vg_errcontext.c +--- valgrind-2.2.0+2.4.0rc1.orig/coregrind/vg_errcontext.c 2005-03-04 05:37:46.000000000 +0000 ++++ valgrind-2.2.0+2.4.0rc1/coregrind/vg_errcontext.c 2005-03-09 19:24:38.000000000 +0000 +@@ -979,12 +979,14 @@ + vg_assert(su->callers[i].name != NULL); + switch (su->callers[i].ty) { + case ObjName: +- (void)VG_(get_objname)(a, caller_name, M_VG_ERRTXT); ++ if (!VG_(get_objname)(a, caller_name, M_VG_ERRTXT)) ++ return False; + break; + + case FunName: + // Nb: mangled names used in suppressions +- (void)VG_(get_fnname_nodemangle)(a, caller_name, M_VG_ERRTXT); ++ if (!VG_(get_fnname_nodemangle)(a, caller_name, M_VG_ERRTXT)) ++ return False; + break; + default: VG_(skin_panic)("supp_matches_callers"); + } --- valgrind-3.6.1.orig/debian/patches/01_suppression-strip.dpatch +++ valgrind-3.6.1/debian/patches/01_suppression-strip.dpatch @@ -0,0 +1,45 @@ +#! /bin/sh -e +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Strips ubuntu suppression already included on Debian package + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 +@DPATCH@ + +diff -urN valgrind-3.2.3.orig/glibc-2.3.supp valgrind-3.2.3/glibc-2.3.supp +--- valgrind-3.2.3.orig/glibc-2.3.supp 2007-01-07 05:39:15.000000000 +0000 ++++ valgrind-3.2.3/glibc-2.3.supp 2007-02-01 19:40:36.392187814 +0000 +@@ -577,18 +577,6 @@ + obj:/lib/ld-2.3.2.so + } + +-##----------------------------------------------------------------------## +-## Ubuntu something (based on Debian 3.0?) on x86 +- +-{ +- Ubuntu-stripped-ld.so +- Memcheck:Cond +- obj:/lib/ld-2.3.*.so +- obj:/lib/ld-2.3.*.so +- obj:/lib/ld-2.3.*.so +- obj:/lib/ld-2.3.*.so +- obj:/lib/ld-2.3.*.so +-} + + ##----------------------------------------------------------------------## + # MontaVista Linux 4.0.1 on ppc32 --- valgrind-3.6.1.orig/debian/patches/16_pthread_mutex_lock.dpatch +++ valgrind-3.6.1/debian/patches/16_pthread_mutex_lock.dpatch @@ -0,0 +1,39 @@ +#! /bin/sh -e +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Warns about a possible deadlock on thread. + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 +@DPATCH@ + +diff -urN valgrind-2.2.0.orig/coregrind/vg_scheduler.c valgrind-2.2.0/coregrind/vg_scheduler.c +--- valgrind-2.2.0.orig/coregrind/vg_scheduler.c 2004-08-29 21:02:28.000000000 +0000 ++++ valgrind-2.2.0/coregrind/vg_scheduler.c 2004-10-14 13:24:26.000000000 +0000 +@@ -2170,8 +2170,11 @@ + } else { + if (is_trylock) + SET_PTHREQ_RETVAL(tid, EBUSY); +- else ++ else { ++ VG_(record_pthread_error)( tid, ++ "pthread_mutex_lock/trylock: operation would deadlock"); + SET_PTHREQ_RETVAL(tid, EDEADLK); ++ } + return; + } + } else { --- valgrind-3.6.1.orig/debian/patches/15_pthread_mutexattr_gettype.dpatch +++ valgrind-3.6.1/debian/patches/15_pthread_mutexattr_gettype.dpatch @@ -0,0 +1,57 @@ +#! /bin/sh -e +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Implements pthread_mutexattr_gettype(). + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 +@DPATCH@ + +diff -urN valgrind-2.2.0.orig/coregrind/vg_libpthread.c valgrind-2.2.0/coregrind/vg_libpthread.c +--- valgrind-2.2.0.orig/coregrind/vg_libpthread.c 2004-08-29 21:02:27.000000000 +0000 ++++ valgrind-2.2.0/coregrind/vg_libpthread.c 2004-10-13 18:55:33.000000000 +0000 +@@ -1276,6 +1276,16 @@ + } + } + ++int __pthread_mutexattr_gettype(const pthread_mutexattr_t *attr, int *type) ++{ ++ vg_pthread_mutexattr_t* vg_attr; ++ CONVERT(mutexattr, attr, vg_attr); ++ ++ *type = vg_attr->__vg_mutexkind; ++ ++ return 0; ++} ++ + int __pthread_mutexattr_destroy(pthread_mutexattr_t *attr) + { + return 0; +diff -urN valgrind-2.2.0.orig/coregrind/vg_libpthread_unimp.c valgrind-2.2.0/coregrind/vg_libpthread_unimp.c +--- valgrind-2.2.0.orig/coregrind/vg_libpthread_unimp.c 2004-08-29 21:02:27.000000000 +0000 ++++ valgrind-2.2.0/coregrind/vg_libpthread_unimp.c 2004-10-13 18:56:00.000000000 +0000 +@@ -225,8 +225,8 @@ + { vgPlain_unimp("pthread_mutexattr_getkind_np"); } + __attribute__((weak)) void pthread_mutexattr_getpshared ( void ) + { vgPlain_unimp("pthread_mutexattr_getpshared"); } +-__attribute__((weak)) void pthread_mutexattr_gettype ( void ) +- { vgPlain_unimp("pthread_mutexattr_gettype"); } ++//__attribute__((weak)) void pthread_mutexattr_gettype ( void ) ++// { vgPlain_unimp("pthread_mutexattr_gettype"); } + __attribute__((weak)) void pthread_mutexattr_setkind_np ( void ) + { vgPlain_unimp("pthread_mutexattr_setkind_np"); } + //__attribute__((weak)) void pthread_mutexattr_setpshared ( void ) --- valgrind-3.6.1.orig/debian/patches/13_sched_setaffinity-getaffinity.dpatch +++ valgrind-3.6.1/debian/patches/13_sched_setaffinity-getaffinity.dpatch @@ -0,0 +1,69 @@ +#! /bin/sh -e +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Adds support for sched_setaffinity and sched_getaffinity syscalls. + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 +@DPATCH@ + +diff -urN valgrind-2.2.0.orig/coregrind/vg_syscalls.c valgrind-2.2.0/coregrind/vg_syscalls.c +--- valgrind-2.2.0.orig/coregrind/vg_syscalls.c 2004-09-10 21:34:03.000000000 +0000 ++++ valgrind-2.2.0/coregrind/vg_syscalls.c 2004-09-10 21:35:49.000000000 +0000 +@@ -5364,6 +5364,33 @@ + } + } + ++ PRE(sched_setaffinity) ++ { ++ /* int sched_setaffinity(pid_t pid, unsigned int len, unsigned long *mask) */ ++ MAYBE_PRINTF("sched_setaffinity ( %d, %d, %p )\n", arg1, arg2, arg3); ++ if (arg2>0 && arg3 != (UInt)NULL) { ++ SYSCALL_TRACK(pre_mem_read, tid, "sched_setaffinity(mask)", arg3, ++ arg2); ++ } ++ } ++ ++ PRE(sched_getaffinity) ++ { ++ /* int sched_setaffinity(pid_t pid, unsigned int len, unsigned long *mask) */ ++ MAYBE_PRINTF("sched_getaffinity ( %d, %d, %p )\n", arg1, arg2, arg3); ++ if (arg2>0) { ++ SYSCALL_TRACK(pre_mem_write, tid, "sched_getaffinity(mask)", arg3, ++ arg2); ++ } ++ } ++ ++ POST(sched_getaffinity) ++ { ++ if (arg2 > 0 && res > 0) { ++ VG_TRACK(post_mem_write, arg3, arg2); ++ } ++ } ++ + PRE(acct) + { + /* int acct(const char *filename); */ +@@ -6110,6 +6137,8 @@ + SYSBA(adjtimex, 0), + SYSBA(mmap2, 0), + SYSBA(futex, MayBlock), ++ SYSB_(sched_setaffinity, 0), ++ SYSBA(sched_getaffinity, 0), + SYSB_(acct, 0), + + /* new signal handling makes these normal blocking syscalls */ --- valgrind-3.6.1.orig/debian/patches/01_amd64-nops.dpatch +++ valgrind-3.6.1/debian/patches/01_amd64-nops.dpatch @@ -0,0 +1,35 @@ +#! /bin/sh -e +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Handles new NOPs opcodes + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 +@DPATCH@ + +diff -urN valgrind-3.2.3.orig/VEX/priv/guest-amd64/toIR.c valgrind-3.2.3/VEX/priv/guest-amd64/toIR.c +--- valgrind-3.2.3.orig/VEX/priv/guest-amd64/toIR.c 2007-01-12 23:19:52.000000000 +0000 ++++ valgrind-3.2.3/VEX/priv/guest-amd64/toIR.c 2007-08-23 21:57:47.000000000 +0000 +@@ -8334,7 +8334,7 @@ + as many invalid combinations as possible. */ + n_prefixes = 0; + while (True) { +- if (n_prefixes > 5) goto decode_failure; ++ if (n_prefixes > 7) goto decode_failure; + pre = getUChar(delta); + switch (pre) { + case 0x66: pfx |= PFX_66; break; --- valgrind-3.6.1.orig/debian/patches/01_valgrind.pc.dpatch +++ valgrind-3.6.1/debian/patches/01_valgrind.pc.dpatch @@ -0,0 +1,42 @@ +#! /bin/sh -e +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Corrects pkg-config information + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 +@DPATCH@ + +diff -urN valgrind-3.3.0.orig/valgrind.pc.in valgrind-3.3.0/valgrind.pc.in +--- valgrind-3.3.0.orig/valgrind.pc.in 2007-12-10 23:18:47.000000000 +0000 ++++ valgrind-3.3.0/valgrind.pc.in 2007-12-12 20:38:54.000000000 +0000 +@@ -4,13 +4,13 @@ + includedir=@includedir@/valgrind + arch=@VG_ARCH@ + os=@VG_OS@ +-platform=@VG_PLATFORM_PRI@ ++platform=@VG_ARCH@-linux + valt_load_address=@VALT_LOAD_ADDRESS@ + + Name: Valgrind + Description: A dynamic binary instrumentation framework + Version: @VERSION@ + Requires: +-Libs: -L${libdir}/valgrind/@VG_PLATFORM_PRI@ -lcoregrind -lvex -lgcc ++Libs: -L${libdir}/valgrind/@VG_ARCH@-linux -lcoregrind -lvex -lgcc + Cflags: -I${includedir} +