From 4016b657973bba87caf75168ba70aaa85d556487 Mon Sep 17 00:00:00 2001 From: Martin Lucina Date: Mon, 23 Jan 2012 09:00:28 +0100 Subject: Imported Upstream version 2.1.11 --- AUTHORS | 7 + ChangeLog | 553 ++++ Makefile.in | 3 +- NEWS | 40 +- acinclude.m4 | 22 + aclocal.m4 | 18 +- builds/msvc/Makefile.in | 3 +- config/config.guess | 219 +- config/config.sub | 156 +- config/libtool.m4 | 1996 +++++++----- config/ltmain.sh | 3967 +++++++++++++++--------- config/ltoptions.m4 | 13 +- config/ltversion.m4 | 12 +- config/lt~obsolete.m4 | 12 +- configure | 4558 ++++++++++++++++------------ configure.in | 20 +- doc/Makefile.in | 3 +- doc/zmq.7 | 6 +- doc/zmq_bind.3 | 4 +- doc/zmq_close.3 | 4 +- doc/zmq_connect.3 | 4 +- doc/zmq_cpp.7 | 6 +- doc/zmq_device.3 | 6 +- doc/zmq_epgm.7 | 4 +- doc/zmq_errno.3 | 6 +- doc/zmq_getsockopt.3 | 4 +- doc/zmq_init.3 | 6 +- doc/zmq_inproc.7 | 6 +- doc/zmq_ipc.7 | 4 +- doc/zmq_msg_close.3 | 6 +- doc/zmq_msg_copy.3 | 6 +- doc/zmq_msg_data.3 | 6 +- doc/zmq_msg_init.3 | 6 +- doc/zmq_msg_init_data.3 | 6 +- doc/zmq_msg_init_size.3 | 6 +- doc/zmq_msg_move.3 | 6 +- doc/zmq_msg_size.3 | 4 +- doc/zmq_pgm.7 | 4 +- doc/zmq_poll.3 | 4 +- doc/zmq_recv.3 | 4 +- doc/zmq_send.3 | 4 +- doc/zmq_setsockopt.3 | 4 +- doc/zmq_socket.3 | 20 +- doc/zmq_socket.html | 206 +- doc/zmq_socket.txt | 14 +- doc/zmq_strerror.3 | 6 +- doc/zmq_tcp.7 | 4 +- doc/zmq_term.3 | 4 +- doc/zmq_version.3 | 6 +- foreign/openpgm/Makefile.in | 3 +- foreign/openpgm/libpgm-5.1.115~dfsg.tar.gz | Bin 1054630 -> 0 bytes foreign/openpgm/libpgm-5.1.118~dfsg.tar.gz | Bin 0 -> 1046589 bytes include/zmq.h | 2 +- include/zmq.hpp | 39 + perf/Makefile.in | 3 +- src/Makefile.in | 3 +- src/clock.cpp | 12 + src/device.cpp | 14 + src/err.cpp | 13 + src/err.hpp | 26 +- src/ip.cpp | 6 +- src/kqueue.cpp | 29 +- src/mailbox.cpp | 5 + src/platform.hpp.in | 12 + src/tcp_socket.cpp | 26 +- src/uuid.cpp | 14 +- src/uuid.hpp | 5 + src/xrep.cpp | 1 - src/zmq.cpp | 2 +- tests/Makefile.in | 3 +- zeromq.spec | 2 +- 71 files changed, 7785 insertions(+), 4423 deletions(-) delete mode 100644 foreign/openpgm/libpgm-5.1.115~dfsg.tar.gz create mode 100644 foreign/openpgm/libpgm-5.1.118~dfsg.tar.gz diff --git a/AUTHORS b/AUTHORS index 7e785bf..d90f26c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,6 +1,7 @@ Contributors ============ +AJ Lewis Alexej Lotz Asko Kauppi Barak Amar @@ -47,14 +48,18 @@ Mikko Koppanen Min Ragan-Kelley Neale Ferguson Nir Soffer +Paul Betts +Paul Colomiets Pavel Gushcha Pavol Malosek Peter Bourgon +Philip Kovacs Pieter Hintjens Piotr Trojanek Robert G. Jakabosky Sebastian Otaegui Steven McCoy +Stuart Webster Tamara Kustarova Taras Shpot Tero Marttila @@ -65,6 +70,8 @@ Tore Halvorsen Vitaly Mayatskikh Ghislain Putois William Roberts +Botond Ballo + Credits ======= diff --git a/ChangeLog b/ChangeLog index ee15982..9161480 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,558 @@ # Generated by Makefile. Do not edit. +commit 73f167eeb5ce9d26678399a574918f9813976024 +Author: Pieter Hintjens +Date: Sun Dec 18 19:11:17 2011 -0600 + + Updated NEWS for 2.1.11 + + NEWS | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 1e49dda4da68c92b410c93065a9dac908bef4cf6 +Author: Pieter Hintjens +Date: Tue Dec 6 14:21:17 2011 +0100 + + Updated NEWS for issue 290 + + NEWS | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +commit 354faeb8360c434600b6c5e34dc1c249991bc014 +Merge: 04b2ef2 1f1b454 +Author: Pieter Hintjens +Date: Mon Dec 5 08:18:28 2011 -0800 + + Merge pull request #35 from mika-fischer/libzmq-290 + + Use monotonic clock for clock_t + +commit 1f1b4543750d9ec882cc83c3e0f49b568c57bbf5 +Author: Mika Fischer +Date: Fri Dec 2 09:43:44 2011 +0100 + + Use monotonic clock for clock_t + + This makes clock_t insensitive to the system clock being reset by NTP or + the sysadmin, which could previously cause long hangs for instance in + zmq_poll. + + configure.in | 4 ++-- + src/clock.cpp | 12 ++++++++++++ + 2 files changed, 14 insertions(+), 2 deletions(-) + +commit 04b2ef208d9fc9bea382fcfb2d0eb3efa36d5f9f +Author: Pieter Hintjens +Date: Wed Nov 30 17:14:18 2011 -0600 + + Reverted commit 1fb107, which was causing memory violations + + NEWS | 2 +- + src/xrep.cpp | 9 +++++---- + 2 files changed, 6 insertions(+), 5 deletions(-) + +commit 0919e99c394c426685e74154fea06ed04b50d5ba +Author: Pieter Hintjens +Date: Wed Nov 30 14:01:43 2011 -0600 + + Wasn't compiling... what happened to xrep.cpp? + + src/xrep.cpp | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit d6cd256584f65764795d82aac0f7850a9cd920de +Author: Pieter Hintjens +Date: Wed Nov 30 14:01:22 2011 -0600 + + Fixed issue 254 + + NEWS | 2 ++ + src/tcp_socket.cpp | 16 +++++++++++----- + 2 files changed, 13 insertions(+), 5 deletions(-) + +commit 4212c4b6dd11971c3dc9f6b2426f787939cc0c04 +Author: Pieter Hintjens +Date: Sun Nov 27 09:11:15 2011 -0600 + + Revert "Fixes duplicated variable error" + + This reverts commit 26da87062080a9247401efd1a85f747c59365db1. + + src/xrep.cpp | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 35df57cda6861cac31710ad2a10fae4c97c0e63c +Author: Martin Sustrik +Date: Mon Nov 21 08:11:33 2011 +0100 + + Phillip Kovacs added to the AUTHORS file + + Signed-off-by: Martin Sustrik + + AUTHORS | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit 1fb107166f67091c4e1e20a0e511e78e4bf13c7b +Merge: d3a1ba6 26da870 +Author: Pieter Hintjens +Date: Sat Nov 19 15:52:02 2011 -0800 + + Merge pull request #28 from gsandoval/master + + Fixes memory leak in XREP xsend + +commit d3a1ba6ae4a0e3939fb9e48935ac341504cd513d +Author: Pieter Hintjens +Date: Sat Nov 19 17:50:59 2011 -0600 + + Added Botond Ballo to authors + + AUTHORS | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +commit 9861b49161aba728151e06bcd50c0ec7bb11121c +Merge: ad47cc5 0ceb637 +Author: Pieter Hintjens +Date: Sat Nov 19 15:48:53 2011 -0800 + + Merge pull request #33 from botond-ballo/master + + C++11 move constructor and move assignment operator for zmq::socket_t and zmq::context_t + +commit 0ceb637b379c65b49d0a5b572e2b0715fcfb3531 +Author: Botond Ballo +Date: Sat Nov 19 18:00:25 2011 -0500 + + Fixed indentation of preprocessor directives + + Fixed indentation of preprocessor directives to it's consistent with + other headers. + Signed-off-by: Botond Ballo + + include/zmq.hpp | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +commit 573614acf14936772fbc4edee5b2c791a8ab4283 +Author: Botond Ballo +Date: Sat Nov 19 17:57:00 2011 -0500 + + Fixed indentation of preprocessor directives. + + Fixed indentation of preprocessor directives to make it consistent with + other headers. + + Signed-off-by: Botond Ballo + + include/zmq.hpp | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +commit 315e563eddc856cdeb062b07c780a476aca954e5 +Author: Botond Ballo +Date: Sat Nov 19 17:44:17 2011 -0500 + + C++11 move constructor/assignment operator for socket_t and context_t + + Added a C++11 move constructor and move assignment operator to zmq::socket_t + and zmq::context_t. These functions are only enabled if the compiler supports + C++11 rvalue references. Currently the code can detect rvalue reference + support for the following compilers: GCC, MSVC, clang. + + Signed-off-by: Botond Ballo + + include/zmq.hpp | 39 +++++++++++++++++++++++++++++++++++++++ + 1 files changed, 39 insertions(+), 0 deletions(-) + +commit ad47cc55cf39660ce533e7921fe259d32d4c4a49 +Author: Martin Sustrik +Date: Sat Nov 19 10:06:06 2011 +0100 + + Stuart Webster added to the AUTHORS file + + Signed-off-by: Martin Sustrik + + AUTHORS | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit bed61c78946e5719bfbd1477ded6c577fe811163 +Author: Stuart Webster +Date: Sat Nov 19 10:02:23 2011 +0100 + + Line-ending conversion rules for hg-git users and enabled use of .gitignore by hg-git users + + Mercurial does not have built-in support for converting line-endings. This is a + settings file for hg eol (http://mercurial.selenic.com/wiki/EolExtension), an + extension that replicates the behaviour of git with core.autocrlf=true. + + Mercurial uses Python regex syntax by default in its .hgignore files. Adding + this line to .gitignore overrides that setting, so hg-git users can just create + a hardlink to it (e.g "mklink /H .hgignore .gitignore" on Windows) to use it. + + Signed-off-by: Stuart Webster + + .gitignore | 1 + + .hgeol | 2 ++ + 2 files changed, 3 insertions(+), 0 deletions(-) + +commit a247c7d422c86cd78ef6f5b8dad8fbfd9a00aeea +Author: Pieter Hintjens +Date: Thu Nov 17 11:20:21 2011 -0600 + + Updated NEWS for issue 281 + + NEWS | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +commit 561a9d2d8022d76166e1de981543337a783f6076 +Merge: 69bc977 c4dabba +Author: Pieter Hintjens +Date: Thu Nov 17 09:16:43 2011 -0800 + + Merge pull request #32 from mika-fischer/libzmq-281 + + Work around for LIBZMQ-281 + +commit c4dabba55f71d2648d9196cd5ef3b2c7238ab254 +Author: Mika Fischer +Date: Thu Nov 17 13:33:55 2011 +0100 + + Work around for LIBZMQ-281 + + The problem is that other threads might still be in mailbox::send() when + it is destroyed. So as a workaround, we just acquire the mutex in the + destructor. Therefore the running send will finish before the mailbox is + destroyed. + + Signed-off-by: Mika Fischer + + src/mailbox.cpp | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +commit 69bc97726e0ec0ffb509eaf4f50e86616544677f +Author: Pieter Hintjens +Date: Wed Nov 16 11:42:08 2011 -0600 + + Fixed erroneous ifdef -- backport 83975c1 + + src/ip.cpp | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 5819d702ff48af12d02276cb79eef0c2068d0dc3 +Author: Pieter Hintjens +Date: Sat Nov 5 20:34:28 2011 +0100 + + Added AJ Lewis to AUTHORS + + AUTHORS | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit 4c7e6d6156d1225f00701ba460c062524e5a474d +Author: Pieter Hintjens +Date: Fri Nov 4 21:09:47 2011 +0100 + + Updated NEWS + + NEWS | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) + +commit 533a94ba0741e54de832140bdffff53d944441c9 +Merge: 6e5a3e9 1afd7a0 +Author: Pieter Hintjens +Date: Fri Nov 4 12:59:40 2011 -0700 + + Merge pull request #30 from vortechs2000/master + + Get zeromq compiling on AIX 6.1 + +commit 1afd7a088400b39fd3309ff996ffbf9e567463ff +Author: AJ Lewis +Date: Thu Nov 3 12:10:35 2011 -0500 + + Combine the existing freebsd/netbsd section with the new HP-UX DCE section + + Using a couple #ifdefs, we can combine the freebsd/netbsd uuid section with + the HP-UX DEC section in uuid.cpp. + + Signed-off-by: AJ Lewis + + src/uuid.cpp | 39 +++++++++++---------------------------- + 1 files changed, 11 insertions(+), 28 deletions(-) + +commit 357a6e9f05110e241a1682f841b886b88e442263 +Author: AJ Lewis +Date: Thu Nov 3 11:57:52 2011 -0500 + + Implement DCE uuid calls properly + + Create HPUX & LIBDCEKT specific sections similar to BSD section. It's + possible that these could be merged, but I'm not sure if it would be + as readable because there are some type differences that might make + things difficult. + + Signed-off-by: AJ Lewis + + src/uuid.cpp | 37 +++++++++++++++++++++++++------------ + src/uuid.hpp | 5 +++++ + 2 files changed, 30 insertions(+), 12 deletions(-) + +commit 857c7f91d1e3c5c82408b9d932e117145678b814 +Author: AJ Lewis +Date: Thu Nov 3 11:37:41 2011 -0500 + + Use DCE library on HP-UX to handle UUID generation + + This is the initial dumb implementation - it just replaces RAND_bytes + in the final uuid case rather than handling uuid_create() as done in + the BSD case. + + It passes the self tests, but it's probably not the correct way to do + it. + + You can also use the openssl method my using the '--without-dce' flag + to configure. + + Signed-off-by: AJ Lewis + + configure.in | 9 ++++++++- + src/uuid.cpp | 12 ++++++++++++ + 2 files changed, 20 insertions(+), 1 deletions(-) + +commit e5742c20cb076a1867ca7d42668ac1a53aab6b58 +Merge: f32cf6d 6e5a3e9 +Author: AJ Lewis +Date: Thu Nov 3 11:35:22 2011 -0500 + + Merge remote-tracking branch 'upstream/master' + +commit 6e5a3e9358373d28123d3b19e91f5a6ff7486073 +Author: Pieter Hintjens +Date: Fri Oct 28 05:43:35 2011 +0900 + + Updated NEWS + + NEWS | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 4cf638a2502a6d344c9e25ef5252b2d45613f7de +Author: Bernd Prager +Date: Thu Oct 27 17:11:28 2011 +0200 + + Missing bracket added + + Signed-off: Martin Sustrik + + src/zmq.cpp | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 8c502692dad0a29e0b98e895b3b04f3d783b5b42 +Author: Pieter Hintjens +Date: Fri Oct 28 05:38:05 2011 +0900 + + Updated NEWS + + NEWS | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +commit b75c06c34f991d96a3b21d48b74efc029df7c800 +Author: Martin Sustrik +Date: Thu Oct 27 11:51:23 2011 +0200 + + Paul Betts added to the AUTHORS file + + Signed-off-by: Martin Sustrik + + Conflicts: + + AUTHORS + + AUTHORS | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +commit 19c865d3d7d6a4157205b4036e95e45955459a0b +Author: Paul Betts +Date: Thu Oct 27 11:48:58 2011 +0200 + + Enable exceptions raising on assert on Win32 + + This patch changes the Win32 version to call RaiseException instead of abort + (which eventually calls TerminateProcess). This allows crash dumps to be sent + correctly instead of the process disappearing. + + Signed-off-by: Paul Betts + + src/err.cpp | 13 +++++++++++++ + src/err.hpp | 26 ++++++++++++++------------ + 2 files changed, 27 insertions(+), 12 deletions(-) + +commit b40d7c18ad1a3210a49da088b65060f784d17009 +Author: Pieter Hintjens +Date: Fri Oct 28 05:33:13 2011 +0900 + + Updated NEWS for issue 261 + + NEWS | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +commit 99e7b6a44ee81d1807a5c8a577eea366e4d7275f +Author: Martin Sustrik +Date: Thu Oct 27 09:41:48 2011 +0200 + + Bug in kqueue poller fixed (issue 261) + + Signed-off-by: Martin Sustrik + + src/kqueue.cpp | 25 +++++++++++++++++-------- + 1 files changed, 17 insertions(+), 8 deletions(-) + +commit b2974da2ba800d2c2b5eb76e1123e95ec63fedf4 +Author: Pieter Hintjens +Date: Fri Oct 28 05:32:02 2011 +0900 + + Revert "Applied workaround for issue 261" + + This reverts commit ddc75f9e54f1fc95a057e935c51c0c22e53df6e7. + + NEWS | 7 +++---- + src/kqueue.cpp | 4 +--- + 2 files changed, 4 insertions(+), 7 deletions(-) + +commit 686f9f53641899d2e4863526aa52fe47c6fb6bc0 +Author: Mikko Koppanen +Date: Thu Oct 27 20:37:06 2011 +0100 + + Fix issue LIBZMQ-273 + + NEWS | 3 +++ + acinclude.m4 | 22 ++++++++++++++++++++++ + configure.in | 5 +++++ + src/ip.cpp | 4 ++-- + 4 files changed, 32 insertions(+), 2 deletions(-) + +commit f32cf6d4991bf7a334fa8350157d51fb5469ed50 +Author: AJ Lewis +Date: Thu Oct 27 08:42:11 2011 -0500 + + Get zeromq compiling on AIX 6.1 + + Includes platform.hpp in device.cpp and then adds the same check for + platforms found in zmq.cpp to include poll.h. Without this, device.cpp + fails to compile with: + device.cpp: In function 'int zmq::device(zmq::socket_base_t*, zmq::socket_base_t*)': + device.cpp:46: error: 'struct zmq_pollitem_t' has no member named 'reqevents' + device.cpp:47: error: 'struct zmq_pollitem_t' has no member named 'rtnevents' + device.cpp:50: error: 'struct zmq_pollitem_t' has no member named 'reqevents' + device.cpp:51: error: 'struct zmq_pollitem_t' has no member named 'rtnevents' + device.cpp:67: error: 'struct zmq_pollitem_t' has no member named 'rtnevents' + device.cpp:92: error: 'struct zmq_pollitem_t' has no member named 'rtnevents' + gmake[1]: *** [libzmq_la-device.lo] Error 1 + + Signed-off-by: AJ Lewis + + src/device.cpp | 14 ++++++++++++++ + 1 files changed, 14 insertions(+), 0 deletions(-) + +commit 26da87062080a9247401efd1a85f747c59365db1 +Author: Guillermo Sandoval +Date: Mon Oct 24 16:14:43 2011 -0500 + + Fixes duplicated variable error + + src/xrep.cpp | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 826d61244360d703f38cfc59ee643a177fb8b65e +Author: Guillermo Sandoval +Date: Mon Oct 24 16:10:12 2011 -0500 + + Calls zmq_msg_close regardless of the message is send or not. So it fixes memory leak in XREP + + src/xrep.cpp | 3 --- + 1 files changed, 0 insertions(+), 3 deletions(-) + +commit daac034503589ed7dabe77fdecb5f1a360ced638 +Merge: db69361 c3af879 +Author: Guillermo Sandoval +Date: Mon Oct 24 16:08:33 2011 -0500 + + Merge branch 'master' of github.com:gsandoval/zeromq2-1 + +commit db69361650acb476269623e01b6f548a549365fa +Author: Guillermo Sandoval +Date: Mon Oct 24 15:14:08 2011 -0500 + + Fixes memory leak in XREP sockets, occurring when the message was successfully sent. + + src/xrep.cpp | 6 ++---- + 1 files changed, 2 insertions(+), 4 deletions(-) + +commit c3af87950559ce87c5f5798ec4c950a6ea5e7e55 +Author: Guillermo Sandoval +Date: Mon Oct 24 15:14:08 2011 -0500 + + Fixes memory leak in XREP sockets, occurring when the message was successfully sent. + + src/xrep.cpp | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +commit 808c3b9ff6756566d7da3a8f2ae5f626d9fd1b13 +Author: Pieter Hintjens +Date: Wed Oct 12 06:52:31 2011 -0500 + + Updated NEWS for issue 269 + + NEWS | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +commit 5f248ef1a63f36e0932db122b73e7f4ce4cf7cd0 +Author: Pieter Hintjens +Date: Wed Oct 12 05:51:39 2011 -0500 + + Revert "Added diagnostics for issue 254" + + This reverts commit 80b0041ea1685ed49c222d237b4c9c49bd495b64. + + src/tcp_socket.cpp | 10 ++-------- + 1 files changed, 2 insertions(+), 8 deletions(-) + +commit 3014e0f87129695c5230ffbc5b68cdf007878de2 +Author: Pieter Hintjens +Date: Wed Oct 5 15:50:35 2011 +0200 + + Clarified doc to say 'round-robined' instead of 'load-balanced' + + doc/zmq_socket.txt | 14 +++++++------- + 1 files changed, 7 insertions(+), 7 deletions(-) + +commit b71462bf750cf00210669921e32fdd2f85d40eb8 +Author: Pieter Hintjens +Date: Wed Oct 5 14:34:35 2011 +0200 + + Updated NEWS for OpenPGM updated + + NEWS | 12 ++++++++++++ + 1 files changed, 12 insertions(+), 0 deletions(-) + +commit 77c8c7f11865b1e1b8c4e11cb5ef6297bc6b774e +Author: Steven McCoy +Date: Tue Oct 4 09:39:55 2011 +0200 + + New upstream OpenPGM maintenance release 5.1.118. + + Signed-off-by: Steven McCoy + + configure.in | 2 +- + foreign/openpgm/libpgm-5.1.115~dfsg.tar.gz | Bin 1054630 -> 0 bytes + foreign/openpgm/libpgm-5.1.118~dfsg.tar.gz | Bin 0 -> 1046589 bytes + 3 files changed, 1 insertions(+), 1 deletions(-) + +commit 0bbc1755387b743aaa086bdc268bcb65fab90af3 +Author: Pieter Hintjens +Date: Mon Oct 3 07:42:08 2011 -0500 + + Updated version to 2.1.11 + + include/zmq.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + commit ab64a395a01293453da606f08e0983ae8bbeb210 Author: Pieter Hintjens Date: Mon Oct 3 07:24:15 2011 -0500 diff --git a/Makefile.in b/Makefile.in index 30d5d0b..32d629f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -164,6 +164,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LTVER = @LTVER@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -195,6 +196,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -230,7 +232,6 @@ libzmq_have_asciidoc = @libzmq_have_asciidoc@ libzmq_have_xmlto = @libzmq_have_xmlto@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/NEWS b/NEWS index fa237fc..936a027 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,36 @@ +0MQ version 2.1.11 (Stable), released on 2011/12/18 +=================================================== + +Bug fixes +--------- + +* Fixed issue 290, zmq_poll was using system time instead of monotonic + clock (Mika Fischer). + +* Fixed issue 281, crash on heavy socket creation - assertion failure in + mutex.hpp:91. (Mika Fischer). + +* Fixed issue 273, O_CLOEXEC flag used in ip.cpp:192 is supported only + on Linux kernels 2.6.27+ + +* Fixed issue 261, assertion failure in kqueue.cpp:76. + +* Fixed issue 269, faulty diagnostic code in 2.1.10. + +* Fixed issue 254, assertion failure at tcp_socket.cpp:229 on ENOTCONN. + +Changes +------- + +* Now builds properly on AIX 6.1 (AJ Lewis). + +* Builds using libdcekt on HP-UX (AJ Lewis). + +* New upstream OpenPGM maintenance release 5.1.118. + +* Enabled debugging on assertion failure on Windows (Paul Betts). + + 0MQ version 2.1.10 (Stable), released on 2011/10/03 =================================================== @@ -15,11 +48,10 @@ Bug fixes * Fixed issue 218, sockets not opened with SOCK_CLOEXEC, causing fork/exec to sit on sockets unnecessarily. -* Fixed issue 250, build errors on Windows. - -* Fixed issue 252, assertion failure in req.cpp:87 and req.cpp:88. +* Fixed issue 250, build errors on Windows (Mikko Koppanen). -* Fixed issue 261, assertion failure in kqueue.cpp:76 on OS/X. +* Fixed issue 252, assertion failure in req.cpp:87 and req.cpp:88 (Mikko + Koppanen). 0MQ version 2.1.9 (Stable), released on 2011/08/29 diff --git a/acinclude.m4 b/acinclude.m4 index bfafc7c..597252d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -580,3 +580,25 @@ AC_DEFUN([LIBZMQ_CHECK_LANG_VISIBILITY], [{ AS_IF([test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_visibility_flag" != "x"], [AC_MSG_RESULT(yes) ; $1], [AC_MSG_RESULT(no) ; $2]) }]) + +dnl ################################################################################ +dnl # LIBZMQ_CHECK_SOCK_CLOEXEC([action-if-found], [action-if-not-found]) # +dnl # Check if SOCK_CLOEXEC is supported # +dnl ################################################################################ +AC_DEFUN([LIBZMQ_CHECK_SOCK_CLOEXEC], [{ + AC_MSG_CHECKING(whether SOCK_CLOEXEC is supported) + AC_TRY_RUN([/* SOCK_CLOEXEC test */ +#include +#include + +int main (int argc, char *argv []) +{ + int s = socket (PF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0); + return (s == -1); +} + ], + [AC_MSG_RESULT(yes) ; libzmq_cv_sock_cloexec="yes" ; $1], + [AC_MSG_RESULT(no) ; libzmq_cv_sock_cloexec="no" ; $2], + [AC_MSG_RESULT(not during cross-compile) ; libzmq_cv_sock_cloexec="no"] + ) +}]) diff --git a/aclocal.m4 b/aclocal.m4 index bd741d2..f6043f0 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -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.67],, -[m4_warning([this file was generated for autoconf 2.67. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, +[m4_warning([this file was generated for autoconf 2.68. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -47,7 +47,8 @@ To do so, use the procedure documented by the package, typically `autoreconf'.]) # ---------------------------------- AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) @@ -93,7 +94,8 @@ m4_define([_PKG_CONFIG], pkg_cv_[]$1="$$1" elif test -n "$PKG_CONFIG"; then PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes]) else pkg_failed=untried @@ -141,9 +143,9 @@ 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` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -156,7 +158,7 @@ $$1_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT])dnl +_PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then AC_MSG_RESULT([no]) @@ -167,7 +169,7 @@ path to pkg-config. _PKG_TEXT -To get pkg-config, see .])dnl +To get pkg-config, see .])[]dnl ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS diff --git a/builds/msvc/Makefile.in b/builds/msvc/Makefile.in index 6283062..4f207da 100644 --- a/builds/msvc/Makefile.in +++ b/builds/msvc/Makefile.in @@ -107,6 +107,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LTVER = @LTVER@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -138,6 +139,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -173,7 +175,6 @@ libzmq_have_asciidoc = @libzmq_have_asciidoc@ libzmq_have_xmlto = @libzmq_have_xmlto@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/config/config.guess b/config/config.guess index c2246a4..40eaed4 100755 --- a/config/config.guess +++ b/config/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011 Free Software Foundation, Inc. -timestamp='2009-12-30' +timestamp='2011-05-11' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -57,7 +57,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -181,7 +181,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -224,7 +224,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -270,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -296,7 +299,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} @@ -395,23 +398,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -481,8 +484,8 @@ EOF echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -495,7 +498,7 @@ EOF else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -552,7 +555,7 @@ EOF echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -595,52 +598,52 @@ EOF 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c - #define _HPUX_SOURCE - #include - #include + #define _HPUX_SOURCE + #include + #include - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -731,22 +734,22 @@ EOF exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -770,14 +773,14 @@ EOF exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -805,14 +808,14 @@ EOF echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; @@ -867,7 +870,7 @@ EOF EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; - esac + esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} @@ -879,7 +882,13 @@ EOF then echo ${UNAME_MACHINE}-unknown-linux-gnu else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + fi fi exit ;; avr32*:Linux:*:*) @@ -892,7 +901,7 @@ EOF echo crisv32-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo frv-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -960,7 +969,7 @@ EOF echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -968,6 +977,9 @@ EOF sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-tilera-linux-gnu + exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; @@ -975,7 +987,7 @@ EOF echo x86_64-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -984,11 +996,11 @@ EOF echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1020,7 +1032,7 @@ EOF fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1048,13 +1060,13 @@ EOF exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp - exit ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1089,8 +1101,8 @@ EOF /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ @@ -1133,10 +1145,10 @@ EOF echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -1162,11 +1174,11 @@ EOF exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1231,6 +1243,9 @@ EOF *:QNX:*:4*) echo i386-pc-qnx exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; NSE-?:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; @@ -1276,13 +1291,13 @@ EOF echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1322,11 +1337,11 @@ main () #include printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif diff --git a/config/config.sub b/config/config.sub index c2d1257..30fdca8 100755 --- a/config/config.sub +++ b/config/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011 Free Software Foundation, Inc. -timestamp='2010-01-22' +timestamp='2011-03-23' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -76,7 +76,7 @@ version="\ GNU config.sub ($timestamp) Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -124,8 +124,9 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os @@ -157,8 +158,8 @@ case $os in os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + -bluegene*) + os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) os= @@ -174,10 +175,10 @@ case $os in os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -282,11 +283,13 @@ case $basic_machine in | moxie \ | mt \ | msp430 \ + | nds32 | nds32le | nds32be \ | nios | nios2 \ | ns16k | ns32k \ + | open8 \ | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ | rx \ | score \ @@ -294,15 +297,24 @@ case $basic_machine in | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ | v850 | v850e \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; m6811 | m68hc11 | m6812 | m68hc12 | picochip) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -314,6 +326,18 @@ case $basic_machine in basic_machine=mt-unknown ;; + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -334,7 +358,7 @@ case $basic_machine in | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ @@ -368,26 +392,28 @@ case $basic_machine in | mmix-* \ | mt-* \ | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tile-* | tilegx-* \ | tron-* \ | ubicom32-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) @@ -412,7 +438,7 @@ case $basic_machine in basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -482,11 +508,20 @@ case $basic_machine in basic_machine=powerpc-ibm os=-cnk ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; - cegcc) + cegcc) basic_machine=arm-unknown os=-cegcc ;; @@ -518,7 +553,7 @@ case $basic_machine in basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -734,7 +769,7 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze) basic_machine=microblaze-xilinx ;; mingw32) @@ -841,6 +876,12 @@ case $basic_machine in np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -923,9 +964,10 @@ case $basic_machine in ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -1019,6 +1061,9 @@ case $basic_machine in basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1075,20 +1120,8 @@ case $basic_machine in basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; - # This must be matched before tile*. - tilegx*) + # This must be matched before tile*. + tilegx*) basic_machine=tilegx-unknown os=-linux-gnu ;; @@ -1163,6 +1196,9 @@ case $basic_machine in xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1260,11 +1296,11 @@ esac if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + -auroraux) + os=-auroraux ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` @@ -1301,7 +1337,8 @@ case $os in | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1348,7 +1385,7 @@ case $os in -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1397,7 +1434,7 @@ case $os in -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1442,8 +1479,8 @@ case $os in -dicos*) os=-dicos ;; - -nacl*) - ;; + -nacl*) + ;; -none) ;; *) @@ -1466,10 +1503,10 @@ else # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1481,8 +1518,17 @@ case $basic_machine in arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1509,7 +1555,7 @@ case $basic_machine in m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1536,7 +1582,7 @@ case $basic_machine in *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) diff --git a/config/libtool.m4 b/config/libtool.m4 index a3fee53..8ff3c76 100644 --- a/config/libtool.m4 +++ b/config/libtool.m4 @@ -1,7 +1,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # 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 free software; the Free Software Foundation gives @@ -10,7 +11,8 @@ m4_define([_LT_COPYING], [dnl # 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. @@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ]) -# serial 56 LT_INIT +# serial 57 LT_INIT # LT_PREREQ(VERSION) @@ -66,6 +68,7 @@ esac # ------------------ AC_DEFUN([LT_INIT], [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl AC_BEFORE([$0], [LT_LANG])dnl AC_BEFORE([$0], [LT_OUTPUT])dnl AC_BEFORE([$0], [LTDL_INIT])dnl @@ -82,6 +85,8 @@ AC_REQUIRE([LTVERSION_VERSION])dnl AC_REQUIRE([LTOBSOLETE_VERSION])dnl m4_require([_LT_PROG_LTMAIN])dnl +_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) + dnl Parse OPTIONS _LT_SET_OPTIONS([$0], [$1]) @@ -118,7 +123,7 @@ m4_defun([_LT_CC_BASENAME], *) 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-%%"` ]) @@ -138,6 +143,9 @@ m4_defun([_LT_FILEUTILS_DEFAULTS], m4_defun([_LT_SETUP], [AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl + _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -160,10 +168,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl m4_require([_LT_CMD_RELOAD])dnl m4_require([_LT_CHECK_MAGIC_METHOD])dnl +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl m4_require([_LT_CMD_OLD_ARCHIVE])dnl m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +m4_require([_LT_WITH_SYSROOT])dnl _LT_CONFIG_LIBTOOL_INIT([ # See if we are running on zsh, and set the options which allow our @@ -179,7 +190,6 @@ fi _LT_CHECK_OBJDIR m4_require([_LT_TAG_COMPILER])dnl -_LT_PROG_ECHO_BACKSLASH case $host_os in aix3*) @@ -193,23 +203,6 @@ aix3*) ;; 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 @@ -250,6 +243,28 @@ _LT_CONFIG_COMMANDS ])# _LT_SETUP +# _LT_PREPARE_SED_QUOTE_VARS +# -------------------------- +# Define a few sed substitution that help us do robust quoting. +m4_defun([_LT_PREPARE_SED_QUOTE_VARS], +[# 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' +]) + # _LT_PROG_LTMAIN # --------------- # Note that this code is called both from `configure', and `config.status' @@ -408,7 +423,7 @@ m4_define([_lt_decl_all_varnames], # declaration there will have the same value as in `configure'. VARNAME # must have a single quote delimited value for this to work. m4_define([_LT_CONFIG_STATUS_DECLARE], -[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) +[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) # _LT_CONFIG_STATUS_DECLARATIONS @@ -418,7 +433,7 @@ m4_define([_LT_CONFIG_STATUS_DECLARE], # embedded single quotes properly. In configure, this macro expands # each variable declared with _LT_DECL (and _LT_TAGDECL) into: # -# ='`$ECHO "X$" | $Xsed -e "$delay_single_quote_subst"`' +# ='`$ECHO "$" | $SED "$delay_single_quote_subst"`' m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) @@ -517,12 +532,20 @@ 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 lt_decl_all_varnames([[ \ ]], lt_decl_quote_varnames); 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\\\\\\"" @@ -533,9 +556,9 @@ done # Double-quote double-evaled strings. for var in lt_decl_all_varnames([[ \ ]], lt_decl_dquote_varnames); 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\\\\\\"" @@ -543,16 +566,38 @@ for var in lt_decl_all_varnames([[ \ esac done -# Fix-up fallback echo if it was mangled by the above quoting rules. -case \$lt_ECHO in -*'\\\[$]0 --fallback-echo"')dnl " - lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` - ;; -esac - _LT_OUTPUT_LIBTOOL_INIT ]) +# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) +# ------------------------------------ +# Generate a child script FILE with all initialization necessary to +# reuse the environment learned by the parent script, and make the +# file executable. If COMMENT is supplied, it is inserted after the +# `#!' sequence but before initialization text begins. After this +# macro, additional text can be appended to FILE to form the body of +# the child script. The macro ends with non-zero status if the +# file could not be fully written (such as if the disk is full). +m4_ifdef([AS_INIT_GENERATED], +[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], +[m4_defun([_LT_GENERATED_FILE_INIT], +[m4_require([AS_PREPARE])]dnl +[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl +[lt_write_fail=0 +cat >$1 <<_ASEOF || lt_write_fail=1 +#! $SHELL +# Generated by $as_me. +$2 +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL