[SCM] pulseaudio packaging branch, master, updated. debian/0.9.21-2-8-g831c988
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Sun Dec 5 11:02:59 UTC 2010
The branch, master has been updated
via 831c9886356d30db4de1638af5c7486c912d28eb (commit)
via b294ce4bceed02d45d588ca3c5d05947523a43e2 (commit)
via 5bdafc16abf14ce6e20566f49e12b9524e414ee1 (commit)
via ab0adf96be1ac81533bd85a4444cc3c393ac7ac0 (commit)
via 0201790155d0719dfdd4785a06a5d5f06cfcd7c1 (commit)
via 0fd5a5243b25fb9fcbf554e4db7fb448d799d40a (commit)
from 47e7ce04aee12fa0d74c11de36b50dc00243f043 (commit)
- Shortlog ------------------------------------------------------------
831c988 Update patch series
b294ce4 start packaging 0.9.22
5bdafc1 Merge commit 'upstream/0.9.22'
Summary of changes:
.tarball-version | 2 +-
ABOUT-NLS | 1956 ++++++-----
ChangeLog | 268 ++
Makefile.am | 3 +-
Makefile.in | 28 +-
aclocal.m4 | 50 +-
compile | 21 +-
config.guess | 221 +-
config.h.in | 9 +
config.rpath | 34 +-
config.sub | 58 +-
configure | 2264 +++++++-----
configure.ac | 15 +-
debian/changelog | 10 +
...round-some-platforms-not-having-O_CLOEXEC.patch | 4 +-
debian/patches/0002-CVE-2009-1299.patch | 90 -
...-start-pulseaudio-from-the-KDE-specific-d.patch | 20 +
debian/patches/0003-Re-bootstrap.patch | 3741 --------------------
...-start-pulseaudio-from-the-KDE-specific-d.patch | 20 -
debian/patches/series | 4 +-
depcomp | 87 +-
doxygen/Makefile.in | 6 +-
install-sh | 5 +-
ltmain.sh | 1735 ++++++----
m4/iconv.m4 | 68 +-
m4/intltool.m4 | 2 +-
m4/lib-ld.m4 | 20 +-
m4/lib-link.m4 | 133 +-
m4/lib-prefix.m4 | 91 +-
m4/libtool.m4 | 999 +++---
m4/ltoptions.m4 | 13 +-
m4/ltversion.m4 | 10 +-
m4/lt~obsolete.m4 | 12 +-
m4/nls.m4 | 13 +-
man/Makefile.in | 6 +-
man/pacat.1 | 56 +-
man/pacat.1.xml.in | 96 +-
man/pactl.1 | 3 -
man/pactl.1.xml.in | 6 -
missing | 49 +-
po/ChangeLog | 662 +----
po/POTFILES.in | 1 +
src/Makefile.am | 8 +-
src/Makefile.in | 14 +-
src/daemon/main.c | 8 +-
src/modules/alsa/alsa-mixer.c | 11 +-
src/modules/alsa/alsa-sink.c | 92 +-
src/modules/alsa/alsa-source.c | 70 +-
src/modules/alsa/alsa-util.c | 60 +-
src/modules/alsa/alsa-util.h | 2 +-
src/modules/alsa/mixer/paths/analog-input-aux.conf | 4 +
src/modules/alsa/mixer/paths/analog-input-fm.conf | 4 +
.../mixer/paths/analog-input-internal-mic.conf | 67 +
.../alsa/mixer/paths/analog-input-linein.conf | 4 +
.../alsa/mixer/paths/analog-input-mic-line.conf | 4 +
src/modules/alsa/mixer/paths/analog-input-mic.conf | 4 +
.../alsa/mixer/paths/analog-input-mic.conf.common | 18 +
.../alsa/mixer/paths/analog-input-tvtuner.conf | 4 +
.../alsa/mixer/paths/analog-input-video.conf | 4 +
src/modules/alsa/mixer/paths/analog-input.conf | 3 +
.../alsa/mixer/paths/analog-input.conf.common | 41 +
.../mixer/paths/analog-output-desktop-speaker.conf | 99 +
.../mixer/paths/analog-output-headphones-2.conf | 5 +
.../alsa/mixer/paths/analog-output-headphones.conf | 5 +
.../mixer/paths/analog-output-lfe-on-mono.conf | 4 +
.../alsa/mixer/paths/analog-output-mono.conf | 4 +
.../alsa/mixer/paths/analog-output-speaker.conf | 5 +
src/modules/alsa/mixer/paths/analog-output.conf | 4 +
.../alsa/mixer/paths/analog-output.conf.common | 11 +
.../alsa/mixer/profile-sets/90-pulseaudio.rules | 3 +
src/modules/alsa/mixer/profile-sets/default.conf | 14 +-
.../mixer/profile-sets/maudio-fasttrack-pro.conf | 85 +
.../native-instruments-korecontroller.conf | 85 +
.../native-instruments-traktorkontrol-s4.conf | 81 +
src/modules/alsa/module-alsa-sink.c | 4 +-
src/modules/bluetooth/bluetooth-util.c | 13 +-
src/modules/bluetooth/module-bluetooth-device.c | 47 +-
src/modules/bluetooth/module-bluetooth-proximity.c | 11 +-
src/modules/jack/module-jack-sink.c | 14 +-
src/modules/jack/module-jack-source.c | 8 +-
src/modules/module-augment-properties.c | 45 +-
src/modules/module-combine.c | 38 +-
src/modules/module-console-kit.c | 9 +-
src/modules/module-device-manager.c | 64 +-
src/modules/module-esound-sink.c | 2 +-
src/modules/module-hal-detect.c | 10 +-
src/modules/module-intended-roles.c | 13 +-
src/modules/module-ladspa-sink.c | 6 +-
src/modules/module-loopback.c | 4 +-
src/modules/module-null-sink.c | 2 +-
src/modules/module-pipe-sink.c | 2 +-
src/modules/module-pipe-source.c | 2 +-
src/modules/module-rygel-media-server.c | 662 +++--
src/modules/module-sine-source.c | 2 +-
src/modules/module-stream-restore.c | 50 +-
src/modules/module-suspend-on-idle.c | 8 +-
src/modules/module-tunnel.c | 2 +-
src/modules/module-udev-detect.c | 71 +-
src/modules/oss/module-oss.c | 2 +-
src/modules/raop/module-raop-sink.c | 2 +-
src/modules/rtp/rtp.c | 4 +-
src/modules/udev-util.c | 110 +
src/modules/x11/module-x11-publish.c | 42 +-
src/pulse/channelmap.c | 2 +-
src/pulse/channelmap.h | 25 +-
src/pulse/client-conf-x11.c | 30 +-
src/pulse/context.c | 39 +-
src/pulse/context.h | 5 +-
src/pulse/glib-mainloop.h | 9 +-
src/pulse/internal.h | 4 +-
src/pulse/introspect.h | 4 +-
src/pulse/mainloop.h | 9 +-
src/pulse/proplist.h | 2 +-
src/pulse/sample.h | 5 +-
src/pulse/scache.c | 10 +-
src/pulse/scache.h | 5 +-
src/pulse/simple.h | 7 +-
src/pulse/stream.c | 67 +-
src/pulse/stream.h | 29 +-
src/pulse/subscribe.h | 5 +-
src/pulse/thread-mainloop.c | 8 +-
src/pulse/thread-mainloop.h | 11 +-
src/pulse/timeval.h | 4 +-
src/pulse/version.h | 4 +-
src/pulse/volume.h | 26 +-
src/pulsecore/core-scache.c | 10 +-
src/pulsecore/core-util.c | 67 +-
src/pulsecore/core-util.h | 1 +
src/pulsecore/cpu-arm.c | 6 +-
src/pulsecore/cpu-x86.c | 6 +-
src/pulsecore/cpu-x86.h | 6 +-
src/pulsecore/dbus-util.c | 29 +-
src/pulsecore/fdsem.c | 41 +-
src/pulsecore/flist.h | 2 +-
src/pulsecore/lock-autospawn.c | 2 +-
src/pulsecore/log.c | 88 +-
src/pulsecore/memblockq.c | 105 +-
src/pulsecore/memblockq.h | 2 +-
src/pulsecore/once.c | 3 +-
src/pulsecore/play-memblockq.c | 7 +-
src/pulsecore/play-memblockq.h | 18 +-
src/pulsecore/play-memchunk.c | 9 +-
src/pulsecore/play-memchunk.h | 15 +-
src/pulsecore/protocol-esound.c | 7 +-
src/pulsecore/protocol-native.c | 31 +-
src/pulsecore/protocol-simple.c | 8 +-
src/pulsecore/shm.c | 2 +-
src/pulsecore/sink-input.c | 4 +-
src/pulsecore/sink-input.h | 2 +-
src/pulsecore/sink.c | 54 +-
src/pulsecore/socket-client.c | 3 +-
src/pulsecore/sound-file-stream.c | 5 +-
src/pulsecore/source.c | 9 +-
src/pulsecore/svolume_arm.c | 5 +-
src/pulsecore/svolume_mmx.c | 16 +-
src/pulsecore/svolume_sse.c | 19 +-
src/pulsecore/thread-posix.c | 56 +-
src/pulsecore/thread.h | 7 +-
src/pulsecore/time-smoother.c | 4 +-
src/pulsecore/x11prop.c | 108 +-
src/pulsecore/x11prop.h | 9 +-
src/pulsecore/x11wrap.c | 4 +
src/pulsecore/x11wrap.h | 4 +
src/tests/alsa-time-test.c | 59 +-
src/tests/asyncmsgq-test.c | 2 +-
src/tests/asyncq-test.c | 4 +-
src/tests/flist-test.c | 2 +-
src/tests/lock-autospawn-test.c | 8 +-
src/tests/thread-test.c | 2 +-
src/utils/pacat.c | 95 +-
src/utils/pacmd.c | 187 +-
src/utils/padsp.c | 55 +-
src/utils/pax11publish.c | 74 +-
vala/libpulse.vapi | 10 +-
174 files changed, 7747 insertions(+), 8802 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 831c9886356d30db4de1638af5c7486c912d28eb
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Sun Dec 5 11:02:17 2010 +0000
Update patch series
diff --git a/debian/changelog b/debian/changelog
index 950faa0..9df7876 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
pulseaudio (0.9.22-1) UNRELEASED; urgency=low
* New upstream release
+ * debian/patches/0002-CVE-2009-1299.patch:
+ + Dropped, fixed upstream
+ * debian/patches/0003-Re-bootstrap.patch
+ + Dropped, not needed anymore
- -- Sjoerd Simons <sjoerd at debian.org> Sun, 05 Dec 2010 10:44:28 +0000
+ -- Sjoerd Simons <sjoerd at debian.org> Sun, 05 Dec 2010 10:59:57 +0000
pulseaudio (0.9.21-3) unstable; urgency=low
diff --git a/debian/patches/0001-Work-around-some-platforms-not-having-O_CLOEXEC.patch b/debian/patches/0001-Work-around-some-platforms-not-having-O_CLOEXEC.patch
index 718ae4e..014fa43 100644
--- a/debian/patches/0001-Work-around-some-platforms-not-having-O_CLOEXEC.patch
+++ b/debian/patches/0001-Work-around-some-platforms-not-having-O_CLOEXEC.patch
@@ -1,7 +1,7 @@
-From 041bcda2518671a4375e77659c80d1be43625904 Mon Sep 17 00:00:00 2001
+From b7fb5904c5eab9fce20dc598dfd60f3349e90190 Mon Sep 17 00:00:00 2001
From: Clint Adams <schizo at debian.org>
Date: Sun, 25 Oct 2009 12:35:14 +0000
-Subject: [PATCH 1/3] Work around some platforms not having O_CLOEXEC
+Subject: [PATCH 1/2] Work around some platforms not having O_CLOEXEC
---
src/modules/module-cli.c | 5 +++++
diff --git a/debian/patches/0002-CVE-2009-1299.patch b/debian/patches/0002-CVE-2009-1299.patch
deleted file mode 100644
index 19f48fc..0000000
--- a/debian/patches/0002-CVE-2009-1299.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From a4c6c3e980f88cb60d3df82c64791577d11e2388 Mon Sep 17 00:00:00 2001
-From: Kees Cook <kees at ubuntu.com>
-Date: Sun, 27 Jun 2010 12:22:46 +0100
-Subject: [PATCH 2/3] CVE-2009-1299
-
-From d3efa43d85ac132c6a5a416a2b6f2115f5d577ee Mon Sep 17 00:00:00 2001
-From: Kees Cook <kees at ubuntu.com>
-Date: Tue, 2 Mar 2010 21:33:34 -0800
-Subject: [PATCH] core-util: ensure that we chmod only the dir we ourselves created
----
- configure.ac | 2 +-
- src/pulsecore/core-util.c | 39 ++++++++++++++++++++++++++++++++++-----
- 2 files changed, 35 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c9ec490..74c8474 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -424,7 +424,7 @@ AC_CHECK_FUNCS_ONCE([lrintf strtof])
- AC_FUNC_FORK
- AC_FUNC_GETGROUPS
- AC_FUNC_SELECT_ARGTYPES
--AC_CHECK_FUNCS_ONCE([chmod chown clock_gettime getaddrinfo getgrgid_r getgrnam_r \
-+AC_CHECK_FUNCS_ONCE([chmod chown fstat fchown fchmod clock_gettime getaddrinfo getgrgid_r getgrnam_r \
- getpwnam_r getpwuid_r gettimeofday getuid inet_ntop inet_pton mlock nanosleep \
- pipe posix_fadvise posix_madvise posix_memalign setpgid setsid shm_open \
- sigaction sleep sysconf pthread_setaffinity_np])
-diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
-index 258e8ee..a949983 100644
---- a/src/pulsecore/core-util.c
-+++ b/src/pulsecore/core-util.c
-@@ -196,7 +196,7 @@ void pa_make_fd_cloexec(int fd) {
- /** Creates a directory securely */
- int pa_make_secure_dir(const char* dir, mode_t m, uid_t uid, gid_t gid) {
- struct stat st;
-- int r, saved_errno;
-+ int r, saved_errno, fd;
-
- pa_assert(dir);
-
-@@ -214,16 +214,45 @@ int pa_make_secure_dir(const char* dir, mode_t m, uid_t uid, gid_t gid) {
- if (r < 0 && errno != EEXIST)
- return -1;
-
--#ifdef HAVE_CHOWN
-+#ifdef HAVE_FSTAT
-+ if ((fd = open(dir,
-+#ifdef O_CLOEXEC
-+ O_CLOEXEC|
-+#endif
-+#ifdef O_NOCTTY
-+ O_NOCTTY|
-+#endif
-+#ifdef O_NOFOLLOW
-+ O_NOFOLLOW|
-+#endif
-+ O_RDONLY)) < 0)
-+ goto fail;
-+
-+ if (fstat(fd, &st) < 0) {
-+ pa_assert_se(pa_close(fd) >= 0);
-+ goto fail;
-+ }
-+
-+ if (!S_ISDIR(st.st_mode)) {
-+ pa_assert_se(pa_close(fd) >= 0);
-+ errno = EEXIST;
-+ goto fail;
-+ }
-+
-+#ifdef HAVE_FCHOWN
- if (uid == (uid_t)-1)
- uid = getuid();
- if (gid == (gid_t)-1)
- gid = getgid();
-- (void) chown(dir, uid, gid);
-+ (void) fchown(fd, uid, gid);
-+#endif
-+
-+#ifdef HAVE_FCHMOD
-+ (void) fchmod(fd, m);
- #endif
-
--#ifdef HAVE_CHMOD
-- chmod(dir, m);
-+ pa_assert_se(pa_close(fd) >= 0);
-+
- #endif
-
- #ifdef HAVE_LSTAT
diff --git a/debian/patches/0004-In-KDE-only-start-pulseaudio-from-the-KDE-specific-d.patch b/debian/patches/0002-In-KDE-only-start-pulseaudio-from-the-KDE-specific-d.patch
similarity index 81%
rename from debian/patches/0004-In-KDE-only-start-pulseaudio-from-the-KDE-specific-d.patch
rename to debian/patches/0002-In-KDE-only-start-pulseaudio-from-the-KDE-specific-d.patch
index 45bb1e8..33e3789 100644
--- a/debian/patches/0004-In-KDE-only-start-pulseaudio-from-the-KDE-specific-d.patch
+++ b/debian/patches/0002-In-KDE-only-start-pulseaudio-from-the-KDE-specific-d.patch
@@ -1,7 +1,7 @@
-From 0c3f62b960f0f07fa5f9703c4b51d26febca2095 Mon Sep 17 00:00:00 2001
+From b4389a752385afd6e65e412a8488828ee3648fbd Mon Sep 17 00:00:00 2001
From: Zsolt Rizsanyi <rizsanyi at users.sourceforge.net>
Date: Sun, 27 Jun 2010 15:16:13 +0100
-Subject: [PATCH 4/4] In KDE only start pulseaudio from the KDE specific desktop file
+Subject: [PATCH 2/2] In KDE only start pulseaudio from the KDE specific desktop file
---
src/daemon/pulseaudio.desktop.in | 1 +
diff --git a/debian/patches/0003-Re-bootstrap.patch b/debian/patches/0003-Re-bootstrap.patch
deleted file mode 100644
index a7fa38c..0000000
--- a/debian/patches/0003-Re-bootstrap.patch
+++ /dev/null
@@ -1,3741 +0,0 @@
-From a7327c5272d0d57dad8d43c91969cada91d3629b Mon Sep 17 00:00:00 2001
-From: Sjoerd Simons <sjoerd at debian.org>
-Date: Sun, 27 Jun 2010 12:43:38 +0100
-Subject: [PATCH 3/3] Re-bootstrap
-
----
- Makefile.in | 23 ++-
- aclocal.m4 | 46 +++--
- config.h.in | 9 +
- config.rpath | 34 ++--
- configure | 534 ++++++++++++++++++++++++++++++++++-----------------
- doxygen/Makefile.in | 4 +-
- ltmain.sh | 37 ++--
- m4/gettext.m4 | 383 ++++++++++++++++++++++++++++++++++++
- m4/iconv.m4 | 68 +++++--
- m4/intltool.m4 | 2 +-
- m4/lib-ld.m4 | 20 +-
- m4/lib-link.m4 | 133 ++++++++++----
- m4/lib-prefix.m4 | 91 +++++++---
- m4/libtool.m4 | 45 +++--
- m4/ltversion.m4 | 10 +-
- m4/nls.m4 | 13 +-
- m4/po.m4 | 449 +++++++++++++++++++++++++++++++++++++++++++
- m4/progtest.m4 | 92 +++++++++
- man/Makefile.in | 4 +-
- src/Makefile.in | 4 +-
- 20 files changed, 1652 insertions(+), 349 deletions(-)
- create mode 100644 m4/gettext.m4
- create mode 100644 m4/po.m4
- create mode 100644 m4/progtest.m4
-
-diff --git a/Makefile.in b/Makefile.in
-index c24f9f5..83300f2 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -64,8 +64,8 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/libpulse-mainloop-glib.pc.in \
- $(srcdir)/libpulse-simple.pc.in $(srcdir)/libpulse.pc.in \
- $(top_srcdir)/configure $(top_srcdir)/src/pulse/version.h.in \
-- ABOUT-NLS compile config.guess config.rpath config.sub depcomp \
-- install-sh ltmain.sh missing
-+ ABOUT-NLS ChangeLog compile config.guess config.rpath \
-+ config.sub depcomp install-sh ltmain.sh missing
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/acx_libwrap.m4 \
- $(top_srcdir)/m4/acx_lirc.m4 $(top_srcdir)/m4/acx_pthread.m4 \
-@@ -320,6 +320,8 @@ PA_SYSTEM_RUNTIME_PATH = @PA_SYSTEM_RUNTIME_PATH@
- PA_SYSTEM_STATE_PATH = @PA_SYSTEM_STATE_PATH@
- PA_SYSTEM_USER = @PA_SYSTEM_USER@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POFILES = @POFILES@
- POSUB = @POSUB@
- PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -548,7 +550,7 @@ uninstall-vapiDATA:
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-+ @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -573,7 +575,7 @@ $(RECURSIVE_TARGETS):
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @failcom='exit 1'; \
-+ @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -740,7 +742,8 @@ distdir: $(DISTFILES)
- top_distdir="$(top_distdir)" distdir="$(distdir)" \
- dist-hook
- -test -n "$(am__skip_mode_fix)" \
-- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+ || find "$(distdir)" -type d ! -perm -755 \
-+ -exec chmod u+rwx,go+rx {} \; -o \
- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-@@ -784,17 +787,17 @@ dist dist-all: distdir
- distcheck: dist
- case '$(DIST_ARCHIVES)' in \
- *.tar.gz*) \
-- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
- *.tar.bz2*) \
-- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
-- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
-+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
- *.tar.xz*) \
- xz -dc $(distdir).tar.xz | $(am__untar) ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
-- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
- *.zip*) \
- unzip $(distdir).zip ;;\
- esac
-diff --git a/aclocal.m4 b/aclocal.m4
-index bebd771..f27448c 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.11 -*- Autoconf -*-
-+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-@@ -13,8 +13,8 @@
-
- m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
--[m4_warning([this file was generated for autoconf 2.64.
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-+[m4_warning([this file was generated for autoconf 2.65.
- 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'.])])
-@@ -453,6 +453,7 @@ fi])
-
-
- # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-+# serial 1 (pkg-config-0.24)
- #
- # Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
- #
-@@ -480,7 +481,10 @@ fi])
- 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
-+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
-@@ -493,7 +497,6 @@ if test -n "$PKG_CONFIG"; then
- AC_MSG_RESULT([no])
- PKG_CONFIG=""
- fi
--
- fi[]dnl
- ])# PKG_PROG_PKG_CONFIG
-
-@@ -502,21 +505,20 @@ fi[]dnl
- # 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],
-@@ -569,6 +571,7 @@ and $1[]_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.])
-
- if test $pkg_failed = yes; then
-+ AC_MSG_RESULT([no])
- _PKG_SHORT_ERRORS_SUPPORTED
- if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
-@@ -578,7 +581,7 @@ if test $pkg_failed = yes; then
- # 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
-@@ -586,25 +589,24 @@ $$1_PKG_ERRORS
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
-
--_PKG_TEXT
--])],
-- [AC_MSG_RESULT([no])
-- $4])
-+_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 <http://pkg-config.freedesktop.org/>.])],
-- [$4])
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])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
-
-@@ -623,7 +625,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
- [am__api_version='1.11'
- dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
- dnl require some minimum version. Point them to the right macro.
--m4_if([$1], [1.11], [],
-+m4_if([$1], [1.11.1], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
-
-@@ -639,7 +641,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.11])dnl
-+[AM_AUTOMAKE_VERSION([1.11.1])dnl
- m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
- _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-diff --git a/config.h.in b/config.h.in
-index e346658..1e7bc6e 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -92,9 +92,18 @@
- /* Define to 1 if you have the <execinfo.h> header file. */
- #undef HAVE_EXECINFO_H
-
-+/* Define to 1 if you have the `fchmod' function. */
-+#undef HAVE_FCHMOD
-+
-+/* Define to 1 if you have the `fchown' function. */
-+#undef HAVE_FCHOWN
-+
- /* Define to 1 if you have the `fork' function. */
- #undef HAVE_FORK
-
-+/* Define to 1 if you have the `fstat' function. */
-+#undef HAVE_FSTAT
-+
- /* Have gdbm? */
- #undef HAVE_GDBM
-
-diff --git a/config.rpath b/config.rpath
-index c547c68..17298f2 100755
---- a/config.rpath
-+++ b/config.rpath
-@@ -2,7 +2,7 @@
- # Output a system dependent set of variables, describing how to set the
- # run time search path of shared libraries in an executable.
- #
--# Copyright 1996-2007 Free Software Foundation, Inc.
-+# Copyright 1996-2010 Free Software Foundation, Inc.
- # Taken from GNU libtool, 2001
- # Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
- #
-@@ -47,7 +47,7 @@ for cc_temp in $CC""; do
- done
- cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
-
--# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
-+# Code taken from libtool.m4's _LT_COMPILER_PIC.
-
- wl=
- if test "$GCC" = yes; then
-@@ -64,7 +64,7 @@ else
- ;;
- esac
- ;;
-- mingw* | cygwin* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2* | cegcc*)
- ;;
- hpux9* | hpux10* | hpux11*)
- wl='-Wl,'
-@@ -76,7 +76,13 @@ else
- ;;
- linux* | k*bsd*-gnu)
- case $cc_basename in
-- icc* | ecc*)
-+ ecc*)
-+ wl='-Wl,'
-+ ;;
-+ icc* | ifort*)
-+ wl='-Wl,'
-+ ;;
-+ lf95*)
- wl='-Wl,'
- ;;
- pgcc | pgf77 | pgf90)
-@@ -124,7 +130,7 @@ else
- esac
- fi
-
--# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
-+# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
-
- hardcode_libdir_flag_spec=
- hardcode_libdir_separator=
-@@ -132,7 +138,7 @@ hardcode_direct=no
- hardcode_minus_L=no
-
- case "$host_os" in
-- cygwin* | mingw* | pw32*)
-+ cygwin* | mingw* | pw32* | cegcc*)
- # FIXME: the MSVC++ port hasn't been tested in a loooong time
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
-@@ -158,7 +164,7 @@ if test "$with_gnu_ld" = yes; then
- # option of GNU ld is called -rpath, not --rpath.
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- case "$host_os" in
-- aix3* | aix4* | aix5*)
-+ aix[3-9]*)
- # On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
- ld_shlibs=no
-@@ -182,7 +188,7 @@ if test "$with_gnu_ld" = yes; then
- ld_shlibs=no
- fi
- ;;
-- cygwin* | mingw* | pw32*)
-+ cygwin* | mingw* | pw32* | cegcc*)
- # hardcode_libdir_flag_spec is actually meaningless, as there is
- # no search path for DLLs.
- hardcode_libdir_flag_spec='-L$libdir'
-@@ -254,7 +260,7 @@ else
- hardcode_direct=unsupported
- fi
- ;;
-- aix4* | aix5*)
-+ aix[4-9]*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
-@@ -264,7 +270,7 @@ else
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
-- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
- for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
- aix_use_runtimelinking=yes
-@@ -326,7 +332,7 @@ else
- ;;
- bsdi[45]*)
- ;;
-- cygwin* | mingw* | pw32*)
-+ cygwin* | mingw* | pw32* | cegcc*)
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
- # hardcode_libdir_flag_spec is actually meaningless, as there is
-@@ -494,7 +500,7 @@ else
- fi
-
- # Check dynamic linker characteristics
--# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
-+# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
- # Unlike libtool.m4, here we don't care about _all_ names of the library, but
- # only about the one the linker finds when passed -lNAME. This is the last
- # element of library_names_spec in libtool.m4, or possibly two of them if the
-@@ -505,7 +511,7 @@ case "$host_os" in
- aix3*)
- library_names_spec='$libname.a'
- ;;
-- aix4* | aix5*)
-+ aix[4-9]*)
- library_names_spec='$libname$shrext'
- ;;
- amigaos*)
-@@ -517,7 +523,7 @@ case "$host_os" in
- bsdi[45]*)
- library_names_spec='$libname$shrext'
- ;;
-- cygwin* | mingw* | pw32*)
-+ cygwin* | mingw* | pw32* | cegcc*)
- shrext=.dll
- library_names_spec='$libname.dll.a $libname.lib'
- ;;
-diff --git a/configure b/configure
-index 9163fd3..5a09e20 100755
---- a/configure
-+++ b/configure
-@@ -1,12 +1,14 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.64 for pulseaudio 0.9.21.
-+# Generated by GNU Autoconf 2.65 for pulseaudio 0.9.21-rebootstrapped-dirty.
- #
- # Report bugs to <mzchyfrnhqvb (at) 0pointer (dot) net>.
- #
-+#
- # 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 Free Software Foundation,
-+# Inc.
-+#
- #
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
-@@ -676,7 +678,8 @@ fi
-
-
-
--exec 7<&0 </dev/null 6>&1
-+test -n "$DJDIR" || exec 7<&0 </dev/null
-+exec 6>&1
-
- # Name of the host.
- # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-@@ -698,8 +701,8 @@ MAKEFLAGS=
- # Identity of this package.
- PACKAGE_NAME='pulseaudio'
- PACKAGE_TARNAME='pulseaudio'
--PACKAGE_VERSION='0.9.21'
--PACKAGE_STRING='pulseaudio 0.9.21'
-+PACKAGE_VERSION='0.9.21-rebootstrapped-dirty'
-+PACKAGE_STRING='pulseaudio 0.9.21-rebootstrapped-dirty'
- PACKAGE_BUGREPORT='mzchyfrnhqvb (at) 0pointer (dot) net'
- PACKAGE_URL=''
-
-@@ -865,6 +868,8 @@ HAVE_X11_TRUE
- HAVE_X11
- X11_LIBS
- X11_CFLAGS
-+PKG_CONFIG_LIBDIR
-+PKG_CONFIG_PATH
- PKG_CONFIG
- pulselocaledir
- MKINSTALLDIRS
-@@ -1119,6 +1124,8 @@ LIBS
- CPPFLAGS
- CPP
- PKG_CONFIG
-+PKG_CONFIG_PATH
-+PKG_CONFIG_LIBDIR
- X11_CFLAGS
- X11_LIBS
- LIBSNDFILE_CFLAGS
-@@ -1694,7 +1701,7 @@ if test "$ac_init_help" = "long"; then
- # Omit some internal or obsolete options to make the list less imposing.
- # This message is too long to be a string in the A/UX 3.1 sh.
- cat <<_ACEOF
--\`configure' configures pulseaudio 0.9.21 to adapt to many kinds of systems.
-+\`configure' configures pulseaudio 0.9.21-rebootstrapped-dirty to adapt to many kinds of systems.
-
- Usage: $0 [OPTION]... [VAR=VALUE]...
-
-@@ -1764,7 +1771,7 @@ fi
-
- if test -n "$ac_init_help"; then
- case $ac_init_help in
-- short | recursive ) echo "Configuration of pulseaudio 0.9.21:";;
-+ short | recursive ) echo "Configuration of pulseaudio 0.9.21-rebootstrapped-dirty:";;
- esac
- cat <<\_ACEOF
-
-@@ -1853,10 +1860,14 @@ Some influential environment variables:
- LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
- nonstandard directory <lib dir>
- LIBS libraries to pass to the linker, e.g. -l<library>
-- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
- you have headers in a nonstandard directory <include dir>
- CPP C preprocessor
- PKG_CONFIG path to pkg-config utility
-+ PKG_CONFIG_PATH
-+ directories to add to pkg-config's search path
-+ PKG_CONFIG_LIBDIR
-+ path overriding pkg-config's built-in search path
- X11_CFLAGS C compiler flags for X11, overriding pkg-config
- X11_LIBS linker flags for X11, overriding pkg-config
- LIBSNDFILE_CFLAGS
-@@ -1975,8 +1986,8 @@ fi
- test -n "$ac_init_help" && exit $ac_status
- if $ac_init_version; then
- cat <<\_ACEOF
--pulseaudio configure 0.9.21
--generated by GNU Autoconf 2.64
-+pulseaudio configure 0.9.21-rebootstrapped-dirty
-+generated by GNU Autoconf 2.65
-
- Copyright (C) 2009 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
-@@ -2023,7 +2034,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- ac_retval=1
- fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-- return $ac_retval
-+ as_fn_set_status $ac_retval
-
- } # ac_fn_c_try_compile
-
-@@ -2060,7 +2071,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- ac_retval=1
- fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-- return $ac_retval
-+ as_fn_set_status $ac_retval
-
- } # ac_fn_c_try_cpp
-
-@@ -2195,7 +2206,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- fi
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-- return $ac_retval
-+ as_fn_set_status $ac_retval
-
- } # ac_fn_c_try_run
-
-@@ -2272,7 +2283,7 @@ fi
- # 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;}
-- return $ac_retval
-+ as_fn_set_status $ac_retval
-
- } # ac_fn_c_try_link
-
-@@ -2439,8 +2450,8 @@ 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 pulseaudio $as_me 0.9.21, which was
--generated by GNU Autoconf 2.64. Invocation command line was
-+It was created by pulseaudio $as_me 0.9.21-rebootstrapped-dirty, which was
-+generated by GNU Autoconf 2.65. Invocation command line was
-
- $ $0 $@
-
-@@ -2693,7 +2704,7 @@ fi
- for ac_site_file in "$ac_site_file1" "$ac_site_file2"
- do
- test "x$ac_site_file" = xNONE && continue
-- if test -r "$ac_site_file"; then
-+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
- $as_echo "$as_me: loading site script $ac_site_file" >&6;}
- sed 's/^/| /' "$ac_site_file" >&5
-@@ -2702,9 +2713,9 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
- done
-
- if test -r "$cache_file"; then
-- # Some versions of bash will fail to source /dev/null (special
-- # files actually), so we avoid doing that.
-- if test -f "$cache_file"; then
-+ # Some versions of bash will fail to source /dev/null (special files
-+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
-+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
- $as_echo "$as_me: loading cache $cache_file" >&6;}
- case $cache_file in
-@@ -2753,6 +2764,9 @@ as_fn_append ac_func_list " lrintf"
- as_fn_append ac_func_list " strtof"
- as_fn_append ac_func_list " chmod"
- as_fn_append ac_func_list " chown"
-+as_fn_append ac_func_list " fstat"
-+as_fn_append ac_func_list " fchown"
-+as_fn_append ac_func_list " fchmod"
- as_fn_append ac_func_list " clock_gettime"
- as_fn_append ac_func_list " getaddrinfo"
- as_fn_append ac_func_list " getgrgid_r"
-@@ -3202,6 +3216,7 @@ IFS=$as_save_IFS
-
- fi
-
-+ test -d ./--version && rmdir ./--version
- if test "${ac_cv_path_mkdir+set}" = set; then
- MKDIR_P="$ac_cv_path_mkdir -p"
- else
-@@ -3209,7 +3224,6 @@ fi
- # value for MKDIR_P within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
-- test -d ./--version && rmdir ./--version
- MKDIR_P="$ac_install_sh -d"
- fi
- fi
-@@ -3338,7 +3352,7 @@ fi
-
- # Define the identity of the package.
- PACKAGE='pulseaudio'
-- VERSION='0.9.21'
-+ VERSION='0.9.21-rebootstrapped-dirty'
-
-
- cat >>confdefs.h <<_ACEOF
-@@ -3949,32 +3963,30 @@ $as_echo "$ac_try_echo"; } >&5
- ... rest of stderr output deleted ...
- 10q' conftest.err >conftest.er1
- cat conftest.er1 >&5
-- rm -f conftest.er1 conftest.err
- fi
-+ rm -f conftest.er1 conftest.err
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
- done
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--#include <stdio.h>
-+
- int
- main ()
- {
--FILE *f = fopen ("conftest.out", "w");
-- return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
-+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
--$as_echo_n "checking for C compiler default output file name... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-+$as_echo_n "checking whether the C compiler works... " >&6; }
- ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
- # The possible output files:
-@@ -4036,10 +4048,10 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
- else
- ac_file=''
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
--$as_echo "$ac_file" >&6; }
- if test -z "$ac_file"; then :
-- $as_echo "$as_me: failed program was:" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-@@ -4047,51 +4059,18 @@ $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; }; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-+$as_echo_n "checking for C compiler default output file name... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-+$as_echo "$ac_file" >&6; }
- ac_exeext=$ac_cv_exeext
-
--# Check that the compiler produces executables we can run. If not, either
--# the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
--$as_echo_n "checking whether the C compiler works... " >&6; }
--# If not cross compiling, check that we can run a simple program.
--if test "$cross_compiling" != yes; then
-- if { ac_try='./$ac_file'
-- { { case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--$as_echo "$ac_try_echo"; } >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; }; }; then
-- cross_compiling=no
-- else
-- if test "$cross_compiling" = maybe; then
-- cross_compiling=yes
-- else
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run C compiled programs.
--If you meant to cross compile, use \`--host'.
--See \`config.log' for more details." "$LINENO" 5; }
-- fi
-- fi
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--
--rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
-+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
--# Check that the compiler produces executables we can run. If not, either
--# the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
--$as_echo_n "checking whether we are cross compiling... " >&6; }
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
--$as_echo "$cross_compiling" >&6; }
--
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
- $as_echo_n "checking for suffix of executables... " >&6; }
- if { { ac_try="$ac_link"
-@@ -4124,13 +4103,72 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error "cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." "$LINENO" 5; }
- fi
--rm -f conftest$ac_cv_exeext
-+rm -f conftest conftest$ac_cv_exeext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
- $as_echo "$ac_cv_exeext" >&6; }
-
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <stdio.h>
-+int
-+main ()
-+{
-+FILE *f = fopen ("conftest.out", "w");
-+ return ferror (f) || fclose (f) != 0;
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+ac_clean_files="$ac_clean_files conftest.out"
-+# Check that the compiler produces executables we can run. If not, either
-+# the compiler is broken, or we cross compile.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-+$as_echo_n "checking whether we are cross compiling... " >&6; }
-+if test "$cross_compiling" != yes; then
-+ { { ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+ (eval "$ac_link") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }
-+ if { ac_try='./conftest$ac_cv_exeext'
-+ { { case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+ (eval "$ac_try") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; }; then
-+ cross_compiling=no
-+ else
-+ if test "$cross_compiling" = maybe; then
-+ cross_compiling=yes
-+ else
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run C compiled programs.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." "$LINENO" 5; }
-+ fi
-+ fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-+$as_echo "$cross_compiling" >&6; }
-+
-+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-+ac_clean_files=$ac_clean_files_save
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
- $as_echo_n "checking for suffix of object files... " >&6; }
- if test "${ac_cv_objext+set}" = set; then :
-@@ -5910,8 +5948,8 @@ esac
-
-
-
--macro_version='2.2.6'
--macro_revision='1.3012'
-+macro_version='2.2.6b'
-+macro_revision='1.3017'
-
-
-
-@@ -6381,13 +6419,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
- else
- lt_cv_nm_interface="BSD nm"
- echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:6384: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:6422: $ac_compile\"" >&5)
- (eval "$ac_compile" 2>conftest.err)
- cat conftest.err >&5
-- (eval echo "\"\$as_me:6387: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:6425: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
- (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
- cat conftest.err >&5
-- (eval echo "\"\$as_me:6390: output\"" >&5)
-+ (eval echo "\"\$as_me:6428: output\"" >&5)
- cat conftest.out >&5
- if $GREP 'External.*some_variable' conftest.out > /dev/null; then
- lt_cv_nm_interface="MS dumpbin"
-@@ -6850,11 +6888,11 @@ irix5* | irix6* | nonstopux*)
- ;;
-
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
--netbsd*)
-+netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
- else
-@@ -7589,7 +7627,7 @@ ia64-*-hpux*)
- ;;
- *-*-irix6*)
- # Find out which ABI we are using.
-- echo '#line 7592 "configure"' > conftest.$ac_ext
-+ echo '#line 7630 "configure"' > conftest.$ac_ext
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-@@ -9147,11 +9185,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9150: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9188: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:9154: \$? = $ac_status" >&5
-+ echo "$as_me:9192: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -9316,7 +9354,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- lt_prog_compiler_static='-non_shared'
- ;;
-
-- linux* | k*bsd*-gnu)
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
- case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
- ecc*)
-@@ -9486,11 +9524,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9489: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9527: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:9493: \$? = $ac_status" >&5
-+ echo "$as_me:9531: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -9591,11 +9629,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9594: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9632: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:9598: \$? = $ac_status" >&5
-+ echo "$as_me:9636: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -9646,11 +9684,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9649: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9687: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:9653: \$? = $ac_status" >&5
-+ echo "$as_me:9691: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -9765,6 +9803,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
- openbsd*)
- with_gnu_ld=no
- ;;
-+ linux* | k*bsd*-gnu)
-+ link_all_deplibs=no
-+ ;;
- esac
-
- ld_shlibs=yes
-@@ -9786,6 +9827,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
- fi
- supports_anon_versioning=no
- case `$LD -v 2>&1` in
-+ *GNU\ gold*) supports_anon_versioning=yes ;;
- *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -9877,7 +9919,7 @@ _LT_EOF
- archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
-- gnu* | linux* | tpf* | k*bsd*-gnu)
-+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
- tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
- case $cc_basename in
-@@ -9947,7 +9989,7 @@ _LT_EOF
- fi
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
-@@ -10122,6 +10164,7 @@ _LT_EOF
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
- fi
-+ link_all_deplibs=no
- else
- # not using gcc
- if test "$host_cpu" = ia64; then
-@@ -10448,7 +10491,7 @@ rm -f core conftest.err conftest.$ac_objext \
- link_all_deplibs=yes
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-@@ -11338,7 +11381,7 @@ linux*oldld* | linux*aout* | linux*coff*)
- ;;
-
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -11378,13 +11421,10 @@ rm -f core conftest.err conftest.$ac_objext \
- # before this can be enabled.
- hardcode_into_libs=yes
-
-- # Add ABI-specific directories to the system library path.
-- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
--
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -11396,6 +11436,18 @@ rm -f core conftest.err conftest.$ac_objext \
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -12016,7 +12068,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
--#line 12019 "configure"
-+#line 12071 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -12112,7 +12164,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
--#line 12115 "configure"
-+#line 12167 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -14806,6 +14858,12 @@ rm -f conftest*
-
-
-
-+
-+
-+
-+
-+
-+
- for ac_func in mkfifo
- do :
- ac_fn_c_check_func "$LINENO" "mkfifo" "ac_cv_func_mkfifo"
-@@ -15380,7 +15438,7 @@ $as_echo_n "checking for ld used by GCC... " >&6; }
- # Canonicalize the path of ld
- ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
- done
- test -z "$LD" && LD="$ac_prog"
- ;;
-@@ -15414,9 +15472,9 @@ else
- # Break only if it was the GNU/non-GNU ld that we prefer.
- case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
- *GNU* | *'with BFD'*)
-- test "$with_gnu_ld" != no && break ;;
-+ test "$with_gnu_ld" != no && break ;;
- *)
-- test "$with_gnu_ld" != yes && break ;;
-+ test "$with_gnu_ld" != yes && break ;;
- esac
- fi
- done
-@@ -15488,23 +15546,70 @@ fi
-
-
-
-- acl_libdirstem=lib
-- searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
-- if test -n "$searchpath"; then
-- acl_save_IFS="${IFS= }"; IFS=":"
-- for searchdir in $searchpath; do
-- if test -d "$searchdir"; then
-- case "$searchdir" in
-- */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
-- *) searchdir=`cd "$searchdir" && pwd`
-- case "$searchdir" in
-- */lib64 ) acl_libdirstem=lib64 ;;
-- esac ;;
-+
-+ acl_libdirstem=lib
-+ acl_libdirstem2=
-+ case "$host_os" in
-+ solaris*)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
-+$as_echo_n "checking for 64-bit host... " >&6; }
-+if test "${gl_cv_solaris_64bit+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+#ifdef _LP64
-+sixtyfour bits
-+#endif
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ $EGREP "sixtyfour bits" >/dev/null 2>&1; then :
-+ gl_cv_solaris_64bit=yes
-+else
-+ gl_cv_solaris_64bit=no
-+fi
-+rm -f conftest*
-+
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
-+$as_echo "$gl_cv_solaris_64bit" >&6; }
-+ if test $gl_cv_solaris_64bit = yes; then
-+ acl_libdirstem=lib/64
-+ case "$host_cpu" in
-+ sparc*) acl_libdirstem2=lib/sparcv9 ;;
-+ i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
- esac
- fi
-- done
-- IFS="$acl_save_IFS"
-- fi
-+ ;;
-+ *)
-+ searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
-+ if test -n "$searchpath"; then
-+ acl_save_IFS="${IFS= }"; IFS=":"
-+ for searchdir in $searchpath; do
-+ if test -d "$searchdir"; then
-+ case "$searchdir" in
-+ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
-+ */../ | */.. )
-+ # Better ignore directories of this form. They are misleading.
-+ ;;
-+ *) searchdir=`cd "$searchdir" && pwd`
-+ case "$searchdir" in
-+ */lib64 ) acl_libdirstem=lib64 ;;
-+ esac ;;
-+ esac
-+ fi
-+ done
-+ IFS="$acl_save_IFS"
-+ fi
-+ ;;
-+ esac
-+ test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
-+
-+
-+
-
-
-
-@@ -15550,6 +15655,10 @@ if test "${with_libiconv_prefix+set}" = set; then :
- else
- additional_includedir="$withval/include"
- additional_libdir="$withval/$acl_libdirstem"
-+ if test "$acl_libdirstem2" != "$acl_libdirstem" \
-+ && ! test -d "$withval/$acl_libdirstem"; then
-+ additional_libdir="$withval/$acl_libdirstem2"
-+ fi
- fi
- fi
-
-@@ -15559,6 +15668,7 @@ fi
- LTLIBICONV=
- INCICONV=
- LIBICONV_PREFIX=
-+ HAVE_LIBICONV=
- rpathdirs=
- ltrpathdirs=
- names_already_handled=
-@@ -15701,7 +15811,9 @@ fi
- if test "X$found_dir" != "X"; then
- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
- if test "X$found_so" != "X"; then
-- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
-+ if test "$enable_rpath" = no \
-+ || test "X$found_dir" = "X/usr/$acl_libdirstem" \
-+ || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
- LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
- else
- haveit=
-@@ -15768,7 +15880,16 @@ fi
- case "$found_dir" in
- */$acl_libdirstem | */$acl_libdirstem/)
- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
-- LIBICONV_PREFIX="$basedir"
-+ if test "$name" = 'iconv'; then
-+ LIBICONV_PREFIX="$basedir"
-+ fi
-+ additional_includedir="$basedir/include"
-+ ;;
-+ */$acl_libdirstem2 | */$acl_libdirstem2/)
-+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
-+ if test "$name" = 'iconv'; then
-+ LIBICONV_PREFIX="$basedir"
-+ fi
- additional_includedir="$basedir/include"
- ;;
- esac
-@@ -15817,9 +15938,11 @@ fi
- case "$dep" in
- -L*)
- additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-- if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
-+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
-+ && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
- haveit=
-- if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
-+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
-+ || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
- if test -n "$GCC"; then
- case $host_os in
- linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-@@ -15951,6 +16074,11 @@ fi
-
-
-
-+
-+
-+
-+
-+
- am_save_CPPFLAGS="$CPPFLAGS"
-
- for element in $INCICONV; do
-@@ -16075,6 +16203,25 @@ int main ()
- return 1;
- }
- }
-+ /* Test against Solaris 10 bug: Failures are not distinguishable from
-+ successful returns. */
-+ {
-+ iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
-+ if (cd_ascii_to_88591 != (iconv_t)(-1))
-+ {
-+ static const char input[] = "\263";
-+ char buf[10];
-+ const char *inptr = input;
-+ size_t inbytesleft = strlen (input);
-+ char *outptr = buf;
-+ size_t outbytesleft = sizeof (buf);
-+ size_t res = iconv (cd_ascii_to_88591,
-+ (char **) &inptr, &inbytesleft,
-+ &outptr, &outbytesleft);
-+ if (res == 0)
-+ return 1;
-+ }
-+ }
- #if 0 /* This bug could be worked around by the caller. */
- /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
- {
-@@ -16188,10 +16335,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-
- am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:-
-- }$am_cv_proto_iconv" >&5
--$as_echo "${ac_t:-
-- }$am_cv_proto_iconv" >&6; }
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result:
-+ $am_cv_proto_iconv" >&5
-+$as_echo "
-+ $am_cv_proto_iconv" >&6; }
-
- cat >>confdefs.h <<_ACEOF
- #define ICONV_CONST $am_cv_proto_iconv_arg1
-@@ -17481,6 +17628,10 @@ pulselocaledir='${prefix}/${DATADIRNAME}/locale'
-
-
-
-+
-+
-+
-+
- 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.
-@@ -17593,7 +17744,6 @@ $as_echo "yes" >&6; }
- $as_echo "no" >&6; }
- PKG_CONFIG=""
- fi
--
- fi
-
- #### X11 (optional) ####
-@@ -17654,6 +17804,8 @@ 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
-@@ -17668,8 +17820,6 @@ fi
- # Put the nasty error message in config.log where it belongs
- echo "$X11_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-
- HAVE_X11=0
- if test "x$x11" = xyes ; then
-@@ -17677,6 +17827,8 @@ $as_echo "no" >&6; }
- fi
-
- elif test $pkg_failed = untried; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-
- HAVE_X11=0
- if test "x$x11" = xyes ; then
-@@ -17853,6 +18005,8 @@ 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
-@@ -17876,9 +18030,10 @@ installed software in a non-standard prefix.
-
- Alternatively, you may set the environment variables LIBSNDFILE_CFLAGS
- and LIBSNDFILE_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
-@@ -17896,7 +18051,7 @@ else
- LIBSNDFILE_LIBS=$pkg_cv_LIBSNDFILE_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-- :
-+
- fi
-
-
-@@ -17942,6 +18097,8 @@ 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
-@@ -17965,9 +18122,10 @@ installed software in a non-standard prefix.
-
- Alternatively, you may set the environment variables LIBSPEEX_CFLAGS
- and LIBSPEEX_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
-@@ -17985,7 +18143,7 @@ else
- LIBSPEEX_LIBS=$pkg_cv_LIBSPEEX_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-- :
-+
- fi
-
-
-@@ -18081,6 +18239,8 @@ 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
-@@ -18095,8 +18255,6 @@ fi
- # Put the nasty error message in config.log where it belongs
- echo "$LIBSAMPLERATE_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-
- HAVE_LIBSAMPLERATE=0
- if test "x$samplerate" = xyes ; then
-@@ -18104,6 +18262,8 @@ $as_echo "no" >&6; }
- fi
-
- elif test $pkg_failed = untried; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-
- HAVE_LIBSAMPLERATE=0
- if test "x$samplerate" = xyes ; then
-@@ -18196,6 +18356,8 @@ 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
-@@ -18210,14 +18372,14 @@ fi
- # Put the nasty error message in config.log where it belongs
- echo "$TDB_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-
- if test "x${with_database}" = "xtdb" ; then
- as_fn_error "*** tdb not found" "$LINENO" 5
- fi
-
- elif test $pkg_failed = untried; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-
- if test "x${with_database}" = "xtdb" ; then
- as_fn_error "*** tdb not found" "$LINENO" 5
-@@ -18513,6 +18675,8 @@ 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
-@@ -18527,8 +18691,6 @@ fi
- # Put the nasty error message in config.log where it belongs
- echo "$ASOUNDLIB_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-
- HAVE_ALSA=0
- if test "x$alsa" = xyes ; then
-@@ -18536,6 +18698,8 @@ $as_echo "no" >&6; }
- fi
-
- elif test $pkg_failed = untried; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-
- HAVE_ALSA=0
- if test "x$alsa" = xyes ; then
-@@ -18683,6 +18847,8 @@ 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
-@@ -18697,8 +18863,6 @@ fi
- # Put the nasty error message in config.log where it belongs
- echo "$GLIB20_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-
- HAVE_GLIB20=0
- if test "x$glib2" = xyes ; then
-@@ -18706,6 +18870,8 @@ $as_echo "no" >&6; }
- fi
-
- elif test $pkg_failed = untried; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-
- HAVE_GLIB20=0
- if test "x$glib2" = xyes ; then
-@@ -18799,6 +18965,8 @@ 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
-@@ -18813,8 +18981,6 @@ fi
- # Put the nasty error message in config.log where it belongs
- echo "$GTK20_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-
- HAVE_GTK20=0
- if test "x$gtk2" = xyes ; then
-@@ -18822,6 +18988,8 @@ $as_echo "no" >&6; }
- fi
-
- elif test $pkg_failed = untried; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-
- HAVE_GTK20=0
- if test "x$gtk2" = xyes ; then
-@@ -18915,6 +19083,8 @@ 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
-@@ -18929,8 +19099,6 @@ fi
- # Put the nasty error message in config.log where it belongs
- echo "$GCONF_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-
- HAVE_GCONF=0
- if test "x$gconf" = xyes ; then
-@@ -18938,6 +19106,8 @@ $as_echo "no" >&6; }
- fi
-
- elif test $pkg_failed = untried; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-
- HAVE_GCONF=0
- if test "x$gconf" = xyes ; then
-@@ -19025,6 +19195,8 @@ 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
-@@ -19039,8 +19211,6 @@ fi
- # Put the nasty error message in config.log where it belongs
- echo "$AVAHI_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-
- HAVE_AVAHI=0
- if test "x$avahi" = xyes ; then
-@@ -19048,6 +19218,8 @@ $as_echo "no" >&6; }
- fi
-
- elif test $pkg_failed = untried; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-
- HAVE_AVAHI=0
- if test "x$avahi" = xyes ; then
-@@ -19135,6 +19307,8 @@ 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
-@@ -19149,8 +19323,6 @@ fi
- # Put the nasty error message in config.log where it belongs
- echo "$JACK_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-
- HAVE_JACK=0
- if test "x$jack" = xyes ; then
-@@ -19158,6 +19330,8 @@ $as_echo "no" >&6; }
- fi
-
- elif test $pkg_failed = untried; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-
- HAVE_JACK=0
- if test "x$jack" = xyes ; then
-@@ -19245,6 +19419,8 @@ 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
-@@ -19259,8 +19435,6 @@ fi
- # Put the nasty error message in config.log where it belongs
- echo "$LIBASYNCNS_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-
- HAVE_LIBASYNCNS=0
- if test "x$asyncns" = xyes ; then
-@@ -19268,6 +19442,8 @@ $as_echo "no" >&6; }
- fi
-
- elif test $pkg_failed = untried; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-
- HAVE_LIBASYNCNS=0
- if test "x$asyncns" = xyes ; then
-@@ -19511,6 +19687,8 @@ 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
-@@ -19525,8 +19703,6 @@ fi
- # Put the nasty error message in config.log where it belongs
- echo "$HAL_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-
- HAVE_HAL=0
- if test "x$hal" = xyes ; then
-@@ -19534,6 +19710,8 @@ $as_echo "no" >&6; }
- fi
-
- elif test $pkg_failed = untried; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-
- HAVE_HAL=0
- if test "x$hal" = xyes ; then
-@@ -19625,6 +19803,8 @@ 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
-@@ -19639,8 +19819,6 @@ fi
- # Put the nasty error message in config.log where it belongs
- echo "$UDEV_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-
- HAVE_UDEV=0
- if test "x$udev" = xyes ; then
-@@ -19648,6 +19826,8 @@ $as_echo "no" >&6; }
- fi
-
- elif test $pkg_failed = untried; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-
- HAVE_UDEV=0
- if test "x$udev" = xyes ; then
-@@ -19773,6 +19953,8 @@ 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
-@@ -19787,8 +19969,6 @@ fi
- # Put the nasty error message in config.log where it belongs
- echo "$BLUEZ_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-
- HAVE_BLUEZ=0
- if test "x$bluez" = xyes ; then
-@@ -19796,6 +19976,8 @@ $as_echo "no" >&6; }
- fi
-
- elif test $pkg_failed = untried; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-
- HAVE_BLUEZ=0
- if test "x$bluez" = xyes ; then
-@@ -19888,6 +20070,8 @@ 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
-@@ -19902,8 +20086,6 @@ fi
- # Put the nasty error message in config.log where it belongs
- echo "$DBUS_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-
- HAVE_DBUS=0
- if test "x$dbus" = xyes ; then
-@@ -19911,6 +20093,8 @@ $as_echo "no" >&6; }
- fi
-
- elif test $pkg_failed = untried; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-
- HAVE_DBUS=0
- if test "x$dbus" = xyes ; then
-@@ -20043,6 +20227,8 @@ 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
-@@ -20057,8 +20243,6 @@ fi
- # Put the nasty error message in config.log where it belongs
- echo "$OPENSSL_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-
- HAVE_OPENSSL=0
- if test "x$openssl" = xyes ; then
-@@ -20066,6 +20250,8 @@ $as_echo "no" >&6; }
- fi
-
- elif test $pkg_failed = untried; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-
- HAVE_OPENSSL=0
- if test "x$openssl" = xyes ; then
-@@ -20950,8 +21136,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- # report actual input values of CONFIG_FILES etc. instead of their
- # values after options handling.
- ac_log="
--This file was extended by pulseaudio $as_me 0.9.21, which was
--generated by GNU Autoconf 2.64. Invocation command line was
-+This file was extended by pulseaudio $as_me 0.9.21-rebootstrapped-dirty, which was
-+generated by GNU Autoconf 2.65. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -20991,6 +21177,7 @@ Usage: $0 [OPTION]... [TAG]...
-
- -h, --help print this help, then exit
- -V, --version print version number and configuration settings, then exit
-+ --config print configuration, then exit
- -q, --quiet, --silent
- do not print progress messages
- -d, --debug don't remove temporary files
-@@ -21013,10 +21200,11 @@ Report bugs to <mzchyfrnhqvb (at) 0pointer (dot) net>."
-
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
- ac_cs_version="\\
--pulseaudio config.status 0.9.21
--configured by $0, generated by GNU Autoconf 2.64,
-- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+pulseaudio config.status 0.9.21-rebootstrapped-dirty
-+configured by $0, generated by GNU Autoconf 2.65,
-+ with options \\"\$ac_cs_config\\"
-
- Copyright (C) 2009 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
-@@ -21054,6 +21242,8 @@ do
- ac_cs_recheck=: ;;
- --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
- $as_echo "$ac_cs_version"; exit ;;
-+ --config | --confi | --conf | --con | --co | --c )
-+ $as_echo "$ac_cs_config"; exit ;;
- --debug | --debu | --deb | --de | --d | -d )
- debug=: ;;
- --file | --fil | --fi | --f )
-@@ -21511,7 +21701,7 @@ s/'"$ac_delim"'$//
- t delim
- :nl
- h
--s/\(.\{148\}\).*/\1/
-+s/\(.\{148\}\)..*/\1/
- t more1
- s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
- p
-@@ -21525,7 +21715,7 @@ s/.\{148\}//
- t nl
- :delim
- h
--s/\(.\{148\}\).*/\1/
-+s/\(.\{148\}\)..*/\1/
- t more2
- s/["\\]/\\&/g; s/^/"/; s/$/"/
- p
-diff --git a/doxygen/Makefile.in b/doxygen/Makefile.in
-index d8feafa..385a59a 100644
---- a/doxygen/Makefile.in
-+++ b/doxygen/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -231,6 +231,8 @@ PA_SYSTEM_RUNTIME_PATH = @PA_SYSTEM_RUNTIME_PATH@
- PA_SYSTEM_STATE_PATH = @PA_SYSTEM_STATE_PATH@
- PA_SYSTEM_USER = @PA_SYSTEM_USER@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POFILES = @POFILES@
- POSUB = @POSUB@
- PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-diff --git a/ltmain.sh b/ltmain.sh
-index 6939dcc..d88da2c 100755
---- a/ltmain.sh
-+++ b/ltmain.sh
-@@ -1,6 +1,6 @@
- # Generated from ltmain.m4sh.
-
--# ltmain.sh (GNU libtool) 2.2.6
-+# ltmain.sh (GNU libtool) 2.2.6b
- # Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
-@@ -65,7 +65,7 @@
- # compiler: $LTCC
- # compiler flags: $LTCFLAGS
- # linker: $LD (gnu? $with_gnu_ld)
--# $progname: (GNU libtool) 2.2.6
-+# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2
- # automake: $automake_version
- # autoconf: $autoconf_version
- #
-@@ -73,9 +73,9 @@
-
- PROGRAM=ltmain.sh
- PACKAGE=libtool
--VERSION=2.2.6
-+VERSION="2.2.6b Debian-2.2.6b-2"
- TIMESTAMP=""
--package_revision=1.3012
-+package_revision=1.3017
-
- # Be Bourne compatible
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -5033,7 +5033,10 @@ func_mode_link ()
- case $pass in
- dlopen) libs="$dlfiles" ;;
- dlpreopen) libs="$dlprefiles" ;;
-- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-+ link)
-+ libs="$deplibs %DEPLIBS%"
-+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-+ ;;
- esac
- fi
- if test "$linkmode,$pass" = "lib,dlpreopen"; then
-@@ -5344,19 +5347,19 @@ func_mode_link ()
- # It is a libtool convenience library, so add in its objects.
- convenience="$convenience $ladir/$objdir/$old_library"
- old_convenience="$old_convenience $ladir/$objdir/$old_library"
-+ tmp_libs=
-+ for deplib in $dependency_libs; do
-+ deplibs="$deplib $deplibs"
-+ if $opt_duplicate_deps ; then
-+ case "$tmp_libs " in
-+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+ esac
-+ fi
-+ tmp_libs="$tmp_libs $deplib"
-+ done
- elif test "$linkmode" != prog && test "$linkmode" != lib; then
- func_fatal_error "\`$lib' is not a convenience library"
- fi
-- tmp_libs=
-- for deplib in $dependency_libs; do
-- deplibs="$deplib $deplibs"
-- if $opt_duplicate_deps ; then
-- case "$tmp_libs " in
-- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-- esac
-- fi
-- tmp_libs="$tmp_libs $deplib"
-- done
- continue
- fi # $pass = conv
-
-@@ -5893,6 +5896,7 @@ func_mode_link ()
- if test "$link_all_deplibs" != no; then
- # Add the search paths of all dependency libraries
- for deplib in $dependency_libs; do
-+ path=
- case $deplib in
- -L*) path="$deplib" ;;
- *.la)
-@@ -6206,6 +6210,9 @@ func_mode_link ()
- revision="$number_minor"
- lt_irix_increment=no
- ;;
-+ *)
-+ func_fatal_configuration "$modename: unknown library version type \`$version_type'"
-+ ;;
- esac
- ;;
- no)
-diff --git a/m4/gettext.m4 b/m4/gettext.m4
-new file mode 100644
-index 0000000..f84e6a5
---- /dev/null
-+++ b/m4/gettext.m4
-@@ -0,0 +1,383 @@
-+# gettext.m4 serial 63 (gettext-0.18)
-+dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+dnl
-+dnl This file can can be used in projects which are not available under
-+dnl the GNU General Public License or the GNU Library General Public
-+dnl License but which still want to provide support for the GNU gettext
-+dnl functionality.
-+dnl Please note that the actual code of the GNU gettext library is covered
-+dnl by the GNU Library General Public License, and the rest of the GNU
-+dnl gettext package package is covered by the GNU General Public License.
-+dnl They are *not* in the public domain.
-+
-+dnl Authors:
-+dnl Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
-+dnl Bruno Haible <haible at clisp.cons.org>, 2000-2006, 2008-2010.
-+
-+dnl Macro to add for using GNU gettext.
-+
-+dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
-+dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
-+dnl default (if it is not specified or empty) is 'no-libtool'.
-+dnl INTLSYMBOL should be 'external' for packages with no intl directory,
-+dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory.
-+dnl If INTLSYMBOL is 'use-libtool', then a libtool library
-+dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static,
-+dnl depending on --{enable,disable}-{shared,static} and on the presence of
-+dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
-+dnl $(top_builddir)/intl/libintl.a will be created.
-+dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
-+dnl implementations (in libc or libintl) without the ngettext() function
-+dnl will be ignored. If NEEDSYMBOL is specified and is
-+dnl 'need-formatstring-macros', then GNU gettext implementations that don't
-+dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
-+dnl INTLDIR is used to find the intl libraries. If empty,
-+dnl the value `$(top_builddir)/intl/' is used.
-+dnl
-+dnl The result of the configuration is one of three cases:
-+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
-+dnl and used.
-+dnl Catalog format: GNU --> install in $(datadir)
-+dnl Catalog extension: .mo after installation, .gmo in source tree
-+dnl 2) GNU gettext has been found in the system's C library.
-+dnl Catalog format: GNU --> install in $(datadir)
-+dnl Catalog extension: .mo after installation, .gmo in source tree
-+dnl 3) No internationalization, always use English msgid.
-+dnl Catalog format: none
-+dnl Catalog extension: none
-+dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
-+dnl The use of .gmo is historical (it was needed to avoid overwriting the
-+dnl GNU format catalogs when building on a platform with an X/Open gettext),
-+dnl but we keep it in order not to force irrelevant filename changes on the
-+dnl maintainers.
-+dnl
-+AC_DEFUN([AM_GNU_GETTEXT],
-+[
-+ dnl Argument checking.
-+ ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
-+ [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
-+])])])])])
-+ ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
-+ [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
-+ ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
-+ [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
-+])])])])
-+ define([gt_included_intl],
-+ ifelse([$1], [external],
-+ ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
-+ [yes]))
-+ define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
-+ gt_NEEDS_INIT
-+ AM_GNU_GETTEXT_NEED([$2])
-+
-+ AC_REQUIRE([AM_PO_SUBDIRS])dnl
-+ ifelse(gt_included_intl, yes, [
-+ AC_REQUIRE([AM_INTL_SUBDIR])dnl
-+ ])
-+
-+ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-+ AC_REQUIRE([AC_LIB_RPATH])
-+
-+ dnl Sometimes libintl requires libiconv, so first search for libiconv.
-+ dnl Ideally we would do this search only after the
-+ dnl if test "$USE_NLS" = "yes"; then
-+ dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
-+ dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
-+ dnl the configure script would need to contain the same shell code
-+ dnl again, outside any 'if'. There are two solutions:
-+ dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
-+ dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
-+ dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
-+ dnl documented, we avoid it.
-+ ifelse(gt_included_intl, yes, , [
-+ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-+ ])
-+
-+ dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
-+ gt_INTL_MACOSX
-+
-+ dnl Set USE_NLS.
-+ AC_REQUIRE([AM_NLS])
-+
-+ ifelse(gt_included_intl, yes, [
-+ BUILD_INCLUDED_LIBINTL=no
-+ USE_INCLUDED_LIBINTL=no
-+ ])
-+ LIBINTL=
-+ LTLIBINTL=
-+ POSUB=
-+
-+ dnl Add a version number to the cache macros.
-+ case " $gt_needs " in
-+ *" need-formatstring-macros "*) gt_api_version=3 ;;
-+ *" need-ngettext "*) gt_api_version=2 ;;
-+ *) gt_api_version=1 ;;
-+ esac
-+ gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
-+ gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
-+
-+ dnl If we use NLS figure out what method
-+ if test "$USE_NLS" = "yes"; then
-+ gt_use_preinstalled_gnugettext=no
-+ ifelse(gt_included_intl, yes, [
-+ AC_MSG_CHECKING([whether included gettext is requested])
-+ AC_ARG_WITH([included-gettext],
-+ [ --with-included-gettext use the GNU gettext library included here],
-+ nls_cv_force_use_gnu_gettext=$withval,
-+ nls_cv_force_use_gnu_gettext=no)
-+ AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
-+
-+ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-+ if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-+ ])
-+ dnl User does not insist on using GNU NLS library. Figure out what
-+ dnl to use. If GNU gettext is available we use this. Else we have
-+ dnl to fall back to GNU NLS library.
-+
-+ if test $gt_api_version -ge 3; then
-+ gt_revision_test_code='
-+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-+#endif
-+changequote(,)dnl
-+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-+changequote([,])dnl
-+'
-+ else
-+ gt_revision_test_code=
-+ fi
-+ if test $gt_api_version -ge 2; then
-+ gt_expression_test_code=' + * ngettext ("", "", 0)'
-+ else
-+ gt_expression_test_code=
-+ fi
-+
-+ AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
-+ [AC_TRY_LINK([#include <libintl.h>
-+$gt_revision_test_code
-+extern int _nl_msg_cat_cntr;
-+extern int *_nl_domain_bindings;],
-+ [bindtextdomain ("", "");
-+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings],
-+ [eval "$gt_func_gnugettext_libc=yes"],
-+ [eval "$gt_func_gnugettext_libc=no"])])
-+
-+ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
-+ dnl Sometimes libintl requires libiconv, so first search for libiconv.
-+ ifelse(gt_included_intl, yes, , [
-+ AM_ICONV_LINK
-+ ])
-+ dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
-+ dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
-+ dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
-+ dnl even if libiconv doesn't exist.
-+ AC_LIB_LINKFLAGS_BODY([intl])
-+ AC_CACHE_CHECK([for GNU gettext in libintl],
-+ [$gt_func_gnugettext_libintl],
-+ [gt_save_CPPFLAGS="$CPPFLAGS"
-+ CPPFLAGS="$CPPFLAGS $INCINTL"
-+ gt_save_LIBS="$LIBS"
-+ LIBS="$LIBS $LIBINTL"
-+ dnl Now see whether libintl exists and does not depend on libiconv.
-+ AC_TRY_LINK([#include <libintl.h>
-+$gt_revision_test_code
-+extern int _nl_msg_cat_cntr;
-+extern
-+#ifdef __cplusplus
-+"C"
-+#endif
-+const char *_nl_expand_alias (const char *);],
-+ [bindtextdomain ("", "");
-+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
-+ [eval "$gt_func_gnugettext_libintl=yes"],
-+ [eval "$gt_func_gnugettext_libintl=no"])
-+ dnl Now see whether libintl exists and depends on libiconv.
-+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
-+ LIBS="$LIBS $LIBICONV"
-+ AC_TRY_LINK([#include <libintl.h>
-+$gt_revision_test_code
-+extern int _nl_msg_cat_cntr;
-+extern
-+#ifdef __cplusplus
-+"C"
-+#endif
-+const char *_nl_expand_alias (const char *);],
-+ [bindtextdomain ("", "");
-+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
-+ [LIBINTL="$LIBINTL $LIBICONV"
-+ LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-+ eval "$gt_func_gnugettext_libintl=yes"
-+ ])
-+ fi
-+ CPPFLAGS="$gt_save_CPPFLAGS"
-+ LIBS="$gt_save_LIBS"])
-+ fi
-+
-+ dnl If an already present or preinstalled GNU gettext() is found,
-+ dnl use it. But if this macro is used in GNU gettext, and GNU
-+ dnl gettext is already preinstalled in libintl, we update this
-+ dnl libintl. (Cf. the install rule in intl/Makefile.in.)
-+ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
-+ || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
-+ && test "$PACKAGE" != gettext-runtime \
-+ && test "$PACKAGE" != gettext-tools; }; then
-+ gt_use_preinstalled_gnugettext=yes
-+ else
-+ dnl Reset the values set by searching for libintl.
-+ LIBINTL=
-+ LTLIBINTL=
-+ INCINTL=
-+ fi
-+
-+ ifelse(gt_included_intl, yes, [
-+ if test "$gt_use_preinstalled_gnugettext" != "yes"; then
-+ dnl GNU gettext is not found in the C library.
-+ dnl Fall back on included GNU gettext library.
-+ nls_cv_use_gnu_gettext=yes
-+ fi
-+ fi
-+
-+ if test "$nls_cv_use_gnu_gettext" = "yes"; then
-+ dnl Mark actions used to generate GNU NLS library.
-+ BUILD_INCLUDED_LIBINTL=yes
-+ USE_INCLUDED_LIBINTL=yes
-+ LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
-+ LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
-+ LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-+ fi
-+
-+ CATOBJEXT=
-+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
-+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
-+ dnl Mark actions to use GNU gettext tools.
-+ CATOBJEXT=.gmo
-+ fi
-+ ])
-+
-+ if test -n "$INTL_MACOSX_LIBS"; then
-+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
-+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
-+ dnl Some extra flags are needed during linking.
-+ LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
-+ LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
-+ fi
-+ fi
-+
-+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
-+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
-+ AC_DEFINE([ENABLE_NLS], [1],
-+ [Define to 1 if translation of program messages to the user's native language
-+ is requested.])
-+ else
-+ USE_NLS=no
-+ fi
-+ fi
-+
-+ AC_MSG_CHECKING([whether to use NLS])
-+ AC_MSG_RESULT([$USE_NLS])
-+ if test "$USE_NLS" = "yes"; then
-+ AC_MSG_CHECKING([where the gettext function comes from])
-+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-+ gt_source="external libintl"
-+ else
-+ gt_source="libc"
-+ fi
-+ else
-+ gt_source="included intl directory"
-+ fi
-+ AC_MSG_RESULT([$gt_source])
-+ fi
-+
-+ if test "$USE_NLS" = "yes"; then
-+
-+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-+ AC_MSG_CHECKING([how to link with libintl])
-+ AC_MSG_RESULT([$LIBINTL])
-+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
-+ fi
-+
-+ dnl For backward compatibility. Some packages may be using this.
-+ AC_DEFINE([HAVE_GETTEXT], [1],
-+ [Define if the GNU gettext() function is already present or preinstalled.])
-+ AC_DEFINE([HAVE_DCGETTEXT], [1],
-+ [Define if the GNU dcgettext() function is already present or preinstalled.])
-+ fi
-+
-+ dnl We need to process the po/ directory.
-+ POSUB=po
-+ fi
-+
-+ ifelse(gt_included_intl, yes, [
-+ dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
-+ dnl to 'yes' because some of the testsuite requires it.
-+ if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
-+ BUILD_INCLUDED_LIBINTL=yes
-+ fi
-+
-+ dnl Make all variables we use known to autoconf.
-+ AC_SUBST([BUILD_INCLUDED_LIBINTL])
-+ AC_SUBST([USE_INCLUDED_LIBINTL])
-+ AC_SUBST([CATOBJEXT])
-+
-+ dnl For backward compatibility. Some configure.ins may be using this.
-+ nls_cv_header_intl=
-+ nls_cv_header_libgt=
-+
-+ dnl For backward compatibility. Some Makefiles may be using this.
-+ DATADIRNAME=share
-+ AC_SUBST([DATADIRNAME])
-+
-+ dnl For backward compatibility. Some Makefiles may be using this.
-+ INSTOBJEXT=.mo
-+ AC_SUBST([INSTOBJEXT])
-+
-+ dnl For backward compatibility. Some Makefiles may be using this.
-+ GENCAT=gencat
-+ AC_SUBST([GENCAT])
-+
-+ dnl For backward compatibility. Some Makefiles may be using this.
-+ INTLOBJS=
-+ if test "$USE_INCLUDED_LIBINTL" = yes; then
-+ INTLOBJS="\$(GETTOBJS)"
-+ fi
-+ AC_SUBST([INTLOBJS])
-+
-+ dnl Enable libtool support if the surrounding package wishes it.
-+ INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
-+ AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
-+ ])
-+
-+ dnl For backward compatibility. Some Makefiles may be using this.
-+ INTLLIBS="$LIBINTL"
-+ AC_SUBST([INTLLIBS])
-+
-+ dnl Make all documented variables known to autoconf.
-+ AC_SUBST([LIBINTL])
-+ AC_SUBST([LTLIBINTL])
-+ AC_SUBST([POSUB])
-+])
-+
-+
-+dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
-+m4_define([gt_NEEDS_INIT],
-+[
-+ m4_divert_text([DEFAULTS], [gt_needs=])
-+ m4_define([gt_NEEDS_INIT], [])
-+])
-+
-+
-+dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
-+AC_DEFUN([AM_GNU_GETTEXT_NEED],
-+[
-+ m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
-+])
-+
-+
-+dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
-+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
-diff --git a/m4/iconv.m4 b/m4/iconv.m4
-index 66bc76f..e2041b9 100644
---- a/m4/iconv.m4
-+++ b/m4/iconv.m4
-@@ -1,5 +1,5 @@
--# iconv.m4 serial AM6 (gettext-0.17)
--dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc.
-+# iconv.m4 serial 11 (gettext-0.18.1)
-+dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
- dnl with or without modifications, as long as this notice is preserved.
-@@ -34,7 +34,7 @@ AC_DEFUN([AM_ICONV_LINK],
- am_save_CPPFLAGS="$CPPFLAGS"
- AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
-
-- AC_CACHE_CHECK([for iconv], am_cv_func_iconv, [
-+ AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
- am_cv_func_iconv="no, consider installing GNU libiconv"
- am_cv_lib_iconv=no
- AC_TRY_LINK([#include <stdlib.h>
-@@ -42,7 +42,7 @@ AC_DEFUN([AM_ICONV_LINK],
- [iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);],
-- am_cv_func_iconv=yes)
-+ [am_cv_func_iconv=yes])
- if test "$am_cv_func_iconv" != yes; then
- am_save_LIBS="$LIBS"
- LIBS="$LIBS $LIBICONV"
-@@ -51,14 +51,14 @@ AC_DEFUN([AM_ICONV_LINK],
- [iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);],
-- am_cv_lib_iconv=yes
-- am_cv_func_iconv=yes)
-+ [am_cv_lib_iconv=yes]
-+ [am_cv_func_iconv=yes])
- LIBS="$am_save_LIBS"
- fi
- ])
- if test "$am_cv_func_iconv" = yes; then
-- AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [
-- dnl This tests against bugs in AIX 5.1 and HP-UX 11.11.
-+ AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
-+ dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10.
- am_save_LIBS="$LIBS"
- if test $am_cv_lib_iconv = yes; then
- LIBS="$LIBS $LIBICONV"
-@@ -87,6 +87,25 @@ int main ()
- return 1;
- }
- }
-+ /* Test against Solaris 10 bug: Failures are not distinguishable from
-+ successful returns. */
-+ {
-+ iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
-+ if (cd_ascii_to_88591 != (iconv_t)(-1))
-+ {
-+ static const char input[] = "\263";
-+ char buf[10];
-+ const char *inptr = input;
-+ size_t inbytesleft = strlen (input);
-+ char *outptr = buf;
-+ size_t outbytesleft = sizeof (buf);
-+ size_t res = iconv (cd_ascii_to_88591,
-+ (char **) &inptr, &inbytesleft,
-+ &outptr, &outbytesleft);
-+ if (res == 0)
-+ return 1;
-+ }
-+ }
- #if 0 /* This bug could be worked around by the caller. */
- /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
- {
-@@ -134,7 +153,7 @@ int main ()
- am_func_iconv=no am_cv_lib_iconv=no
- fi
- if test "$am_func_iconv" = yes; then
-- AC_DEFINE(HAVE_ICONV, 1,
-+ AC_DEFINE([HAVE_ICONV], [1],
- [Define if you have the iconv() function and it works.])
- fi
- if test "$am_cv_lib_iconv" = yes; then
-@@ -147,16 +166,31 @@ int main ()
- LIBICONV=
- LTLIBICONV=
- fi
-- AC_SUBST(LIBICONV)
-- AC_SUBST(LTLIBICONV)
-+ AC_SUBST([LIBICONV])
-+ AC_SUBST([LTLIBICONV])
- ])
-
--AC_DEFUN([AM_ICONV],
-+dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
-+dnl avoid warnings like
-+dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
-+dnl This is tricky because of the way 'aclocal' is implemented:
-+dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
-+dnl Otherwise aclocal's initial scan pass would miss the macro definition.
-+dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
-+dnl Otherwise aclocal would emit many "Use of uninitialized value $1"
-+dnl warnings.
-+m4_define([gl_iconv_AC_DEFUN],
-+ m4_version_prereq([2.64],
-+ [[AC_DEFUN_ONCE(
-+ [$1], [$2])]],
-+ [[AC_DEFUN(
-+ [$1], [$2])]]))
-+gl_iconv_AC_DEFUN([AM_ICONV],
- [
- AM_ICONV_LINK
- if test "$am_cv_func_iconv" = yes; then
- AC_MSG_CHECKING([for iconv declaration])
-- AC_CACHE_VAL(am_cv_proto_iconv, [
-+ AC_CACHE_VAL([am_cv_proto_iconv], [
- AC_TRY_COMPILE([
- #include <stdlib.h>
- #include <iconv.h>
-@@ -169,12 +203,12 @@ size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, si
- #else
- size_t iconv();
- #endif
--], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
-+], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"])
- am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
- am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-- AC_MSG_RESULT([$]{ac_t:-
-- }[$]am_cv_proto_iconv)
-- AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
-+ AC_MSG_RESULT([
-+ $am_cv_proto_iconv])
-+ AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
- [Define as const if the declaration of iconv() needs const.])
- fi
- ])
-diff --git a/m4/intltool.m4 b/m4/intltool.m4
-index 122d773..839e855 100644
---- a/m4/intltool.m4
-+++ b/m4/intltool.m4
-@@ -172,7 +172,7 @@ IT_PO_SUBDIR([po])
- AC_DEFUN([IT_PO_SUBDIR],
- [AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
- dnl
--dnl The following CONFIG_COMMANDS should be exetuted at the very end
-+dnl The following CONFIG_COMMANDS should be executed at the very end
- dnl of config.status.
- AC_CONFIG_COMMANDS_PRE([
- AC_CONFIG_COMMANDS([$1/stamp-it], [
-diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4
-index 96c4e2c..ebb3052 100644
---- a/m4/lib-ld.m4
-+++ b/m4/lib-ld.m4
-@@ -1,5 +1,5 @@
--# lib-ld.m4 serial 3 (gettext-0.13)
--dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
-+# lib-ld.m4 serial 4 (gettext-0.18)
-+dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
- dnl with or without modifications, as long as this notice is preserved.
-@@ -10,7 +10,7 @@ dnl with libtool.m4.
-
- dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
- AC_DEFUN([AC_LIB_PROG_LD_GNU],
--[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
-+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
- [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
- case `$LD -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-@@ -23,7 +23,7 @@ with_gnu_ld=$acl_cv_prog_gnu_ld
-
- dnl From libtool-1.4. Sets the variable LD.
- AC_DEFUN([AC_LIB_PROG_LD],
--[AC_ARG_WITH(gnu-ld,
-+[AC_ARG_WITH([gnu-ld],
- [ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
- test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
- AC_REQUIRE([AC_PROG_CC])dnl
-@@ -59,7 +59,7 @@ if test "$GCC" = yes; then
- # Canonicalize the path of ld
- ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
- done
- test -z "$LD" && LD="$ac_prog"
- ;;
-@@ -77,7 +77,7 @@ elif test "$with_gnu_ld" = yes; then
- else
- AC_MSG_CHECKING([for non-GNU ld])
- fi
--AC_CACHE_VAL(acl_cv_path_LD,
-+AC_CACHE_VAL([acl_cv_path_LD],
- [if test -z "$LD"; then
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
- for ac_dir in $PATH; do
-@@ -89,9 +89,9 @@ AC_CACHE_VAL(acl_cv_path_LD,
- # Break only if it was the GNU/non-GNU ld that we prefer.
- case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
- *GNU* | *'with BFD'*)
-- test "$with_gnu_ld" != no && break ;;
-+ test "$with_gnu_ld" != no && break ;;
- *)
-- test "$with_gnu_ld" != yes && break ;;
-+ test "$with_gnu_ld" != yes && break ;;
- esac
- fi
- done
-@@ -101,9 +101,9 @@ else
- fi])
- LD="$acl_cv_path_LD"
- if test -n "$LD"; then
-- AC_MSG_RESULT($LD)
-+ AC_MSG_RESULT([$LD])
- else
-- AC_MSG_RESULT(no)
-+ AC_MSG_RESULT([no])
- fi
- test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
- AC_LIB_PROG_LD_GNU
-diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
-index e3d26fc..c73bd8e 100644
---- a/m4/lib-link.m4
-+++ b/m4/lib-link.m4
-@@ -1,12 +1,12 @@
--# lib-link.m4 serial 13 (gettext-0.17)
--dnl Copyright (C) 2001-2007 Free Software Foundation, Inc.
-+# lib-link.m4 serial 21 (gettext-0.18)
-+dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
- dnl with or without modifications, as long as this notice is preserved.
-
- dnl From Bruno Haible.
-
--AC_PREREQ(2.54)
-+AC_PREREQ([2.54])
-
- dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
- dnl the libraries corresponding to explicit and implicit dependencies.
-@@ -18,9 +18,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS],
- [
- AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
- AC_REQUIRE([AC_LIB_RPATH])
-- define([Name],[translit([$1],[./-], [___])])
-- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-+ pushdef([Name],[translit([$1],[./-], [___])])
-+ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
- AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
- AC_LIB_LINKFLAGS_BODY([$1], [$2])
- ac_cv_lib[]Name[]_libs="$LIB[]NAME"
-@@ -39,16 +39,17 @@ AC_DEFUN([AC_LIB_LINKFLAGS],
- dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
- dnl results of this search when this library appears as a dependency.
- HAVE_LIB[]NAME=yes
-- undefine([Name])
-- undefine([NAME])
-+ popdef([NAME])
-+ popdef([Name])
- ])
-
--dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
-+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
- dnl searches for libname and the libraries corresponding to explicit and
- dnl implicit dependencies, together with the specified include files and
--dnl the ability to compile and link the specified testcode. If found, it
--dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
--dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
-+dnl the ability to compile and link the specified testcode. The missing-message
-+dnl defaults to 'no' and may contain additional hints for the user.
-+dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
-+dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
- dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
- dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
- dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
-@@ -57,9 +58,9 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
- [
- AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
- AC_REQUIRE([AC_LIB_RPATH])
-- define([Name],[translit([$1],[./-], [___])])
-- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-+ pushdef([Name],[translit([$1],[./-], [___])])
-+ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-
- dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
- dnl accordingly.
-@@ -73,13 +74,25 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
-
- AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
- ac_save_LIBS="$LIBS"
-- LIBS="$LIBS $LIB[]NAME"
-- AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
-+ dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
-+ dnl because these -l options might require -L options that are present in
-+ dnl LIBS. -l options benefit only from the -L options listed before it.
-+ dnl Otherwise, add it to the front of LIBS, because it may be a static
-+ dnl library that depends on another static library that is present in LIBS.
-+ dnl Static libraries benefit only from the static libraries listed after
-+ dnl it.
-+ case " $LIB[]NAME" in
-+ *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
-+ *) LIBS="$LIB[]NAME $LIBS" ;;
-+ esac
-+ AC_TRY_LINK([$3], [$4],
-+ [ac_cv_lib[]Name=yes],
-+ [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
- LIBS="$ac_save_LIBS"
- ])
- if test "$ac_cv_lib[]Name" = yes; then
- HAVE_LIB[]NAME=yes
-- AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
-+ AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
- AC_MSG_CHECKING([how to link with lib[]$1])
- AC_MSG_RESULT([$LIB[]NAME])
- else
-@@ -95,8 +108,8 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
- AC_SUBST([LIB]NAME)
- AC_SUBST([LTLIB]NAME)
- AC_SUBST([LIB]NAME[_PREFIX])
-- undefine([Name])
-- undefine([NAME])
-+ popdef([NAME])
-+ popdef([Name])
- ])
-
- dnl Determine the platform dependent parameters needed to use rpath:
-@@ -114,7 +127,7 @@ AC_DEFUN([AC_LIB_RPATH],
- AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
- AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
- AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
-- AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
-+ AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
- CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
- ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
- . ./conftest.sh
-@@ -131,11 +144,32 @@ AC_DEFUN([AC_LIB_RPATH],
- acl_hardcode_direct="$acl_cv_hardcode_direct"
- acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
- dnl Determine whether the user wants rpath handling at all.
-- AC_ARG_ENABLE(rpath,
-+ AC_ARG_ENABLE([rpath],
- [ --disable-rpath do not hardcode runtime library paths],
- :, enable_rpath=yes)
- ])
-
-+dnl AC_LIB_FROMPACKAGE(name, package)
-+dnl declares that libname comes from the given package. The configure file
-+dnl will then not have a --with-libname-prefix option but a
-+dnl --with-package-prefix option. Several libraries can come from the same
-+dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
-+dnl macro call that searches for libname.
-+AC_DEFUN([AC_LIB_FROMPACKAGE],
-+[
-+ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-+ define([acl_frompackage_]NAME, [$2])
-+ popdef([NAME])
-+ pushdef([PACK],[$2])
-+ pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
-+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-+ define([acl_libsinpackage_]PACKUP,
-+ m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
-+ popdef([PACKUP])
-+ popdef([PACK])
-+])
-+
- dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
- dnl the libraries corresponding to explicit and implicit dependencies.
- dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
-@@ -144,19 +178,23 @@ dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
- AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
- [
- AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
-- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-+ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-+ pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
-+ pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
-+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-+ pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
- dnl Autoconf >= 2.61 supports dots in --with options.
-- define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])])
-+ pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
- dnl By default, look in $includedir and $libdir.
- use_additional=yes
- AC_LIB_WITH_FINAL_PREFIX([
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
- ])
-- AC_LIB_ARG_WITH([lib]N_A_M_E[-prefix],
--[ --with-lib]N_A_M_E[-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
-- --without-lib]N_A_M_E[-prefix don't search for lib$1 in includedir and libdir],
-+ AC_ARG_WITH(P_A_C_K[-prefix],
-+[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
-+ --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]],
- [
- if test "X$withval" = "Xno"; then
- use_additional=no
-@@ -169,6 +207,10 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
- else
- additional_includedir="$withval/include"
- additional_libdir="$withval/$acl_libdirstem"
-+ if test "$acl_libdirstem2" != "$acl_libdirstem" \
-+ && ! test -d "$withval/$acl_libdirstem"; then
-+ additional_libdir="$withval/$acl_libdirstem2"
-+ fi
- fi
- fi
- ])
-@@ -178,6 +220,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
- LTLIB[]NAME=
- INC[]NAME=
- LIB[]NAME[]_PREFIX=
-+ dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
-+ dnl computed. So it has to be reset here.
-+ HAVE_LIB[]NAME=
- rpathdirs=
- ltrpathdirs=
- names_already_handled=
-@@ -327,7 +372,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
- dnl Linking with a shared library. We attempt to hardcode its
- dnl directory into the executable's runpath, unless it's the
- dnl standard /usr/lib.
-- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
-+ if test "$enable_rpath" = no \
-+ || test "X$found_dir" = "X/usr/$acl_libdirstem" \
-+ || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
- dnl No hardcoding is needed.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- else
-@@ -415,7 +462,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
- case "$found_dir" in
- */$acl_libdirstem | */$acl_libdirstem/)
- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
-- LIB[]NAME[]_PREFIX="$basedir"
-+ if test "$name" = '$1'; then
-+ LIB[]NAME[]_PREFIX="$basedir"
-+ fi
-+ additional_includedir="$basedir/include"
-+ ;;
-+ */$acl_libdirstem2 | */$acl_libdirstem2/)
-+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
-+ if test "$name" = '$1'; then
-+ LIB[]NAME[]_PREFIX="$basedir"
-+ fi
- additional_includedir="$basedir/include"
- ;;
- esac
-@@ -476,9 +532,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
- dnl 3. if it's already present in $LDFLAGS or the already
- dnl constructed $LIBNAME,
- dnl 4. if it doesn't exist as a directory.
-- if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
-+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
-+ && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
- haveit=
-- if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
-+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
-+ || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
- if test -n "$GCC"; then
- case $host_os in
- linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-@@ -609,6 +667,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
- done
- fi
-+ popdef([P_A_C_K])
-+ popdef([PACKLIBS])
-+ popdef([PACKUP])
-+ popdef([PACK])
-+ popdef([NAME])
- ])
-
- dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
-@@ -654,7 +717,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
- if test -n "$next"; then
- dir="$next"
- dnl No need to hardcode the standard /usr/lib.
-- if test "X$dir" != "X/usr/$acl_libdirstem"; then
-+ if test "X$dir" != "X/usr/$acl_libdirstem" \
-+ && test "X$dir" != "X/usr/$acl_libdirstem2"; then
- rpathdirs="$rpathdirs $dir"
- fi
- next=
-@@ -663,7 +727,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
- -L) next=yes ;;
- -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
- dnl No need to hardcode the standard /usr/lib.
-- if test "X$dir" != "X/usr/$acl_libdirstem"; then
-+ if test "X$dir" != "X/usr/$acl_libdirstem" \
-+ && test "X$dir" != "X/usr/$acl_libdirstem2"; then
- rpathdirs="$rpathdirs $dir"
- fi
- next= ;;
-diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
-index a8684e1..1601cea 100644
---- a/m4/lib-prefix.m4
-+++ b/m4/lib-prefix.m4
-@@ -1,5 +1,5 @@
--# lib-prefix.m4 serial 5 (gettext-0.15)
--dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
-+# lib-prefix.m4 serial 7 (gettext-0.18)
-+dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
- dnl with or without modifications, as long as this notice is preserved.
-@@ -153,33 +153,72 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
- prefix="$acl_save_prefix"
- ])
-
--dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing
--dnl the basename of the libdir, either "lib" or "lib64".
-+dnl AC_LIB_PREPARE_MULTILIB creates
-+dnl - a variable acl_libdirstem, containing the basename of the libdir, either
-+dnl "lib" or "lib64" or "lib/64",
-+dnl - a variable acl_libdirstem2, as a secondary possible value for
-+dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
-+dnl "lib/amd64".
- AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
- [
-- dnl There is no formal standard regarding lib and lib64. The current
-- dnl practice is that on a system supporting 32-bit and 64-bit instruction
-- dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit
-- dnl libraries go under $prefix/lib. We determine the compiler's default
-- dnl mode by looking at the compiler's library search path. If at least
-- dnl of its elements ends in /lib64 or points to a directory whose absolute
-- dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the
-- dnl default, namely "lib".
-+ dnl There is no formal standard regarding lib and lib64.
-+ dnl On glibc systems, the current practice is that on a system supporting
-+ dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
-+ dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
-+ dnl the compiler's default mode by looking at the compiler's library search
-+ dnl path. If at least one of its elements ends in /lib64 or points to a
-+ dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
-+ dnl Otherwise we use the default, namely "lib".
-+ dnl On Solaris systems, the current practice is that on a system supporting
-+ dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
-+ dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
-+ dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
-+ AC_REQUIRE([AC_CANONICAL_HOST])
- acl_libdirstem=lib
-- searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
-- if test -n "$searchpath"; then
-- acl_save_IFS="${IFS= }"; IFS=":"
-- for searchdir in $searchpath; do
-- if test -d "$searchdir"; then
-- case "$searchdir" in
-- */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
-- *) searchdir=`cd "$searchdir" && pwd`
-- case "$searchdir" in
-- */lib64 ) acl_libdirstem=lib64 ;;
-- esac ;;
-+ acl_libdirstem2=
-+ case "$host_os" in
-+ solaris*)
-+ dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
-+ dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
-+ dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
-+ dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
-+ dnl symlink is missing, so we set acl_libdirstem2 too.
-+ AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
-+ [AC_EGREP_CPP([sixtyfour bits], [
-+#ifdef _LP64
-+sixtyfour bits
-+#endif
-+ ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
-+ ])
-+ if test $gl_cv_solaris_64bit = yes; then
-+ acl_libdirstem=lib/64
-+ case "$host_cpu" in
-+ sparc*) acl_libdirstem2=lib/sparcv9 ;;
-+ i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
- esac
- fi
-- done
-- IFS="$acl_save_IFS"
-- fi
-+ ;;
-+ *)
-+ searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
-+ if test -n "$searchpath"; then
-+ acl_save_IFS="${IFS= }"; IFS=":"
-+ for searchdir in $searchpath; do
-+ if test -d "$searchdir"; then
-+ case "$searchdir" in
-+ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
-+ */../ | */.. )
-+ # Better ignore directories of this form. They are misleading.
-+ ;;
-+ *) searchdir=`cd "$searchdir" && pwd`
-+ case "$searchdir" in
-+ */lib64 ) acl_libdirstem=lib64 ;;
-+ esac ;;
-+ esac
-+ fi
-+ done
-+ IFS="$acl_save_IFS"
-+ fi
-+ ;;
-+ esac
-+ test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
- ])
-diff --git a/m4/libtool.m4 b/m4/libtool.m4
-index 671cde1..a3fee53 100644
---- a/m4/libtool.m4
-+++ b/m4/libtool.m4
-@@ -2445,7 +2445,7 @@ linux*oldld* | linux*aout* | linux*coff*)
- ;;
-
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -2470,13 +2470,10 @@ linux* | k*bsd*-gnu)
- # before this can be enabled.
- hardcode_into_libs=yes
-
-- # Add ABI-specific directories to the system library path.
-- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
--
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -2488,6 +2485,18 @@ linux* | k*bsd*-gnu)
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -3075,11 +3084,11 @@ irix5* | irix6* | nonstopux*)
- ;;
-
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
--netbsd*)
-+netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
- else
-@@ -3696,7 +3705,7 @@ m4_if([$1], [CXX], [
- ;;
- esac
- ;;
-- linux* | k*bsd*-gnu)
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
- case $cc_basename in
- KCC*)
- # KAI C++ Compiler
-@@ -3760,7 +3769,7 @@ m4_if([$1], [CXX], [
- ;;
- esac
- ;;
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- ;;
- *qnx* | *nto*)
- # QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -3980,7 +3989,7 @@ m4_if([$1], [CXX], [
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-
-- linux* | k*bsd*-gnu)
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
- case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
- ecc*)
-@@ -4185,6 +4194,9 @@ m4_if([$1], [CXX], [
- cygwin* | mingw* | cegcc*)
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
-+ linux* | k*bsd*-gnu)
-+ _LT_TAGVAR(link_all_deplibs, $1)=no
-+ ;;
- *)
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
-@@ -4249,6 +4261,9 @@ dnl Note also adjust exclude_expsyms for C++ above.
- openbsd*)
- with_gnu_ld=no
- ;;
-+ linux* | k*bsd*-gnu)
-+ _LT_TAGVAR(link_all_deplibs, $1)=no
-+ ;;
- esac
-
- _LT_TAGVAR(ld_shlibs, $1)=yes
-@@ -4270,6 +4285,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
- fi
- supports_anon_versioning=no
- case `$LD -v 2>&1` in
-+ *GNU\ gold*) supports_anon_versioning=yes ;;
- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -4361,7 +4377,7 @@ _LT_EOF
- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
-- gnu* | linux* | tpf* | k*bsd*-gnu)
-+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
- tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
- case $cc_basename in
-@@ -4431,7 +4447,7 @@ _LT_EOF
- fi
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
-@@ -4606,6 +4622,7 @@ _LT_EOF
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
- fi
-+ _LT_TAGVAR(link_all_deplibs, $1)=no
- else
- # not using gcc
- if test "$host_cpu" = ia64; then
-@@ -4844,7 +4861,7 @@ _LT_EOF
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-@@ -5844,7 +5861,7 @@ if test "$_lt_caught_CXX_error" != yes; then
- _LT_TAGVAR(inherit_rpath, $1)=yes
- ;;
-
-- linux* | k*bsd*-gnu)
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
- case $cc_basename in
- KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-diff --git a/m4/ltversion.m4 b/m4/ltversion.m4
-index b8e154f..f3c5309 100644
---- a/m4/ltversion.m4
-+++ b/m4/ltversion.m4
-@@ -9,15 +9,15 @@
-
- # Generated from ltversion.in.
-
--# serial 3012 ltversion.m4
-+# serial 3017 ltversion.m4
- # This file is part of GNU Libtool
-
--m4_define([LT_PACKAGE_VERSION], [2.2.6])
--m4_define([LT_PACKAGE_REVISION], [1.3012])
-+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
-+m4_define([LT_PACKAGE_REVISION], [1.3017])
-
- AC_DEFUN([LTVERSION_VERSION],
--[macro_version='2.2.6'
--macro_revision='1.3012'
-+[macro_version='2.2.6b'
-+macro_revision='1.3017'
- _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
- _LT_DECL(, macro_revision, 0)
- ])
-diff --git a/m4/nls.m4 b/m4/nls.m4
-index 7967cc2..003704c 100644
---- a/m4/nls.m4
-+++ b/m4/nls.m4
-@@ -1,5 +1,6 @@
--# nls.m4 serial 3 (gettext-0.15)
--dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
-+# nls.m4 serial 5 (gettext-0.18)
-+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
-+dnl Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
- dnl with or without modifications, as long as this notice is preserved.
-@@ -17,15 +18,15 @@ dnl Authors:
- dnl Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
- dnl Bruno Haible <haible at clisp.cons.org>, 2000-2003.
-
--AC_PREREQ(2.50)
-+AC_PREREQ([2.50])
-
- AC_DEFUN([AM_NLS],
- [
- AC_MSG_CHECKING([whether NLS is requested])
- dnl Default is enabled NLS
-- AC_ARG_ENABLE(nls,
-+ AC_ARG_ENABLE([nls],
- [ --disable-nls do not use Native Language Support],
- USE_NLS=$enableval, USE_NLS=yes)
-- AC_MSG_RESULT($USE_NLS)
-- AC_SUBST(USE_NLS)
-+ AC_MSG_RESULT([$USE_NLS])
-+ AC_SUBST([USE_NLS])
- ])
-diff --git a/m4/po.m4 b/m4/po.m4
-new file mode 100644
-index 0000000..47f36a4
---- /dev/null
-+++ b/m4/po.m4
-@@ -0,0 +1,449 @@
-+# po.m4 serial 17 (gettext-0.18)
-+dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+dnl
-+dnl This file can can be used in projects which are not available under
-+dnl the GNU General Public License or the GNU Library General Public
-+dnl License but which still want to provide support for the GNU gettext
-+dnl functionality.
-+dnl Please note that the actual code of the GNU gettext library is covered
-+dnl by the GNU Library General Public License, and the rest of the GNU
-+dnl gettext package package is covered by the GNU General Public License.
-+dnl They are *not* in the public domain.
-+
-+dnl Authors:
-+dnl Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
-+dnl Bruno Haible <haible at clisp.cons.org>, 2000-2003.
-+
-+AC_PREREQ([2.50])
-+
-+dnl Checks for all prerequisites of the po subdirectory.
-+AC_DEFUN([AM_PO_SUBDIRS],
-+[
-+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-+ AC_REQUIRE([AC_PROG_INSTALL])dnl
-+ AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
-+ AC_REQUIRE([AM_NLS])dnl
-+
-+ dnl Release version of the gettext macros. This is used to ensure that
-+ dnl the gettext macros and po/Makefile.in.in are in sync.
-+ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
-+
-+ dnl Perform the following tests also if --disable-nls has been given,
-+ dnl because they are needed for "make dist" to work.
-+
-+ dnl Search for GNU msgfmt in the PATH.
-+ dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
-+ dnl The second test excludes FreeBSD msgfmt.
-+ AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-+ [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
-+ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-+ :)
-+ AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
-+
-+ dnl Test whether it is GNU msgfmt >= 0.15.
-+changequote(,)dnl
-+ case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
-+ *) MSGFMT_015=$MSGFMT ;;
-+ esac
-+changequote([,])dnl
-+ AC_SUBST([MSGFMT_015])
-+changequote(,)dnl
-+ case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
-+ *) GMSGFMT_015=$GMSGFMT ;;
-+ esac
-+changequote([,])dnl
-+ AC_SUBST([GMSGFMT_015])
-+
-+ dnl Search for GNU xgettext 0.12 or newer in the PATH.
-+ dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
-+ dnl The second test excludes FreeBSD xgettext.
-+ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-+ [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
-+ (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-+ :)
-+ dnl Remove leftover from FreeBSD xgettext call.
-+ rm -f messages.po
-+
-+ dnl Test whether it is GNU xgettext >= 0.15.
-+changequote(,)dnl
-+ case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
-+ *) XGETTEXT_015=$XGETTEXT ;;
-+ esac
-+changequote([,])dnl
-+ AC_SUBST([XGETTEXT_015])
-+
-+ dnl Search for GNU msgmerge 0.11 or newer in the PATH.
-+ AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
-+ [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
-+
-+ dnl Installation directories.
-+ dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
-+ dnl have to define it here, so that it can be used in po/Makefile.
-+ test -n "$localedir" || localedir='${datadir}/locale'
-+ AC_SUBST([localedir])
-+
-+ dnl Support for AM_XGETTEXT_OPTION.
-+ test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
-+ AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
-+
-+ AC_CONFIG_COMMANDS([po-directories], [[
-+ for ac_file in $CONFIG_FILES; do
-+ # Support "outfile[:infile[:infile...]]"
-+ case "$ac_file" in
-+ *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-+ esac
-+ # PO directories have a Makefile.in generated from Makefile.in.in.
-+ case "$ac_file" in */Makefile.in)
-+ # Adjust a relative srcdir.
-+ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-+ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-+ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-+ # In autoconf-2.13 it is called $ac_given_srcdir.
-+ # In autoconf-2.50 it is called $srcdir.
-+ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-+ case "$ac_given_srcdir" in
-+ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-+ /*) top_srcdir="$ac_given_srcdir" ;;
-+ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
-+ esac
-+ # Treat a directory as a PO directory if and only if it has a
-+ # POTFILES.in file. This allows packages to have multiple PO
-+ # directories under different names or in different locations.
-+ if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-+ rm -f "$ac_dir/POTFILES"
-+ test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-+ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
-+ POMAKEFILEDEPS="POTFILES.in"
-+ # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
-+ # on $ac_dir but don't depend on user-specified configuration
-+ # parameters.
-+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-+ # The LINGUAS file contains the set of available languages.
-+ if test -n "$OBSOLETE_ALL_LINGUAS"; then
-+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-+ fi
-+ ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-+ # Hide the ALL_LINGUAS assigment from automake < 1.5.
-+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-+ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-+ else
-+ # The set of available languages was given in configure.in.
-+ # Hide the ALL_LINGUAS assigment from automake < 1.5.
-+ eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
-+ fi
-+ # Compute POFILES
-+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
-+ # Compute UPDATEPOFILES
-+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
-+ # Compute DUMMYPOFILES
-+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
-+ # Compute GMOFILES
-+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
-+ case "$ac_given_srcdir" in
-+ .) srcdirpre= ;;
-+ *) srcdirpre='$(srcdir)/' ;;
-+ esac
-+ POFILES=
-+ UPDATEPOFILES=
-+ DUMMYPOFILES=
-+ GMOFILES=
-+ for lang in $ALL_LINGUAS; do
-+ POFILES="$POFILES $srcdirpre$lang.po"
-+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-+ done
-+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
-+ # environment variable.
-+ INST_LINGUAS=
-+ if test -n "$ALL_LINGUAS"; then
-+ for presentlang in $ALL_LINGUAS; do
-+ useit=no
-+ if test "%UNSET%" != "$LINGUAS"; then
-+ desiredlanguages="$LINGUAS"
-+ else
-+ desiredlanguages="$ALL_LINGUAS"
-+ fi
-+ for desiredlang in $desiredlanguages; do
-+ # Use the presentlang catalog if desiredlang is
-+ # a. equal to presentlang, or
-+ # b. a variant of presentlang (because in this case,
-+ # presentlang can be used as a fallback for messages
-+ # which are not translated in the desiredlang catalog).
-+ case "$desiredlang" in
-+ "$presentlang"*) useit=yes;;
-+ esac
-+ done
-+ if test $useit = yes; then
-+ INST_LINGUAS="$INST_LINGUAS $presentlang"
-+ fi
-+ done
-+ fi
-+ CATALOGS=
-+ if test -n "$INST_LINGUAS"; then
-+ for lang in $INST_LINGUAS; do
-+ CATALOGS="$CATALOGS $lang.gmo"
-+ done
-+ fi
-+ test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-+ sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-+ for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-+ if test -f "$f"; then
-+ case "$f" in
-+ *.orig | *.bak | *~) ;;
-+ *) cat "$f" >> "$ac_dir/Makefile" ;;
-+ esac
-+ fi
-+ done
-+ fi
-+ ;;
-+ esac
-+ done]],
-+ [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
-+ # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
-+ # from automake < 1.5.
-+ eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
-+ # Capture the value of LINGUAS because we need it to compute CATALOGS.
-+ LINGUAS="${LINGUAS-%UNSET%}"
-+ ])
-+])
-+
-+dnl Postprocesses a Makefile in a directory containing PO files.
-+AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
-+[
-+ # When this code is run, in config.status, two variables have already been
-+ # set:
-+ # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
-+ # - LINGUAS is the value of the environment variable LINGUAS at configure
-+ # time.
-+
-+changequote(,)dnl
-+ # Adjust a relative srcdir.
-+ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-+ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-+ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-+ # In autoconf-2.13 it is called $ac_given_srcdir.
-+ # In autoconf-2.50 it is called $srcdir.
-+ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-+ case "$ac_given_srcdir" in
-+ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-+ /*) top_srcdir="$ac_given_srcdir" ;;
-+ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
-+ esac
-+
-+ # Find a way to echo strings without interpreting backslash.
-+ if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
-+ gt_echo='echo'
-+ else
-+ if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
-+ gt_echo='printf %s\n'
-+ else
-+ echo_func () {
-+ cat <<EOT
-+$*
-+EOT
-+ }
-+ gt_echo='echo_func'
-+ fi
-+ fi
-+
-+ # A sed script that extracts the value of VARIABLE from a Makefile.
-+ sed_x_variable='
-+# Test if the hold space is empty.
-+x
-+s/P/P/
-+x
-+ta
-+# Yes it was empty. Look if we have the expected variable definition.
-+/^[ ]*VARIABLE[ ]*=/{
-+ # Seen the first line of the variable definition.
-+ s/^[ ]*VARIABLE[ ]*=//
-+ ba
-+}
-+bd
-+:a
-+# Here we are processing a line from the variable definition.
-+# Remove comment, more precisely replace it with a space.
-+s/#.*$/ /
-+# See if the line ends in a backslash.
-+tb
-+:b
-+s/\\$//
-+# Print the line, without the trailing backslash.
-+p
-+tc
-+# There was no trailing backslash. The end of the variable definition is
-+# reached. Clear the hold space.
-+s/^.*$//
-+x
-+bd
-+:c
-+# A trailing backslash means that the variable definition continues in the
-+# next line. Put a nonempty string into the hold space to indicate this.
-+s/^.*$/P/
-+x
-+:d
-+'
-+changequote([,])dnl
-+
-+ # Set POTFILES to the value of the Makefile variable POTFILES.
-+ sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
-+ POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
-+ # Compute POTFILES_DEPS as
-+ # $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-+ POTFILES_DEPS=
-+ for file in $POTFILES; do
-+ POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
-+ done
-+ POMAKEFILEDEPS=""
-+
-+ if test -n "$OBSOLETE_ALL_LINGUAS"; then
-+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-+ fi
-+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-+ # The LINGUAS file contains the set of available languages.
-+ ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-+ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-+ else
-+ # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
-+ sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
-+ ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
-+ fi
-+ # Hide the ALL_LINGUAS assigment from automake < 1.5.
-+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-+ # Compute POFILES
-+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
-+ # Compute UPDATEPOFILES
-+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
-+ # Compute DUMMYPOFILES
-+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
-+ # Compute GMOFILES
-+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
-+ # Compute PROPERTIESFILES
-+ # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
-+ # Compute CLASSFILES
-+ # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
-+ # Compute QMFILES
-+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
-+ # Compute MSGFILES
-+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
-+ # Compute RESOURCESDLLFILES
-+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
-+ case "$ac_given_srcdir" in
-+ .) srcdirpre= ;;
-+ *) srcdirpre='$(srcdir)/' ;;
-+ esac
-+ POFILES=
-+ UPDATEPOFILES=
-+ DUMMYPOFILES=
-+ GMOFILES=
-+ PROPERTIESFILES=
-+ CLASSFILES=
-+ QMFILES=
-+ MSGFILES=
-+ RESOURCESDLLFILES=
-+ for lang in $ALL_LINGUAS; do
-+ POFILES="$POFILES $srcdirpre$lang.po"
-+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-+ PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
-+ CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
-+ QMFILES="$QMFILES $srcdirpre$lang.qm"
-+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-+ MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
-+ frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
-+ RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
-+ done
-+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
-+ # environment variable.
-+ INST_LINGUAS=
-+ if test -n "$ALL_LINGUAS"; then
-+ for presentlang in $ALL_LINGUAS; do
-+ useit=no
-+ if test "%UNSET%" != "$LINGUAS"; then
-+ desiredlanguages="$LINGUAS"
-+ else
-+ desiredlanguages="$ALL_LINGUAS"
-+ fi
-+ for desiredlang in $desiredlanguages; do
-+ # Use the presentlang catalog if desiredlang is
-+ # a. equal to presentlang, or
-+ # b. a variant of presentlang (because in this case,
-+ # presentlang can be used as a fallback for messages
-+ # which are not translated in the desiredlang catalog).
-+ case "$desiredlang" in
-+ "$presentlang"*) useit=yes;;
-+ esac
-+ done
-+ if test $useit = yes; then
-+ INST_LINGUAS="$INST_LINGUAS $presentlang"
-+ fi
-+ done
-+ fi
-+ CATALOGS=
-+ JAVACATALOGS=
-+ QTCATALOGS=
-+ TCLCATALOGS=
-+ CSHARPCATALOGS=
-+ if test -n "$INST_LINGUAS"; then
-+ for lang in $INST_LINGUAS; do
-+ CATALOGS="$CATALOGS $lang.gmo"
-+ JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
-+ QTCATALOGS="$QTCATALOGS $lang.qm"
-+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-+ TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
-+ frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
-+ CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
-+ done
-+ fi
-+
-+ sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
-+ if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
-+ # Add dependencies that cannot be formulated as a simple suffix rule.
-+ for lang in $ALL_LINGUAS; do
-+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-+ cat >> "$ac_file.tmp" <<EOF
-+$frobbedlang.msg: $lang.po
-+ @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
-+ \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-+EOF
-+ done
-+ fi
-+ if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
-+ # Add dependencies that cannot be formulated as a simple suffix rule.
-+ for lang in $ALL_LINGUAS; do
-+ frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
-+ cat >> "$ac_file.tmp" <<EOF
-+$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
-+ @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
-+ \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-+EOF
-+ done
-+ fi
-+ if test -n "$POMAKEFILEDEPS"; then
-+ cat >> "$ac_file.tmp" <<EOF
-+Makefile: $POMAKEFILEDEPS
-+EOF
-+ fi
-+ mv "$ac_file.tmp" "$ac_file"
-+])
-+
-+dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
-+AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
-+[
-+ XGETTEXT_EXTRA_OPTIONS=
-+])
-+
-+dnl Registers an option to be passed to xgettext in the po subdirectory.
-+AC_DEFUN([AM_XGETTEXT_OPTION],
-+[
-+ AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
-+ XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
-+])
-diff --git a/m4/progtest.m4 b/m4/progtest.m4
-new file mode 100644
-index 0000000..2d804ac
---- /dev/null
-+++ b/m4/progtest.m4
-@@ -0,0 +1,92 @@
-+# progtest.m4 serial 6 (gettext-0.18)
-+dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+dnl
-+dnl This file can can be used in projects which are not available under
-+dnl the GNU General Public License or the GNU Library General Public
-+dnl License but which still want to provide support for the GNU gettext
-+dnl functionality.
-+dnl Please note that the actual code of the GNU gettext library is covered
-+dnl by the GNU Library General Public License, and the rest of the GNU
-+dnl gettext package package is covered by the GNU General Public License.
-+dnl They are *not* in the public domain.
-+
-+dnl Authors:
-+dnl Ulrich Drepper <drepper at cygnus.com>, 1996.
-+
-+AC_PREREQ([2.50])
-+
-+# Search path for a program which passes the given test.
-+
-+dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-+dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-+AC_DEFUN([AM_PATH_PROG_WITH_TEST],
-+[
-+# Prepare PATH_SEPARATOR.
-+# 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
-+
-+# Find out how to test for executable files. Don't use a zero-byte file,
-+# as systems may use methods other than mode bits to determine executability.
-+cat >conf$$.file <<_ASEOF
-+#! /bin/sh
-+exit 0
-+_ASEOF
-+chmod +x conf$$.file
-+if test -x conf$$.file >/dev/null 2>&1; then
-+ ac_executable_p="test -x"
-+else
-+ ac_executable_p="test -f"
-+fi
-+rm -f conf$$.file
-+
-+# Extract the first word of "$2", so it can be a program name with args.
-+set dummy $2; ac_word=[$]2
-+AC_MSG_CHECKING([for $ac_word])
-+AC_CACHE_VAL([ac_cv_path_$1],
-+[case "[$]$1" in
-+ [[\\/]]* | ?:[[\\/]]*)
-+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-+ for ac_dir in ifelse([$5], , $PATH, [$5]); do
-+ IFS="$ac_save_IFS"
-+ test -z "$ac_dir" && ac_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-+ echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
-+ if [$3]; then
-+ ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
-+ break 2
-+ fi
-+ fi
-+ done
-+ done
-+ IFS="$ac_save_IFS"
-+dnl If no 4th arg is given, leave the cache variable unset,
-+dnl so AC_PATH_PROGS will keep looking.
-+ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-+])dnl
-+ ;;
-+esac])dnl
-+$1="$ac_cv_path_$1"
-+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-+ AC_MSG_RESULT([$][$1])
-+else
-+ AC_MSG_RESULT([no])
-+fi
-+AC_SUBST([$1])dnl
-+])
-diff --git a/man/Makefile.in b/man/Makefile.in
-index 0976a1a..4d0cf62 100644
---- a/man/Makefile.in
-+++ b/man/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -262,6 +262,8 @@ PA_SYSTEM_RUNTIME_PATH = @PA_SYSTEM_RUNTIME_PATH@
- PA_SYSTEM_STATE_PATH = @PA_SYSTEM_STATE_PATH@
- PA_SYSTEM_USER = @PA_SYSTEM_USER@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POFILES = @POFILES@
- POSUB = @POSUB@
- PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-diff --git a/src/Makefile.in b/src/Makefile.in
-index 73a9959..72da483 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -2432,6 +2432,8 @@ PA_SYSTEM_RUNTIME_PATH = @PA_SYSTEM_RUNTIME_PATH@
- PA_SYSTEM_STATE_PATH = @PA_SYSTEM_STATE_PATH@
- PA_SYSTEM_USER = @PA_SYSTEM_USER@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POFILES = @POFILES@
- POSUB = @POSUB@
- PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
diff --git a/debian/patches/series b/debian/patches/series
index ff02b5b..8e45941 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
0001-Work-around-some-platforms-not-having-O_CLOEXEC.patch
-0002-CVE-2009-1299.patch
-0003-Re-bootstrap.patch
-0004-In-KDE-only-start-pulseaudio-from-the-KDE-specific-d.patch
+0002-In-KDE-only-start-pulseaudio-from-the-KDE-specific-d.patch
commit b294ce4bceed02d45d588ca3c5d05947523a43e2
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Sun Dec 5 10:44:51 2010 +0000
start packaging 0.9.22
diff --git a/debian/changelog b/debian/changelog
index 18fc047..950faa0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pulseaudio (0.9.22-1) UNRELEASED; urgency=low
+
+ * New upstream release
+
+ -- Sjoerd Simons <sjoerd at debian.org> Sun, 05 Dec 2010 10:44:28 +0000
+
pulseaudio (0.9.21-3) unstable; urgency=low
* debian/rules: Compile with -g0 on mips{,el} to work around #519006 in
commit 5bdafc16abf14ce6e20566f49e12b9524e414ee1
Merge: 47e7ce04aee12fa0d74c11de36b50dc00243f043 ab0adf96be1ac81533bd85a4444cc3c393ac7ac0
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Sun Dec 5 10:43:57 2010 +0000
Merge commit 'upstream/0.9.22'
diff --combined configure
index 9163fd3,78ed842..a494c0a
--- a/configure
+++ b/configure
@@@ -1,13 -1,15 +1,15 @@@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.64 for pulseaudio 0.9.21.
+ # Generated by GNU Autoconf 2.66 for pulseaudio 0.9.22.
#
# Report bugs to <mzchyfrnhqvb (at) 0pointer (dot) net>.
#
+ #
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
- # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+ # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
# Foundation, Inc.
#
+ #
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## -------------------- ##
@@@ -171,7 -173,15 +173,15 @@@ test x\$exitcode = x0 || exit 1
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
- test \$(( 1 + 1 )) = 2 || exit 1"
+ test \$(( 1 + 1 )) = 2 || exit 1
+
+ test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+ PATH=/empty FPATH=/empty; export PATH FPATH
+ test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+ || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
if (eval "$as_required") 2>/dev/null; then :
as_have_required=yes
else
@@@ -317,7 -327,7 +327,7 @@@ $as_echo X"$as_dir"
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
@@@ -357,19 -367,19 +367,19 @@@ els
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
@@@ -526,160 -536,14 +536,14 @@@ as_tr_cpp="eval sed 'y%*$as_cr_letters%
# Sed expression to map a string onto a valid variable name.
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
- # Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
- case X$lt_ECHO in
- X*--fallback-echo)
- # Remove one level of quotation (which was required for Make).
- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
- ;;
- esac
-
- ECHO=${lt_ECHO-echo}
- if test "X$1" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
- elif test "X$1" = X--fallback-echo; then
- # Avoid inline document here, it may be left over
- :
- elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
- # Yippee, $ECHO works!
- :
- else
- # Restart under the correct shell.
- exec $SHELL "$0" --no-reexec ${1+"$@"}
- fi
-
- if test "X$1" = X--fallback-echo; then
- # used as fallback echo
- shift
- cat <<_LT_EOF
- $*
- _LT_EOF
- exit 0
- fi
-
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
- (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
- if test -z "$lt_ECHO"; then
- if test "X${echo_test_string+set}" != Xset; then
- # find a string as large as possible, as long as the shell can cope with it
- for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
- if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
- then
- break
- fi
- done
- fi
-
- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- :
- else
- # The Solaris, AIX, and Digital Unix default echo programs unquote
- # backslashes. This makes it impossible to quote backslashes using
- # echo "$something" | sed 's/\\/\\\\/g'
- #
- # So, first we look for a working echo in the user's PATH.
-
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for dir in $PATH /usr/ucb; do
- IFS="$lt_save_ifs"
- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- ECHO="$dir/echo"
- break
- fi
- done
- IFS="$lt_save_ifs"
-
- if test "X$ECHO" = Xecho; then
- # We didn't find a better echo, so look for alternatives.
- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # This shell has a builtin print -r that does the trick.
- ECHO='print -r'
- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
- test "X$CONFIG_SHELL" != X/bin/ksh; then
- # If we have ksh, try running configure again with it.
- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
- export ORIGINAL_CONFIG_SHELL
- CONFIG_SHELL=/bin/ksh
- export CONFIG_SHELL
- exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
- else
- # Try using printf.
- ECHO='printf %s\n'
- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # Cool, printf works
- :
- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
- export CONFIG_SHELL
- SHELL="$CONFIG_SHELL"
- export SHELL
- ECHO="$CONFIG_SHELL $0 --fallback-echo"
- elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- ECHO="$CONFIG_SHELL $0 --fallback-echo"
- else
- # maybe with a smaller string...
- prev=:
-
- for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
- then
- break
- fi
- prev="$cmd"
- done
- if test "$prev" != 'sed 50q "$0"'; then
- echo_test_string=`eval $prev`
- export echo_test_string
- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
- else
- # Oops. We lost completely, so just stick with echo.
- ECHO=echo
- fi
- fi
- fi
- fi
- fi
- fi
-
- # Copy echo and quote the copy suitably for passing to libtool from
- # the Makefile, instead of quoting the original, which is used later.
- lt_ECHO=$ECHO
- if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
- lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
- fi
-
-
-
-
- exec 7<&0 </dev/null 6>&1
+ test -n "$DJDIR" || exec 7<&0 </dev/null
+ 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`
@@@ -698,8 -562,8 +562,8 @@@ MAKEFLAGS
# Identity of this package.
PACKAGE_NAME='pulseaudio'
PACKAGE_TARNAME='pulseaudio'
- PACKAGE_VERSION='0.9.21'
- PACKAGE_STRING='pulseaudio 0.9.21'
+ PACKAGE_VERSION='0.9.22'
+ PACKAGE_STRING='pulseaudio 0.9.22'
PACKAGE_BUGREPORT='mzchyfrnhqvb (at) 0pointer (dot) net'
PACKAGE_URL=''
@@@ -748,6 -612,7 +612,7 @@@ LTLIBOBJ
LIBOBJS
FORCE_PREOPEN_FALSE
FORCE_PREOPEN_TRUE
+ udevrulesdir
modlibexecdir
PREOPEN_MODS
PREOPEN_MODS_FALSE
@@@ -865,6 -730,8 +730,8 @@@ HAVE_X11_TRU
HAVE_X11
X11_LIBS
X11_CFLAGS
+ PKG_CONFIG_LIBDIR
+ PKG_CONFIG_PATH
PKG_CONFIG
pulselocaledir
MKINSTALLDIRS
@@@ -934,7 -801,6 +801,6 @@@ OTOO
LIPO
NMEDIT
DSYMUTIL
- lt_ECHO
RANLIB
AR
LN_S
@@@ -1072,6 -938,7 +938,7 @@@ enable_fast_instal
with_gnu_ld
enable_libtool_lock
enable_largefile
+ with_gnu_ld
enable_rpath
with_libiconv_prefix
enable_nls
@@@ -1107,6 -974,7 +974,7 @@@ enable_legacy_runtime_di
enable_static_bins
with_preopen_mods
with_module_dir
+ with_udev_rules_dir
enable_force_preopen
'
ac_precious_vars='build_alias
@@@ -1118,7 -986,10 +986,10 @@@ LDFLAG
LIBS
CPPFLAGS
CPP
+ CPPFLAGS
PKG_CONFIG
+ PKG_CONFIG_PATH
+ PKG_CONFIG_LIBDIR
X11_CFLAGS
X11_LIBS
LIBSNDFILE_CFLAGS
@@@ -1261,7 -1132,7 +1132,7 @@@ d
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
@@@ -1287,7 -1158,7 +1158,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
@@@ -1491,7 -1362,7 +1362,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
@@@ -1507,7 -1378,7 +1378,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
@@@ -1537,8 -1408,8 +1408,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"
;;
*=*)
@@@ -1546,7 -1417,7 +1417,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 ;;
@@@ -1564,13 -1435,13 +1435,13 @@@ don
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
@@@ -1593,7 -1464,7 +1464,7 @@@ d
[\\/$]* | ?:[\\/]* ) 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'
@@@ -1607,8 -1478,8 +1478,8 @@@ target=$target_alia
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
@@@ -1623,9 -1494,9 +1494,9 @@@ test "$silent" = yes && exec 6>/dev/nul
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.
@@@ -1664,11 -1535,11 +1535,11 @@@ els
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
@@@ -1694,7 -1565,7 +1565,7 @@@ if test "$ac_init_help" = "long"; the
# 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 pulseaudio 0.9.21 to adapt to many kinds of systems.
+ \`configure' configures pulseaudio 0.9.22 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@@ -1708,7 -1579,7 +1579,7 @@@ Configuration
--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
@@@ -1764,7 -1635,7 +1635,7 @@@ f
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of pulseaudio 0.9.21:";;
+ short | recursive ) echo "Configuration of pulseaudio 0.9.22:";;
esac
cat <<\_ACEOF
@@@ -1846,6 -1717,8 +1717,8 @@@ Optional Packages
--with-preopen-mods Modules to preopen in daemon (default: all).
--with-module-dir Directory where to install the modules to (defaults
to ${libdir}/pulse-${PA_MAJORMINORMICRO}/modules
+ --with-udev-rules-dir Directory where to install udev rules to (defaults
+ to /lib/udev/rules.d)
Some influential environment variables:
CC C compiler command
@@@ -1853,10 -1726,14 +1726,14 @@@
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
PKG_CONFIG path to pkg-config utility
+ PKG_CONFIG_PATH
+ directories to add to pkg-config's search path
+ PKG_CONFIG_LIBDIR
+ path overriding pkg-config's built-in search path
X11_CFLAGS C compiler flags for X11, overriding pkg-config
X11_LIBS linker flags for X11, overriding pkg-config
LIBSNDFILE_CFLAGS
@@@ -1975,10 -1852,10 +1852,10 @@@ f
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
- pulseaudio configure 0.9.21
- generated by GNU Autoconf 2.64
+ pulseaudio configure 0.9.22
+ generated by GNU Autoconf 2.66
- 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
@@@ -2023,7 -1900,7 +1900,7 @@@ sed 's/^/| /' conftest.$ac_ext >&
ac_retval=1
fi
eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
+ as_fn_set_status $ac_retval
} # ac_fn_c_try_compile
@@@ -2060,7 -1937,7 +1937,7 @@@ sed 's/^/| /' conftest.$ac_ext >&
ac_retval=1
fi
eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
+ as_fn_set_status $ac_retval
} # ac_fn_c_try_cpp
@@@ -2072,10 -1949,10 +1949,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 "test \"\${$3+set}\"" = set; 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 "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
fi
eval ac_res=\$$3
@@@ -2134,17 -2011,15 +2011,15 @@@ $as_echo "$as_me: WARNING: $2: see the
$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 mzchyfrnhqvb (at) 0pointer (dot) 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 "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
eval "$3=\$ac_header_compiler"
@@@ -2195,7 -2070,7 +2070,7 @@@ sed 's/^/| /' conftest.$ac_ext >&
fi
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
+ as_fn_set_status $ac_retval
} # ac_fn_c_try_run
@@@ -2208,7 -2083,7 +2083,7 @@@ ac_fn_c_check_header_compile (
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@@ -2272,7 -2147,7 +2147,7 @@@ f
# 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;}
- return $ac_retval
+ as_fn_set_status $ac_retval
} # ac_fn_c_try_link
@@@ -2284,7 -2159,7 +2159,7 @@@ ac_fn_c_check_func (
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@@ -2352,7 -2227,7 +2227,7 @@@ ac_fn_c_check_type (
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
eval "$3=no"
@@@ -2397,15 -2272,18 +2272,18 @@@ $as_echo "$ac_res" >&6;
} # ac_fn_c_check_type
- # ac_fn_c_check_decl LINENO SYMBOL VAR
- # ------------------------------------
- # Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
+ # ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+ # ---------------------------------------------
+ # Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+ # accordingly.
ac_fn_c_check_decl ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
- $as_echo_n "checking whether $2 is declared... " >&6; }
- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ as_decl_name=`echo $2|sed 's/ *(.*//'`
+ as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+ $as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+ if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@@ -2414,8 -2292,12 +2292,12 @@@ $
int
main ()
{
- #ifndef $2
- (void) $2;
+ #ifndef $as_decl_name
+ #ifdef __cplusplus
+ (void) $as_decl_use;
+ #else
+ (void) $as_decl_name;
+ #endif
#endif
;
@@@ -2439,8 -2321,8 +2321,8 @@@ cat >config.log <<_ACEO
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
- It was created by pulseaudio $as_me 0.9.21, which was
- generated by GNU Autoconf 2.64. Invocation command line was
+ It was created by pulseaudio $as_me 0.9.22, which was
+ generated by GNU Autoconf 2.66. Invocation command line was
$ $0 $@
@@@ -2550,11 -2432,9 +2432,9 @@@ trap 'exit_status=$
{
echo
- cat <<\_ASBOX
- ## ---------------- ##
+ $as_echo "## ---------------- ##
## Cache variables. ##
- ## ---------------- ##
- _ASBOX
+ ## ---------------- ##"
echo
# The following way of writing the cache mishandles newlines in values,
(
@@@ -2588,11 -2468,9 +2468,9 @@@ $as_echo "$as_me: WARNING: cache variab
)
echo
- cat <<\_ASBOX
- ## ----------------- ##
+ $as_echo "## ----------------- ##
## Output variables. ##
- ## ----------------- ##
- _ASBOX
+ ## ----------------- ##"
echo
for ac_var in $ac_subst_vars
do
@@@ -2605,11 -2483,9 +2483,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
@@@ -2623,11 -2499,9 +2499,9 @@@
fi
if test -s confdefs.h; then
- cat <<\_ASBOX
- ## ----------- ##
+ $as_echo "## ----------- ##
## confdefs.h. ##
- ## ----------- ##
- _ASBOX
+ ## ----------- ##"
echo
cat confdefs.h
echo
@@@ -2682,7 -2556,12 +2556,12 @@@ _ACEO
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
@@@ -2693,18 -2572,22 +2572,22 @@@ f
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
- if test -r "$ac_site_file"; then
+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file"
+ . "$ac_site_file" \
+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "failed to load site script $ac_site_file
+ See \`config.log' for more details" "$LINENO" 5; }
fi
done
if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special
- # files actually), so we avoid doing that.
- if test -f "$cache_file"; then
+ # Some versions of bash will fail to source /dev/null (special files
+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
@@@ -2753,6 -2636,9 +2636,9 @@@ as_fn_append ac_func_list " lrintf
as_fn_append ac_func_list " strtof"
as_fn_append ac_func_list " chmod"
as_fn_append ac_func_list " chown"
+ as_fn_append ac_func_list " fstat"
+ as_fn_append ac_func_list " fchown"
+ as_fn_append ac_func_list " fchmod"
as_fn_append ac_func_list " clock_gettime"
as_fn_append ac_func_list " getaddrinfo"
as_fn_append ac_func_list " getgrgid_r"
@@@ -2848,7 -2734,7 +2734,7 @@@ if $ac_cache_corrupted; the
$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. ##
@@@ -2869,16 -2755,22 +2755,22 @@@ am__api_version='1.11
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,
@@@ -2994,11 -2886,11 +2886,11 @@@ am_lf=
'
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
@@@ -3020,7 -2912,7 +2912,7 @@@ if
# 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
@@@ -3030,7 -2922,7 +2922,7 @@@ the
# 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
@@@ -3202,6 -3094,7 +3094,7 @@@ IFS=$as_save_IF
fi
+ test -d ./--version && rmdir ./--version
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
@@@ -3209,7 -3102,6 +3102,6 @@@
# value for MKDIR_P within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
- test -d ./--version && rmdir ./--version
MKDIR_P="$ac_install_sh -d"
fi
fi
@@@ -3268,7 -3160,7 +3160,7 @@@ don
$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 "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@@ -3276,7 -3168,7 +3168,7 @@@ SHELL = /bin/s
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;;
@@@ -3322,7 -3214,7 +3214,7 @@@ if test "`cd $srcdir && pwd`" != "`pwd`
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
@@@ -3338,7 -3230,7 +3230,7 @@@ f
# Define the identity of the package.
PACKAGE='pulseaudio'
- VERSION='0.9.21'
+ VERSION='0.9.22'
cat >>confdefs.h <<_ACEOF
@@@ -3484,7 -3376,7 +3376,7 @@@ PA_PROTOCOL_VERSION=1
# The stable ABI for client applications, for the version info x:y:z
# always will hold y=z
- LIBPULSE_VERSION_INFO=12:2:12
+ LIBPULSE_VERSION_INFO=12:3:12
# A simplified, synchronous, ABI-stable interface for client
@@@ -3504,7 -3396,7 +3396,7 @@@ LIBPULSE_MAINLOOP_GLIB_VERSION_INFO=0:4
# 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; }
@@@ -3515,16 -3407,16 +3407,16 @@@ els
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='-'
@@@ -3549,7 -3441,7 +3441,7 @@@ els
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
@@@ -3557,7 -3449,7 +3449,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='-'
@@@ -3927,8 -3819,8 +3819,8 @@@ f
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
@@@ -3949,32 -3841,30 +3841,30 @@@ $as_echo "$ac_try_echo"; } >&
... rest of stderr output deleted ...
10q' conftest.err >conftest.er1
cat conftest.er1 >&5
- rm -f conftest.er1 conftest.err
fi
+ rm -f conftest.er1 conftest.err
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
done
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- #include <stdio.h>
+
int
main ()
{
- FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
;
return 0;
}
_ACEOF
ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
+ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
- $as_echo_n "checking for C compiler default output file name... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+ $as_echo_n "checking whether the C compiler works... " >&6; }
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
@@@ -4036,62 -3926,28 +3926,28 @@@ test "$ac_cv_exeext" = no && ac_cv_exee
else
ac_file=''
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
- $as_echo "$ac_file" >&6; }
if test -z "$ac_file"; then :
- $as_echo "$as_me: failed program was:" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { as_fn_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; }
fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+ $as_echo_n "checking for C compiler default output file name... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+ $as_echo "$ac_file" >&6; }
ac_exeext=$ac_cv_exeext
- # Check that the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
- $as_echo_n "checking whether the C compiler works... " >&6; }
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
- if { ac_try='./$ac_file'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
- $as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then
- cross_compiling=no
- else
- if test "$cross_compiling" = maybe; then
- cross_compiling=yes
- else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error "cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
- See \`config.log' for more details." "$LINENO" 5; }
- fi
- fi
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-
- rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
+ rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
- # Check that the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
- $as_echo_n "checking whether we are cross compiling... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
- $as_echo "$cross_compiling" >&6; }
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
$as_echo_n "checking for suffix of executables... " >&6; }
if { { ac_try="$ac_link"
@@@ -4121,16 -3977,75 +3977,75 @@@ don
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$ac_cv_exeext
+ rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
$as_echo "$ac_cv_exeext" >&6; }
rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <stdio.h>
+ int
+ main ()
+ {
+ FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+ }
+ _ACEOF
+ ac_clean_files="$ac_clean_files conftest.out"
+ # Check that the compiler produces executables we can run. If not, either
+ # the compiler is broken, or we cross compile.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+ $as_echo_n "checking whether we are cross compiling... " >&6; }
+ if test "$cross_compiling" != yes; then
+ { { ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+ $as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if { ac_try='./conftest$ac_cv_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+ $as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then
+ cross_compiling=no
+ else
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+ See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ fi
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+ $as_echo "$cross_compiling" >&6; }
+
+ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ ac_clean_files=$ac_clean_files_save
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
$as_echo_n "checking for suffix of object files... " >&6; }
if test "${ac_cv_objext+set}" = set; then :
@@@ -4173,8 -4088,8 +4088,8 @@@ sed 's/^/| /' conftest.$ac_ext >&
{ { $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
@@@ -4769,7 -4684,7 +4684,7 @@@ $as_echo_n "checking whether cc underst
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 "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@@ -5014,8 -4929,8 +4929,8 @@@ 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
@@@ -5076,7 -4991,7 +4991,7 @@@ esa
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
@@@ -5142,7 -5057,7 +5057,7 @@@ esa
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
@@@ -5316,8 -5231,7 +5231,7 @@@ do
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
"
- 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
@@@ -5435,7 -5349,7 +5349,7 @@@ don
test -n "$M4" || M4="no"
if test "x$M4" = xno ; then
- as_fn_error "m4 missing" "$LINENO" 5
+ as_fn_error $? "m4 missing" "$LINENO" 5
fi
@@@ -5647,7 -5561,7 +5561,7 @@@ if test "${enable_atomic_arm_linux_help
case "${enableval}" in
yes) atomic_arm_linux_helpers=yes ;;
no) atomic_arm_linux_helpers=no ;;
- *) as_fn_error "bad value ${enableval} for --disable-atomic-arm-linux-helpers" "$LINENO" 5 ;;
+ *) as_fn_error $? "bad value ${enableval} for --disable-atomic-arm-linux-helpers" "$LINENO" 5 ;;
esac
else
@@@ -5665,7 -5579,7 +5579,7 @@@ cat >>confdefs.h <<_ACEO
_ACEOF
;;
no) ;;
- *) as_fn_error "bad value ${enableval} for --disable-atomic-arm-linux-helpers" "$LINENO" 5 ;;
+ *) as_fn_error $? "bad value ${enableval} for --disable-atomic-arm-linux-helpers" "$LINENO" 5 ;;
esac
fi
@@@ -5677,7 -5591,7 +5591,7 @@@ if test "${enable_netbsd_atomic_ops+set
case "${enableval}" in
yes) atomic_netbsd_helpers=yes ;;
no) atomic_netbsd_helpers=no ;;
- *) as_fn_error "bad value ${enableval} for --enable-netbsd-atomic-ops" "$LINENO" 5 ;;
+ *) as_fn_error $? "bad value ${enableval} for --enable-netbsd-atomic-ops" "$LINENO" 5 ;;
esac
else
@@@ -5910,8 -5824,8 +5824,8 @@@ esa
- macro_version='2.2.6'
- macro_revision='1.3012'
+ macro_version='2.2.10'
+ macro_revision='1.3175'
@@@ -5927,6 -5841,75 +5841,75 @@@
ltmain="$ac_aux_dir/ltmain.sh"
+ # Backslashify metacharacters that are still active within
+ # double-quoted strings.
+ sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+
+ # Same as above, but do not quote variable references.
+ double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+ # Sed substitution to delay expansion of an escaped shell variable in a
+ # double_quote_subst'ed string.
+ delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+ # Sed substitution to delay expansion of an escaped single quote.
+ delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+ # Sed substitution to avoid accidental globbing in evaled expressions
+ no_glob_subst='s/\*/\\\*/g'
+
+ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+ $as_echo_n "checking how to print strings... " >&6; }
+ # Test print first, because it will be a builtin if present.
+ if test "X`print -r -- -n 2>/dev/null`" = X-n && \
+ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+ ECHO='print -r --'
+ elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+ ECHO='printf %s\n'
+ else
+ # Use this function as a fallback that always works.
+ func_fallback_echo ()
+ {
+ eval 'cat <<_LTECHO_EOF
+ $1
+ _LTECHO_EOF'
+ }
+ ECHO='func_fallback_echo'
+ fi
+
+ # func_echo_all arg...
+ # Invoke $ECHO with all args, space-separated.
+ func_echo_all ()
+ {
+ $ECHO ""
+ }
+
+ case "$ECHO" in
+ printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+ $as_echo "printf" >&6; } ;;
+ print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+ $as_echo "print -r" >&6; } ;;
+ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+ $as_echo "cat" >&6; } ;;
+ esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
if test "${ac_cv_path_SED+set}" = set; then :
@@@ -5984,7 -5967,7 +5967,7 @@@ esa
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
@@@ -6063,7 -6046,7 +6046,7 @@@ esa
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_FGREP"; then
- as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_FGREP=$FGREP
@@@ -6179,7 -6162,7 +6162,7 @@@ els
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+ test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
if test "${lt_cv_prog_gnu_ld+set}" = set; then :
@@@ -6262,8 -6245,11 +6245,11 @@@ if test "$lt_cv_path_NM" != "no"; the
NM="$lt_cv_path_NM"
else
# Didn't find any BSD compatible name lister, look for dumpbin.
- if test -n "$ac_tool_prefix"; then
- for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+ if test -n "$DUMPBIN"; then :
+ # Let the user override the test.
+ else
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in dumpbin "link -dump"
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@@ -6307,7 -6293,7 +6293,7 @@@ f
fi
if test -z "$DUMPBIN"; then
ac_ct_DUMPBIN=$DUMPBIN
- for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+ for ac_prog in dumpbin "link -dump"
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@@ -6362,6 -6348,15 +6348,15 @@@ esa
fi
fi
+ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+ *COFF*)
+ DUMPBIN="$DUMPBIN -symbols"
+ ;;
+ *)
+ DUMPBIN=:
+ ;;
+ esac
+ fi
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
@@@ -6381,13 -6376,13 +6376,13 @@@ if test "${lt_cv_nm_interface+set}" = s
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:6384: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:6387: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:6390: output\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@@ -6444,6 -6439,11 +6439,11 @@@ els
lt_cv_sys_max_cmd_len=8192;
;;
+ mint*)
+ # On MiNT this can take a long time and run out of memory.
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
@@@ -6508,8 -6508,8 +6508,8 @@@
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
- = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+ = "X$teststring$teststring"; } >/dev/null 2>&1 &&
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
@@@ -6777,16 -6777,18 +6777,18 @@@ mingw* | pw32*
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
- if ( file / ) >/dev/null 2>&1; then
+ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
else
- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+ # Keep this pattern in sync with the one in func_win32_libid.
+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
lt_cv_file_magic_cmd='$OBJDUMP -f'
fi
;;
- cegcc)
+ cegcc*)
# use the weaker test based on 'objdump'. See mingw*.
lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
@@@ -6816,6 -6818,10 +6818,10 @@@ gnu*
lt_cv_deplibs_check_method=pass_all
;;
+ haiku*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
@@@ -6824,11 -6830,11 +6830,11 @@@
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
;;
*)
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
@@@ -6850,7 -6856,7 +6856,7 @@@ irix5* | irix6* | nonstopux*
;;
# This must be Linux ELF.
- linux* | k*bsd*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@@ -7266,6 -7272,18 +7272,18 @@@ if test -n "$RANLIB"; the
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
+ case $host_os in
+ darwin*)
+ lock_old_archive_extraction=yes ;;
+ *)
+ lock_old_archive_extraction=no ;;
+ esac
+
+
+
+
+
+
@@@ -7435,8 -7453,8 +7453,8 @@@ _LT_EO
test $ac_status = 0; }; then
# Now try to grab the symbols.
nlist=conftest.nm
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
- (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
+ (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } && test -s "$nlist"; then
@@@ -7589,7 -7607,7 +7607,7 @@@ ia64-*-hpux*
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7592 "configure"' > conftest.$ac_ext
+ echo '#line '$LINENO' "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@@ -8301,6 -8319,38 +8319,38 @@@ rm -f core conftest.err conftest.$ac_ob
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+ $as_echo_n "checking for -force_load linker flag... " >&6; }
+ if test "${lt_cv_ld_force_load+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_ld_force_load=no
+ cat > conftest.c << _LT_EOF
+ int forced_loaded() { return 2;}
+ _LT_EOF
+ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
+ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+ echo "$AR cru libconftest.a conftest.o" >&5
+ $AR cru libconftest.a conftest.o 2>&5
+ echo "$RANLIB libconftest.a" >&5
+ $RANLIB libconftest.a 2>&5
+ cat > conftest.c << _LT_EOF
+ int main() { return 0;}
+ _LT_EOF
+ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+ _lt_result=$?
+ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+ lt_cv_ld_force_load=yes
+ else
+ cat conftest.err >&5
+ fi
+ rm -f conftest.err libconftest.a conftest conftest.c
+ rm -rf conftest.dSYM
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+ $as_echo "$lt_cv_ld_force_load" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@@ -8328,7 -8378,7 +8378,7 @@@
else
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
- if test "$DSYMUTIL" != ":"; then
+ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
@@@ -8351,12 -8401,14 +8401,14 @@@ don
+
+
# Set options
enable_dlopen=yes
enable_win32_dll=yes
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
set dummy ${ac_tool_prefix}as; ac_word=$2
@@@ -8799,6 -8851,7 +8851,7 @@@ LIBTOOL='$(SHELL) $(top_builddir)/libto
+
test -z "$LN_S" && LN_S="ln -s"
@@@ -8848,19 -8901,6 +8901,6 @@@ _ACEO
-
-
-
-
-
-
-
-
-
-
-
-
-
case $host_os in
aix3*)
# AIX sometimes has problems with the GCC collect2 program. For some
@@@ -8873,23 -8913,6 +8913,6 @@@
;;
esac
- # Sed substitution that helps us do robust quoting. It backslashifies
- # metacharacters that are still active within double-quoted strings.
- sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-
- # Same as above, but do not quote variable references.
- double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
- # Sed substitution to delay expansion of an escaped shell variable in a
- # double_quote_subst'ed string.
- delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
- # Sed substitution to delay expansion of an escaped single quote.
- delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
- # Sed substitution to avoid accidental globbing in evaled expressions
- no_glob_subst='s/\*/\\\*/g'
-
# Global variables:
ofile=libtool
can_build_shared=yes
@@@ -8918,7 -8941,7 +8941,7 @@@ for cc_temp in $compiler""; d
*) break;;
esac
done
- cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
# Only perform the check for file, if the check method requires it
@@@ -9127,7 -9150,12 +9150,12 @@@ if test -n "$compiler"; the
lt_prog_compiler_no_builtin_flag=
if test "$GCC" = yes; then
- lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+ case $cc_basename in
+ nvcc*)
+ lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+ *)
+ lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+ esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
@@@ -9147,15 -9175,15 +9175,15 @@@ els
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9150: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9154: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_rtti_exceptions=yes
@@@ -9233,6 -9261,12 +9261,12 @@@ $as_echo_n "checking for $compiler opti
lt_prog_compiler_pic='-fno-common'
;;
+ haiku*)
+ # PIC is the default for Haiku.
+ # The "-static" flag exists, but is broken.
+ lt_prog_compiler_static=
+ ;;
+
hpux*)
# PIC is the default for 64-bit PA HP-UX, but not for 32-bit
# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
@@@ -9275,6 -9309,13 +9309,13 @@@
lt_prog_compiler_pic='-fPIC'
;;
esac
+
+ case $cc_basename in
+ nvcc*) # Cuda Compiler Driver 2.2
+ lt_prog_compiler_wl='-Xlinker '
+ lt_prog_compiler_pic='-Xcompiler -fPIC'
+ ;;
+ esac
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
@@@ -9316,7 -9357,7 +9357,7 @@@
lt_prog_compiler_static='-non_shared'
;;
- linux* | k*bsd*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@@ -9337,7 -9378,7 +9378,7 @@@
lt_prog_compiler_pic='--shared'
lt_prog_compiler_static='--static'
;;
- pgcc* | pgf77* | pgf90* | pgf95*)
+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
lt_prog_compiler_wl='-Wl,'
@@@ -9349,25 -9390,25 +9390,25 @@@
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
- xl*)
- # IBM XL C 8.0/Fortran 10.1 on PPC
+ xl* | bgxl* | bgf* | mpixl*)
+ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-qpic'
lt_prog_compiler_static='-qstaticlink'
;;
*)
case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C 5.9
+ *Sun\ F* | *Sun*Fortran*)
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
- lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_wl=''
;;
- *Sun\ F*)
- # Sun Fortran 8.3 passes all unrecognized flags to the linker
+ *Sun\ C*)
+ # Sun C 5.9
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
- lt_prog_compiler_wl=''
+ lt_prog_compiler_wl='-Wl,'
;;
esac
;;
@@@ -9399,7 -9440,7 +9440,7 @@@
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
case $cc_basename in
- f77* | f90* | f95*)
+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
lt_prog_compiler_wl='-Qoption ld ';;
*)
lt_prog_compiler_wl='-Wl,';;
@@@ -9486,15 -9527,15 +9527,15 @@@ els
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9489: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9493: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_pic_works=yes
@@@ -9542,7 -9583,7 +9583,7 @@@ els
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&5
- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_static_works=yes
@@@ -9591,16 -9632,16 +9632,16 @@@ els
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9594: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9598: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
@@@ -9646,16 -9687,16 +9687,16 @@@ els
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9649: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9653: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
@@@ -9768,7 -9809,33 +9809,33 @@@ $as_echo_n "checking whether the $compi
esac
ld_shlibs=yes
+
+ # On some targets, GNU ld is compatible enough with the native linker
+ # that we're better off using the native interface for both.
+ lt_use_gnu_ld_interface=no
if test "$with_gnu_ld" = yes; then
+ case $host_os in
+ aix*)
+ # The AIX port of GNU ld has always aspired to compatibility
+ # with the native linker. However, as the warning in the GNU ld
+ # block says, versions before 2.19.5* couldn't really create working
+ # shared libraries, regardless of the interface used.
+ case `$LD -v 2>&1` in
+ *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+ *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
+ *\ \(GNU\ Binutils\)\ [3-9]*) ;;
+ *)
+ lt_use_gnu_ld_interface=yes
+ ;;
+ esac
+ ;;
+ *)
+ lt_use_gnu_ld_interface=yes
+ ;;
+ esac
+ fi
+
+ if test "$lt_use_gnu_ld_interface" = yes; then
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@@ -9786,6 -9853,7 +9853,7 @@@
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
+ *GNU\ gold*) supports_anon_versioning=yes ;;
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@@ -9801,11 -9869,12 +9869,12 @@@
ld_shlibs=no
cat <<_LT_EOF 1>&2
- *** Warning: the GNU linker, at least up to release 2.9.1, is reported
+ *** Warning: the GNU linker, at least up to release 2.19, is reported
*** to be unable to reliably create shared libraries on AIX.
*** Therefore, libtool is disabling shared libraries support. If you
- *** really care for shared libraries, you may want to modify your PATH
- *** so that a non-GNU linker is found, and then restart.
+ *** really care for shared libraries, you may want to install binutils
+ *** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+ *** You will then need to restart the configuration process.
_LT_EOF
fi
@@@ -9841,6 -9910,7 +9910,7 @@@
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
+ export_dynamic_flag_spec='${wl}--export-all-symbols'
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
@@@ -9862,6 -9932,11 +9932,11 @@@
fi
;;
+ haiku*)
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ link_all_deplibs=yes
+ ;;
+
interix[3-9]*)
hardcode_direct=no
hardcode_shlibpath_var=no
@@@ -9877,7 -9952,7 +9952,7 @@@
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
- gnu* | linux* | tpf* | k*bsd*-gnu)
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
@@@ -9891,11 -9966,12 +9966,12 @@@
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag'
;;
- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ pgf77* | pgf90* | pgf95* | pgfortran*)
+ # Portland Group f77 and f90 compilers
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@@ -9906,13 -9982,17 +9982,17 @@@
lf95*) # Lahey Fortran 8.1
whole_archive_flag_spec=
tmp_sharedflag='--shared' ;;
- xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
tmp_sharedflag='-qmkshrobj'
tmp_addflag= ;;
+ nvcc*) # Cuda Compiler Driver 2.2
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ compiler_needs_object=yes
+ ;;
esac
case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*) # Sun C 5.9
- whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
compiler_needs_object=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
@@@ -9928,17 -10008,17 +10008,17 @@@
fi
case $cc_basename in
- xlf*)
+ xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
hardcode_libdir_flag_spec=
hardcode_libdir_flag_spec_ld='-rpath $libdir'
- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
if test "x$supports_anon_versioning" = xyes; then
archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
echo "local: *; };" >> $output_objdir/$libname.ver~
- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
fi
;;
esac
@@@ -10059,8 -10139,10 +10139,10 @@@ _LT_EO
else
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
+ # Also, AIX nm treats weak defined symbols like other global
+ # defined symbols, whereas GNU nm marks them as "W".
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
else
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
@@@ -10178,7 -10260,7 +10260,7 @@@ rm -f core conftest.err conftest.$ac_ob
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
@@@ -10222,8 -10304,13 +10304,13 @@@ if test -z "$aix_libpath"; then aix_lib
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
- # Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec='$convenience'
+ if test "$with_gnu_ld" = yes; then
+ # We only use this code for GNU lds that support --whole-archive.
+ whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ else
+ # Exported symbols can be pulled into shared objects from archives
+ whole_archive_flag_spec='$convenience'
+ fi
archive_cmds_need_lc=yes
# This is similar to how AIX traditionally builds its shared libraries.
archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
@@@ -10262,7 -10349,7 +10349,7 @@@
# Tell ltmain to make .dll files, not .so files.
shrext_cmds=".dll"
# FIXME: Setting linknames here is a bad hack.
- archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
# The linker will automatically build a .lib file if we build a DLL.
old_archive_from_new_cmds='true'
# FIXME: Should let the user specify the lib program.
@@@ -10278,7 -10365,11 +10365,11 @@@
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
- whole_archive_flag_spec=''
+ if test "$lt_cv_ld_force_load" = "yes"; then
+ whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ else
+ whole_archive_flag_spec=''
+ fi
link_all_deplibs=yes
allow_undefined_flag="$_lt_dar_allow_undefined"
case $cc_basename in
@@@ -10286,7 -10377,7 +10377,7 @@@
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
- output_verbose_link_cmd=echo
+ output_verbose_link_cmd=func_echo_all
archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@@ -10352,7 -10443,7 +10443,7 @@@
;;
hpux10*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
@@@ -10371,7 -10462,7 +10462,7 @@@
;;
hpux11*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
case $host_cpu in
hppa*64*)
archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@@ -10392,7 -10483,46 +10483,46 @@@
archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+
+ # Older versions of the 11.00 compiler do not understand -b yet
+ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+ $as_echo_n "checking if $CC understands -b... " >&6; }
+ if test "${lt_cv_prog_compiler__b+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_prog_compiler__b=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -b"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&5
+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler__b=yes
+ fi
+ else
+ lt_cv_prog_compiler__b=yes
+ fi
+ fi
+ $RM -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+ $as_echo "$lt_cv_prog_compiler__b" >&6; }
+
+ if test x"$lt_cv_prog_compiler__b" = xyes; then
+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ fi
+
;;
esac
fi
@@@ -10420,7 -10550,7 +10550,7 @@@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
@@@ -10431,15 -10561,15 +10561,15 @@@
int foo(void) {}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LDFLAGS="$save_LDFLAGS"
else
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@@ -10501,17 -10631,17 +10631,17 @@@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
- archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+ archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
;;
osf3*)
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
allow_undefined_flag=' -expect_unresolved \*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@@ -10521,13 -10651,13 +10651,13 @@@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag=' -expect_unresolved \*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
@@@ -10730,44 -10860,50 +10860,50 @@@ x|xyes
# to ld, don't add -lc before -lgcc.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
- $RM conftest*
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ if test "${lt_cv_archive_cmds_need_lc+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ $RM conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } 2>conftest.err; then
- soname=conftest
- lib=conftest
- libobjs=conftest.$ac_objext
- deplibs=
- wl=$lt_prog_compiler_wl
- pic_flag=$lt_prog_compiler_pic
- compiler_flags=-v
- linker_flags=-v
- verstring=
- output_objdir=.
- libname=conftest
- lt_save_allow_undefined_flag=$allow_undefined_flag
- allow_undefined_flag=
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+ soname=conftest
+ lib=conftest
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$lt_prog_compiler_wl
+ pic_flag=$lt_prog_compiler_pic
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+ output_objdir=.
+ libname=conftest
+ lt_save_allow_undefined_flag=$allow_undefined_flag
+ allow_undefined_flag=
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
(eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- then
- archive_cmds_need_lc=no
- else
- archive_cmds_need_lc=yes
- fi
- allow_undefined_flag=$lt_save_allow_undefined_flag
- else
- cat conftest.err 1>&5
- fi
- $RM conftest*
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
- $as_echo "$archive_cmds_need_lc" >&6; }
+ then
+ lt_cv_archive_cmds_need_lc=no
+ else
+ lt_cv_archive_cmds_need_lc=yes
+ fi
+ allow_undefined_flag=$lt_save_allow_undefined_flag
+ else
+ cat conftest.err 1>&5
+ fi
+ $RM conftest*
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+ $as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+ archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
;;
esac
fi
@@@ -10938,16 -11074,23 +11074,23 @@@ if test "$GCC" = yes; the
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+ case $host_os in
+ mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
+ *) lt_sed_strip_eq="s,=/,/,g" ;;
+ esac
+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+ case $lt_search_path_spec in
+ *\;*)
# if the path contains ";" then we assume it to be the separator
# otherwise default to the standard path separator (i.e. ":") - it is
# assumed that no part of a normal pathname contains ";" but that should
# okay in the real world where ";" in dirpaths is itself problematic.
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
- else
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+ ;;
+ *)
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+ ;;
+ esac
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
@@@ -10960,7 -11103,7 +11103,7 @@@
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
- lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
@@@ -10980,7 -11123,13 +11123,13 @@@
if (lt_foo != "") { lt_freq[lt_foo]++; }
if (lt_freq[lt_foo] == 1) { print lt_foo; }
}'`
- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+ # AWK program above erroneously prepends '/' to C:/dos/paths
+ # for these hosts.
+ case $host_os in
+ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+ $SED 's,/\([A-Za-z]:\),\1,g'` ;;
+ esac
+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
@@@ -11068,7 -11217,7 +11217,7 @@@ amigaos*
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
;;
esac
;;
@@@ -11121,23 -11270,12 +11270,12 @@@ cygwin* | mingw* | pw32* | cegcc*
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
- # It is most probably a Windows format PATH printed by
- # mingw gcc, but we are running on Cygwin. Gcc prints its search
- # path with ; separators, and with drive letters. We can handle the
- # drive letters (cygwin fileutils understands them), so leave them,
- # especially as we might pass files found there to a mingw objdump,
- # which wouldn't understand a cygwinified path. Ahh.
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@@ -11237,6 -11375,19 +11375,19 @@@ gnu*
hardcode_into_libs=yes
;;
+ haiku*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ dynamic_linker="$host_os runtime_loader"
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+ hardcode_into_libs=yes
+ ;;
+
hpux9* | hpux10* | hpux11*)
# Give a soname corresponding to the major version so that dld.sl refuses to
# link against other versions.
@@@ -11279,8 -11430,10 +11430,10 @@@
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
- # HP-UX runs *really* slowly unless shared libraries are mode 555.
+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
postinstall_cmds='chmod 555 $lib'
+ # or fails outright, so override atomically:
+ install_override_mode=555
;;
interix[3-9]*)
@@@ -11338,7 -11491,7 +11491,7 @@@ linux*oldld* | linux*aout* | linux*coff
;;
# This must be Linux ELF.
- linux* | k*bsd*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@@ -11347,12 -11500,17 +11500,17 @@@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
+
# Some binutils ld are patched to set DT_RUNPATH
- save_LDFLAGS=$LDFLAGS
- save_libdir=$libdir
- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_shlibpath_overrides_runpath=no
+ save_LDFLAGS=$LDFLAGS
+ save_libdir=$libdir
+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@@ -11365,13 -11523,17 +11523,17 @@@ main (
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
- shlibpath_overrides_runpath=yes
+ lt_cv_shlibpath_overrides_runpath=yes
fi
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- LDFLAGS=$save_LDFLAGS
- libdir=$save_libdir
+ LDFLAGS=$save_LDFLAGS
+ libdir=$save_libdir
+
+ fi
+
+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
@@@ -11383,8 -11545,9 +11545,9 @@@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@@ -11686,6 -11849,11 +11849,11 @@@ f
+
+
+
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
@@@ -11980,7 -12148,7 +12148,6 @@@ f
fi
--fi
fi
@@@ -12016,7 -12184,7 +12183,7 @@@ els
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
- #line 12019 "configure"
+ #line $LINENO "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@@ -12057,7 -12225,13 +12224,13 @@@
# endif
#endif
- void fnord() { int i=42;}
+ /* When -fvisbility=hidden is used, assume the code has been annotated
+ correspondingly for the symbols needed. */
+ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+ void fnord () __attribute__((visibility("default")));
+ #endif
+
+ void fnord () { int i=42; }
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@@ -12066,7 -12240,11 +12239,11 @@@
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else
+ {
+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else puts (dlerror ());
+ }
/* dlclose (self); */
}
else
@@@ -12112,7 -12290,7 +12289,7 @@@ els
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
- #line 12115 "configure"
+ #line $LINENO "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@@ -12153,7 -12331,13 +12330,13 @@@
# endif
#endif
- void fnord() { int i=42;}
+ /* When -fvisbility=hidden is used, assume the code has been annotated
+ correspondingly for the symbols needed. */
+ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+ void fnord () __attribute__((visibility("default")));
+ #endif
+
+ void fnord () { int i=42; }
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@@ -12162,7 -12346,11 +12345,11 @@@
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else
+ {
+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else puts (dlerror ());
+ }
/* dlclose (self); */
}
else
@@@ -12220,13 -12408,13 +12407,53 @@@ f
++for ac_header in netinet/ip.h
++do :
++ ac_fn_c_check_header_compile "$LINENO" "netinet/ip.h" "ac_cv_header_netinet_ip_h" "#include <sys/types.h>
++ #if HAVE_NETINET_IN_H
++ # include <netinet/in.h>
++ #endif
++ #if HAVE_NETINET_IN_SYSTM_H
++ # include <netinet/in_systm.h>
++ #endif
++"
++if test "x$ac_cv_header_netinet_ip_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_NETINET_IP_H 1
++_ACEOF
++fi
++done
++for ac_header in regex.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "regex.h" "ac_cv_header_regex_h" "$ac_includes_default"
++if test "x$ac_cv_header_regex_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_REGEX_H 1
++_ACEOF
++ HAVE_REGEX=1
++else
++ HAVE_REGEX=0
++fi
++done
++for ac_header in sys/un.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "sys/un.h" "ac_cv_header_sys_un_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_un_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_SYS_UN_H 1
++_ACEOF
++ HAVE_AF_UNIX=1
++else
++ HAVE_AF_UNIX=0
++fi
++done
striplib=
@@@ -12259,11 -12447,11 +12486,38 @@@ $as_echo "no" >&6;
esac
fi
++ if test "x$HAVE_AF_UNIX" = "x1"; then
++ HAVE_AF_UNIX_TRUE=
++ HAVE_AF_UNIX_FALSE='#'
++else
++ HAVE_AF_UNIX_TRUE='#'
++ HAVE_AF_UNIX_FALSE=
++fi
++# Linux
++for ac_header in linux/input.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "linux/input.h" "ac_cv_header_linux_input_h" "$ac_includes_default"
++if test "x$ac_cv_header_linux_input_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_LINUX_INPUT_H 1
++_ACEOF
++ HAVE_EVDEV=1
++else
++ HAVE_EVDEV=0
++fi
++done
++ if test "x$HAVE_EVDEV" = "x1"; then
++ HAVE_EVDEV_TRUE=
++ HAVE_EVDEV_FALSE='#'
++else
++ HAVE_EVDEV_TRUE='#'
++ HAVE_EVDEV_FALSE=
++fi
@@@ -12319,10 -12507,10 +12573,12 @@@ ac_compiler_gnu=$ac_cv_c_compiler_gn
CC="$lt_save_CC"
++# NetBSD
++# Other
@@@ -12392,7 -12580,7 +12648,7 @@@ f
if test "x$LIBLTDL" = "x"; then :
- as_fn_error "Unable to find libltdl version 2. Makes sure you have libtool 2.2 or later installed." "$LINENO" 5
+ as_fn_error $? "Unable to find libltdl version 2. Makes sure you have libtool 2.2 or later installed." "$LINENO" 5
fi
@@@ -12547,8 -12735,7 +12803,7 @@@ do
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
"
- 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
@@@ -13031,7 -13218,7 +13286,7 @@@ $as_echo "#define AC_APPLE_UNIVERSAL_BU
;; #(
*)
- as_fn_error "unknown endianness
+ as_fn_error $? "unknown endianness
presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
esac
@@@ -14284,8 -14471,7 +14539,7 @@@ don
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
@@@ -14316,8 -14502,7 +14570,7 @@@ for ac_func in fork vfor
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
@@@ -14683,8 -14868,7 +14936,7 @@@ for ac_header in sys/select.h sys/socke
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
@@@ -14806,6 -14990,12 +15058,12 @@@ rm -f conftest
+
+
+
+
+
+
for ac_func in mkfifo
do :
ac_fn_c_check_func "$LINENO" "mkfifo" "ac_cv_func_mkfifo"
@@@ -15002,8 -15192,7 +15260,7 @@@ if test $ac_cv_os_cray = yes; the
for ac_func in _getb67 GETB67 getb67; 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 CRAY_STACKSEG_END $ac_func
@@@ -15380,7 -15569,7 +15637,7 @@@ $as_echo_n "checking for ld used by GCC
# Canonicalize the path of ld
ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
done
test -z "$LD" && LD="$ac_prog"
;;
@@@ -15414,9 -15603,9 +15671,9 @@@ els
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
*GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break ;;
+ test "$with_gnu_ld" != no && break ;;
*)
- test "$with_gnu_ld" != yes && break ;;
+ test "$with_gnu_ld" != yes && break ;;
esac
fi
done
@@@ -15434,7 -15623,7 +15691,7 @@@ els
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+ test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
if test "${acl_cv_prog_gnu_ld+set}" = set; then :
@@@ -15488,23 -15677,70 +15745,70 @@@ f
- acl_libdirstem=lib
- searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
- if test -n "$searchpath"; then
- acl_save_IFS="${IFS= }"; IFS=":"
- for searchdir in $searchpath; do
- if test -d "$searchdir"; then
- case "$searchdir" in
- */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
- *) searchdir=`cd "$searchdir" && pwd`
- case "$searchdir" in
- */lib64 ) acl_libdirstem=lib64 ;;
- esac ;;
+
+ acl_libdirstem=lib
+ acl_libdirstem2=
+ case "$host_os" in
+ solaris*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
+ $as_echo_n "checking for 64-bit host... " >&6; }
+ if test "${gl_cv_solaris_64bit+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ #ifdef _LP64
+ sixtyfour bits
+ #endif
+
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "sixtyfour bits" >/dev/null 2>&1; then :
+ gl_cv_solaris_64bit=yes
+ else
+ gl_cv_solaris_64bit=no
+ fi
+ rm -f conftest*
+
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
+ $as_echo "$gl_cv_solaris_64bit" >&6; }
+ if test $gl_cv_solaris_64bit = yes; then
+ acl_libdirstem=lib/64
+ case "$host_cpu" in
+ sparc*) acl_libdirstem2=lib/sparcv9 ;;
+ i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
esac
fi
- done
- IFS="$acl_save_IFS"
- fi
+ ;;
+ *)
+ searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+ if test -n "$searchpath"; then
+ acl_save_IFS="${IFS= }"; IFS=":"
+ for searchdir in $searchpath; do
+ if test -d "$searchdir"; then
+ case "$searchdir" in
+ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+ */../ | */.. )
+ # Better ignore directories of this form. They are misleading.
+ ;;
+ *) searchdir=`cd "$searchdir" && pwd`
+ case "$searchdir" in
+ */lib64 ) acl_libdirstem=lib64 ;;
+ esac ;;
+ esac
+ fi
+ done
+ IFS="$acl_save_IFS"
+ fi
+ ;;
+ esac
+ test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+
+
+
@@@ -15550,6 -15786,10 +15854,10 @@@ if test "${with_libiconv_prefix+set}"
else
additional_includedir="$withval/include"
additional_libdir="$withval/$acl_libdirstem"
+ if test "$acl_libdirstem2" != "$acl_libdirstem" \
+ && ! test -d "$withval/$acl_libdirstem"; then
+ additional_libdir="$withval/$acl_libdirstem2"
+ fi
fi
fi
@@@ -15559,6 -15799,7 +15867,7 @@@ f
LTLIBICONV=
INCICONV=
LIBICONV_PREFIX=
+ HAVE_LIBICONV=
rpathdirs=
ltrpathdirs=
names_already_handled=
@@@ -15701,7 -15942,9 +16010,9 @@@
if test "X$found_dir" != "X"; then
LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
if test "X$found_so" != "X"; then
- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
+ if test "$enable_rpath" = no \
+ || test "X$found_dir" = "X/usr/$acl_libdirstem" \
+ || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
else
haveit=
@@@ -15768,7 -16011,16 +16079,16 @@@
case "$found_dir" in
*/$acl_libdirstem | */$acl_libdirstem/)
basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
- LIBICONV_PREFIX="$basedir"
+ if test "$name" = 'iconv'; then
+ LIBICONV_PREFIX="$basedir"
+ fi
+ additional_includedir="$basedir/include"
+ ;;
+ */$acl_libdirstem2 | */$acl_libdirstem2/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
+ if test "$name" = 'iconv'; then
+ LIBICONV_PREFIX="$basedir"
+ fi
additional_includedir="$basedir/include"
;;
esac
@@@ -15817,9 -16069,11 +16137,11 @@@
case "$dep" in
-L*)
additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
- if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
+ && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
haveit=
- if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
+ || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
if test -n "$GCC"; then
case $host_os in
linux* | gnu* | k*bsd*-gnu) haveit=yes;;
@@@ -15951,6 -16205,11 +16273,11 @@@
+
+
+
+
+
am_save_CPPFLAGS="$CPPFLAGS"
for element in $INCICONV; do
@@@ -16075,6 -16334,25 +16402,25 @@@ int main (
return 1;
}
}
+ /* Test against Solaris 10 bug: Failures are not distinguishable from
+ successful returns. */
+ {
+ iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
+ if (cd_ascii_to_88591 != (iconv_t)(-1))
+ {
+ static const char input[] = "\263";
+ char buf[10];
+ const char *inptr = input;
+ size_t inbytesleft = strlen (input);
+ char *outptr = buf;
+ size_t outbytesleft = sizeof (buf);
+ size_t res = iconv (cd_ascii_to_88591,
+ (char **) &inptr, &inbytesleft,
+ &outptr, &outbytesleft);
+ if (res == 0)
+ return 1;
+ }
+ }
#if 0 /* This bug could be worked around by the caller. */
/* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
{
@@@ -16188,10 -16466,10 +16534,10 @@@ rm -f core conftest.err conftest.$ac_ob
fi
am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:-
- }$am_cv_proto_iconv" >&5
- $as_echo "${ac_t:-
- }$am_cv_proto_iconv" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result:
+ $am_cv_proto_iconv" >&5
+ $as_echo "
+ $am_cv_proto_iconv" >&6; }
cat >>confdefs.h <<_ACEOF
#define ICONV_CONST $am_cv_proto_iconv_arg1
@@@ -16218,7 -16496,7 +16564,7 @@@ $as_echo "$USE_NLS" >&6;
case "$am__api_version" in
1.01234)
- as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
+ as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
;;
*)
;;
@@@ -16235,7 -16513,7 +16581,7 @@@ $as_echo_n "checking for intltool >= 0.
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
- as_fn_error "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5
+ as_fn_error $? "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5
fi
# Extract the first word of "intltool-update", so it can be a program name with args.
@@@ -16359,7 -16637,7 +16705,7 @@@ f
if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
- as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
+ as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5
fi
INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
@@@ -16641,13 -16919,13 +16987,13 @@@ f
if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
- as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
+ as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
fi
xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
- as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
+ as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
fi
# Extract the first word of "perl", so it can be a program name with args.
@@@ -16691,13 -16969,13 +17037,13 @@@ f
if test -z "$INTLTOOL_PERL"; then
- as_fn_error "perl not found" "$LINENO" 5
+ as_fn_error $? "perl not found" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
$as_echo_n "checking for perl >= 5.8.1... " >&6; }
$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
if test $? -ne 0; then
- as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
+ as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
else
IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
@@@ -16710,7 -16988,7 +17056,7 @@@ $as_echo_n "checking for XML::Parser..
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
$as_echo "ok" >&6; }
else
- as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
+ as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5
fi
fi
@@@ -17481,6 -17759,10 +17827,10 @@@ pulselocaledir='${prefix}/${DATADIRNAME
+
+
+
+
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.
@@@ -17593,7 -17875,6 +17943,6 @@@ $as_echo "yes" >&6;
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-
fi
#### X11 (optional) ####
@@@ -17604,7 -17885,7 +17953,7 @@@ if test "${enable_x11+set}" = set; the
case "${enableval}" in
yes) x11=yes ;;
no) x11=no ;;
- *) as_fn_error "bad value ${enableval} for --disable-x11" "$LINENO" 5 ;;
+ *) as_fn_error $? "bad value ${enableval} for --disable-x11" "$LINENO" 5 ;;
esac
else
@@@ -17622,12 -17903,12 +17971,12 @@@ if test -n "$X11_CFLAGS"; the
pkg_cv_X11_CFLAGS="$X11_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" x11 ice sm xtst \""; } >&5
- ($PKG_CONFIG --exists --print-errors " x11 ice sm xtst ") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" x11-xcb ice sm xtst xcb-atom \""; } >&5
+ ($PKG_CONFIG --exists --print-errors " x11-xcb ice sm xtst xcb-atom ") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_X11_CFLAGS=`$PKG_CONFIG --cflags " x11 ice sm xtst " 2>/dev/null`
+ pkg_cv_X11_CFLAGS=`$PKG_CONFIG --cflags " x11-xcb ice sm xtst xcb-atom " 2>/dev/null`
else
pkg_failed=yes
fi
@@@ -17638,12 -17919,12 +17987,12 @@@ if test -n "$X11_LIBS"; the
pkg_cv_X11_LIBS="$X11_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" x11 ice sm xtst \""; } >&5
- ($PKG_CONFIG --exists --print-errors " x11 ice sm xtst ") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" x11-xcb ice sm xtst xcb-atom \""; } >&5
+ ($PKG_CONFIG --exists --print-errors " x11-xcb ice sm xtst xcb-atom ") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_X11_LIBS=`$PKG_CONFIG --libs " x11 ice sm xtst " 2>/dev/null`
+ pkg_cv_X11_LIBS=`$PKG_CONFIG --libs " x11-xcb ice sm xtst xcb-atom " 2>/dev/null`
else
pkg_failed=yes
fi
@@@ -17654,6 -17935,8 +18003,8 @@@ f
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
@@@ -17661,26 -17944,26 +18012,26 @@@ els
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " x11 ice sm xtst " 2>&1`
+ X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " x11-xcb ice sm xtst xcb-atom " 2>&1`
else
- X11_PKG_ERRORS=`$PKG_CONFIG --print-errors " x11 ice sm xtst " 2>&1`
+ X11_PKG_ERRORS=`$PKG_CONFIG --print-errors " x11-xcb ice sm xtst xcb-atom " 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$X11_PKG_ERRORS" >&5
HAVE_X11=0
if test "x$x11" = xyes ; then
- as_fn_error "*** X11 not found" "$LINENO" 5
+ as_fn_error $? "*** X11 not found" "$LINENO" 5
fi
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
HAVE_X11=0
if test "x$x11" = xyes ; then
- as_fn_error "*** X11 not found" "$LINENO" 5
+ as_fn_error $? "*** X11 not found" "$LINENO" 5
fi
else
@@@ -17781,7 -18064,7 +18132,7 @@@ if test "$ac_res" != no; then
else
if test "x${with_caps}" = "xyes" ; then
- as_fn_error "*** POSIX caps libraries not found" "$LINENO" 5
+ as_fn_error $? "*** POSIX caps libraries not found" "$LINENO" 5
fi
fi
@@@ -17796,7 -18079,7 +18147,7 @@@ _ACEO
else
if test "x${with_caps}" = "xyes" ; then
- as_fn_error "*** POSIX caps headers not found" "$LINENO" 5
+ as_fn_error $? "*** POSIX caps headers not found" "$LINENO" 5
fi
fi
@@@ -17853,6 -18136,8 +18204,8 @@@ f
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
@@@ -17867,7 -18152,7 +18220,7 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$LIBSNDFILE_PKG_ERRORS" >&5
- as_fn_error "Package requirements ( sndfile >= 1.0.20 ) were not met:
+ as_fn_error $? "Package requirements ( sndfile >= 1.0.20 ) were not met:
$LIBSNDFILE_PKG_ERRORS
@@@ -17876,12 -18161,14 +18229,14 @@@ installed software in a non-standard pr
Alternatively, you may set the environment variables LIBSNDFILE_CFLAGS
and LIBSNDFILE_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.
@@@ -17890,13 -18177,14 +18245,14 @@@ and LIBSNDFILE_LIBS to avoid the need t
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." "$LINENO" 5; }
+ See \`config.log' for more details" "$LINENO" 5; }
+
else
LIBSNDFILE_CFLAGS=$pkg_cv_LIBSNDFILE_CFLAGS
LIBSNDFILE_LIBS=$pkg_cv_LIBSNDFILE_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@@ -17942,6 -18230,8 +18298,8 @@@ f
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
@@@ -17956,7 -18246,7 +18314,7 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$LIBSPEEX_PKG_ERRORS" >&5
- as_fn_error "Package requirements ( speexdsp >= 1.2 ) were not met:
+ as_fn_error $? "Package requirements ( speexdsp >= 1.2 ) were not met:
$LIBSPEEX_PKG_ERRORS
@@@ -17965,12 -18255,14 +18323,14 @@@ installed software in a non-standard pr
Alternatively, you may set the environment variables LIBSPEEX_CFLAGS
and LIBSPEEX_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.
@@@ -17979,13 -18271,14 +18339,14 @@@ and LIBSPEEX_LIBS to avoid the need to
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." "$LINENO" 5; }
+ See \`config.log' for more details" "$LINENO" 5; }
+
else
LIBSPEEX_CFLAGS=$pkg_cv_LIBSPEEX_CFLAGS
LIBSPEEX_LIBS=$pkg_cv_LIBSPEEX_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@@ -18007,7 -18300,7 +18368,7 @@@ _ACEO
else
- as_fn_error "*** libatomic-ops headers not found" "$LINENO" 5
+ as_fn_error $? "*** libatomic-ops headers not found" "$LINENO" 5
fi
@@@ -18031,7 -18324,7 +18392,7 @@@ if test "${enable_samplerate+set}" = se
case "${enableval}" in
yes) samplerate=yes ;;
no) samplerate=no ;;
- *) as_fn_error "bad value ${enableval} for --disable-samplerate" "$LINENO" 5 ;;
+ *) as_fn_error $? "bad value ${enableval} for --disable-samplerate" "$LINENO" 5 ;;
esac
else
@@@ -18081,6 -18374,8 +18442,8 @@@ f
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
@@@ -18095,19 -18390,19 +18458,19 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$LIBSAMPLERATE_PKG_ERRORS" >&5
HAVE_LIBSAMPLERATE=0
if test "x$samplerate" = xyes ; then
- as_fn_error "*** Libsamplerate not found" "$LINENO" 5
+ as_fn_error $? "*** Libsamplerate not found" "$LINENO" 5
fi
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
HAVE_LIBSAMPLERATE=0
if test "x$samplerate" = xyes ; then
- as_fn_error "*** Libsamplerate not found" "$LINENO" 5
+ as_fn_error $? "*** Libsamplerate not found" "$LINENO" 5
fi
else
@@@ -18196,6 -18491,8 +18559,8 @@@ f
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
@@@ -18210,17 -18507,17 +18575,17 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$TDB_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
if test "x${with_database}" = "xtdb" ; then
- as_fn_error "*** tdb not found" "$LINENO" 5
+ as_fn_error $? "*** tdb not found" "$LINENO" 5
fi
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
if test "x${with_database}" = "xtdb" ; then
- as_fn_error "*** tdb not found" "$LINENO" 5
+ as_fn_error $? "*** tdb not found" "$LINENO" 5
fi
else
@@@ -18306,7 -18603,7 +18671,7 @@@ don
GDBM_LIBS=-lgdbm
with_database=gdbm
elif test "x${with_database}" = "xgdbm"; then
- as_fn_error "*** gdbm not found" "$LINENO" 5
+ as_fn_error $? "*** gdbm not found" "$LINENO" 5
fi
fi
@@@ -18316,7 -18613,7 +18681,7 @@@ if test "x${with_database}" = "xauto" -
fi
if test "x${HAVE_TDB}" != x1 -a "x${HAVE_GDBM}" != x1 -a "x${HAVE_SIMPLEDB}" != x1; then
- as_fn_error "*** missing database backend" "$LINENO" 5
+ as_fn_error $? "*** missing database backend" "$LINENO" 5
fi
if test "x${HAVE_TDB}" = x1 ; then
@@@ -18379,7 -18676,7 +18744,7 @@@ if test "${enable_oss_output+set}" = se
case "${enableval}" in
yes) oss_output=yes ;;
no) oss_output=no ;;
- *) as_fn_error "bad value ${enableval} for --disable-oss-output" "$LINENO" 5 ;;
+ *) as_fn_error $? "bad value ${enableval} for --disable-oss-output" "$LINENO" 5 ;;
esac
else
@@@ -18393,7 -18690,7 +18758,7 @@@ if test "${enable_oss_wrapper+set}" = s
case "${enableval}" in
yes) oss_wrapper=yes ;;
no) oss_wrapper=no ;;
- *) as_fn_error "bad value ${enableval} for --disable-oss-wrapper" "$LINENO" 5 ;;
+ *) as_fn_error $? "bad value ${enableval} for --disable-oss-wrapper" "$LINENO" 5 ;;
esac
else
@@@ -18426,7 -18723,7 +18791,7 @@@ els
HAVE_OSS=0
if test "x$oss_output" = xyes || test "x$oss_wrapper" = "xyes"; then
- as_fn_error "*** OSS support not found" "$LINENO" 5
+ as_fn_error $? "*** OSS support not found" "$LINENO" 5
fi
fi
@@@ -18463,7 -18760,7 +18828,7 @@@ if test "${enable_alsa+set}" = set; the
case "${enableval}" in
yes) alsa=yes ;;
no) alsa=no ;;
- *) as_fn_error "bad value ${enableval} for --disable-alsa" "$LINENO" 5 ;;
+ *) as_fn_error $? "bad value ${enableval} for --disable-alsa" "$LINENO" 5 ;;
esac
else
@@@ -18513,6 -18810,8 +18878,8 @@@ f
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
@@@ -18527,19 -18826,19 +18894,19 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$ASOUNDLIB_PKG_ERRORS" >&5
HAVE_ALSA=0
if test "x$alsa" = xyes ; then
- as_fn_error "*** Needed alsa >= 1.0.19 support not found" "$LINENO" 5
+ as_fn_error $? "*** Needed alsa >= 1.0.19 support not found" "$LINENO" 5
fi
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
HAVE_ALSA=0
if test "x$alsa" = xyes ; then
- as_fn_error "*** Needed alsa >= 1.0.19 support not found" "$LINENO" 5
+ as_fn_error $? "*** Needed alsa >= 1.0.19 support not found" "$LINENO" 5
fi
else
@@@ -18578,7 -18877,7 +18945,7 @@@ if test "${enable_solaris+set}" = set;
case "${enableval}" in
yes) solaris=yes ;;
no) solaris=no ;;
- *) as_fn_error "bad value ${enableval} for --disable-solaris" "$LINENO" 5 ;;
+ *) as_fn_error $? "bad value ${enableval} for --disable-solaris" "$LINENO" 5 ;;
esac
else
@@@ -18604,7 -18903,7 +18971,7 @@@ els
HAVE_SOLARIS=0
if test "x$solaris" = xyes ; then
- as_fn_error "*** Solaris audio support not found" "$LINENO" 5
+ as_fn_error $? "*** Solaris audio support not found" "$LINENO" 5
fi
fi
@@@ -18633,7 -18932,7 +19000,7 @@@ if test "${enable_glib2+set}" = set; th
case "${enableval}" in
yes) glib2=yes ;;
no) glib2=no ;;
- *) as_fn_error "bad value ${enableval} for --disable-glib2" "$LINENO" 5 ;;
+ *) as_fn_error $? "bad value ${enableval} for --disable-glib2" "$LINENO" 5 ;;
esac
else
@@@ -18683,6 -18982,8 +19050,8 @@@ f
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
@@@ -18697,19 -18998,19 +19066,19 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$GLIB20_PKG_ERRORS" >&5
HAVE_GLIB20=0
if test "x$glib2" = xyes ; then
- as_fn_error "*** GLib 2 support not found" "$LINENO" 5
+ as_fn_error $? "*** GLib 2 support not found" "$LINENO" 5
fi
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
HAVE_GLIB20=0
if test "x$glib2" = xyes ; then
- as_fn_error "*** GLib 2 support not found" "$LINENO" 5
+ as_fn_error $? "*** GLib 2 support not found" "$LINENO" 5
fi
else
@@@ -18749,7 -19050,7 +19118,7 @@@ if test "${enable_gtk2+set}" = set; the
case "${enableval}" in
yes) gtk2=yes ;;
no) gtk2=no ;;
- *) as_fn_error "bad value ${enableval} for --disable-gtk2" "$LINENO" 5 ;;
+ *) as_fn_error $? "bad value ${enableval} for --disable-gtk2" "$LINENO" 5 ;;
esac
else
@@@ -18799,6 -19100,8 +19168,8 @@@ f
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
@@@ -18813,19 -19116,19 +19184,19 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$GTK20_PKG_ERRORS" >&5
HAVE_GTK20=0
if test "x$gtk2" = xyes ; then
- as_fn_error "*** Gtk+ 2 support not found" "$LINENO" 5
+ as_fn_error $? "*** Gtk+ 2 support not found" "$LINENO" 5
fi
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
HAVE_GTK20=0
if test "x$gtk2" = xyes ; then
- as_fn_error "*** Gtk+ 2 support not found" "$LINENO" 5
+ as_fn_error $? "*** Gtk+ 2 support not found" "$LINENO" 5
fi
else
@@@ -18865,7 -19168,7 +19236,7 @@@ if test "${enable_gconf+set}" = set; th
case "${enableval}" in
yes) gconf=yes ;;
no) gconf=no ;;
- *) as_fn_error "bad value ${enableval} for --disable-gconf" "$LINENO" 5 ;;
+ *) as_fn_error $? "bad value ${enableval} for --disable-gconf" "$LINENO" 5 ;;
esac
else
@@@ -18883,12 -19186,12 +19254,12 @@@ if test -n "$GCONF_CFLAGS"; the
pkg_cv_GCONF_CFLAGS="$GCONF_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gconf-2.0 >= 2.4.0 \""; } >&5
- ($PKG_CONFIG --exists --print-errors " gconf-2.0 >= 2.4.0 ") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gconf-2.0 >= 2.4.0 gobject-2.0 \""; } >&5
+ ($PKG_CONFIG --exists --print-errors " gconf-2.0 >= 2.4.0 gobject-2.0 ") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags " gconf-2.0 >= 2.4.0 " 2>/dev/null`
+ pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags " gconf-2.0 >= 2.4.0 gobject-2.0 " 2>/dev/null`
else
pkg_failed=yes
fi
@@@ -18899,12 -19202,12 +19270,12 @@@ if test -n "$GCONF_LIBS"; the
pkg_cv_GCONF_LIBS="$GCONF_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gconf-2.0 >= 2.4.0 \""; } >&5
- ($PKG_CONFIG --exists --print-errors " gconf-2.0 >= 2.4.0 ") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gconf-2.0 >= 2.4.0 gobject-2.0 \""; } >&5
+ ($PKG_CONFIG --exists --print-errors " gconf-2.0 >= 2.4.0 gobject-2.0 ") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GCONF_LIBS=`$PKG_CONFIG --libs " gconf-2.0 >= 2.4.0 " 2>/dev/null`
+ pkg_cv_GCONF_LIBS=`$PKG_CONFIG --libs " gconf-2.0 >= 2.4.0 gobject-2.0 " 2>/dev/null`
else
pkg_failed=yes
fi
@@@ -18915,6 -19218,8 +19286,8 @@@ f
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
@@@ -18922,26 -19227,26 +19295,26 @@@ els
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " gconf-2.0 >= 2.4.0 " 2>&1`
+ GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " gconf-2.0 >= 2.4.0 gobject-2.0 " 2>&1`
else
- GCONF_PKG_ERRORS=`$PKG_CONFIG --print-errors " gconf-2.0 >= 2.4.0 " 2>&1`
+ GCONF_PKG_ERRORS=`$PKG_CONFIG --print-errors " gconf-2.0 >= 2.4.0 gobject-2.0 " 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GCONF_PKG_ERRORS" >&5
HAVE_GCONF=0
if test "x$gconf" = xyes ; then
- as_fn_error "*** GConf support not found" "$LINENO" 5
+ as_fn_error $? "*** GConf support not found" "$LINENO" 5
fi
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
HAVE_GCONF=0
if test "x$gconf" = xyes ; then
- as_fn_error "*** GConf support not found" "$LINENO" 5
+ as_fn_error $? "*** GConf support not found" "$LINENO" 5
fi
else
@@@ -18975,7 -19280,7 +19348,7 @@@ if test "${enable_avahi+set}" = set; th
case "${enableval}" in
yes) avahi=yes ;;
no) avahi=no ;;
- *) as_fn_error "bad value ${enableval} for --disable-avahi" "$LINENO" 5 ;;
+ *) as_fn_error $? "bad value ${enableval} for --disable-avahi" "$LINENO" 5 ;;
esac
else
@@@ -19025,6 -19330,8 +19398,8 @@@ f
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
@@@ -19039,19 -19346,19 +19414,19 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$AVAHI_PKG_ERRORS" >&5
HAVE_AVAHI=0
if test "x$avahi" = xyes ; then
- as_fn_error "*** Avahi support not found" "$LINENO" 5
+ as_fn_error $? "*** Avahi support not found" "$LINENO" 5
fi
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
HAVE_AVAHI=0
if test "x$avahi" = xyes ; then
- as_fn_error "*** Avahi support not found" "$LINENO" 5
+ as_fn_error $? "*** Avahi support not found" "$LINENO" 5
fi
else
@@@ -19085,7 -19392,7 +19460,7 @@@ if test "${enable_jack+set}" = set; the
case "${enableval}" in
yes) jack=yes ;;
no) jack=no ;;
- *) as_fn_error "bad value ${enableval} for --disable-jack" "$LINENO" 5 ;;
+ *) as_fn_error $? "bad value ${enableval} for --disable-jack" "$LINENO" 5 ;;
esac
else
@@@ -19135,6 -19442,8 +19510,8 @@@ f
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
@@@ -19149,19 -19458,19 +19526,19 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$JACK_PKG_ERRORS" >&5
HAVE_JACK=0
if test "x$jack" = xyes ; then
- as_fn_error "*** JACK support not found" "$LINENO" 5
+ as_fn_error $? "*** JACK support not found" "$LINENO" 5
fi
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
HAVE_JACK=0
if test "x$jack" = xyes ; then
- as_fn_error "*** JACK support not found" "$LINENO" 5
+ as_fn_error $? "*** JACK support not found" "$LINENO" 5
fi
else
@@@ -19195,7 -19504,7 +19572,7 @@@ if test "${enable_asyncns+set}" = set;
case "${enableval}" in
yes) asyncns=yes ;;
no) asyncns=no ;;
- *) as_fn_error "bad value ${enableval} for --disable-asyncns" "$LINENO" 5 ;;
+ *) as_fn_error $? "bad value ${enableval} for --disable-asyncns" "$LINENO" 5 ;;
esac
else
@@@ -19245,6 -19554,8 +19622,8 @@@ f
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
@@@ -19259,19 -19570,19 +19638,19 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$LIBASYNCNS_PKG_ERRORS" >&5
HAVE_LIBASYNCNS=0
if test "x$asyncns" = xyes ; then
- as_fn_error "*** Async DNS support not found" "$LINENO" 5
+ as_fn_error $? "*** Async DNS support not found" "$LINENO" 5
fi
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
HAVE_LIBASYNCNS=0
if test "x$asyncns" = xyes ; then
- as_fn_error "*** Async DNS support not found" "$LINENO" 5
+ as_fn_error $? "*** Async DNS support not found" "$LINENO" 5
fi
else
@@@ -19311,7 -19622,7 +19690,7 @@@ if test "${enable_tcpwrap+set}" = set;
case "${enableval}" in
yes) tcpwrap=yes ;;
no) tcpwrap=no ;;
- *) as_fn_error "bad value ${enableval} for --disable-tcpwrap" "$LINENO" 5 ;;
+ *) as_fn_error $? "bad value ${enableval} for --disable-tcpwrap" "$LINENO" 5 ;;
esac
else
@@@ -19357,7 -19668,7 +19736,7 @@@ rm -f core conftest.err conftest.$ac_ob
LIBS="$saved_LIBS"
if test "x${LIBWRAP_LIBS}" = x && test "x$tcpwrap" = xyes ; then
- as_fn_error "*** TCP wrappers support not found" "$LINENO" 5
+ as_fn_error $? "*** TCP wrappers support not found" "$LINENO" 5
fi
else
LIBWRAP_LIBS=
@@@ -19373,7 -19684,7 +19752,7 @@@ if test "${enable_lirc+set}" = set; the
case "${enableval}" in
yes) lirc=yes ;;
no) lirc=no ;;
- *) as_fn_error "bad value ${enableval} for --disable-lirc" "$LINENO" 5 ;;
+ *) as_fn_error $? "bad value ${enableval} for --disable-lirc" "$LINENO" 5 ;;
esac
else
@@@ -19437,7 -19748,7 +19816,7 @@@ f
if test "x${HAVE_LIRC}" = x0 && test "x$lirc" = xyes ; then
- as_fn_error "*** LIRC support not found" "$LINENO" 5
+ as_fn_error $? "*** LIRC support not found" "$LINENO" 5
fi
else
HAVE_LIRC=0
@@@ -19462,7 -19773,7 +19841,7 @@@ if test "${enable_hal+set}" = set; the
case "${enableval}" in
yes) hal=yes ;;
no) hal=no ;;
- *) as_fn_error "bad value ${enableval} for --disable-hal" "$LINENO" 5 ;;
+ *) as_fn_error $? "bad value ${enableval} for --disable-hal" "$LINENO" 5 ;;
esac
else
@@@ -19511,6 -19822,8 +19890,8 @@@ f
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
@@@ -19525,19 -19838,19 +19906,19 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$HAL_PKG_ERRORS" >&5
HAVE_HAL=0
if test "x$hal" = xyes ; then
- as_fn_error "*** HAL support not found" "$LINENO" 5
+ as_fn_error $? "*** HAL support not found" "$LINENO" 5
fi
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
HAVE_HAL=0
if test "x$hal" = xyes ; then
- as_fn_error "*** HAL support not found" "$LINENO" 5
+ as_fn_error $? "*** HAL support not found" "$LINENO" 5
fi
else
@@@ -19576,7 -19889,7 +19957,7 @@@ if test "${enable_udev+set}" = set; the
case "${enableval}" in
yes) udev=yes ;;
no) udev=no ;;
- *) as_fn_error "bad value ${enableval} for --disable-udev" "$LINENO" 5 ;;
+ *) as_fn_error $? "bad value ${enableval} for --disable-udev" "$LINENO" 5 ;;
esac
else
@@@ -19625,6 -19938,8 +20006,8 @@@ f
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
@@@ -19639,19 -19954,19 +20022,19 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$UDEV_PKG_ERRORS" >&5
HAVE_UDEV=0
if test "x$udev" = xyes ; then
- as_fn_error "*** UDEV support not found" "$LINENO" 5
+ as_fn_error $? "*** UDEV support not found" "$LINENO" 5
fi
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
HAVE_UDEV=0
if test "x$udev" = xyes ; then
- as_fn_error "*** UDEV support not found" "$LINENO" 5
+ as_fn_error $? "*** UDEV support not found" "$LINENO" 5
fi
else
@@@ -19690,7 -20005,7 +20073,7 @@@ if test "${enable_hal_compat+set}" = se
case "${enableval}" in
yes) halcompat=yes ;;
no) halcompat=no ;;
- *) as_fn_error "bad value ${enableval} for --disable-hal-compat" "$LINENO" 5 ;;
+ *) as_fn_error $? "bad value ${enableval} for --disable-hal-compat" "$LINENO" 5 ;;
esac
else
@@@ -19724,7 -20039,7 +20107,7 @@@ if test "${enable_bluez+set}" = set; th
case "${enableval}" in
yes) bluez=yes ;;
no) bluez=no ;;
- *) as_fn_error "bad value ${enableval} for --disable-bluez" "$LINENO" 5 ;;
+ *) as_fn_error $? "bad value ${enableval} for --disable-bluez" "$LINENO" 5 ;;
esac
else
@@@ -19773,6 -20088,8 +20156,8 @@@ f
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
@@@ -19787,19 -20104,19 +20172,19 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$BLUEZ_PKG_ERRORS" >&5
HAVE_BLUEZ=0
if test "x$bluez" = xyes ; then
- as_fn_error "*** BLUEZ support not found" "$LINENO" 5
+ as_fn_error $? "*** BLUEZ support not found" "$LINENO" 5
fi
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
HAVE_BLUEZ=0
if test "x$bluez" = xyes ; then
- as_fn_error "*** BLUEZ support not found" "$LINENO" 5
+ as_fn_error $? "*** BLUEZ support not found" "$LINENO" 5
fi
else
@@@ -19833,7 -20150,7 +20218,7 @@@ if test "${enable_dbus+set}" = set; the
case "${enableval}" in
yes) dbus=yes ;;
no) dbus=no ;;
- *) as_fn_error "bad value ${enableval} for --disable-dbus" "$LINENO" 5 ;;
+ *) as_fn_error $? "bad value ${enableval} for --disable-dbus" "$LINENO" 5 ;;
esac
else
@@@ -19888,6 -20205,8 +20273,8 @@@ f
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
@@@ -19902,19 -20221,19 +20289,19 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$DBUS_PKG_ERRORS" >&5
HAVE_DBUS=0
if test "x$dbus" = xyes ; then
- as_fn_error "*** D-Bus support not found" "$LINENO" 5
+ as_fn_error $? "*** D-Bus support not found" "$LINENO" 5
fi
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
HAVE_DBUS=0
if test "x$dbus" = xyes ; then
- as_fn_error "*** D-Bus support not found" "$LINENO" 5
+ as_fn_error $? "*** D-Bus support not found" "$LINENO" 5
fi
else
@@@ -19967,7 -20286,7 +20354,7 @@@ if test "${enable_ipv6+set}" = set; the
case "${enableval}" in
yes) ipv6=yes ;;
no) ipv6=no ;;
- *) as_fn_error "bad value ${enableval} for --disable-ipv6" "$LINENO" 5 ;;
+ *) as_fn_error $? "bad value ${enableval} for --disable-ipv6" "$LINENO" 5 ;;
esac
else
@@@ -19992,7 -20311,7 +20379,7 @@@ if test "${enable_openssl+set}" = set;
case "${enableval}" in
yes) openssl=yes ;;
no) openssl=no ;;
- *) as_fn_error "bad value ${enableval} for --disable-openssl" "$LINENO" 5 ;;
+ *) as_fn_error $? "bad value ${enableval} for --disable-openssl" "$LINENO" 5 ;;
esac
else
@@@ -20043,6 -20362,8 +20430,8 @@@ f
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
@@@ -20057,19 -20378,19 +20446,19 @@@ f
# Put the nasty error message in config.log where it belongs
echo "$OPENSSL_PKG_ERRORS" >&5
HAVE_OPENSSL=0
if test "x$openssl" = xyes ; then
- as_fn_error "*** OpenSSL support not found" "$LINENO" 5
+ as_fn_error $? "*** OpenSSL support not found" "$LINENO" 5
fi
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
HAVE_OPENSSL=0
if test "x$openssl" = xyes ; then
- as_fn_error "*** OpenSSL support not found" "$LINENO" 5
+ as_fn_error $? "*** OpenSSL support not found" "$LINENO" 5
fi
else
@@@ -20106,7 -20427,7 +20495,7 @@@ if test "${enable_manpages+set}" = set
enableval=$enable_manpages; case "${enableval}" in
yes) manpages=yes ;;
no) manpages=no ;;
- *) as_fn_error "bad value ${enableval} for --disable-manpages" "$LINENO" 5 ;;
+ *) as_fn_error $? "bad value ${enableval} for --disable-manpages" "$LINENO" 5 ;;
esac
else
manpages=yes
@@@ -20184,7 -20505,7 +20573,7 @@@ if test "${enable_per_user_esound_socke
case "${enableval}" in
yes) per_user_esound_socket=1 ;;
no) per_user_esound_socket=0 ;;
- *) as_fn_error "bad value ${enableval} for --disable-per-user-esound-socket" "$LINENO" 5 ;;
+ *) as_fn_error $? "bad value ${enableval} for --disable-per-user-esound-socket" "$LINENO" 5 ;;
esac
else
@@@ -20273,6 -20594,17 +20662,17 @@@ f
+
+ # Check whether --with-udev-rules-dir was given.
+ if test "${with_udev_rules_dir+set}" = set; then :
+ withval=$with_udev_rules_dir; udevrulesdir=$withval
+ else
+ udevrulesdir="/lib/udev/rules.d"
+ fi
+
+
+
+
# Check whether --enable-force-preopen was given.
if test "${enable_force_preopen+set}" = set; then :
enableval=$enable_force_preopen; FORCE_PREOPEN=$enableval
@@@ -20375,6 -20707,7 +20775,7 @@@ DEFS=-DHAVE_CONFIG_
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$//'
@@@ -20398,40 -20731,40 +20799,40 @@@ els
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 "${BUILD_TESTS_DEFAULT_TRUE}" && test -z "${BUILD_TESTS_DEFAULT_FALSE}"; then
- as_fn_error "conditional \"BUILD_TESTS_DEFAULT\" was never defined.
+ as_fn_error $? "conditional \"BUILD_TESTS_DEFAULT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${OS_IS_WIN32_TRUE}" && test -z "${OS_IS_WIN32_FALSE}"; then
- as_fn_error "conditional \"OS_IS_WIN32\" was never defined.
+ as_fn_error $? "conditional \"OS_IS_WIN32\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_REGEX_TRUE}" && test -z "${HAVE_REGEX_FALSE}"; then
- as_fn_error "conditional \"HAVE_REGEX\" was never defined.
+ as_fn_error $? "conditional \"HAVE_REGEX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_AF_UNIX_TRUE}" && test -z "${HAVE_AF_UNIX_FALSE}"; then
- as_fn_error "conditional \"HAVE_AF_UNIX\" was never defined.
+ as_fn_error $? "conditional \"HAVE_AF_UNIX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_EVDEV_TRUE}" && test -z "${HAVE_EVDEV_FALSE}"; then
- as_fn_error "conditional \"HAVE_EVDEV\" was never defined.
+ as_fn_error $? "conditional \"HAVE_EVDEV\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_SIGXCPU_TRUE}" && test -z "${HAVE_SIGXCPU_FALSE}"; then
- as_fn_error "conditional \"HAVE_SIGXCPU\" was never defined.
+ as_fn_error $? "conditional \"HAVE_SIGXCPU\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_MKFIFO_TRUE}" && test -z "${HAVE_MKFIFO_FALSE}"; then
- as_fn_error "conditional \"HAVE_MKFIFO\" was never defined.
+ as_fn_error $? "conditional \"HAVE_MKFIFO\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@@ -20439,107 -20772,107 +20840,107 @@@
if test -z "${HAVE_X11_TRUE}" && test -z "${HAVE_X11_FALSE}"; then
- as_fn_error "conditional \"HAVE_X11\" was never defined.
+ as_fn_error $? "conditional \"HAVE_X11\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_LIBSAMPLERATE_TRUE}" && test -z "${HAVE_LIBSAMPLERATE_FALSE}"; then
- as_fn_error "conditional \"HAVE_LIBSAMPLERATE\" was never defined.
+ as_fn_error $? "conditional \"HAVE_LIBSAMPLERATE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_TDB_TRUE}" && test -z "${HAVE_TDB_FALSE}"; then
- as_fn_error "conditional \"HAVE_TDB\" was never defined.
+ as_fn_error $? "conditional \"HAVE_TDB\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_GDBM_TRUE}" && test -z "${HAVE_GDBM_FALSE}"; then
- as_fn_error "conditional \"HAVE_GDBM\" was never defined.
+ as_fn_error $? "conditional \"HAVE_GDBM\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_SIMPLEDB_TRUE}" && test -z "${HAVE_SIMPLEDB_FALSE}"; then
- as_fn_error "conditional \"HAVE_SIMPLEDB\" was never defined.
+ as_fn_error $? "conditional \"HAVE_SIMPLEDB\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_OSS_OUTPUT_TRUE}" && test -z "${HAVE_OSS_OUTPUT_FALSE}"; then
- as_fn_error "conditional \"HAVE_OSS_OUTPUT\" was never defined.
+ as_fn_error $? "conditional \"HAVE_OSS_OUTPUT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_OSS_WRAPPER_TRUE}" && test -z "${HAVE_OSS_WRAPPER_FALSE}"; then
- as_fn_error "conditional \"HAVE_OSS_WRAPPER\" was never defined.
+ as_fn_error $? "conditional \"HAVE_OSS_WRAPPER\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_ALSA_TRUE}" && test -z "${HAVE_ALSA_FALSE}"; then
- as_fn_error "conditional \"HAVE_ALSA\" was never defined.
+ as_fn_error $? "conditional \"HAVE_ALSA\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_SOLARIS_TRUE}" && test -z "${HAVE_SOLARIS_FALSE}"; then
- as_fn_error "conditional \"HAVE_SOLARIS\" was never defined.
+ as_fn_error $? "conditional \"HAVE_SOLARIS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_GLIB20_TRUE}" && test -z "${HAVE_GLIB20_FALSE}"; then
- as_fn_error "conditional \"HAVE_GLIB20\" was never defined.
+ as_fn_error $? "conditional \"HAVE_GLIB20\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_GTK20_TRUE}" && test -z "${HAVE_GTK20_FALSE}"; then
- as_fn_error "conditional \"HAVE_GTK20\" was never defined.
+ as_fn_error $? "conditional \"HAVE_GTK20\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_GCONF_TRUE}" && test -z "${HAVE_GCONF_FALSE}"; then
- as_fn_error "conditional \"HAVE_GCONF\" was never defined.
+ as_fn_error $? "conditional \"HAVE_GCONF\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_AVAHI_TRUE}" && test -z "${HAVE_AVAHI_FALSE}"; then
- as_fn_error "conditional \"HAVE_AVAHI\" was never defined.
+ as_fn_error $? "conditional \"HAVE_AVAHI\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_JACK_TRUE}" && test -z "${HAVE_JACK_FALSE}"; then
- as_fn_error "conditional \"HAVE_JACK\" was never defined.
+ as_fn_error $? "conditional \"HAVE_JACK\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_LIBASYNCNS_TRUE}" && test -z "${HAVE_LIBASYNCNS_FALSE}"; then
- as_fn_error "conditional \"HAVE_LIBASYNCNS\" was never defined.
+ as_fn_error $? "conditional \"HAVE_LIBASYNCNS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_LIRC_TRUE}" && test -z "${HAVE_LIRC_FALSE}"; then
- as_fn_error "conditional \"HAVE_LIRC\" was never defined.
+ as_fn_error $? "conditional \"HAVE_LIRC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_HAL_TRUE}" && test -z "${HAVE_HAL_FALSE}"; then
- as_fn_error "conditional \"HAVE_HAL\" was never defined.
+ as_fn_error $? "conditional \"HAVE_HAL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_UDEV_TRUE}" && test -z "${HAVE_UDEV_FALSE}"; then
- as_fn_error "conditional \"HAVE_UDEV\" was never defined.
+ as_fn_error $? "conditional \"HAVE_UDEV\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_HAL_COMPAT_TRUE}" && test -z "${HAVE_HAL_COMPAT_FALSE}"; then
- as_fn_error "conditional \"HAVE_HAL_COMPAT\" was never defined.
+ as_fn_error $? "conditional \"HAVE_HAL_COMPAT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_BLUEZ_TRUE}" && test -z "${HAVE_BLUEZ_FALSE}"; then
- as_fn_error "conditional \"HAVE_BLUEZ\" was never defined.
+ as_fn_error $? "conditional \"HAVE_BLUEZ\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_DBUS_TRUE}" && test -z "${HAVE_DBUS_FALSE}"; then
- as_fn_error "conditional \"HAVE_DBUS\" was never defined.
+ as_fn_error $? "conditional \"HAVE_DBUS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_OPENSSL_TRUE}" && test -z "${HAVE_OPENSSL_FALSE}"; then
- as_fn_error "conditional \"HAVE_OPENSSL\" was never defined.
+ as_fn_error $? "conditional \"HAVE_OPENSSL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_MANPAGES_TRUE}" && test -z "${BUILD_MANPAGES_FALSE}"; then
- as_fn_error "conditional \"BUILD_MANPAGES\" was never defined.
+ as_fn_error $? "conditional \"BUILD_MANPAGES\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${STATIC_BINS_TRUE}" && test -z "${STATIC_BINS_FALSE}"; then
- as_fn_error "conditional \"STATIC_BINS\" was never defined.
+ as_fn_error $? "conditional \"STATIC_BINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${PREOPEN_MODS_TRUE}" && test -z "${PREOPEN_MODS_FALSE}"; then
- as_fn_error "conditional \"PREOPEN_MODS\" was never defined.
+ as_fn_error $? "conditional \"PREOPEN_MODS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${FORCE_PREOPEN_TRUE}" && test -z "${FORCE_PREOPEN_FALSE}"; then
- as_fn_error "conditional \"FORCE_PREOPEN\" was never defined.
+ as_fn_error $? "conditional \"FORCE_PREOPEN\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@@ -20689,19 -21022,19 +21090,19 @@@ export LANGUAG
(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
@@@ -20897,7 -21230,7 +21298,7 @@@ $as_echo X"$as_dir"
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
@@@ -20950,8 -21283,8 +21351,8 @@@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wr
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
- This file was extended by pulseaudio $as_me 0.9.21, which was
- generated by GNU Autoconf 2.64. Invocation command line was
+ This file was extended by pulseaudio $as_me 0.9.22, which was
+ generated by GNU Autoconf 2.66. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@@ -20991,6 -21324,7 +21392,7 @@@ Usage: $0 [OPTION]... [TAG]..
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
+ --config print configuration, then exit
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
@@@ -21013,12 -21347,13 +21415,13 @@@ Report bugs to <mzchyfrnhqvb (at) 0poin
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
- pulseaudio config.status 0.9.21
- configured by $0, generated by GNU Autoconf 2.64,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+ pulseaudio config.status 0.9.22
+ configured by $0, generated by GNU Autoconf 2.66,
+ 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."
@@@ -21054,6 -21389,8 +21457,8 @@@ d
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
+ --config | --confi | --conf | --con | --co | --c )
+ $as_echo "$ac_cs_config"; exit ;;
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
@@@ -21072,7 -21409,7 +21477,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 ;;
@@@ -21081,7 -21418,7 +21486,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"
@@@ -21135,133 -21472,148 +21540,148 @@@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$a
sed_quote_subst='$sed_quote_subst'
double_quote_subst='$double_quote_subst'
delay_variable_subst='$delay_variable_subst'
- macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
- macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
- AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`'
- DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`'
- OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
- enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
- enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
- pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
- enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
- host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
- host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
- host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
- build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
- build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
- build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
- SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
- Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
- GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
- EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
- FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
- LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
- NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
- LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
- max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
- ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
- exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
- lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
- lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
- lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
- reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
- reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
- deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
- file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
- AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
- AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
- STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
- RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
- old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
- old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
- old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
- CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
- CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
- compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
- GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
- lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
- lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
- lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
- lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
- objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
- SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
- ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
- MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
- lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
- lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
- lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
- lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
- lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
- need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
- DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
- NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
- LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
- OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
- OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
- libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
- shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
- extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
- archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
- enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
- export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
- whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
- compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
- old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
- old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
- archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
- archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
- module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
- module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
- with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
- allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
- no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
- hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
- hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
- hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
- hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
- hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
- hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
- hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
- hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
- inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
- link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
- fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
- always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
- export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
- exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
- include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
- prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
- file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
- variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
- need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
- need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
- version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
- runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
- shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
- shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
- libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
- library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
- soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
- postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
- postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
- finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
- finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
- hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
- sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
- sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
- hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
- enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
- enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
- enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
- old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
- striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
+ macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+ macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+ AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
+ DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+ OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+ enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+ enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+ pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+ enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+ SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+ host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+ host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+ host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+ build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+ build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+ build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+ SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+ Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+ GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+ EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+ FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+ LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+ NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+ LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+ max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+ ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+ lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+ lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+ lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+ reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+ reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+ deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+ file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+ AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+ AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+ STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+ RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+ old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+ old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+ old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+ lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+ CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+ CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+ compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+ GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+ lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+ lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
+ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+ objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
+ MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
+ lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+ lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+ lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+ lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+ lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+ need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+ DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+ NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+ LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+ OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+ OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+ libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+ shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+ extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+ archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+ enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+ export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+ whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+ compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+ old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+ old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+ archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+ archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+ module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+ module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+ with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+ allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+ no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+ hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+ hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
+ hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+ hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+ hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+ hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+ hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+ inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+ link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+ fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
+ always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+ export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+ exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+ include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+ prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+ file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+ variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+ need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+ need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+ version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+ runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+ shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+ shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+ libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+ library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+ soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+ install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+ postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+ postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+ finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+ finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+ hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+ sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+ sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+ hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+ enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+ enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+ enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+ old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+ striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
LTCC='$LTCC'
LTCFLAGS='$LTCFLAGS'
compiler='$compiler_DEFAULT'
+ # A function that is used when there is no print builtin or printf.
+ func_fallback_echo ()
+ {
+ eval 'cat <<_LTECHO_EOF
+ \$1
+ _LTECHO_EOF'
+ }
+
# Quote evaled strings.
- for var in SED \
+ for var in AS \
+ DLLTOOL \
+ OBJDUMP \
+ SHELL \
+ ECHO \
+ SED \
GREP \
EGREP \
FGREP \
@@@ -21284,8 -21636,6 +21704,6 @@@ lt_cv_sys_global_symbol_pipe
lt_cv_sys_global_symbol_to_cdecl \
lt_cv_sys_global_symbol_to_c_name_address \
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
- SHELL \
- ECHO \
lt_prog_compiler_no_builtin_flag \
lt_prog_compiler_wl \
lt_prog_compiler_pic \
@@@ -21315,12 -21665,13 +21733,13 @@@ variables_saved_for_relink
libname_spec \
library_names_spec \
soname_spec \
+ install_override_mode \
finish_eval \
old_striplib \
striplib; do
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@@ -21347,9 -21698,9 +21766,9 @@@ postuninstall_cmds
finish_cmds \
sys_lib_search_path_spec \
sys_lib_dlsearch_path_spec; do
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@@ -21357,12 -21708,6 +21776,6 @@@
esac
done
- # Fix-up fallback echo if it was mangled by the above quoting rules.
- case \$lt_ECHO in
- *'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
- ;;
- esac
-
ac_aux_dir='$ac_aux_dir'
xsi_shell='$xsi_shell'
lt_shell_append='$lt_shell_append'
@@@ -21409,7 -21754,7 +21822,7 @@@ d
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
done
@@@ -21447,7 -21792,7 +21860,7 @@@ $debug |
{
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
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@@ -21464,7 -21809,7 +21877,7 @@@ if test "x$ac_cr" = x; the
fi
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\\r'
+ ac_cs_awk_cr='\r'
else
ac_cs_awk_cr=$ac_cr
fi
@@@ -21478,18 -21823,18 +21891,18 @@@ _ACEO
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
@@@ -21511,7 -21856,7 +21924,7 @@@ s/'"$ac_delim"'$/
t delim
:nl
h
- s/\(.\{148\}\).*/\1/
+ s/\(.\{148\}\)..*/\1/
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
@@@ -21525,7 -21870,7 +21938,7 @@@ s/.\{148\}/
t nl
:delim
h
- s/\(.\{148\}\).*/\1/
+ s/\(.\{148\}\)..*/\1/
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
@@@ -21578,20 -21923,28 +21991,28 @@@ if sed "s/$ac_cr//" < /dev/null > /dev/
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
- || as_fn_error "could not setup config files machinery" "$LINENO" 5
+ || 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
@@@ -21619,7 -21972,7 +22040,7 @@@ for ac_last_try in false false :; d
if test -z "$ac_t"; 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
@@@ -21704,7 -22057,7 +22125,7 @@@ cat >>$CONFIG_STATUS <<_ACEOF || ac_wri
_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"
@@@ -21717,7 -22070,7 +22138,7 @@@ d
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
@@@ -21745,7 -22098,7 +22166,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'"
@@@ -21772,7 -22125,7 +22193,7 @@@ $as_echo "$as_me: creating $ac_file" >&
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@@ -21909,22 -22262,22 +22330,22 @@@ s&@MKDIR_P@&$ac_MKDIR_P&;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
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
- which seems to be undefined. Please make sure it is defined." >&5
+ 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"
case $ac_file in
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
;;
:H)
#
@@@ -21935,19 -22288,19 +22356,19 @@@
$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
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
rm -f "$ac_file"
mv "$tmp/config.h" "$ac_file" \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
+ || 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
+ || as_fn_error $? "could not create -" "$LINENO" 5
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
@@@ -22108,7 -22461,8 +22529,8 @@@ $as_echo X"$file"
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
- # 2006, 2007, 2008 Free Software Foundation, Inc.
+ # 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+ # Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
@@@ -22145,13 -22499,13 +22567,13 @@@ macro_version=$macro_versio
macro_revision=$macro_revision
# Assembler program.
- AS=$AS
+ AS=$lt_AS
# DLL creation program.
- DLLTOOL=$DLLTOOL
+ DLLTOOL=$lt_DLLTOOL
# Object dumper program.
- OBJDUMP=$OBJDUMP
+ OBJDUMP=$lt_OBJDUMP
# Whether or not to build static libraries.
build_old_libs=$enable_static
@@@ -22165,6 -22519,12 +22587,12 @@@ pic_mode=$pic_mod
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
+ # Shell to use when invoking shell scripts.
+ SHELL=$lt_SHELL
+
+ # An echo program that protects backslashes.
+ ECHO=$lt_ECHO
+
# The host system.
host_alias=$host_alias
host=$host
@@@ -22214,10 -22574,6 +22642,6 @@@ SP2NL=$lt_lt_SP2N
# turn newlines into spaces.
NL2SP=$lt_lt_NL2SP
- # How to create reloadable object files.
- reload_flag=$lt_reload_flag
- reload_cmds=$lt_reload_cmds
-
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@@ -22236,6 -22592,9 +22660,9 @@@ RANLIB=$lt_RANLI
old_postinstall_cmds=$lt_old_postinstall_cmds
old_postuninstall_cmds=$lt_old_postuninstall_cmds
+ # Whether to use a lock for old archive extraction.
+ lock_old_archive_extraction=$lock_old_archive_extraction
+
# A C compiler.
LTCC=$lt_CC
@@@ -22257,12 -22616,6 +22684,6 @@@ global_symbol_to_c_name_address_lib_pre
# The name of the directory that contains temporary libtool files.
objdir=$objdir
- # Shell to use when invoking shell scripts.
- SHELL=$lt_SHELL
-
- # An echo program that does not interpret backslashes.
- ECHO=$lt_ECHO
-
# Used to examine libraries when file_magic_cmd begins with "file".
MAGIC_CMD=$MAGIC_CMD
@@@ -22325,6 -22678,9 +22746,9 @@@ library_names_spec=$lt_library_names_sp
# The coded name of the library, if different from the real name.
soname_spec=$lt_soname_spec
+ # Permission mode override for installation of shared libraries.
+ install_override_mode=$lt_install_override_mode
+
# Command to use after installation of a shared archive.
postinstall_cmds=$lt_postinstall_cmds
@@@ -22364,6 -22720,10 +22788,10 @@@ striplib=$lt_stripli
# The linker used to build libraries.
LD=$lt_LD
+ # How to create reloadable object files.
+ reload_flag=$lt_reload_flag
+ reload_cmds=$lt_reload_cmds
+
# Commands used to build an old-style archive.
old_archive_cmds=$lt_old_archive_cmds
@@@ -22623,7 -22983,7 +23051,7 @@@ _LT_EO
func_dirname ()
{
# Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
if test "X$func_dirname_result" = "X${1}"; then
func_dirname_result="${3}"
else
@@@ -22634,7 -22994,7 +23062,7 @@@
# func_basename file
func_basename ()
{
- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+ func_basename_result=`$ECHO "${1}" | $SED "$basename"`
}
@@@ -22647,10 -23007,8 +23075,8 @@@
func_stripname ()
{
case ${2} in
- .*) func_stripname_result=`$ECHO "X${3}" \
- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "X${3}" \
- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
esac
}
@@@ -22661,20 -23019,20 +23087,20 @@@ my_sed_long_arg='1s/^-[^=]*=//
# func_opt_split
func_opt_split ()
{
- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+ func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
+ func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
}
# func_lo2o object
func_lo2o ()
{
- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
}
# func_xform libobj-or-source
func_xform ()
{
- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
}
# func_arith arithmetic-term...
@@@ -22733,7 -23091,7 +23159,7 @@@ _LT_EO
esac ;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
- as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
+ as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
@@@ -22761,7 -23119,7 +23187,7 @@@ _ACEO
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.
@@@ -22782,7 -23140,7 +23208,7 @@@ if test "$no_create" != yes; the
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 --combined ltmain.sh
index 6939dcc,d8efb57..c04f6fc
--- a/ltmain.sh
+++ b/ltmain.sh
@@@ -1,9 -1,10 +1,10 @@@
# Generated from ltmain.m4sh.
- # ltmain.sh (GNU libtool) 2.2.6
+ # libtool (GNU libtool) 2.2.10
# Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+ # 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
# This is free software; see the source for copying conditions. There is NO
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@@ -32,50 -33,54 +33,54 @@@
#
# Provide generalized library-building support services.
#
- # --config show all configuration variables
- # --debug enable verbose shell tracing
- # -n, --dry-run display commands without modifying any files
- # --features display basic configuration information and exit
- # --mode=MODE use operation mode MODE
- # --preserve-dup-deps don't remove duplicate dependency libraries
- # --quiet, --silent don't print informational messages
- # --tag=TAG use configuration variables from tag TAG
- # -v, --verbose print informational messages (default)
- # --version print version information
- # -h, --help print short or long help message
+ # --config show all configuration variables
+ # --debug enable verbose shell tracing
+ # -n, --dry-run display commands without modifying any files
+ # --features display basic configuration information and exit
+ # --mode=MODE use operation mode MODE
+ # --preserve-dup-deps don't remove duplicate dependency libraries
+ # --quiet, --silent don't print informational messages
+ # --no-quiet, --no-silent
+ # print informational messages (default)
+ # --tag=TAG use configuration variables from tag TAG
+ # -v, --verbose print more informational messages than default
+ # --no-verbose don't print the extra informational messages
+ # --version print version information
+ # -h, --help, --help-all print short, long, or detailed help message
#
# MODE must be one of the following:
#
- # clean remove files from the build directory
- # compile compile a source file into a libtool object
- # execute automatically set library path, then run a program
- # finish complete the installation of libtool libraries
- # install install libraries or executables
- # link create a library or an executable
- # uninstall remove libraries from an installed directory
+ # clean remove files from the build directory
+ # compile compile a source file into a libtool object
+ # execute automatically set library path, then run a program
+ # finish complete the installation of libtool libraries
+ # install install libraries or executables
+ # link create a library or an executable
+ # uninstall remove libraries from an installed directory
#
- # MODE-ARGS vary depending on the MODE.
+ # MODE-ARGS vary depending on the MODE. When passed as first option,
+ # `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
#
# When reporting a bug, please describe a test case to reproduce it and
# include the following information:
#
- # host-triplet: $host
- # shell: $SHELL
- # compiler: $LTCC
- # compiler flags: $LTCFLAGS
- # linker: $LD (gnu? $with_gnu_ld)
- # $progname: (GNU libtool) 2.2.6
- # automake: $automake_version
- # autoconf: $autoconf_version
+ # host-triplet: $host
+ # shell: $SHELL
+ # compiler: $LTCC
+ # compiler flags: $LTCFLAGS
+ # linker: $LD (gnu? $with_gnu_ld)
+ # $progname: (GNU libtool) 2.2.10
+ # automake: $automake_version
+ # autoconf: $autoconf_version
#
# Report bugs to <bug-libtool at gnu.org>.
- PROGRAM=ltmain.sh
+ PROGRAM=libtool
PACKAGE=libtool
- VERSION=2.2.6
+ VERSION=2.2.10
TIMESTAMP=""
- package_revision=1.3012
+ package_revision=1.3175
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@@ -91,10 -96,15 +96,15 @@@ f
BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
+ # A function that is used when there is no print builtin or printf.
+ func_fallback_echo ()
+ {
+ eval 'cat <<_LTECHO_EOF
+ $1
+ _LTECHO_EOF'
+ }
+
# NLS nuisances: We save the old values to restore during execute mode.
- # Only set LANG and LC_ALL to C if already set.
- # These must not be set unconditionally because not all systems understand
- # e.g. LANG=C (notably SCO).
lt_user_locale=
lt_safe_locale=
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
@@@ -107,15 -117,24 +117,24 @@@ d
lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
fi"
done
+ LC_ALL=C
+ LANGUAGE=C
+ export LANGUAGE LC_ALL
$lt_unset CDPATH
+ # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+ # is ksh but when the shell is invoked as "sh" and the current value of
+ # the _XPG environment variable is not equal to 1 (one), the special
+ # positional parameter $0, within a function call, is the name of the
+ # function.
+ progpath="$0"
: ${CP="cp -f"}
- : ${ECHO="echo"}
+ test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
: ${EGREP="/bin/grep -E"}
: ${FGREP="/bin/grep -F"}
: ${GREP="/bin/grep"}
@@@ -159,32 -178,168 +178,168 @@@ basename="s,^.*/,,
func_dirname_and_basename ()
{
# Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
if test "X$func_dirname_result" = "X${1}"; then
func_dirname_result="${3}"
else
func_dirname_result="$func_dirname_result${2}"
fi
- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
}
# Generated shell functions inserted here.
- # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
- # is ksh but when the shell is invoked as "sh" and the current value of
- # the _XPG environment variable is not equal to 1 (one), the special
- # positional parameter $0, within a function call, is the name of the
- # function.
- progpath="$0"
+ # These SED scripts presuppose an absolute path with a trailing slash.
+ pathcar='s,^/\([^/]*\).*$,\1,'
+ pathcdr='s,^/[^/]*,,'
+ removedotparts=':dotsl
+ s@/\./@/@g
+ t dotsl
+ s,/\.$,/,'
+ collapseslashes='s@/\{1,\}@/@g'
+ finalslash='s,/*$,/,'
+
+ # func_normal_abspath PATH
+ # Remove doubled-up and trailing slashes, "." path components,
+ # and cancel out any ".." path components in PATH after making
+ # it an absolute path.
+ # value returned in "$func_normal_abspath_result"
+ func_normal_abspath ()
+ {
+ # Start from root dir and reassemble the path.
+ func_normal_abspath_result=
+ func_normal_abspath_tpath=$1
+ func_normal_abspath_altnamespace=
+ case $func_normal_abspath_tpath in
+ "")
+ # Empty path, that just means $cwd.
+ func_stripname '' '/' "`pwd`"
+ func_normal_abspath_result=$func_stripname_result
+ return
+ ;;
+ # The next three entries are used to spot a run of precisely
+ # two leading slashes without using negated character classes;
+ # we take advantage of case's first-match behaviour.
+ ///*)
+ # Unusual form of absolute path, do nothing.
+ ;;
+ //*)
+ # Not necessarily an ordinary path; POSIX reserves leading '//'
+ # and for example Cygwin uses it to access remote file shares
+ # over CIFS/SMB, so we conserve a leading double slash if found.
+ func_normal_abspath_altnamespace=/
+ ;;
+ /*)
+ # Absolute path, do nothing.
+ ;;
+ *)
+ # Relative path, prepend $cwd.
+ func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+ ;;
+ esac
+ # Cancel out all the simple stuff to save iterations. We also want
+ # the path to end with a slash for ease of parsing, so make sure
+ # there is one (and only one) here.
+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
+ while :; do
+ # Processed it all yet?
+ if test "$func_normal_abspath_tpath" = / ; then
+ # If we ascended to the root using ".." the result may be empty now.
+ if test -z "$func_normal_abspath_result" ; then
+ func_normal_abspath_result=/
+ fi
+ break
+ fi
+ func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$pathcar"`
+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$pathcdr"`
+ # Figure out what to do with it
+ case $func_normal_abspath_tcomponent in
+ "")
+ # Trailing empty path component, ignore it.
+ ;;
+ ..)
+ # Parent dir; strip last assembled component from result.
+ func_dirname "$func_normal_abspath_result"
+ func_normal_abspath_result=$func_dirname_result
+ ;;
+ *)
+ # Actual path component, append it.
+ func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
+ ;;
+ esac
+ done
+ # Restore leading double-slash if one was found on entry.
+ func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+ }
+
+ # func_relative_path SRCDIR DSTDIR
+ # generates a relative path from SRCDIR to DSTDIR, with a trailing
+ # slash if non-empty, suitable for immediately appending a filename
+ # without needing to append a separator.
+ # value returned in "$func_relative_path_result"
+ func_relative_path ()
+ {
+ func_relative_path_result=
+ func_normal_abspath "$1"
+ func_relative_path_tlibdir=$func_normal_abspath_result
+ func_normal_abspath "$2"
+ func_relative_path_tbindir=$func_normal_abspath_result
+
+ # Ascend the tree starting from libdir
+ while :; do
+ # check if we have found a prefix of bindir
+ case $func_relative_path_tbindir in
+ $func_relative_path_tlibdir)
+ # found an exact match
+ func_relative_path_tcancelled=
+ break
+ ;;
+ $func_relative_path_tlibdir*)
+ # found a matching prefix
+ func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+ func_relative_path_tcancelled=$func_stripname_result
+ if test -z "$func_relative_path_result"; then
+ func_relative_path_result=.
+ fi
+ break
+ ;;
+ *)
+ func_dirname $func_relative_path_tlibdir
+ func_relative_path_tlibdir=${func_dirname_result}
+ if test "x$func_relative_path_tlibdir" = x ; then
+ # Have to descend all the way to the root!
+ func_relative_path_result=../$func_relative_path_result
+ func_relative_path_tcancelled=$func_relative_path_tbindir
+ break
+ fi
+ func_relative_path_result=../$func_relative_path_result
+ ;;
+ esac
+ done
+
+ # Now calculate path; take care to avoid doubling-up slashes.
+ func_stripname '' '/' "$func_relative_path_result"
+ func_relative_path_result=$func_stripname_result
+ func_stripname '/' '/' "$func_relative_path_tcancelled"
+ if test "x$func_stripname_result" != x ; then
+ func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
+ fi
+
+ # Normalisation. If bindir is libdir, return empty string,
+ # else relative path ending with a slash; either way, target
+ # file name can be directly appended.
+ if test ! -z "$func_relative_path_result"; then
+ func_stripname './' '' "$func_relative_path_result/"
+ func_relative_path_result=$func_stripname_result
+ fi
+ }
# The name of this program:
- # In the unlikely event $progname began with a '-', it would play havoc with
- # func_echo (imagine progname=-n), so we prepend ./ in that case:
func_dirname_and_basename "$progpath"
progname=$func_basename_result
- case $progname in
- -*) progname=./$progname ;;
- esac
# Make sure we have an absolute path for reexecution:
case $progpath in
@@@ -258,6 -413,13 +413,13 @@@ func_verbose (
:
}
+ # func_echo_all arg...
+ # Invoke $ECHO with all args, space-separated.
+ func_echo_all ()
+ {
+ $ECHO "$*"
+ }
+
# func_error arg...
# Echo program name prefixed message to standard error.
func_error ()
@@@ -326,9 -488,9 +488,9 @@@ func_mkdir_p (
case $my_directory_path in */*) ;; *) break ;; esac
# ...otherwise throw away the child directory and loop
- my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
+ my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
done
- my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
+ my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
save_mkdir_p_IFS="$IFS"; IFS=':'
for my_dir in $my_dir_list; do
@@@ -378,7 -540,7 +540,7 @@@ func_mktempdir (
func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
fi
- $ECHO "X$my_tmpdir" | $Xsed
+ $ECHO "$my_tmpdir"
}
@@@ -392,7 -554,7 +554,7 @@@ func_quote_for_eval (
{
case $1 in
*[\\\`\"\$]*)
- func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
+ func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
*)
func_quote_for_eval_unquoted_result="$1" ;;
esac
@@@ -419,7 -581,7 +581,7 @@@ func_quote_for_expand (
{
case $1 in
*[\\\`\"]*)
- my_arg=`$ECHO "X$1" | $Xsed \
+ my_arg=`$ECHO "$1" | $SED \
-e "$double_quote_subst" -e "$sed_double_backslash"` ;;
*)
my_arg="$1" ;;
@@@ -489,14 -651,19 +651,19 @@@ func_show_eval_locale (
}
-
-
-
# func_version
# Echo version message to standard output and exit.
func_version ()
{
- $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
+ $SED -n '/(C)/!b go
+ :more
+ /\./!{
+ N
+ s/\n# / /
+ b more
+ }
+ :go
+ /^# '$PROGRAM' (GNU /,/# warranty; / {
s/^# //
s/^# *$//
s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
@@@ -509,19 -676,20 +676,20 @@@
# Echo short help message to standard output and exit.
func_usage ()
{
- $SED -n '/^# Usage:/,/# -h/ {
+ $SED -n '/^# Usage:/,/^# *.*--help/ {
s/^# //
s/^# *$//
s/\$progname/'$progname'/
p
}' < "$progpath"
- $ECHO
+ echo
$ECHO "run \`$progname --help | more' for full usage"
exit $?
}
- # func_help
- # Echo long help message to standard output and exit.
+ # func_help [NOEXIT]
+ # Echo long help message to standard output and exit,
+ # unless 'noexit' is passed as argument.
func_help ()
{
$SED -n '/^# Usage:/,/# Report bugs to/ {
@@@ -538,7 -706,10 +706,10 @@@
s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
p
}' < "$progpath"
- exit $?
+ ret=$?
+ if test -z "$1"; then
+ exit $ret
+ fi
}
# func_missing_arg argname
@@@ -546,7 -717,7 +717,7 @@@
# exit_cmd.
func_missing_arg ()
{
- func_error "missing argument for $1"
+ func_error "missing argument for $1."
exit_cmd=exit
}
@@@ -556,29 -727,6 +727,6 @@@ exit_cmd=
- # Check that we have a working $ECHO.
- if test "X$1" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
- elif test "X$1" = X--fallback-echo; then
- # Avoid inline document here, it may be left over
- :
- elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
- # Yippee, $ECHO works!
- :
- else
- # Restart under the correct shell, and then maybe $ECHO will work.
- exec $SHELL "$progpath" --no-reexec ${1+"$@"}
- fi
-
- if test "X$1" = X--fallback-echo; then
- # used as fallback echo
- shift
- cat <<EOF
- $*
- EOF
- exit $EXIT_SUCCESS
- fi
magic="%%%MAGIC variable%%%"
magic_exe="%%%MAGIC EXE variable%%%"
@@@ -636,16 -784,16 +784,16 @@@ func_config (
# Display the features supported by this script.
func_features ()
{
- $ECHO "host: $host"
+ echo "host: $host"
if test "$build_libtool_libs" = yes; then
- $ECHO "enable shared libraries"
+ echo "enable shared libraries"
else
- $ECHO "disable shared libraries"
+ echo "disable shared libraries"
fi
if test "$build_old_libs" = yes; then
- $ECHO "enable static libraries"
+ echo "enable static libraries"
else
- $ECHO "disable static libraries"
+ echo "disable static libraries"
fi
exit $?
@@@ -772,10 -920,21 +920,21 @@@ func_enable_tag (
--quiet|--silent) preserve_args="$preserve_args $opt"
opt_silent=:
+ opt_verbose=false
+ ;;
+
+ --no-quiet|--no-silent)
+ preserve_args="$preserve_args $opt"
+ opt_silent=false
;;
--verbose| -v) preserve_args="$preserve_args $opt"
opt_silent=false
+ opt_verbose=:
+ ;;
+
+ --no-verbose) preserve_args="$preserve_args $opt"
+ opt_verbose=false
;;
--tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
@@@ -793,6 -952,7 +952,7 @@@
-\?|-h) func_usage ;;
--help) opt_help=: ;;
+ --help-all) opt_help=': help-all' ;;
--version) func_version ;;
-*) func_fatal_help "unrecognized option \`$opt'" ;;
@@@ -1016,10 -1176,13 +1176,13 @@@ func_infer_tag (
func_quote_for_eval "$arg"
CC_quoted="$CC_quoted $func_quote_for_eval_result"
done
+ CC_expanded=`func_echo_all $CC`
+ CC_quoted_expanded=`func_echo_all $CC_quoted`
case $@ in
# Blanks in the command may have been stripped by the calling shell,
# but not from the CC environment variable when configure was run.
- " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
+ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
# Blanks at the start of $base_compile will cause this to fail
# if we don't check for them as well.
*)
@@@ -1033,8 -1196,11 +1196,11 @@@
func_quote_for_eval "$arg"
CC_quoted="$CC_quoted $func_quote_for_eval_result"
done
+ CC_expanded=`func_echo_all $CC`
+ CC_quoted_expanded=`func_echo_all $CC_quoted`
case "$@ " in
- " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
+ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
# The compiler in the base compile command matches
# the one in the tagged configuration.
# Assume this is the tagged configuration we want.
@@@ -1213,7 -1379,7 +1379,7 @@@ func_mode_compile (
*.[cCFSifmso] | \
*.ada | *.adb | *.ads | *.asm | \
*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
- *.[fF][09]? | *.for | *.java | *.obj | *.sx)
+ *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
func_xform "$libobj"
libobj=$func_xform_result
;;
@@@ -1288,7 -1454,7 +1454,7 @@@
# Calculate the filename of the output object if compiler does
# not support -o with -c
if test "$compiler_c_o" = no; then
- output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+ output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
lockfile="$output_obj.lock"
else
output_obj=
@@@ -1445,7 -1611,7 +1611,7 @@@ compiler.
}
$opt_help || {
- test "$mode" = compile && func_mode_compile ${1+"$@"}
+ test "$mode" = compile && func_mode_compile ${1+"$@"}
}
func_mode_help ()
@@@ -1482,10 -1648,11 +1648,11 @@@ This mode accepts the following additio
-o OUTPUT-FILE set the output file name to OUTPUT-FILE
-no-suppress do not suppress compiler output for multiple passes
- -prefer-pic try to building PIC objects only
- -prefer-non-pic try to building non-PIC objects only
+ -prefer-pic try to build PIC objects only
+ -prefer-non-pic try to build non-PIC objects only
-shared do not build a \`.o' file suitable for static linking
-static only build a \`.o' file suitable for static linking
+ -Wc,FLAG pass FLAG directly to the compiler
COMPILE-COMMAND is a command to be used in creating a \`standard' object file
from the given SOURCEFILE.
@@@ -1538,7 -1705,7 +1705,7 @@@ either the \`install' or \`cp' program
The following components of INSTALL-COMMAND are treated specially:
- -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation
+ -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation
The rest of the components are interpreted as arguments to that command (only
BSD-compatible install options are recognized)."
@@@ -1558,6 -1725,8 +1725,8 @@@ The following components of LINK-COMMAN
-all-static do not do any dynamic linking at all
-avoid-version do not add a version suffix if possible
+ -bindir BINDIR specify path to binaries directory (for systems where
+ libraries must be found in the PATH setting at runtime)
-dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
@@@ -1586,6 -1755,11 +1755,11 @@@
-version-info CURRENT[:REVISION[:AGE]]
specify library version info [each variable defaults to 0]
-weak LIBNAME declare that the target provides the LIBNAME interface
+ -Wc,FLAG
+ -Xcompiler FLAG pass linker-specific FLAG directly to the compiler
+ -Wl,FLAG
+ -Xlinker FLAG pass linker-specific FLAG directly to the linker
+ -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC)
All other options (arguments beginning with \`-') are ignored.
@@@ -1623,14 -1797,40 +1797,40 @@@ Otherwise, only FILE itself is deleted
;;
esac
- $ECHO
+ echo
$ECHO "Try \`$progname --help' for more information about other modes."
-
- exit $?
}
- # Now that we've collected a possible --mode arg, show help if necessary
- $opt_help && func_mode_help
+ # Now that we've collected a possible --mode arg, show help if necessary
+ if $opt_help; then
+ if test "$opt_help" = :; then
+ func_mode_help
+ else
+ {
+ func_help noexit
+ for mode in compile link execute install finish uninstall clean; do
+ func_mode_help
+ done
+ } | sed -n '1p; 2,$s/^Usage:/ or: /p'
+ {
+ func_help noexit
+ for mode in compile link execute install finish uninstall clean; do
+ echo
+ func_mode_help
+ done
+ } |
+ sed '1d
+ /^When reporting/,/^Report/{
+ H
+ d
+ }
+ $x
+ /information about other modes/d
+ /more detailed .*MODE/d
+ s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
+ fi
+ exit $?
+ fi
# func_mode_execute arg...
@@@ -1712,7 -1912,7 +1912,7 @@@ func_mode_execute (
for file
do
case $file in
- -*) ;;
+ -* | *.la | *.lo ) ;;
*)
# Do a test to see if this is really a libtool program.
if func_ltwrapper_script_p "$file"; then
@@@ -1754,7 -1954,7 +1954,7 @@@
# Display what would be done.
if test -n "$shlibpath_var"; then
eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
- $ECHO "export $shlibpath_var"
+ echo "export $shlibpath_var"
fi
$ECHO "$cmd$args"
exit $EXIT_SUCCESS
@@@ -1795,23 -1995,23 +1995,23 @@@ func_mode_finish (
# Exit here if they wanted silent mode.
$opt_silent && exit $EXIT_SUCCESS
- $ECHO "X----------------------------------------------------------------------" | $Xsed
- $ECHO "Libraries have been installed in:"
+ echo "----------------------------------------------------------------------"
+ echo "Libraries have been installed in:"
for libdir in $libdirs; do
$ECHO " $libdir"
done
- $ECHO
- $ECHO "If you ever happen to want to link against installed libraries"
- $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
- $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
- $ECHO "flag during linking and do at least one of the following:"
+ echo
+ echo "If you ever happen to want to link against installed libraries"
+ echo "in a given directory, LIBDIR, you must either use libtool, and"
+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+ echo "flag during linking and do at least one of the following:"
if test -n "$shlibpath_var"; then
- $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable"
- $ECHO " during execution"
+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
+ echo " during execution"
fi
if test -n "$runpath_var"; then
- $ECHO " - add LIBDIR to the \`$runpath_var' environment variable"
- $ECHO " during linking"
+ echo " - add LIBDIR to the \`$runpath_var' environment variable"
+ echo " during linking"
fi
if test -n "$hardcode_libdir_flag_spec"; then
libdir=LIBDIR
@@@ -1823,21 -2023,21 +2023,21 @@@
$ECHO " - have your system administrator run these commands:$admincmds"
fi
if test -f /etc/ld.so.conf; then
- $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
fi
- $ECHO
+ echo
- $ECHO "See any operating system documentation about shared libraries for"
+ echo "See any operating system documentation about shared libraries for"
case $host in
solaris2.[6789]|solaris2.1[0-9])
- $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
- $ECHO "pages."
+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+ echo "pages."
;;
*)
- $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
+ echo "more information, such as the ld(1) and ld.so(8) manual pages."
;;
esac
- $ECHO "X----------------------------------------------------------------------" | $Xsed
+ echo "----------------------------------------------------------------------"
exit $EXIT_SUCCESS
}
@@@ -1852,7 -2052,7 +2052,7 @@@ func_mode_install (
# install_prog (especially on Windows NT).
if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
# Allow the use of GNU shtool's install command.
- $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
+ case $nonopt in *shtool*) :;; *) false;; esac; then
# Aesthetically quote it.
func_quote_for_eval "$nonopt"
install_prog="$func_quote_for_eval_result "
@@@ -1867,6 -2067,11 +2067,11 @@@
# Aesthetically quote it.
func_quote_for_eval "$arg"
install_prog="$install_prog$func_quote_for_eval_result"
+ install_shared_prog=$install_prog
+ case " $install_prog " in
+ *[\\\ /]cp\ *) install_cp=: ;;
+ *) install_cp=false ;;
+ esac
# We need to accept at least all the BSD install flags.
dest=
@@@ -1876,8 -2081,10 +2081,10 @@@
install_type=
isdir=no
stripme=
+ no_mode=:
for arg
do
+ arg2=
if test -n "$dest"; then
files="$files $dest"
dest=$arg
@@@ -1887,10 -2094,9 +2094,9 @@@
case $arg in
-d) isdir=yes ;;
-f)
- case " $install_prog " in
- *[\\\ /]cp\ *) ;;
- *) prev=$arg ;;
- esac
+ if $install_cp; then :; else
+ prev=$arg
+ fi
;;
-g | -m | -o)
prev=$arg
@@@ -1904,6 -2110,10 +2110,10 @@@
*)
# If the previous option needed an argument, then skip it.
if test -n "$prev"; then
+ if test "x$prev" = x-m && test -n "$install_override_mode"; then
+ arg2=$install_override_mode
+ no_mode=false
+ fi
prev=
else
dest=$arg
@@@ -1915,6 -2125,10 +2125,10 @@@
# Aesthetically quote the argument.
func_quote_for_eval "$arg"
install_prog="$install_prog $func_quote_for_eval_result"
+ if test -n "$arg2"; then
+ func_quote_for_eval "$arg2"
+ fi
+ install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
done
test -z "$install_prog" && \
@@@ -1923,6 -2137,13 +2137,13 @@@
test -n "$prev" && \
func_fatal_help "the \`$prev' option requires an argument"
+ if test -n "$install_override_mode" && $no_mode; then
+ if $install_cp; then :; else
+ func_quote_for_eval "$install_override_mode"
+ install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
+ fi
+ fi
+
if test -z "$files"; then
if test -z "$dest"; then
func_fatal_help "no file or destination specified"
@@@ -2010,7 -2231,7 +2231,7 @@@
if test -n "$relink_command"; then
# Determine the prefix the user has applied to our future dir.
- inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
+ inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
# Don't allow the user to place us outside of our expected
# location b/c this prevents finding dependent libraries that
@@@ -2023,9 -2244,9 +2244,9 @@@
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
else
- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
+ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
fi
func_warning "relinking \`$file'"
@@@ -2043,7 -2264,7 +2264,7 @@@
test -n "$relink_command" && srcname="$realname"T
# Install the shared library and build the symlinks.
- func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
+ func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
'exit $?'
tstripme="$stripme"
case $host_os in
@@@ -2183,7 -2404,7 +2404,7 @@@
if test -f "$lib"; then
func_source "$lib"
fi
- libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+ libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
if test -n "$libdir" && test ! -f "$libfile"; then
func_warning "\`$lib' has not been installed in \`$libdir'"
finalize=no
@@@ -2202,7 -2423,7 +2423,7 @@@
file="$func_basename_result"
outputname="$tmpdir/$file"
# Replace the output file specification.
- relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+ relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
$opt_silent || {
func_quote_for_expand "$relink_command"
@@@ -2221,7 -2442,7 +2442,7 @@@
}
else
# Install the binary that we compiled earlier.
- file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+ file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
fi
fi
@@@ -2323,6 -2544,10 +2544,6 @@@ func_generate_dlsyms (
extern \"C\" {
#endif
-#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
-#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
-#endif
-
/* External symbol declarations for the compiler. */\
"
@@@ -2332,7 -2557,7 +2553,7 @@@
$opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
# Add our own program objects to the symbol list.
- progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
for progfile in $progfiles; do
func_verbose "extracting global C symbols from \`$progfile'"
$opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
@@@ -2371,7 -2596,7 +2592,7 @@@
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
eval '$MV "$nlist"T "$nlist"'
case $host in
- *cygwin | *mingw* | *cegcc* )
+ *cygwin* | *mingw* | *cegcc* )
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
;;
@@@ -2415,10 -2640,10 +2636,10 @@@
if test -f "$nlist"S; then
eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
else
- $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
+ echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
fi
- $ECHO >> "$output_objdir/$my_dlsyms" "\
+ echo >> "$output_objdir/$my_dlsyms" "\
/* The mapping between symbol names and symbols. */
typedef struct {
@@@ -2428,7 -2653,7 +2649,7 @@@
"
case $host in
*cygwin* | *mingw* | *cegcc* )
- $ECHO >> "$output_objdir/$my_dlsyms" "\
+ echo >> "$output_objdir/$my_dlsyms" "\
/* DATA imports from DLLs on WIN32 con't be const, because
runtime relocations are performed -- see ld's documentation
on pseudo-relocs. */"
@@@ -2441,7 -2666,7 +2662,7 @@@
lt_dlsym_const=const ;;
esac
- $ECHO >> "$output_objdir/$my_dlsyms" "\
+ echo >> "$output_objdir/$my_dlsyms" "\
extern $lt_dlsym_const lt_dlsymlist
lt_${my_prefix}_LTX_preloaded_symbols[];
$lt_dlsym_const lt_dlsymlist
@@@ -2457,7 -2682,7 +2678,7 @@@ lt_${my_prefix}_LTX_preloaded_symbols[
eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
;;
esac
- $ECHO >> "$output_objdir/$my_dlsyms" "\
+ echo >> "$output_objdir/$my_dlsyms" "\
{0, (void *) 0}
};
@@@ -2515,16 -2740,16 +2736,16 @@@ static const void *lt_preloaded_setup(
case $host in
*cygwin* | *mingw* | *cegcc* )
if test -f "$output_objdir/$my_outputname.def"; then
- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
else
- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
fi
;;
*)
- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
;;
esac
;;
@@@ -2538,8 -2763,8 +2759,8 @@@
# really was required.
# Nullify the symbol file.
- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+ compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
+ finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
fi
}
@@@ -2549,6 -2774,7 +2770,7 @@@
# Need a lot of goo to handle *both* DLLs and import libs
# Has to be a shell function in order to 'eat' the argument
# that is supplied when $file_magic_command is called.
+ # Despite the name, also deal with 64 bit binaries.
func_win32_libid ()
{
$opt_debug
@@@ -2559,8 -2785,9 +2781,9 @@@
win32_libid_type="x86 archive import"
;;
*ar\ archive*) # could be an import, or static
+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
- $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
win32_nmres=`eval $NM -f posix -A $1 |
$SED -n -e '
1,100{
@@@ -2598,7 -2825,18 +2821,18 @@@ func_extract_an_archive (
$opt_debug
f_ex_an_ar_dir="$1"; shift
f_ex_an_ar_oldlib="$1"
- func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
+ if test "$lock_old_archive_extraction" = yes; then
+ lockfile=$f_ex_an_ar_oldlib.lock
+ until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+ func_echo "Waiting for $lockfile to be removed"
+ sleep 2
+ done
+ fi
+ func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
+ 'stat=$?; rm -f "$lockfile"; exit $stat'
+ if test "$lock_old_archive_extraction" = yes; then
+ $opt_dry_run || rm -f "$lockfile"
+ fi
if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
:
else
@@@ -2669,7 -2907,7 +2903,7 @@@ func_extract_archives (
darwin_file=
darwin_files=
for darwin_file in $darwin_filelist; do
- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
$LIPO -create -output "$darwin_file" $darwin_files
done # $darwin_filelist
$RM -rf unfat-$$
@@@ -2684,25 -2922,30 +2918,30 @@@
func_extract_an_archive "$my_xdir" "$my_xabs"
;;
esac
- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
done
func_extract_archives_result="$my_oldobjs"
}
-
- # func_emit_wrapper_part1 [arg=no]
+ # func_emit_wrapper [arg=no]
#
- # Emit the first part of a libtool wrapper script on stdout.
- # For more information, see the description associated with
- # func_emit_wrapper(), below.
- func_emit_wrapper_part1 ()
+ # Emit a libtool wrapper script on stdout.
+ # Don't directly open a file because we may want to
+ # incorporate the script contents within a cygwin/mingw
+ # wrapper executable. Must ONLY be called from within
+ # func_mode_link because it depends on a number of variables
+ # set therein.
+ #
+ # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+ # variable will take. If 'yes', then the emitted script
+ # will assume that the directory in which it is stored is
+ # the $objdir directory. This is a cygwin/mingw-specific
+ # behavior.
+ func_emit_wrapper ()
{
- func_emit_wrapper_part1_arg1=no
- if test -n "$1" ; then
- func_emit_wrapper_part1_arg1=$1
- fi
+ func_emit_wrapper_arg1=${1-no}
$ECHO "\
#! $SHELL
@@@ -2718,7 -2961,6 +2957,6 @@@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
- Xsed='${SED} -e 1s/^X//'
sed_quote_subst='$sed_quote_subst'
# Be Bourne compatible
@@@ -2749,31 -2991,132 +2987,132 @@@ if test \"\$libtool_install_magic\" = \
else
# When we are sourced in execute mode, \$file and \$ECHO are already set.
if test \"\$libtool_execute_magic\" != \"$magic\"; then
- ECHO=\"$qecho\"
- file=\"\$0\"
- # Make sure echo works.
- if test \"X\$1\" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
- elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
- # Yippee, \$ECHO works!
- :
- else
- # Restart under the correct shell, and then maybe \$ECHO will work.
- exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
- fi
- fi\
+ file=\"\$0\""
+
+ qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
+ $ECHO "\
+
+ # A function that is used when there is no print builtin or printf.
+ func_fallback_echo ()
+ {
+ eval 'cat <<_LTECHO_EOF
+ \$1
+ _LTECHO_EOF'
+ }
+ ECHO=\"$qECHO\"
+ fi
+
+ # Very basic option parsing. These options are (a) specific to
+ # the libtool wrapper, (b) are identical between the wrapper
+ # /script/ and the wrapper /executable/ which is used only on
+ # windows platforms, and (c) all begin with the string "--lt-"
+ # (application programs are unlikely to have options which match
+ # this pattern).
+ #
+ # There are only two supported options: --lt-debug and
+ # --lt-dump-script. There is, deliberately, no --lt-help.
+ #
+ # The first argument to this parsing function should be the
+ # script's $0 value, followed by "$@".
+ lt_option_debug=
+ func_parse_lt_options ()
+ {
+ lt_script_arg0=\$0
+ shift
+ for lt_opt
+ do
+ case \"\$lt_opt\" in
+ --lt-debug) lt_option_debug=1 ;;
+ --lt-dump-script)
+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
+ cat \"\$lt_dump_D/\$lt_dump_F\"
+ exit 0
+ ;;
+ --lt-*)
+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
+ exit 1
+ ;;
+ esac
+ done
+
+ # Print the debug banner immediately:
+ if test -n \"\$lt_option_debug\"; then
+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
+ fi
+ }
+
+ # Used when --lt-debug. Prints its arguments to stdout
+ # (redirection is the responsibility of the caller)
+ func_lt_dump_args ()
+ {
+ lt_dump_args_N=1;
+ for lt_arg
+ do
+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
+ done
+ }
+
+ # Core function for launching the target application
+ func_exec_program_core ()
+ {
"
- $ECHO "\
+ case $host in
+ # Backslashes separate directories on plain windows
+ *-*-mingw | *-*-os2* | *-cegcc*)
+ $ECHO "\
+ if test -n \"\$lt_option_debug\"; then
+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
+ func_lt_dump_args \${1+\"\$@\"} 1>&2
+ fi
+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+ "
+ ;;
+
+ *)
+ $ECHO "\
+ if test -n \"\$lt_option_debug\"; then
+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
+ func_lt_dump_args \${1+\"\$@\"} 1>&2
+ fi
+ exec \"\$progdir/\$program\" \${1+\"\$@\"}
+ "
+ ;;
+ esac
+ $ECHO "\
+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+ exit 1
+ }
+
+ # A function to encapsulate launching the target application
+ # Strips options in the --lt-* namespace from \$@ and
+ # launches target application with the remaining arguments.
+ func_exec_program ()
+ {
+ for lt_wr_arg
+ do
+ case \$lt_wr_arg in
+ --lt-*) ;;
+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+ esac
+ shift
+ done
+ func_exec_program_core \${1+\"\$@\"}
+ }
+
+ # Parse options
+ func_parse_lt_options \"\$0\" \${1+\"\$@\"}
# Find the directory that this script lives in.
- thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+ thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
test \"x\$thisdir\" = \"x\$file\" && thisdir=.
# Follow symbolic links until we get to the real thisdir.
- file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
+ file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
while test -n \"\$file\"; do
- destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+ destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
# If there was a directory component, then change thisdir.
if test \"x\$destdir\" != \"x\$file\"; then
@@@ -2783,30 -3126,13 +3122,13 @@@
esac
fi
- file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
- file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+ file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
+ file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
done
# Usually 'no', except on cygwin/mingw when embedded into
# the cwrapper.
- WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
+ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
# special case for '.'
if test \"\$thisdir\" = \".\"; then
@@@ -2814,7 -3140,7 +3136,7 @@@
fi
# remove .libs from thisdir
case \"\$thisdir\" in
- *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
+ *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
$objdir ) thisdir=. ;;
esac
fi
@@@ -2877,7 -3203,7 +3199,7 @@@
# Some systems cannot cope with colon-terminated $shlibpath_var
# The second colon is a workaround for a bug in BeOS R4 sed
- $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+ $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
export $shlibpath_var
"
@@@ -2894,64 -3220,18 +3216,18 @@@
$ECHO "\
if test \"\$libtool_execute_magic\" != \"$magic\"; then
# Run the actual program with our arguments.
- "
- case $host in
- # Backslashes separate directories on plain windows
- *-*-mingw | *-*-os2* | *-cegcc*)
- $ECHO "\
- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
- "
- ;;
-
- *)
- $ECHO "\
- exec \"\$progdir/\$program\" \${1+\"\$@\"}
- "
- ;;
- esac
- $ECHO "\
- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
- exit 1
+ func_exec_program \${1+\"\$@\"}
fi
else
# The program doesn't exist.
\$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
\$ECHO \"This script is just a wrapper for \$program.\" 1>&2
- $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+ \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
exit 1
fi
fi\
"
}
- # end: func_emit_wrapper_part2
-
-
- # func_emit_wrapper [arg=no]
- #
- # Emit a libtool wrapper script on stdout.
- # Don't directly open a file because we may want to
- # incorporate the script contents within a cygwin/mingw
- # wrapper executable. Must ONLY be called from within
- # func_mode_link because it depends on a number of variables
- # set therein.
- #
- # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
- # variable will take. If 'yes', then the emitted script
- # will assume that the directory in which it is stored is
- # the $objdir directory. This is a cygwin/mingw-specific
- # behavior.
- func_emit_wrapper ()
- {
- func_emit_wrapper_arg1=no
- if test -n "$1" ; then
- func_emit_wrapper_arg1=$1
- fi
-
- # split this up so that func_emit_cwrapperexe_src
- # can call each part independently.
- func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
- func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
- }
# func_to_host_path arg
@@@ -2978,23 -3258,19 +3254,19 @@@
func_to_host_path ()
{
func_to_host_path_result="$1"
- if test -n "$1" ; then
+ if test -n "$1"; then
case $host in
*mingw* )
lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
case $build in
*mingw* ) # actually, msys
# awkward: cmd appends spaces to result
- lt_sed_strip_trailing_spaces="s/[ ]*\$//"
- func_to_host_path_tmp1=`( cmd //c echo "$1" |\
- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
- $SED -e "$lt_sed_naive_backslashify"`
+ func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
;;
*cygwin* )
- func_to_host_path_tmp1=`cygpath -w "$1"`
- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
- $SED -e "$lt_sed_naive_backslashify"`
+ func_to_host_path_result=`cygpath -w "$1" |
+ $SED -e "$lt_sed_naive_backslashify"`
;;
* )
# Unfortunately, winepath does not exit with a non-zero
@@@ -3006,17 -3282,17 +3278,17 @@@
# the odd construction:
func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+ func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
$SED -e "$lt_sed_naive_backslashify"`
else
# Allow warning below.
- func_to_host_path_result=""
+ func_to_host_path_result=
fi
;;
esac
if test -z "$func_to_host_path_result" ; then
func_error "Could not determine host path corresponding to"
- func_error " '$1'"
+ func_error " \`$1'"
func_error "Continuing, but uninstalled executables may not work."
# Fallback:
func_to_host_path_result="$1"
@@@ -3049,30 -3325,24 +3321,24 @@@
func_to_host_pathlist ()
{
func_to_host_pathlist_result="$1"
- if test -n "$1" ; then
+ if test -n "$1"; then
case $host in
*mingw* )
lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
# Remove leading and trailing path separator characters from
# ARG. msys behavior is inconsistent here, cygpath turns them
# into '.;' and ';.', and winepath ignores them completely.
- func_to_host_pathlist_tmp2="$1"
- # Once set for this call, this variable should not be
- # reassigned. It is used in tha fallback case.
- func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
- $SED -e 's|^:*||' -e 's|:*$||'`
+ func_stripname : : "$1"
+ func_to_host_pathlist_tmp1=$func_stripname_result
case $build in
*mingw* ) # Actually, msys.
# Awkward: cmd appends spaces to result.
- lt_sed_strip_trailing_spaces="s/[ ]*\$//"
- func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
- $SED -e "$lt_sed_naive_backslashify"`
+ func_to_host_pathlist_result=`
+ ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
;;
*cygwin* )
- func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+ func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
$SED -e "$lt_sed_naive_backslashify"`
;;
* )
@@@ -3088,18 -3358,17 +3354,17 @@@
if test -z "$func_to_host_pathlist_result" ; then
func_to_host_pathlist_result="$func_to_host_path_result"
else
- func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
+ func_append func_to_host_pathlist_result ";$func_to_host_path_result"
fi
fi
fi
- IFS=:
done
IFS=$func_to_host_pathlist_oldIFS
;;
esac
- if test -z "$func_to_host_pathlist_result" ; then
+ if test -z "$func_to_host_pathlist_result"; then
func_error "Could not determine the host path(s) corresponding to"
- func_error " '$1'"
+ func_error " \`$1'"
func_error "Continuing, but uninstalled executables may not work."
# Fallback. This may break if $1 contains DOS-style drive
# specifications. The fix is not to complicate the expression
@@@ -3116,7 -3385,7 +3381,7 @@@
;;
esac
case "$1" in
- *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
+ *: ) func_append func_to_host_pathlist_result ";"
;;
esac
;;
@@@ -3141,31 -3410,23 +3406,23 @@@ func_emit_cwrapperexe_src (
This wrapper executable should never be moved out of the build directory.
If it is, it will not operate correctly.
*/
EOF
cat <<"EOF"
+ #ifdef _MSC_VER
+ # define _CRT_SECURE_NO_DEPRECATE 1
+ #endif
#include <stdio.h>
#include <stdlib.h>
#ifdef _MSC_VER
# include <direct.h>
# include <process.h>
# include <io.h>
- # define setmode _setmode
#else
# include <unistd.h>
# include <stdint.h>
# ifdef __CYGWIN__
# include <io.h>
- # define HAVE_SETENV
- # ifdef __STRICT_ANSI__
- char *realpath (const char *, char *);
- int putenv (char *);
- int setenv (const char *, const char *, int);
- # endif
# endif
#endif
#include <malloc.h>
@@@ -3177,6 -3438,44 +3434,44 @@@
#include <fcntl.h>
#include <sys/stat.h>
+ /* declarations of non-ANSI functions */
+ #if defined(__MINGW32__)
+ # ifdef __STRICT_ANSI__
+ int _putenv (const char *);
+ # endif
+ #elif defined(__CYGWIN__)
+ # ifdef __STRICT_ANSI__
+ char *realpath (const char *, char *);
+ int putenv (char *);
+ int setenv (const char *, const char *, int);
+ # endif
+ /* #elif defined (other platforms) ... */
+ #endif
+
+ /* portability defines, excluding path handling macros */
+ #if defined(_MSC_VER)
+ # define setmode _setmode
+ # define stat _stat
+ # define chmod _chmod
+ # define getcwd _getcwd
+ # define putenv _putenv
+ # define S_IXUSR _S_IEXEC
+ # ifndef _INTPTR_T_DEFINED
+ # define _INTPTR_T_DEFINED
+ # define intptr_t int
+ # endif
+ #elif defined(__MINGW32__)
+ # define setmode _setmode
+ # define stat _stat
+ # define chmod _chmod
+ # define getcwd _getcwd
+ # define putenv _putenv
+ #elif defined(__CYGWIN__)
+ # define HAVE_SETENV
+ # define FOPEN_WB "wb"
+ /* #elif defined (other platforms) ... */
+ #endif
+
#if defined(PATH_MAX)
# define LT_PATHMAX PATH_MAX
#elif defined(MAXPATHLEN)
@@@ -3192,14 -3491,7 +3487,7 @@@
# define S_IXGRP 0
#endif
- #ifdef _MSC_VER
- # define S_IXUSR _S_IEXEC
- # define stat _stat
- # ifndef _INTPTR_T_DEFINED
- # define intptr_t int
- # endif
- #endif
-
+ /* path handling portability macros */
#ifndef DIR_SEPARATOR
# define DIR_SEPARATOR '/'
# define PATH_SEPARATOR ':'
@@@ -3230,10 -3522,6 +3518,6 @@@
# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
#endif /* PATH_SEPARATOR_2 */
- #ifdef __CYGWIN__
- # define FOPEN_WB "wb"
- #endif
-
#ifndef FOPEN_WB
# define FOPEN_WB "w"
#endif
@@@ -3246,22 -3534,13 +3530,13 @@@
if (stale) { free ((void *) stale); stale = 0; } \
} while (0)
- #undef LTWRAPPER_DEBUGPRINTF
- #if defined DEBUGWRAPPER
- # define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
- static void
- ltwrapper_debugprintf (const char *fmt, ...)
- {
- va_list args;
- va_start (args, fmt);
- (void) vfprintf (stderr, fmt, args);
- va_end (args);
- }
+ #if defined(LT_DEBUGWRAPPER)
+ static int lt_debug = 1;
#else
- # define LTWRAPPER_DEBUGPRINTF(args)
+ static int lt_debug = 0;
#endif
- const char *program_name = NULL;
+ const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
void *xmalloc (size_t num);
char *xstrdup (const char *string);
@@@ -3271,31 -3550,17 +3546,17 @@@ char *chase_symlinks (const char *paths
int make_executable (const char *path);
int check_executable (const char *path);
char *strendzap (char *str, const char *pat);
- void lt_fatal (const char *message, ...);
+ void lt_debugprintf (const char *file, int line, const char *fmt, ...);
+ void lt_fatal (const char *file, int line, const char *message, ...);
+ static const char *nonnull (const char *s);
+ static const char *nonempty (const char *s);
void lt_setenv (const char *name, const char *value);
char *lt_extend_str (const char *orig_value, const char *add, int to_end);
- void lt_opt_process_env_set (const char *arg);
- void lt_opt_process_env_prepend (const char *arg);
- void lt_opt_process_env_append (const char *arg);
- int lt_split_name_value (const char *arg, char** name, char** value);
void lt_update_exe_path (const char *name, const char *value);
void lt_update_lib_path (const char *name, const char *value);
-
- static const char *script_text_part1 =
- EOF
-
- func_emit_wrapper_part1 yes |
- $SED -e 's/\([\\"]\)/\\\1/g' \
- -e 's/^/ "/' -e 's/$/\\n"/'
- echo ";"
- cat <<EOF
-
- static const char *script_text_part2 =
+ char **prepare_spawn (char **argv);
+ void lt_dump_script (FILE *f);
EOF
- func_emit_wrapper_part2 yes |
- $SED -e 's/\([\\"]\)/\\\1/g' \
- -e 's/^/ "/' -e 's/$/\\n"/'
- echo ";"
cat <<EOF
const char * MAGIC_EXE = "$magic_exe";
@@@ -3340,24 -3605,10 +3601,10 @@@ EO
cat <<"EOF"
#define LTWRAPPER_OPTION_PREFIX "--lt-"
- #define LTWRAPPER_OPTION_PREFIX_LENGTH 5
- static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
-
static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
-
- static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
- static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set";
- /* argument is putenv-style "foo=bar", value of foo is set to bar */
-
- static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
- static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend";
- /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
-
- static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
- static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append";
- /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
+ static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";
int
main (int argc, char *argv[])
@@@ -3374,10 -3625,13 +3621,13 @@@
int i;
program_name = (char *) xstrdup (base_name (argv[0]));
- LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
- LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
+ newargz = XMALLOC (char *, argc + 1);
- /* very simple arg parsing; don't want to rely on getopt */
+ /* very simple arg parsing; don't want to rely on getopt
+ * also, copy all non cwrapper options to newargz, except
+ * argz[0], which is handled differently
+ */
+ newargc=0;
for (i = 1; i < argc; i++)
{
if (strcmp (argv[i], dumpscript_opt) == 0)
@@@ -3391,25 -3645,57 +3641,57 @@@ EO
esac
cat <<"EOF"
- printf ("%s", script_text_part1);
- printf ("%s", script_text_part2);
+ lt_dump_script (stdout);
return 0;
}
+ if (strcmp (argv[i], debug_opt) == 0)
+ {
+ lt_debug = 1;
+ continue;
+ }
+ if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
+ {
+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+ namespace, but it is not one of the ones we know about and
+ have already dealt with, above (inluding dump-script), then
+ report an error. Otherwise, targets might begin to believe
+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+ namespace. The first time any user complains about this, we'll
+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+ or a configure.ac-settable value.
+ */
+ lt_fatal (__FILE__, __LINE__,
+ "unrecognized %s option: '%s'",
+ ltwrapper_option_prefix, argv[i]);
+ }
+ /* otherwise ... */
+ newargz[++newargc] = xstrdup (argv[i]);
}
+ newargz[++newargc] = NULL;
+
+ EOF
+ cat <<EOF
+ /* The GNU banner must be the first non-error debug message */
+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
+ EOF
+ cat <<"EOF"
+ lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
+ lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
- newargz = XMALLOC (char *, argc + 1);
tmp_pathspec = find_executable (argv[0]);
if (tmp_pathspec == NULL)
- lt_fatal ("Couldn't find %s", argv[0]);
- LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
- tmp_pathspec));
+ lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
+ lt_debugprintf (__FILE__, __LINE__,
+ "(main) found exe (before symlink chase) at: %s\n",
+ tmp_pathspec);
actual_cwrapper_path = chase_symlinks (tmp_pathspec);
- LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
- actual_cwrapper_path));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(main) found exe (after symlink chase) at: %s\n",
+ actual_cwrapper_path);
XFREE (tmp_pathspec);
- actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
+ actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
strendzap (actual_cwrapper_path, actual_cwrapper_name);
/* wrapper name transforms */
@@@ -3427,8 -3713,9 +3709,9 @@@
target_name = tmp_pathspec;
tmp_pathspec = 0;
- LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
- target_name));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(main) libtool target name: %s\n",
+ target_name);
EOF
cat <<EOF
@@@ -3481,77 -3768,12 +3764,12 @@@ EO
lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
- newargc=0;
- for (i = 1; i < argc; i++)
- {
- if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
- {
- if (argv[i][env_set_opt_len] == '=')
- {
- const char *p = argv[i] + env_set_opt_len + 1;
- lt_opt_process_env_set (p);
- }
- else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
- {
- lt_opt_process_env_set (argv[++i]); /* don't copy */
- }
- else
- lt_fatal ("%s missing required argument", env_set_opt);
- continue;
- }
- if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
- {
- if (argv[i][env_prepend_opt_len] == '=')
- {
- const char *p = argv[i] + env_prepend_opt_len + 1;
- lt_opt_process_env_prepend (p);
- }
- else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
- {
- lt_opt_process_env_prepend (argv[++i]); /* don't copy */
- }
- else
- lt_fatal ("%s missing required argument", env_prepend_opt);
- continue;
- }
- if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
- {
- if (argv[i][env_append_opt_len] == '=')
- {
- const char *p = argv[i] + env_append_opt_len + 1;
- lt_opt_process_env_append (p);
- }
- else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
- {
- lt_opt_process_env_append (argv[++i]); /* don't copy */
- }
- else
- lt_fatal ("%s missing required argument", env_append_opt);
- continue;
- }
- if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
- {
- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
- namespace, but it is not one of the ones we know about and
- have already dealt with, above (inluding dump-script), then
- report an error. Otherwise, targets might begin to believe
- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
- namespace. The first time any user complains about this, we'll
- need to make LTWRAPPER_OPTION_PREFIX a configure-time option
- or a configure.ac-settable value.
- */
- lt_fatal ("Unrecognized option in %s namespace: '%s'",
- ltwrapper_option_prefix, argv[i]);
- }
- /* otherwise ... */
- newargz[++newargc] = xstrdup (argv[i]);
- }
- newargz[++newargc] = NULL;
-
- LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
+ nonnull (lt_argv_zero));
for (i = 0; i < newargc; i++)
{
- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
+ i, nonnull (newargz[i]));
}
EOF
@@@ -3560,11 -3782,14 +3778,14 @@@
mingw*)
cat <<"EOF"
/* execv doesn't actually work on mingw as expected on unix */
+ newargz = prepare_spawn (newargz);
rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
if (rval == -1)
{
/* failed to start process */
- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(main) failed to launch target \"%s\": %s\n",
+ lt_argv_zero, nonnull (strerror (errno)));
return 127;
}
return rval;
@@@ -3586,7 -3811,7 +3807,7 @@@ xmalloc (size_t num
{
void *p = (void *) malloc (num);
if (!p)
- lt_fatal ("Memory exhausted");
+ lt_fatal (__FILE__, __LINE__, "memory exhausted");
return p;
}
@@@ -3620,8 -3845,8 +3841,8 @@@ check_executable (const char *path
{
struct stat st;
- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
- path ? (*path ? path : "EMPTY!") : "NULL!"));
+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
+ nonempty (path));
if ((!path) || (!*path))
return 0;
@@@ -3638,8 -3863,8 +3859,8 @@@ make_executable (const char *path
int rval = 0;
struct stat st;
- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
- path ? (*path ? path : "EMPTY!") : "NULL!"));
+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
+ nonempty (path));
if ((!path) || (!*path))
return 0;
@@@ -3665,8 -3890,8 +3886,8 @@@ find_executable (const char *wrapper
int tmp_len;
char *concat_name;
- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
+ nonempty (wrapper));
if ((wrapper == NULL) || (*wrapper == '\0'))
return NULL;
@@@ -3719,7 -3944,8 +3940,8 @@@
{
/* empty path: current directory */
if (getcwd (tmp, LT_PATHMAX) == NULL)
- lt_fatal ("getcwd failed");
+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+ nonnull (strerror (errno)));
tmp_len = strlen (tmp);
concat_name =
XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
@@@ -3744,7 -3970,8 +3966,8 @@@
}
/* Relative path | not found in path: prepend cwd */
if (getcwd (tmp, LT_PATHMAX) == NULL)
- lt_fatal ("getcwd failed");
+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+ nonnull (strerror (errno)));
tmp_len = strlen (tmp);
concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
memcpy (concat_name, tmp, tmp_len);
@@@ -3770,8 -3997,9 +3993,9 @@@ chase_symlinks (const char *pathspec
int has_symlinks = 0;
while (strlen (tmp_pathspec) && !has_symlinks)
{
- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
- tmp_pathspec));
+ lt_debugprintf (__FILE__, __LINE__,
+ "checking path component for symlinks: %s\n",
+ tmp_pathspec);
if (lstat (tmp_pathspec, &s) == 0)
{
if (S_ISLNK (s.st_mode) != 0)
@@@ -3793,8 -4021,9 +4017,9 @@@
}
else
{
- char *errstr = strerror (errno);
- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
+ lt_fatal (__FILE__, __LINE__,
+ "error accessing file \"%s\": %s",
+ tmp_pathspec, nonnull (strerror (errno)));
}
}
XFREE (tmp_pathspec);
@@@ -3807,7 -4036,8 +4032,8 @@@
tmp_pathspec = realpath (pathspec, buf);
if (tmp_pathspec == 0)
{
- lt_fatal ("Could not follow symlinks for %s", pathspec);
+ lt_fatal (__FILE__, __LINE__,
+ "could not follow symlinks for %s", pathspec);
}
return xstrdup (tmp_pathspec);
#endif
@@@ -3833,11 -4063,25 +4059,25 @@@ strendzap (char *str, const char *pat
return str;
}
+ void
+ lt_debugprintf (const char *file, int line, const char *fmt, ...)
+ {
+ va_list args;
+ if (lt_debug)
+ {
+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
+ va_start (args, fmt);
+ (void) vfprintf (stderr, fmt, args);
+ va_end (args);
+ }
+ }
+
static void
- lt_error_core (int exit_status, const char *mode,
+ lt_error_core (int exit_status, const char *file,
+ int line, const char *mode,
const char *message, va_list ap)
{
- fprintf (stderr, "%s: %s: ", program_name, mode);
+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
vfprintf (stderr, message, ap);
fprintf (stderr, ".\n");
@@@ -3846,20 -4090,32 +4086,32 @@@
}
void
- lt_fatal (const char *message, ...)
+ lt_fatal (const char *file, int line, const char *message, ...)
{
va_list ap;
va_start (ap, message);
- lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
va_end (ap);
}
+ static const char *
+ nonnull (const char *s)
+ {
+ return s ? s : "(null)";
+ }
+
+ static const char *
+ nonempty (const char *s)
+ {
+ return (s && !*s) ? "(empty)" : nonnull (s);
+ }
+
void
lt_setenv (const char *name, const char *value)
{
- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
- (name ? name : "<NULL>"),
- (value ? value : "<NULL>")));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(lt_setenv) setting '%s' to '%s'\n",
+ nonnull (name), nonnull (value));
{
#ifdef HAVE_SETENV
/* always make a copy, for consistency with !HAVE_SETENV */
@@@ -3904,95 -4160,12 +4156,12 @@@ lt_extend_str (const char *orig_value,
return new_value;
}
void
lt_update_exe_path (const char *name, const char *value)
{
- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
- (name ? name : "<NULL>"),
- (value ? value : "<NULL>")));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+ nonnull (name), nonnull (value));
if (name && *name && value && *value)
{
@@@ -4011,9 -4184,9 +4180,9 @@@
void
lt_update_lib_path (const char *name, const char *value)
{
- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
- (name ? name : "<NULL>"),
- (value ? value : "<NULL>")));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+ nonnull (name), nonnull (value));
if (name && *name && value && *value)
{
@@@ -4023,11 -4196,152 +4192,152 @@@
}
}
+ EOF
+ case $host_os in
+ mingw*)
+ cat <<"EOF"
+
+ /* Prepares an argument vector before calling spawn().
+ Note that spawn() does not by itself call the command interpreter
+ (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
+ ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+ GetVersionEx(&v);
+ v.dwPlatformId == VER_PLATFORM_WIN32_NT;
+ }) ? "cmd.exe" : "command.com").
+ Instead it simply concatenates the arguments, separated by ' ', and calls
+ CreateProcess(). We must quote the arguments since Win32 CreateProcess()
+ interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
+ special way:
+ - Space and tab are interpreted as delimiters. They are not treated as
+ delimiters if they are surrounded by double quotes: "...".
+ - Unescaped double quotes are removed from the input. Their only effect is
+ that within double quotes, space and tab are treated like normal
+ characters.
+ - Backslashes not followed by double quotes are not special.
+ - But 2*n+1 backslashes followed by a double quote become
+ n backslashes followed by a double quote (n >= 0):
+ \" -> "
+ \\\" -> \"
+ \\\\\" -> \\"
+ */
+ #define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+ #define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+ char **
+ prepare_spawn (char **argv)
+ {
+ size_t argc;
+ char **new_argv;
+ size_t i;
+ /* Count number of arguments. */
+ for (argc = 0; argv[argc] != NULL; argc++)
+ ;
+
+ /* Allocate new argument vector. */
+ new_argv = XMALLOC (char *, argc + 1);
+
+ /* Put quoted arguments into the new argument vector. */
+ for (i = 0; i < argc; i++)
+ {
+ const char *string = argv[i];
+
+ if (string[0] == '\0')
+ new_argv[i] = xstrdup ("\"\"");
+ else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
+ {
+ int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
+ size_t length;
+ unsigned int backslashes;
+ const char *s;
+ char *quoted_string;
+ char *p;
+
+ length = 0;
+ backslashes = 0;
+ if (quote_around)
+ length++;
+ for (s = string; *s != '\0'; s++)
+ {
+ char c = *s;
+ if (c == '"')
+ length += backslashes + 1;
+ length++;
+ if (c == '\\')
+ backslashes++;
+ else
+ backslashes = 0;
+ }
+ if (quote_around)
+ length += backslashes + 1;
+
+ quoted_string = XMALLOC (char, length + 1);
+
+ p = quoted_string;
+ backslashes = 0;
+ if (quote_around)
+ *p++ = '"';
+ for (s = string; *s != '\0'; s++)
+ {
+ char c = *s;
+ if (c == '"')
+ {
+ unsigned int j;
+ for (j = backslashes + 1; j > 0; j--)
+ *p++ = '\\';
+ }
+ *p++ = c;
+ if (c == '\\')
+ backslashes++;
+ else
+ backslashes = 0;
+ }
+ if (quote_around)
+ {
+ unsigned int j;
+ for (j = backslashes; j > 0; j--)
+ *p++ = '\\';
+ *p++ = '"';
+ }
+ *p = '\0';
+
+ new_argv[i] = quoted_string;
+ }
+ else
+ new_argv[i] = (char *) string;
+ }
+ new_argv[argc] = NULL;
+
+ return new_argv;
+ }
+ EOF
+ ;;
+ esac
+
+ cat <<"EOF"
+ void lt_dump_script (FILE* f)
+ {
+ EOF
+ func_emit_wrapper yes |
+ $SED -e 's/\([\\"]\)/\\\1/g' \
+ -e 's/^/ fputs ("/' -e 's/$/\\n", f);/'
+
+ cat <<"EOF"
+ }
EOF
}
# end: func_emit_cwrapperexe_src
+ # func_win32_import_lib_p ARG
+ # True if ARG is an import lib, as indicated by $file_magic_cmd
+ func_win32_import_lib_p ()
+ {
+ $opt_debug
+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
+ *import*) : ;;
+ *) false ;;
+ esac
+ }
+
# func_mode_link arg...
func_mode_link ()
{
@@@ -4072,6 -4386,7 +4382,7 @@@
new_inherited_linker_flags=
avoid_version=no
+ bindir=
dlfiles=
dlprefiles=
dlself=no
@@@ -4164,6 -4479,11 +4475,11 @@@
esac
case $prev in
+ bindir)
+ bindir="$arg"
+ prev=
+ continue
+ ;;
dlfiles|dlprefiles)
if test "$preload" = no; then
# Add the symbol object into the linking commands.
@@@ -4425,6 -4745,11 +4741,11 @@@
continue
;;
+ -bindir)
+ prev=bindir
+ continue
+ ;;
+
-dlopen)
prev=dlfiles
continue
@@@ -4503,7 -4828,7 +4824,7 @@@
esac
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
- testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+ testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$dir:"*) ;;
::) dllsearchpath=$dir;;
@@@ -4522,7 -4847,7 +4843,7 @@@
-l*)
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
# These systems don't actually have a C or math library (as such)
continue
;;
@@@ -4708,7 -5033,7 +5029,7 @@@
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
- arg="$arg $wl$func_quote_for_eval_result"
+ arg="$arg $func_quote_for_eval_result"
compiler_flags="$compiler_flags $func_quote_for_eval_result"
done
IFS="$save_ifs"
@@@ -4754,18 -5079,19 +5075,19 @@@
arg="$func_quote_for_eval_result"
;;
- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
- # -r[0-9][0-9]* specifies the processor on the SGI compiler
- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
- # +DA*, +DD* enable 64-bit mode on the HP compiler
- # -q* pass through compiler args for the IBM compiler
- # -m*, -t[45]*, -txscale* pass through architecture-specific
- # compiler args for GCC
- # -F/path gives path to uninstalled frameworks, gcc on darwin
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- # @file GCC response files
+ # Flags to be passed through unchanged, with rationale:
+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
+ # -r[0-9][0-9]* specify processor for the SGI compiler
+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
+ # +DA*, +DD* enable 64-bit mode for the HP compiler
+ # -q* compiler args for the IBM compiler
+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
+ # -F/path path to uninstalled frameworks, gcc on darwin
+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
+ # @file GCC response files
+ # -tp=* Portland pgcc target processor selection
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
func_quote_for_eval "$arg"
arg="$func_quote_for_eval_result"
func_append compile_command " $arg"
@@@ -4925,7 -5251,7 +5247,7 @@@
if test -n "$shlibpath_var"; then
# get the directories listed in $shlibpath_var
- eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+ eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
else
shlib_search_path=
fi
@@@ -5048,7 -5374,8 +5370,8 @@@
# Collect preopened libtool deplibs, except any this library
# has declared as weak libs
for deplib in $dependency_libs; do
- deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
+ func_basename "$deplib"
+ deplib_base=$func_basename_result
case " $weak_libs " in
*" $deplib_base "*) ;;
*) deplibs="$deplibs $deplib" ;;
@@@ -5227,7 -5554,7 +5550,7 @@@
match_pattern*)
set dummy $deplibs_check_method; shift
match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
- if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
+ if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
| $EGREP "$match_pattern_regex" > /dev/null; then
valid_a_lib=yes
fi
@@@ -5237,15 -5564,15 +5560,15 @@@
;;
esac
if test "$valid_a_lib" != yes; then
- $ECHO
+ echo
$ECHO "*** Warning: Trying to link with static lib archive $deplib."
- $ECHO "*** I have the capability to make that library automatically link in when"
- $ECHO "*** you link to this library. But I can only do this if you have a"
- $ECHO "*** shared version of the library, which you do not appear to have"
- $ECHO "*** because the file extensions .$libext of this argument makes me believe"
- $ECHO "*** that it is just a static archive that I should not use here."
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have"
+ echo "*** because the file extensions .$libext of this argument makes me believe"
+ echo "*** that it is just a static archive that I should not use here."
else
- $ECHO
+ echo
$ECHO "*** Warning: Linking the shared library $output against the"
$ECHO "*** static library $deplib is not portable!"
deplibs="$deplib $deplibs"
@@@ -5318,7 -5645,7 +5641,7 @@@
# Convert "-framework foo" to "foo.ltframework"
if test -n "$inherited_linker_flags"; then
- tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
+ tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
case " $new_inherited_linker_flags " in
*" $tmp_inherited_linker_flag "*) ;;
@@@ -5326,7 -5653,7 +5649,7 @@@
esac
done
fi
- dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan" ||
{ test "$linkmode" != prog && test "$linkmode" != lib; }; then
@@@ -5580,7 -5907,7 +5903,7 @@@
fi
done
if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
- $ECHO
+ echo
if test "$linkmode" = prog; then
$ECHO "*** Warning: Linking the executable $output against the loadable module"
else
@@@ -5683,9 -6010,9 +6006,9 @@@
if test "X$dlopenmodule" != "X$lib"; then
$ECHO "*** Warning: lib $linklib is a module, not a shared library"
if test -z "$old_library" ; then
- $ECHO
- $ECHO "*** And there doesn't seem to be a static archive available"
- $ECHO "*** The link will probably fail, sorry"
+ echo
+ echo "*** And there doesn't seem to be a static archive available"
+ echo "*** The link will probably fail, sorry"
else
add="$dir/$old_library"
fi
@@@ -5825,21 -6152,21 +6148,21 @@@
# Just print a warning and add the library to dependency_libs so
# that the program can be linked against the static library.
- $ECHO
+ echo
$ECHO "*** Warning: This system can not link to static lib archive $lib."
- $ECHO "*** I have the capability to make that library automatically link in when"
- $ECHO "*** you link to this library. But I can only do this if you have a"
- $ECHO "*** shared version of the library, which you do not appear to have."
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have."
if test "$module" = yes; then
- $ECHO "*** But as you try to build a module library, libtool will still create "
- $ECHO "*** a static module, that should work as long as the dlopening application"
- $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
+ echo "*** But as you try to build a module library, libtool will still create "
+ echo "*** a static module, that should work as long as the dlopening application"
+ echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
if test -z "$global_symbol_pipe"; then
- $ECHO
- $ECHO "*** However, this would only work if libtool was able to extract symbol"
- $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
- $ECHO "*** not find such a program. So, this module is probably useless."
- $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
+ echo
+ echo "*** However, this would only work if libtool was able to extract symbol"
+ echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ echo "*** not find such a program. So, this module is probably useless."
+ echo "*** \`nm' from GNU binutils and a full rebuild may help."
fi
if test "$build_old_libs" = no; then
build_libtool_libs=module
@@@ -5893,6 -6220,7 +6216,7 @@@
if test "$link_all_deplibs" != no; then
# Add the search paths of all dependency libraries
for deplib in $dependency_libs; do
+ path=
case $deplib in
-L*) path="$deplib" ;;
*.la)
@@@ -5958,7 -6286,7 +6282,7 @@@
compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
else
- compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
fi
fi
dependency_libs="$newdependency_libs"
@@@ -6126,7 -6454,7 +6450,7 @@@
if test "$deplibs_check_method" != pass_all; then
func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
else
- $ECHO
+ echo
$ECHO "*** Warning: Linking the shared library $output against the non-libtool"
$ECHO "*** objects $objs is not portable!"
libobjs="$libobjs $objs"
@@@ -6194,7 -6522,7 +6518,7 @@@
age="$number_minor"
revision="$number_revision"
;;
- freebsd-aout|freebsd-elf|sunos)
+ freebsd-aout|freebsd-elf|qnx|sunos)
current="$number_major"
revision="$number_minor"
age="0"
@@@ -6428,14 -6756,14 +6752,14 @@@
oldlibs="$oldlibs $output_objdir/$libname.$libext"
# Transform .lo files to .o files.
- oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+ oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
fi
# Eliminate all temporary directories.
#for path in $notinst_path; do
- # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
- # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
- # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
+ # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
+ # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
+ # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
#done
if test -n "$xrpath"; then
@@@ -6476,7 -6804,7 +6800,7 @@@
if test "$build_libtool_libs" = yes; then
if test -n "$rpath"; then
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
# these systems don't actually have a c library (as such)!
;;
*-*-rhapsody* | *-*-darwin1.[012])
@@@ -6561,13 -6889,13 +6885,13 @@@ EO
newdeplibs="$newdeplibs $i"
else
droppeddeps=yes
- $ECHO
+ echo
$ECHO "*** Warning: dynamic linker does not accept needed library $i."
- $ECHO "*** I have the capability to make that library automatically link in when"
- $ECHO "*** you link to this library. But I can only do this if you have a"
- $ECHO "*** shared version of the library, which I believe you do not have"
- $ECHO "*** because a test_compile did reveal that the linker did not use it for"
- $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which I believe you do not have"
+ echo "*** because a test_compile did reveal that the linker did not use it for"
+ echo "*** its dynamic dependency list that programs get resolved with at runtime."
fi
fi
;;
@@@ -6604,22 -6932,22 +6928,22 @@@
newdeplibs="$newdeplibs $i"
else
droppeddeps=yes
- $ECHO
+ echo
$ECHO "*** Warning: dynamic linker does not accept needed library $i."
- $ECHO "*** I have the capability to make that library automatically link in when"
- $ECHO "*** you link to this library. But I can only do this if you have a"
- $ECHO "*** shared version of the library, which you do not appear to have"
- $ECHO "*** because a test_compile did reveal that the linker did not use this one"
- $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have"
+ echo "*** because a test_compile did reveal that the linker did not use this one"
+ echo "*** as a dynamic dependency that programs can get resolved with at runtime."
fi
fi
else
droppeddeps=yes
- $ECHO
+ echo
$ECHO "*** Warning! Library $i is needed by this library but I was not able to"
- $ECHO "*** make it link in! You will probably need to install it or some"
- $ECHO "*** library that it depends on before this library will be fully"
- $ECHO "*** functional. Installing it before continuing would be even better."
+ echo "*** make it link in! You will probably need to install it or some"
+ echo "*** library that it depends on before this library will be fully"
+ echo "*** functional. Installing it before continuing would be even better."
fi
;;
*)
@@@ -6665,7 -6993,7 +6989,7 @@@
potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
case $potliblink in
[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
- *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+ *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
esac
done
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
@@@ -6680,12 -7008,12 +7004,12 @@@
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
- $ECHO
+ echo
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
- $ECHO "*** I have the capability to make that library automatically link in when"
- $ECHO "*** you link to this library. But I can only do this if you have a"
- $ECHO "*** shared version of the library, which you do not appear to have"
- $ECHO "*** because I did check the linker path looking for a file starting"
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have"
+ echo "*** because I did check the linker path looking for a file starting"
if test -z "$potlib" ; then
$ECHO "*** with $libname but no candidates were found. (...for file magic test)"
else
@@@ -6723,7 -7051,7 +7047,7 @@@
potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
for potent_lib in $potential_libs; do
potlib="$potent_lib" # see symlink-check above in file_magic test
- if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
+ if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
$EGREP "$match_pattern_regex" > /dev/null; then
newdeplibs="$newdeplibs $a_deplib"
a_deplib=""
@@@ -6734,12 -7062,12 +7058,12 @@@
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
- $ECHO
+ echo
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
- $ECHO "*** I have the capability to make that library automatically link in when"
- $ECHO "*** you link to this library. But I can only do this if you have a"
- $ECHO "*** shared version of the library, which you do not appear to have"
- $ECHO "*** because I did check the linker path looking for a file starting"
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have"
+ echo "*** because I did check the linker path looking for a file starting"
if test -z "$potlib" ; then
$ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
else
@@@ -6757,25 -7085,25 +7081,25 @@@
;;
none | unknown | *)
newdeplibs=""
- tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
- -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
+ tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
for i in $predeps $postdeps ; do
# can't use Xsed below, because $i might contain '/'
- tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
+ tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
done
fi
- if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' |
- $GREP . >/dev/null; then
- $ECHO
+ case $tmp_deplibs in
+ *[!\ \ ]*)
+ echo
if test "X$deplibs_check_method" = "Xnone"; then
- $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
+ echo "*** Warning: inter-library dependencies are not supported in this platform."
else
- $ECHO "*** Warning: inter-library dependencies are not known to be supported."
+ echo "*** Warning: inter-library dependencies are not known to be supported."
fi
- $ECHO "*** All declared inter-library dependencies are being dropped."
+ echo "*** All declared inter-library dependencies are being dropped."
droppeddeps=yes
- fi
+ ;;
+ esac
;;
esac
versuffix=$versuffix_save
@@@ -6787,23 -7115,23 +7111,23 @@@
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library with the System framework
- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+ newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
;;
esac
if test "$droppeddeps" = yes; then
if test "$module" = yes; then
- $ECHO
- $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
+ echo
+ echo "*** Warning: libtool could not satisfy all declared inter-library"
$ECHO "*** dependencies of module $libname. Therefore, libtool will create"
- $ECHO "*** a static module, that should work as long as the dlopening"
- $ECHO "*** application is linked with the -dlopen flag."
+ echo "*** a static module, that should work as long as the dlopening"
+ echo "*** application is linked with the -dlopen flag."
if test -z "$global_symbol_pipe"; then
- $ECHO
- $ECHO "*** However, this would only work if libtool was able to extract symbol"
- $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
- $ECHO "*** not find such a program. So, this module is probably useless."
- $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
+ echo
+ echo "*** However, this would only work if libtool was able to extract symbol"
+ echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ echo "*** not find such a program. So, this module is probably useless."
+ echo "*** \`nm' from GNU binutils and a full rebuild may help."
fi
if test "$build_old_libs" = no; then
oldlibs="$output_objdir/$libname.$libext"
@@@ -6813,16 -7141,16 +7137,16 @@@
build_libtool_libs=no
fi
else
- $ECHO "*** The inter-library dependencies that have been dropped here will be"
- $ECHO "*** automatically added whenever a program is linked with this library"
- $ECHO "*** or is declared to -dlopen it."
+ echo "*** The inter-library dependencies that have been dropped here will be"
+ echo "*** automatically added whenever a program is linked with this library"
+ echo "*** or is declared to -dlopen it."
if test "$allow_undefined" = no; then
- $ECHO
- $ECHO "*** Since this library must not contain undefined symbols,"
- $ECHO "*** because either the platform does not support them or"
- $ECHO "*** it was explicitly requested with -no-undefined,"
- $ECHO "*** libtool will only create a static version of it."
+ echo
+ echo "*** Since this library must not contain undefined symbols,"
+ echo "*** because either the platform does not support them or"
+ echo "*** it was explicitly requested with -no-undefined,"
+ echo "*** libtool will only create a static version of it."
if test "$build_old_libs" = no; then
oldlibs="$output_objdir/$libname.$libext"
build_libtool_libs=module
@@@ -6839,9 -7167,9 +7163,9 @@@
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
case $host in
*-*-darwin*)
- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
- new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
- deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
;;
esac
@@@ -6963,7 -7291,7 +7287,7 @@@
done
# Use standard objects if they are pic
- test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
test "X$libobjs" = "X " && libobjs=
delfiles=
@@@ -7029,7 -7357,7 +7353,7 @@@
if test -n "$export_symbols" && test -n "$include_expsyms"; then
tmp_export_symbols="$export_symbols"
test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
- $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
fi
if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
@@@ -7130,7 -7458,8 +7454,8 @@@
save_libobjs=$libobjs
fi
save_output=$output
- output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
+ func_basename "$output"
+ output_la=$func_basename_result
# Clear the reloadable object creation command queue and
# initialize k to one.
@@@ -7143,12 -7472,12 +7468,12 @@@
if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
output=${output_objdir}/${output_la}.lnkscript
func_verbose "creating GNU ld script: $output"
- $ECHO 'INPUT (' > $output
+ echo 'INPUT (' > $output
for obj in $save_libobjs
do
$ECHO "$obj" >> $output
done
- $ECHO ')' >> $output
+ echo ')' >> $output
delfiles="$delfiles $output"
elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
output=${output_objdir}/${output_la}.lnk
@@@ -7190,17 -7519,19 +7515,19 @@@
# command to the queue.
if test "$k" -eq 1 ; then
# The first file doesn't have a previous command to add.
- eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
+ reload_objs=$objlist
+ eval concat_cmds=\"$reload_cmds\"
else
# All subsequent reloadable object files will link in
# the last one created.
- eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
+ reload_objs="$objlist $last_robj"
+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
fi
last_robj=$output_objdir/$output_la-${k}.$objext
func_arith $k + 1
k=$func_arith_result
output=$output_objdir/$output_la-${k}.$objext
- objlist=$obj
+ objlist=" $obj"
func_len " $last_robj"
func_arith $len0 + $func_len_result
len=$func_arith_result
@@@ -7210,7 -7541,8 +7537,8 @@@
# reloadable object file. All subsequent reloadable object
# files will link in the last one created.
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
- eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+ reload_objs="$objlist $last_robj"
+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
if test -n "$last_robj"; then
eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
fi
@@@ -7269,7 -7601,7 +7597,7 @@@
if test -n "$export_symbols" && test -n "$include_expsyms"; then
tmp_export_symbols="$export_symbols"
test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
- $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
fi
if test -n "$orig_export_symbols"; then
@@@ -7434,7 -7766,7 +7762,7 @@@
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
- reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+ reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
else
gentop="$output_objdir/${obj}x"
generated="$generated $gentop"
@@@ -7445,7 -7777,7 +7773,7 @@@
fi
# Create the old-style object.
- reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+ reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
output="$obj"
func_execute_cmds "$reload_cmds" 'exit $?'
@@@ -7505,8 -7837,8 +7833,8 @@@
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+ compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
+ finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
;;
esac
@@@ -7523,8 -7855,8 +7851,8 @@@
esac
fi
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
;;
esac
@@@ -7661,8 -7993,8 +7989,8 @@@
if test -n "$libobjs" && test "$build_old_libs" = yes; then
# Transform all the library objects into standard objects.
- compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
- finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+ finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
fi
func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
@@@ -7674,15 -8006,15 +8002,15 @@@
wrappers_required=yes
case $host in
+ *cegcc* | *mingw32ce*)
+ # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
+ wrappers_required=no
+ ;;
*cygwin* | *mingw* )
if test "$build_libtool_libs" != yes; then
wrappers_required=no
fi
;;
- *cegcc)
- # Disable wrappers for cegcc, we are cross compiling anyway.
- wrappers_required=no
- ;;
*)
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
wrappers_required=no
@@@ -7691,7 -8023,7 +8019,7 @@@
esac
if test "$wrappers_required" = no; then
# Replace the output file specification.
- compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
@@@ -7738,7 -8070,7 +8066,7 @@@
# We don't need to create a wrapper script.
link_command="$compile_var$compile_command$compile_rpath"
# Replace the output file specification.
- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
# Delete the old output file.
$opt_dry_run || $RM $output
# Link the executable and exit
@@@ -7757,7 -8089,7 +8085,7 @@@
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
- relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+ relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
else
# fast_install is set to needless
relink_command=
@@@ -7769,7 -8101,7 +8097,7 @@@
fi
# Replace the output file specification.
- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
# Delete the old output files.
$opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
@@@ -7793,18 -8125,7 +8121,7 @@@
fi
done
relink_command="(cd `pwd`; $relink_command)"
- relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
- fi
-
- # Quote $ECHO for shipping.
- if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
- case $progpath in
- [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
- *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
- esac
- qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
- else
- qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
fi
# Only actually do things if not in dry run mode.
@@@ -7925,7 -8246,7 +8242,7 @@@
done | sort | sort -uc >/dev/null 2>&1); then
:
else
- $ECHO "copying selected object files to avoid basename conflicts..."
+ echo "copying selected object files to avoid basename conflicts..."
gentop="$output_objdir/${outputname}x"
generated="$generated $gentop"
func_mkdir_p "$gentop"
@@@ -8036,7 -8357,7 +8353,7 @@@
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
- relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
@@@ -8121,9 -8442,27 +8438,27 @@@
fi
$RM $output
# place dlname in correct position for cygwin
+ # In fact, it would be nice if we could use this code for all target
+ # systems that can't hard-code library paths into their executables
+ # and that have no shared library path variable independent of PATH,
+ # but it turns out we can't easily determine that from inspecting
+ # libtool variables, so we have to hard-code the OSs to which it
+ # applies here; at the moment, that means platforms that use the PE
+ # object format with DLL files. See the long comment at the top of
+ # tests/bindir.at for full details.
tdlname=$dlname
case $host,$output,$installed,$module,$dlname in
- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+ # If a -bindir argument was supplied, place the dll there.
+ if test "x$bindir" != x ;
+ then
+ func_relative_path "$install_libdir" "$bindir"
+ tdlname=$func_relative_path_result$dlname
+ else
+ # Otherwise fall back on heuristic.
+ tdlname=../bin/$dlname
+ fi
+ ;;
esac
$ECHO > $output "\
# $outputname - a libtool library file
--
pulseaudio packaging
More information about the pkg-pulseaudio-devel
mailing list