[Pkg-voip-commits] [twinkle] 34/73: Imported Debian patch 1:1.2-1

Peter Colberg pc-guest at moszumanska.debian.org
Wed Jan 6 00:31:50 UTC 2016


This is an automated email from the git hooks/post-receive script.

pc-guest pushed a commit to branch master
in repository twinkle.

commit 6958263eef33678f7c52d27eb04be62a9157a73c
Merge: d8cd3fa 867c429
Author: Mikael Magnusson <mikma at users.sourceforge.net>
Date:   Sat Mar 15 18:43:10 2008 +0100

    Imported Debian patch 1:1.2-1

 ChangeLog                                          |   43 +-
 Makefile.in                                        |    3 +-
 NEWS                                               |   39 +
 acinclude.m4                                       |   18 +
 configure                                          |   97 +-
 configure.in                                       |   86 +-
 debian/changelog                                   |   16 +
 debian/control                                     |   16 +-
 debian/menu                                        |    2 +-
 debian/patches/libgsm.patch                        |  111 +-
 ...igure-boost.patch => z99-configure-boost.patch} | 1214 ++++--
 src/Makefile.am                                    |    6 +-
 src/Makefile.in                                    |   12 +-
 src/abstract_dialog.cpp                            |   39 +-
 src/abstract_dialog.h                              |   21 +-
 src/address_book.cpp                               |    2 +-
 src/address_book.h                                 |    2 +-
 src/audio/Makefile.am                              |    4 +-
 src/audio/Makefile.in                              |    8 +-
 src/audio/audio_codecs.cpp                         |    2 +-
 src/audio/audio_codecs.h                           |    2 +-
 src/audio/audio_decoder.cpp                        |    2 +-
 src/audio/audio_decoder.h                          |    7 +-
 src/audio/audio_device.cpp                         |   20 +-
 src/audio/audio_device.h                           |    2 +-
 src/audio/audio_encoder.cpp                        |    2 +-
 src/audio/audio_encoder.h                          |    7 +-
 src/audio/audio_rx.cpp                             |    2 +-
 src/audio/audio_rx.h                               |    2 +-
 src/audio/audio_session.cpp                        |    8 +-
 src/audio/audio_session.h                          |    2 +-
 src/audio/audio_tx.cpp                             |    2 +-
 src/audio/audio_tx.h                               |    2 +-
 src/audio/dtmf_player.cpp                          |    2 +-
 src/audio/dtmf_player.h                            |    2 +-
 src/audio/freq_gen.cpp                             |    2 +-
 src/audio/freq_gen.h                               |    2 +-
 src/audio/gsm/Makefile.am                          |    6 +-
 src/audio/gsm/Makefile.in                          |    9 +-
 src/audio/media_buffer.cpp                         |    2 +-
 src/audio/media_buffer.h                           |    2 +-
 src/audio/rtp_telephone_event.cpp                  |    2 +-
 src/audio/rtp_telephone_event.h                    |    2 +-
 src/audio/tone_gen.cpp                             |    2 +-
 src/audio/tone_gen.h                               |    2 +-
 src/audio/twinkle_rtp_session.cpp                  |    2 +-
 src/audio/twinkle_rtp_session.h                    |    2 +-
 src/audio/twinkle_zrtp_ui.cpp                      |    2 +-
 src/audio/twinkle_zrtp_ui.h                        |    2 +-
 src/audits/Makefile.am                             |    3 +-
 src/audits/Makefile.in                             |    7 +-
 src/audits/memman.cpp                              |    2 +-
 src/audits/memman.h                                |    2 +-
 src/auth.cpp                                       |    2 +-
 src/auth.h                                         |    2 +-
 src/call_history.cpp                               |    2 +-
 src/call_history.h                                 |    2 +-
 src/call_script.cpp                                |    2 +-
 src/call_script.h                                  |    2 +-
 src/client_request.cpp                             |    2 +-
 src/client_request.h                               |    2 +-
 src/cmd_socket.cpp                                 |    2 +-
 src/cmd_socket.h                                   |    2 +-
 src/dialog.cpp                                     |  133 +-
 src/dialog.h                                       |    2 +-
 src/epa.cpp                                        |    3 +-
 src/epa.h                                          |    2 +-
 src/events.cpp                                     |   46 +-
 src/events.h                                       |   46 +-
 src/exceptions.h                                   |    2 +-
 src/gui/Makefile                                   |    9 +-
 src/gui/address_finder.cpp                         |    2 +-
 src/gui/address_finder.h                           |    2 +-
 src/gui/addresscardform.ui.h                       |    2 +-
 src/gui/addresslistviewitem.cpp                    |    2 +-
 src/gui/addresslistviewitem.h                      |    2 +-
 src/gui/authenticationform.ui.h                    |    2 +-
 src/gui/buddyform.ui.h                             |    2 +-
 src/gui/buddylistview.cpp                          |    2 +-
 src/gui/buddylistview.h                            |    2 +-
 src/gui/command_args.h                             |    6 +-
 src/gui/core_strings.h                             |    1 +
 src/gui/deregisterform.ui.h                        |    2 +-
 src/gui/dtmfform.ui.h                              |    2 +-
 src/gui/getaddressform.ui.h                        |    2 +-
 src/gui/getprofilenameform.ui                      |    3 -
 src/gui/getprofilenameform.ui.h                    |    2 +-
 src/gui/gui.cpp                                    |   34 +-
 src/gui/gui.h                                      |    2 +-
 src/gui/historyform.ui.h                           |    2 +-
 src/gui/historylistview.cpp                        |    2 +-
 src/gui/historylistview.h                          |    2 +-
 src/gui/inviteform.ui.h                            |    2 +-
 src/gui/lang/Makefile.am                           |   35 +-
 src/gui/lang/Makefile.in                           |   39 +-
 src/gui/lang/twinkle_cs.ts                         |  119 +-
 src/gui/lang/twinkle_de.ts                         |  249 +-
 src/gui/lang/twinkle_fr.ts                         |  121 +-
 src/gui/lang/twinkle_nl.ts                         |  119 +-
 src/gui/lang/{twinkle_nl.ts => twinkle_ru.ts}      | 4130 ++++++++++----------
 src/gui/lang/{twinkle_nl.ts => twinkle_xx.ts}      | 4130 ++++++++++----------
 src/gui/logviewform.ui.h                           |    2 +-
 src/gui/main.cpp                                   |  139 +-
 src/gui/messageform.ui                             |    4 +-
 src/gui/messageform.ui.h                           |   17 +-
 src/gui/messageformview.cpp                        |   57 +-
 src/gui/messageformview.h                          |    2 +-
 src/gui/mphoneform.ui.h                            |    2 +-
 src/gui/numberconversionform.ui.h                  |    2 +-
 src/gui/qt_translator.h                            |    2 +-
 src/gui/redirectform.ui.h                          |    2 +-
 src/gui/selectnicform.ui.h                         |    5 +-
 src/gui/selectprofileform.ui.h                     |    2 +-
 src/gui/selectuserform.ui.h                        |    2 +-
 src/gui/srvredirectform.ui.h                       |    2 +-
 src/gui/syssettingsform.ui                         |  324 +-
 src/gui/syssettingsform.ui.h                       |   33 +-
 src/gui/termcapform.ui.h                           |    2 +-
 src/gui/transferform.ui.h                          |    2 +-
 src/gui/twinkle.pro                                |    6 +-
 src/gui/twinklesystray.cpp                         |    2 +-
 src/gui/twinklesystray.h                           |    2 +-
 src/gui/userprofileform.ui                         |  313 +-
 src/gui/userprofileform.ui.h                       |   53 +-
 src/gui/wizardform.ui.h                            |    2 +-
 src/gui/yesnodialog.cpp                            |    2 +-
 src/gui/yesnodialog.h                              |    2 +-
 src/id_object.cpp                                  |    2 +-
 src/id_object.h                                    |    2 +-
 src/im/Makefile.am                                 |    2 +-
 src/im/Makefile.in                                 |    5 +-
 src/im/msg_session.cpp                             |   45 +-
 src/im/msg_session.h                               |   53 +-
 src/line.cpp                                       |   14 +-
 src/line.h                                         |    8 +-
 src/listener.cpp                                   |  370 +-
 src/listener.h                                     |   15 +-
 src/log.cpp                                        |   14 +-
 src/log.h                                          |    5 +-
 src/main.cpp                                       |  125 +-
 src/mwi/Makefile.am                                |    4 +-
 src/mwi/Makefile.in                                |    8 +-
 src/mwi/mwi.cpp                                    |    8 +-
 src/mwi/mwi.h                                      |   25 +-
 src/mwi/mwi_dialog.cpp                             |    2 +-
 src/mwi/mwi_dialog.h                               |    2 +-
 src/mwi/mwi_subscription.cpp                       |    4 +-
 src/mwi/mwi_subscription.h                         |    2 +-
 src/mwi/simple_msg_sum_body.cpp                    |   16 +-
 src/mwi/simple_msg_sum_body.h                      |   21 +-
 src/parser/Makefile.am                             |   15 +-
 src/parser/Makefile.in                             |   27 +-
 src/parser/challenge.cpp                           |    2 +-
 src/parser/challenge.h                             |    2 +-
 src/parser/coding.cpp                              |    9 +-
 src/parser/coding.h                                |    2 +-
 src/parser/credentials.cpp                         |    2 +-
 src/parser/credentials.h                           |    2 +-
 src/parser/definitions.cpp                         |    2 +-
 src/parser/definitions.h                           |    2 +-
 src/parser/hdr_accept.cpp                          |    2 +-
 src/parser/hdr_accept.h                            |    2 +-
 src/parser/hdr_accept_encoding.cpp                 |    2 +-
 src/parser/hdr_accept_encoding.h                   |    2 +-
 src/parser/hdr_accept_language.cpp                 |    7 +-
 src/parser/hdr_accept_language.h                   |    2 +-
 src/parser/hdr_alert_info.cpp                      |    2 +-
 src/parser/hdr_alert_info.h                        |    2 +-
 src/parser/hdr_allow.cpp                           |    6 +-
 src/parser/hdr_allow.h                             |    2 +-
 src/parser/hdr_allow_events.cpp                    |    2 +-
 src/parser/hdr_allow_events.h                      |    2 +-
 src/parser/hdr_auth_info.cpp                       |    2 +-
 src/parser/hdr_auth_info.h                         |    2 +-
 src/parser/hdr_authorization.cpp                   |    2 +-
 src/parser/hdr_authorization.h                     |    2 +-
 src/parser/hdr_call_id.cpp                         |    2 +-
 src/parser/hdr_call_id.h                           |    2 +-
 src/parser/hdr_call_info.cpp                       |    2 +-
 src/parser/hdr_call_info.h                         |    2 +-
 src/parser/hdr_contact.cpp                         |   23 +-
 src/parser/hdr_contact.h                           |    9 +-
 src/parser/hdr_content_disp.cpp                    |    2 +-
 src/parser/hdr_content_disp.h                      |    2 +-
 src/parser/hdr_content_encoding.cpp                |    2 +-
 src/parser/hdr_content_encoding.h                  |    2 +-
 src/parser/hdr_content_language.cpp                |    2 +-
 src/parser/hdr_content_language.h                  |    2 +-
 src/parser/hdr_content_length.cpp                  |    2 +-
 src/parser/hdr_content_length.h                    |    2 +-
 src/parser/hdr_content_type.cpp                    |    2 +-
 src/parser/hdr_content_type.h                      |    2 +-
 src/parser/hdr_cseq.cpp                            |    2 +-
 src/parser/hdr_cseq.h                              |    2 +-
 src/parser/hdr_date.cpp                            |    2 +-
 src/parser/hdr_date.h                              |    2 +-
 src/parser/hdr_error_info.cpp                      |    2 +-
 src/parser/hdr_error_info.h                        |    2 +-
 src/parser/hdr_event.cpp                           |    2 +-
 src/parser/hdr_event.h                             |    2 +-
 src/parser/hdr_expires.cpp                         |    2 +-
 src/parser/hdr_expires.h                           |    2 +-
 src/parser/hdr_from.cpp                            |    2 +-
 src/parser/hdr_from.h                              |    2 +-
 src/parser/hdr_in_reply_to.cpp                     |    2 +-
 src/parser/hdr_in_reply_to.h                       |    2 +-
 src/parser/hdr_max_forwards.cpp                    |    2 +-
 src/parser/hdr_max_forwards.h                      |    2 +-
 src/parser/hdr_mime_version.cpp                    |    2 +-
 src/parser/hdr_mime_version.h                      |    2 +-
 src/parser/hdr_min_expires.cpp                     |    2 +-
 src/parser/hdr_min_expires.h                       |    2 +-
 src/parser/hdr_organization.cpp                    |    2 +-
 src/parser/hdr_organization.h                      |    2 +-
 src/parser/hdr_p_asserted_identity.cpp             |    2 +-
 src/parser/hdr_p_asserted_identity.h               |    2 +-
 src/parser/hdr_p_preferred_identity.cpp            |    2 +-
 src/parser/hdr_p_preferred_identity.h              |    2 +-
 src/parser/hdr_priority.cpp                        |    2 +-
 src/parser/hdr_priority.h                          |    2 +-
 src/parser/hdr_privacy.cpp                         |    6 +-
 src/parser/hdr_privacy.h                           |    2 +-
 src/parser/hdr_proxy_authenticate.cpp              |    2 +-
 src/parser/hdr_proxy_authenticate.h                |    2 +-
 src/parser/hdr_proxy_authorization.cpp             |    2 +-
 src/parser/hdr_proxy_authorization.h               |    2 +-
 src/parser/hdr_proxy_require.cpp                   |    2 +-
 src/parser/hdr_proxy_require.h                     |    2 +-
 src/parser/hdr_rack.cpp                            |    2 +-
 src/parser/hdr_rack.h                              |    2 +-
 src/parser/hdr_record_route.cpp                    |    2 +-
 src/parser/hdr_record_route.h                      |    2 +-
 src/parser/hdr_refer_sub.cpp                       |    2 +-
 src/parser/hdr_refer_sub.h                         |    2 +-
 src/parser/hdr_refer_to.cpp                        |    2 +-
 src/parser/hdr_refer_to.h                          |    2 +-
 src/parser/hdr_referred_by.cpp                     |    2 +-
 src/parser/hdr_referred_by.h                       |    2 +-
 src/parser/hdr_replaces.cpp                        |    2 +-
 src/parser/hdr_replaces.h                          |    2 +-
 src/parser/hdr_reply_to.cpp                        |    2 +-
 src/parser/hdr_reply_to.h                          |    2 +-
 src/parser/hdr_require.cpp                         |    2 +-
 src/parser/hdr_require.h                           |    2 +-
 src/parser/hdr_retry_after.cpp                     |    2 +-
 src/parser/hdr_retry_after.h                       |    2 +-
 src/parser/hdr_route.cpp                           |    2 +-
 src/parser/hdr_route.h                             |    2 +-
 src/parser/hdr_rseq.cpp                            |    2 +-
 src/parser/hdr_rseq.h                              |    2 +-
 src/parser/hdr_server.cpp                          |    2 +-
 src/parser/hdr_server.h                            |    2 +-
 src/parser/hdr_sip_etag.cpp                        |    2 +-
 src/parser/hdr_sip_etag.h                          |    2 +-
 src/parser/hdr_sip_if_match.cpp                    |    2 +-
 src/parser/hdr_sip_if_match.h                      |    2 +-
 src/parser/hdr_subject.cpp                         |    2 +-
 src/parser/hdr_subject.h                           |    2 +-
 src/parser/hdr_subscription_state.cpp              |    2 +-
 src/parser/hdr_subscription_state.h                |    2 +-
 src/parser/hdr_supported.cpp                       |    2 +-
 src/parser/hdr_supported.h                         |    2 +-
 src/parser/hdr_timestamp.cpp                       |    9 +-
 src/parser/hdr_timestamp.h                         |    2 +-
 src/parser/hdr_to.cpp                              |    2 +-
 src/parser/hdr_to.h                                |    2 +-
 src/parser/hdr_unsupported.cpp                     |    2 +-
 src/parser/hdr_unsupported.h                       |    2 +-
 src/parser/hdr_user_agent.cpp                      |    2 +-
 src/parser/hdr_user_agent.h                        |    2 +-
 src/parser/hdr_via.cpp                             |   92 +-
 src/parser/hdr_via.h                               |    6 +-
 src/parser/hdr_warning.cpp                         |    2 +-
 src/parser/hdr_warning.h                           |    2 +-
 src/parser/hdr_www_authenticate.cpp                |    2 +-
 src/parser/hdr_www_authenticate.h                  |    2 +-
 src/parser/header.cpp                              |    2 +-
 src/parser/header.h                                |    2 +-
 src/parser/identity.cpp                            |    2 +-
 src/parser/identity.h                              |    2 +-
 src/parser/media_type.cpp                          |   13 +-
 src/parser/media_type.h                            |    2 +-
 src/parser/parameter.cpp                           |    2 +-
 src/parser/parameter.h                             |    2 +-
 src/parser/parse_ctrl.cpp                          |   16 +-
 src/parser/parse_ctrl.h                            |   31 +-
 src/parser/parser.cxx                              |    2 +-
 src/parser/parser.yxx                              |    4 +-
 src/parser/request.cpp                             |  104 +-
 src/parser/request.h                               |   18 +-
 src/parser/response.cpp                            |   30 +-
 src/parser/response.h                              |   13 +-
 src/parser/scanner.cxx                             |    2 +-
 src/parser/scanner.lxx                             |    2 +-
 src/parser/sip_body.cpp                            |    6 +-
 src/parser/sip_body.h                              |    9 +-
 src/parser/sip_message.cpp                         |   55 +-
 src/parser/sip_message.h                           |   38 +-
 src/patterns/Makefile.am                           |    2 +-
 src/patterns/Makefile.in                           |    5 +-
 src/patterns/observer.cpp                          |    2 +-
 src/patterns/observer.h                            |    2 +-
 src/phone.cpp                                      |   22 +-
 src/phone.h                                        |   18 +-
 src/phone_user.cpp                                 |   87 +-
 src/phone_user.h                                   |   28 +-
 src/presence/Makefile.am                           |    4 +-
 src/presence/Makefile.in                           |    6 +-
 src/presence/buddy.cpp                             |    2 +-
 src/presence/buddy.h                               |    2 +-
 src/presence/pidf_body.cpp                         |    2 +-
 src/presence/pidf_body.h                           |    2 +-
 src/presence/presence_dialog.cpp                   |    2 +-
 src/presence/presence_dialog.h                     |    2 +-
 src/presence/presence_epa.cpp                      |    2 +-
 src/presence/presence_epa.h                        |    2 +-
 src/presence/presence_state.cpp                    |    2 +-
 src/presence/presence_state.h                      |    2 +-
 src/presence/presence_subscription.cpp             |    2 +-
 src/presence/presence_subscription.h               |    2 +-
 src/prohibit_thread.cpp                            |    2 +-
 src/prohibit_thread.h                              |    2 +-
 src/protocol.h                                     |   22 +-
 src/redirect.cpp                                   |    2 +-
 src/redirect.h                                     |    2 +-
 src/sdp/Makefile.am                                |    3 +-
 src/sdp/Makefile.in                                |    7 +-
 src/sdp/sdp.cpp                                    |   17 +-
 src/sdp/sdp.h                                      |   12 +-
 src/sdp/sdp_parse_ctrl.cpp                         |    5 +-
 src/sdp/sdp_parse_ctrl.h                           |    6 +-
 src/sdp/sdp_parser.cxx                             | 1378 ++++---
 src/sdp/sdp_parser.h                               |   45 +-
 src/sdp/sdp_parser.yxx                             |    3 +-
 src/sdp/sdp_scanner.cxx                            | 1493 ++++---
 src/sdp/sdp_scanner.lxx                            |    2 +-
 src/sender.cpp                                     |  218 +-
 src/sender.h                                       |   14 +-
 src/sequence_number.h                              |    2 +-
 src/service.cpp                                    |    2 +-
 src/service.h                                      |    2 +-
 src/session.cpp                                    |   37 +-
 src/session.h                                      |    4 +-
 src/sockets/Makefile.am                            |    7 +-
 src/sockets/Makefile.in                            |   18 +-
 src/sockets/connection.cpp                         |  247 ++
 src/sockets/connection.h                           |  171 +
 src/sockets/connection_table.cpp                   |  403 ++
 src/sockets/connection_table.h                     |  168 +
 src/sockets/dnssrv.h                               |    2 +-
 src/sockets/interfaces.cpp                         |    6 +-
 src/sockets/interfaces.h                           |    2 +-
 src/sockets/socket.cpp                             |  152 +-
 src/sockets/socket.h                               |  134 +-
 src/sockets/url.cpp                                |  167 +-
 src/sockets/url.h                                  |   76 +-
 src/stun/Makefile.am                               |    4 +-
 src/stun/Makefile.in                               |    8 +-
 src/stun/stun_transaction.cpp                      |   33 +-
 src/stun/stun_transaction.h                        |    2 +-
 src/sub_refer.cpp                                  |    5 +-
 src/sub_refer.h                                    |    2 +-
 src/subscription.cpp                               |    2 +-
 src/subscription.h                                 |    2 +-
 src/subscription_dialog.cpp                        |    6 +-
 src/subscription_dialog.h                          |    2 +-
 src/sys_settings.cpp                               |   93 +-
 src/sys_settings.h                                 |   88 +-
 src/threads/Makefile.am                            |    2 +-
 src/threads/Makefile.in                            |    5 +-
 src/threads/mutex.cpp                              |   14 +-
 src/threads/mutex.h                                |   33 +-
 src/threads/sema.cpp                               |    2 +-
 src/threads/sema.h                                 |    2 +-
 src/threads/thread.cpp                             |    2 +-
 src/threads/thread.h                               |    2 +-
 src/timekeeper.cpp                                 |   12 +-
 src/timekeeper.h                                   |    2 +-
 src/transaction.cpp                                |  251 +-
 src/transaction.h                                  |   74 +-
 src/transaction_layer.cpp                          |   16 +-
 src/transaction_layer.h                            |    2 +-
 src/transaction_mgr.cpp                            |   84 +-
 src/transaction_mgr.h                              |    4 +-
 src/translator.h                                   |    2 +-
 src/user.cpp                                       |  123 +-
 src/user.h                                         |   57 +-
 src/userintf.cpp                                   |   26 +-
 src/userintf.h                                     |    2 +-
 src/util.cpp                                       |   21 +-
 src/util.h                                         |   16 +-
 src/utils/Makefile.am                              |    2 -
 src/utils/Makefile.in                              |    4 +-
 src/utils/record_file.h                            |    2 +-
 twinkle.desktop.in                                 |    2 +-
 twinkle.spec.in                                    |    4 +-
 396 files changed, 12151 insertions(+), 7571 deletions(-)

diff --cc debian/changelog
index 19ebd7f,0000000..6488f34
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,305 -1,0 +1,321 @@@
++twinkle (1:1.2-1) unstable; urgency=low
++
++  [ Kilian Krause ]
++  * Fix menu entry Apps -> Applications
++  * Add Homepage field as added in dpkg-dev 1.14.6.
++
++  [ Mikael Magnusson ]
++  * New upstream release (Closes: #465187)
++  * Add myself to Uploaders.
++  * Update debian/control package Description.
++  * Update patches/libgsm.patch. (Partly merged by upstream.)
++  * Rename patches/configure-boost.patch to
++    patches/z99-configure-boost.patch (fixes patch order), and update.
++
++ -- Mikael Magnusson <mikma at users.sourceforge.net>  Sat, 15 Mar 2008 18:43:10 +0100
++
 +twinkle (1:1.1-2) unstable; urgency=low
 +
 +  * Remove obsolete Build-Depends: kdelibs-bin
 +  * Rebuild for libboost transition
 +
 + -- Mark Purcell <msp at debian.org>  Thu, 16 Aug 2007 18:12:05 +0100
 +
 +twinkle (1:1.1-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Rework debian/patches/libgsm.patch
 +  * Rework debian/patches/configure-boost.patch  to correctly detect
 +    -lboost_regex-mt...
 +
 + -- Mark Purcell <msp at debian.org>  Wed, 25 Jul 2007 22:50:26 +0100
 +
 +twinkle (1:1.0.1-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * debian/patches deleted as included upstream:
 +    - audiocheck.patch
 +    - conf.patch
 +    - incoming.patch
 +  * Rebuild with Depends: libzrtpcpp-0.9-0 (>= 0.9-4)
 +    - Crashes when making/receiving a call (Closes: #420138)
 +
 + -- Mark Purcell <msp at debian.org>  Sun, 20 May 2007 16:55:03 +0100
 +
 +twinkle (1:1.0-3) unstable; urgency=low
 +
 +  * Rebuild for libccrtp-dev > 1.5.1 [libccrtp soname]
 +    - twinkle depends on libccrtp1-1.5-0 which is not in sid (Closes:
 +    #418843)
 +
 + -- Mark Purcell <msp at debian.org>  Thu, 12 Apr 2007 21:43:17 +0100
 +
 +twinkle (1:1.0-2) unstable; urgency=low
 +
 +  * Add upstream patches; audiocheck, conf & incoming
 +
 + -- Mark Purcell <msp at debian.org>  Sat,  3 Mar 2007 13:14:15 +0000
 +
 +twinkle (1:1.0-1) unstable; urgency=low
 +
 +  * New upstream release
 +    - binNMU required (Closes: #402509)
 +    - Via headers containing ipv6 addresses are dropped (Closes: #398849)
 +  * Update debian/rules URL location
 +  * Delete debian/patches/extra-qualifications.patch included upstream
 +  * Update debian/control package Description
 +  * Update debian/twinkle.1 manpage for 1.0 release
 +  * lintian cleanup: extended-description-line-too-long
 +
 + -- Mark Purcell <msp at debian.org>  Thu, 25 Jan 2007 22:32:22 +0000
 +
 +twinkle (1:1.0~beta-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Needed for the preceeding package to get into etch
 +  * delete debian/patches dtmf, invite4xx and memman included upstream
 +  * debian/rules get-orig-source targets rewritten
 +  * Cleanup debian/watch
 +  * Add extra-qualifications.patch to fix upstream g 4.1.1 build errors
 +
 + -- Mark Purcell <msp at debian.org>  Mon,  8 Jan 2007 21:29:49 +0000
 +
 +twinkle (1:0.9-6) testing-proposed-updates; urgency=medium
 +
 +  * Apply upstream memman.patch to fix random twinkle crashes
 +    - crash on call end (Closes: #402509)
 +  * Loaded direct to t-p-u as discussed on debian-release
 +
 + -- Mark Purcell <msp at debian.org>  Sun,  7 Jan 2007 06:27:36 +0000
 +
 +twinkle (1:0.9-5) unstable; urgency=low
 +
 +  * Pre-run autoheader to include expected src/twinkle_config.h.in changes
 +    inside debian/patches/libgsm.patch
 +    - Closes: #394153: FTBFS: undefined reference to gsm_decode
 +
 + -- Mark Purcell <msp at debian.org>  Sat, 25 Nov 2006 08:57:34 +0000
 +
 +twinkle (1:0.9-4) unstable; urgency=low
 +
 +  * Grab upstream patches: DTMF & Invite4xx
 +  * VoIP Provider issue: Can't talk for more than a minute (Closes: #365588)
 +  * help2man generated manpage
 +  * Linitan cleanup: manpage-has-useless-whatis-entry
 +
 + -- Mark Purcell <msp at debian.org>  Sat,  4 Nov 2006 13:17:50 +0000
 +
 +twinkle (1:0.9-3) unstable; urgency=low
 +
 +  * Rebuild
 +
 + -- Mark Purcell <msp at debian.org>  Wed,  1 Nov 2006 21:38:21 +0000
 +
 +twinkle (1:0.9-2) unstable; urgency=low
 +
 +  * Build-Depends: libzrtpcpp-dev
 +
 + -- Mark Purcell <msp at debian.org>  Mon, 16 Oct 2006 19:22:13 +0100
 +
 +twinkle (1:0.9-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Update Build-Depends
 +  * PRACK messages should be authenticated (Closes: #389252)
 +
 + -- Mark Purcell <msp at debian.org>  Mon,  2 Oct 2006 09:50:03 +0800
 +
 +twinkle (1:0.8.1-1) unstable; urgency=low
 +
 +  [ Kilian Krause ]
 +  * New upstream release. Ships without iLBC, therefore no need to repackage.
 +
 +  [ Mark Purcell ]
 +  * Cleanup debian/patches/libgsm.patch
 +  * Use upstream supplied sip.protocol & twinkle.desktop
 +
 + -- Mark Purcell <msp at debian.org>  Thu, 20 Jul 2006 19:33:00 +0100
 +
 +twinkle (0.8.dfsg-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Remove non-free iLBC code from DFSG release
 +
 + -- Mark Purcell <msp at debian.org>  Sun,  2 Jul 2006 21:37:09 +0100
 +
 +twinkle (0.7.1-2) unstable; urgency=low
 +
 +  * Enable sip URIs: debian/sip.protocol
 +    - Twinkle won't manage sip URI from Konqueror (Closes: #366975)
 +
 + -- Mark Purcell <msp at debian.org>  Fri, 12 May 2006 21:20:39 +0100
 +
 +twinkle (0.7.1-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Mark Purcell <msp at debian.org>  Sun,  7 May 2006 23:00:03 +0100
 +
 +twinkle (0.7-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Update debian/control. Fixes FTBFS on kfreebsd-amd64: unsatisfied
 +     Build-Depends (Closes: #361483)
 +  * Rebuild with updated libccrtp & libcommoncpp2
 +    - Fixes: libccext2-1.3.so.1: cannot open shared object file (Closes: #362440)
 +  * Installed debian/twinkle.desktop. Fixes: please install a .desktop
 +  file (Closes: #358398)
 +  * Add Build-Depends: libspeex-dev
 +  * Modify debian/patches/libgsm.diff
 +
 + -- Mark Purcell <msp at debian.org>  Mon,  1 May 2006 12:21:03 +0100
 +
 +twinkle (0.6.2-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * debian/patches/gui.cpp.diff removed as applied upstream
 +
 + -- Mark Purcell <msp at debian.org>  Sun, 26 Feb 2006 17:46:56 +0000
 +
 +twinkle (0.6.1-2) unstable; urgency=low
 +
 +  * Add debian/patches/libgsm.diff to use Build-Depends: libgsm1-dev
 +  * Add debian/patches/gui.cpp.diff (Closes: Bug#352534)
 +
 + -- Mark Purcell <msp at debian.org>  Tue, 21 Feb 2006 18:31:51 +0000
 +
 +twinkle (0.6.1-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Mark Purcell <msp at debian.org>  Sun, 12 Feb 2006 08:06:44 +0000
 +
 +twinkle (0.6-1) UNRELEASED; urgency=low
 +
 +  * (NOT RELEASED YET) New upstream release
 +  * Add Build-Depends: libxpm-dev, libsndfile1-dev
 +
 + -- Mark Purcell <msp at debian.org>  Fri, 10 Feb 2006 10:32:07 +1100
 +
 +twinkle (0.5-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Don't ship upstream NEWS as it is a duplicate of upstream ChangeLog
 +  * Remove usr/sbin from debian/dirs
 +
 + -- Mark Purcell <msp at debian.org>  Tue, 17 Jan 2006 16:53:16 +0000
 +
 +twinkle (0.4.2-1) unstable; urgency=low
 +
 +  * New upstream release
 +    - Lines hang with "dialing" status (Closes: #340779)
 +    - does not play ringtone (Closes: #340233)
 +
 + -- Mark Purcell <msp at debian.org>  Tue, 29 Nov 2005 20:47:21 +0000
 +
 +twinkle (0.4.1-3) unstable; urgency=low
 +
 +  * Rebuild against kdelibs 3.4.2 for unstable
 +    - twinkle is not installable on sid (Closes: #340534)
 +  * Suggests: kaddressbook
 +
 + -- Mark Purcell <msp at debian.org>  Thu, 24 Nov 2005 07:34:45 +0000
 +
 +twinkle (0.4.1-2) unstable; urgency=low
 +
 +  * Rebuild against kdelibs 3.4.2
 +
 + -- Mark Purcell <msp at debian.org>  Tue, 22 Nov 2005 20:16:05 +0000
 +
 +twinkle (0.4.1-1) unstable; urgency=low
 +
 +  * New upstream release
 +    - FTBFS on 64 bit arches: cast from 'void*' to 'int' loses precision
 +    (Closes: #324395)
 +    - ftbfs [sparc] stun.cxx:680: error: 'gethrtime' was not declared in
 +    this scope (Closes: #336746)
 +  * Fix Build-Depends: FTBFS on GNU/kFreeBSD (Closes: #336859)
 +  * Copyright audit to debian/copyright
 +  * Use correct QTDIR=/usr/share/qt3, negates need for
 +    DEB_AUTO_UPDATE_AUTOCONF
 +  * Remove patch against configure.in
 +
 + -- Mark Purcell <msp at debian.org>  Sun, 20 Nov 2005 23:05:07 +0000
 +
 +twinkle (0.3.2-4) unstable; urgency=low
 +
 +  * Add Build-Depends: kdelibs4-dev kdelibs-bin, libasounds2-dev, libxml2-dev
 +    - fix ppc build (Closes: #325057)
 +  * Remove ppc-build patch, obsolete by upstream v 0.3
 +
 + -- Mark Purcell <msp at debian.org>  Sun, 30 Oct 2005 07:56:45 +0000
 +
 +twinkle (0.3.2-3) unstable; urgency=low
 +
 +  * Use DEB_AUTO_UPDATE_AUTOCONF to rebuild configure from patched
 +    configure.in. Ugly..
 +
 + -- Mark Purcell <msp at debian.org>  Sat, 29 Oct 2005 22:54:12 +0100
 +
 +twinkle (0.3.2-2) unstable; urgency=low
 +
 +  * Add Build-Depends: cdbs
 +
 + -- Mark Purcell <msp at debian.org>  Sat, 29 Oct 2005 17:45:43 +0100
 +
 +twinkle (0.3.2-1) unstable; urgency=low
 +
 +  * New upstream release
 +    - New upstream version available (Closes: #334615)
 +  * FTBFS on 64 bit arches: cast from 'void*' to 'int' loses precision
 +    (Closes: #324395)
 +  * Patch from Guido Guenther
 +    - fix ppc build (Closes: #325057)
 +  * Patch from Mikael Magnusson
 +    - Thread creation timing bug causes crashes (Closes: #329433)
 +  * Fix: old-fsf-address-in-copyright-file
 +
 + -- Mark Purcell <msp at debian.org>  Sat, 29 Oct 2005 16:46:40 +0100
 +
 +twinkle (0.3-1) unstable; urgency=low
 +
 +  [ Kilian Krause ]
 +  * Debian VoIP upload
 +
 +  [ Mark Purcell ]
 +  * New upstream release
 +  * Switch to cdbs!
 +
 + -- Mark Purcell <msp at debian.org>  Thu, 13 Oct 2005 18:12:02 +0100
 +
 +twinkle (0.2.1-2) unstable; urgency=low
 +
 +  * Build-Depends: libxml2-dev
 +
 + -- Mark Purcell <msp at debian.org>  Sun, 21 Aug 2005 15:55:13 +0100
 +
 +twinkle (0.2.1-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Build-Depends:  libccrtp-dev (>=1.3.4)
 +  * Add Build-Depends: qt3-apps-dev
 +  * Add Build-Depends: automake1.9
 +  * Export QTDIR for build target as well :-(
 +  * Update extended description
 +
 + -- Mark Purcell <msp at debian.org>  Sun, 21 Aug 2005 14:05:30 +0100
 +
 +twinkle (0.1-2) unstable; urgency=low
 +
 +  * C++ migration
 +  * Build-Depends:  libqt3-mt-dev (>= 3:3.3.4-4)
 +
 + -- Mark Purcell <msp at debian.org>  Thu, 18 Aug 2005 21:02:31 +0100
 +
 +twinkle (0.1-1) experimental; urgency=low
 +
 +  * Upload to experimental while c++ transition
 +  * Initial release Closes: #311150
 +
 + -- Mark Purcell <msp at debian.org>  Thu, 11 Aug 2005 22:16:20 +0100
 +
diff --cc debian/control
index 9031a38,0000000..9f9aa5c
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,79 -1,0 +1,79 @@@
 +Source: twinkle
 +Section: comm
 +Priority: optional
 +Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
- Uploaders: Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Santiago Garcia Mantinan <manty at debian.org>
++Uploaders: Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Mikael Magnusson <mikma at users.sourceforge.net>
 +Build-Depends: debhelper (>= 4.0.0), autotools-dev, libcommoncpp2-dev (>= 1.4.2), libccrtp-dev (>= 1.5.0), help2man, libqt3-mt-dev (>= 3:3.3.0), qt3-apps-dev, automake1.9, cdbs, kdelibs4-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libxml2-dev, libgsm1-dev, libsndfile1-dev, libxpm-dev, libspeex-dev, libboost-regex-dev, libzrtpcpp-dev
 +Standards-Version: 3.6.1
- XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/
- XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/
++Homepage: http://www.twinklephone.com/
++Vcs-Svn: svn://svn.debian.org/pkg-voip/twinkle/trunk/
++Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/twinkle/?op=log
 +
 +Package: twinkle
 +Architecture: any
 +Depends: ${shlibs:Depends}, ${misc:Depends}
 +Suggests: kaddressbook
 +Description: Voice over Internet Protocol (VoIP) SIP Phone
 + Soft-phone for making telephone calls using SIP over an IP network.
 + .
 + Twinkle supports direct IP phone to IP phone communication or a network
 + using a SIP proxy to route your calls.
 + .
 + In addition to making basic voice calls Twinkle provides you the
 + following features regardless of the services that your VoIP service
 + provider might offer. 
 + .
 +  2 call appearances (lines)
 +  Multiple active call identities
 +  Custom ring tones
 +  Call Waiting
 +  Call Hold
 +  3-way conference calling
 +  Mute
 +  Call redirection on demand
 +  Call redirection unconditional
 +  Call redirection when busy
 +  Call redirection no answer
 +  Reject call redirection request
 +  Blind call transfer
 +  Call transfer with consultation (attended call transfer) (new)
 +  Reject call transfer request
 +  Call reject
 +  Repeat last call
 +  Do not disturb
 +  Auto answer
-   Message Waiting Indication (new)
-   Voice mail speed dial (new)
++  Message Waiting Indication
++  Voice mail speed dial
 +  User definable scripts triggered on call events
 +   E.g. to implement selective call reject or distinctive ringing 
 +  RFC 2833 DTMF events
 +  In-band DTMF
 +  Out-of-band DTMF (SIP INFO)
 +  STUN support for NAT traversal
 +  Send NAT keep alive packets when using STUN
 +  NAT traversal through static provisioning
 +  Missed call indication
 +  History of call detail records for incoming, outgoing, successful and missed
 +  DNS SRV support
 +  Automatic fail-over to an alternate server if a server is unavailable
 +  Other programs can originate a call via Twinkle, e.g. call from address book
 +  System tray icon
 +  System tray menu to originate and answer calls while Twinkle stays hidden
 +  User definable number conversion rules
-   Simple address book (new)
++  Simple address book
++  Support for UDP and TCP (new) as transport for SIP
 + .
 + Audio codecs
 +  G.711 A-law (64 kbps payload, 8 kHz sampling rate)
 +  G.711 u-law (64 kbps payload, 8 kHz sampling rate)
 +  GSM (13 kbps payload, 8 kHz sampling rate)
 +  Speex narrow band (15.2 kbps payload, 8 kHz sampling rate)
 +  Speex wide band (28 kbps payload, 16 kHz sampling rate)
 +  Speex ultra wide band (36 kbps payload, 32 kHz sampling rate)
 +  G.726 (16, 24, 32 or 40 kbps payload, 8 kHz sampling rate)
 + .
 + KDE goodies
 +  Balloon pop-up from system tray when a call comes in
 +  Interface to KAddressBook: dial phone numbers from your address book
 +  Display names from KAddressBook on incoming calls
 +  Display photos from KAddressBook on incoming calls
-  .
-  Website: http://www.twinklephone.com
diff --cc debian/menu
index 8eebf11,0000000..aba2a0a
mode 100644,000000..100644
--- a/debian/menu
+++ b/debian/menu
@@@ -1,5 -1,0 +1,5 @@@
- ?package(twinkle):needs="X11" section="Apps/Net"\
++?package(twinkle):needs="X11" section="Applications/Net"\
 +  title="twinkle" command="/usr/bin/twinkle" \
 +  icon16x16="/usr/share/twinkle/twinkle16.png" \
 +  icon32x32="/usr/share/twinkle/twinkle32.png" \
 +  icon="/usr/share/twinkle/twinkle48.png"
diff --cc debian/patches/libgsm.patch
index 70f69c6,0000000..66ae6fd
mode 100644,000000..100644
--- a/debian/patches/libgsm.patch
+++ b/debian/patches/libgsm.patch
@@@ -1,101 -1,0 +1,68 @@@
- diff -Nur twinkle-1.1/configure.in twinkle-1.1.new/configure.in
- --- twinkle-1.1/configure.in	2007-07-25 22:17:06.000000000 +0100
- +++ twinkle-1.1.new/configure.in	2007-07-25 22:17:07.000000000 +0100
- @@ -161,6 +161,17 @@
-  AC_CHECK_LIB(sndfile, sf_open, [], 
-  	[AC_MSG_ERROR([libsndfile library is missing.])])
++diff -Nur twinkle-1.2/configure.in twinkle-1.2.new/configure.in
++--- twinkle-1.2/configure.in	2008-03-15 22:37:24.000000000 +0100
+++++ twinkle-1.2.new/configure.in	2008-03-15 22:37:25.000000000 +0100
++@@ -188,22 +188,33 @@
++ 
++ # This check does not work on all platforms
++ # Check if libgsm is available
++-# AC_CHECK_LIB(gsm, sf_open, [
++-#	AC_CHECK_HEADER(gsm.h, [],
++-#		[AC_MSG_ERROR([gsm header files missing (gsm.h)])])
++-#	AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the <libgsm> library.])
++-#	GSM_LIBS="-lgsm"
++-#	echo "LIBS += -lgsm" >> $QT_INCL_PRO
++-#	have_gsm="yes" ], [
++-#	have_gsm="no"
++-#	GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
++-#	echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
++-have_gsm="no"
++-GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
++-echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO
+++AC_CHECK_LIB(gsm, sf_open, [
+++	AC_CHECK_HEADER(gsm.h, [],
+++		[AC_MSG_ERROR([gsm header files missing (gsm.h)])])
+++	AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the <libgsm> library.])
+++	GSM_LIBS="-lgsm"
+++	echo "LIBS += -lgsm" >> $QT_INCL_PRO
+++	have_gsm="yes" ], [
+++	have_gsm="no"
+++	GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
+++	echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
+++#have_gsm="no"
+++#GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
+++#echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO
++ 
++ AC_SUBST(GSM_LIBS)
 + 
 ++# Check if libgsm is available
 ++AC_CHECK_LIB(gsm, sf_open, [
 ++	AC_CHECK_HEADER(gsm.h, [],
 ++		[AC_MSG_ERROR([gsm header files missing (gsm.h)])])
 ++	AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the <libgsm> library.])
 ++	LIBS="-lgsm $LIBS"
 ++	echo "LIBS += -lgsm" >> $QT_INCL_PRO
 ++	have_gsm="yes" ], [
 ++	have_gsm="no"
 ++	echo "$(top_builddir)/src/audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
 ++
 + # Check if ALSA is available
 + AC_CHECK_LIB(asound, main, [
 + 	AC_CHECK_HEADER(alsa/asoundlib.h, [],
- @@ -261,3 +272,4 @@
++@@ -319,3 +330,4 @@
 + AC_MSG_RESULT([Speex:       $have_speex])
 + AC_MSG_RESULT([iLBC:        $have_ilbc])
 + AC_MSG_RESULT([ZRTP:        $have_zrtp])
 ++AC_MSG_RESULT([Libgsm dynamic link:	$have_gsm])
- diff -Nur twinkle-1.1/src/audio/audio_decoder.h twinkle-1.1.new/src/audio/audio_decoder.h
- --- twinkle-1.1/src/audio/audio_decoder.h	2007-01-07 07:47:33.000000000 +0000
- +++ twinkle-1.1.new/src/audio/audio_decoder.h	2007-07-25 22:17:07.000000000 +0100
- @@ -25,7 +25,12 @@
-  #include "twinkle_config.h"
-  #include "audio_codecs.h"
-  #include "user.h"
- +
- +#ifdef HAVE_GSM
- +#include <gsm/gsm.h>
- +#else
-  #include "gsm/inc/gsm.h"
- +#endif
-  
-  #ifdef HAVE_SPEEX
-  #include <speex/speex.h>
- diff -Nur twinkle-1.1/src/audio/audio_encoder.h twinkle-1.1.new/src/audio/audio_encoder.h
- --- twinkle-1.1/src/audio/audio_encoder.h	2007-01-07 07:47:33.000000000 +0000
- +++ twinkle-1.1.new/src/audio/audio_encoder.h	2007-07-25 22:17:07.000000000 +0100
- @@ -25,7 +25,12 @@
-  #include "twinkle_config.h"
-  #include "audio_codecs.h"
-  #include "user.h"
- +
- +#ifdef HAVE_GSM
- +#include <gsm/gsm.h>
- +#else
-  #include "gsm/inc/gsm.h"
- +#endif
-  
-  #ifdef HAVE_SPEEX
-  #include <speex/speex.h>
- diff -Nur twinkle-1.1/src/gui/twinkle.pro twinkle-1.1.new/src/gui/twinkle.pro
- --- twinkle-1.1/src/gui/twinkle.pro	2007-07-21 19:56:16.000000000 +0100
- +++ twinkle-1.1.new/src/gui/twinkle.pro	2007-07-25 22:17:07.000000000 +0100
- @@ -3,7 +3,7 @@
-  
-  CONFIG	+= qt warn_off release thread
-  
- -LIBS	+= ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a ../mwi/libmwi.a ../im/libim.a ../patterns/libpatterns.a ../presence/libpresence.a -lsndfile
- +LIBS	+= ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audits/libaudits.a ../stun/libstun.a ../mwi/libmwi.a ../im/libim.a ../patterns/libpatterns.a ../presence/libpresence.a -lsndfile
-  
-  DEFINES	+= QT_NO_STL
-  
- diff -Nur twinkle-1.1/src/Makefile.am twinkle-1.1.new/src/Makefile.am
- --- twinkle-1.1/src/Makefile.am	2007-07-19 19:53:56.000000000 +0100
- +++ twinkle-1.1.new/src/Makefile.am	2007-07-25 22:17:07.000000000 +0100
- @@ -16,13 +16,13 @@
-          $(top_builddir)/src/sockets/libsocket.a\
-          $(top_builddir)/src/threads/libthread.a\
-          $(top_builddir)/src/audio/libaudio.a\
- -        $(top_builddir)/src/audio/gsm/libgsm.a\
-          $(top_builddir)/src/audits/libaudits.a\
-          $(top_builddir)/src/stun/libstun.a\
-          $(top_builddir)/src/mwi/libmwi.a\
-          $(top_builddir)/src/im/libim.a\
-          $(top_builddir)/src/presence/libpresence.a\
-          $(top_builddir)/src/patterns/libpatterns.a\
- +	$(LIBS)\
-  	$(CCRTP_LIBS)\
-  	$(XML2_LIBS)\
-  	-lsndfile
- diff -Nur twinkle-1.1/src/twinkle_config.h.in twinkle-1.1.new/src/twinkle_config.h.in
- --- twinkle-1.1/src/twinkle_config.h.in	2007-07-21 20:21:08.000000000 +0100
- +++ twinkle-1.1.new/src/twinkle_config.h.in	2007-07-25 22:17:07.000000000 +0100
++diff -Nur twinkle-1.2/src/twinkle_config.h.in twinkle-1.2.new/src/twinkle_config.h.in
++--- twinkle-1.2/src/twinkle_config.h.in	2008-03-09 09:33:02.000000000 +0100
+++++ twinkle-1.2.new/src/twinkle_config.h.in	2008-03-15 22:37:25.000000000 +0100
 +@@ -16,6 +16,9 @@
 +    don't. */
 + #undef HAVE_DECL_STRERROR_R
 + 
 ++/* Define to 1 if you have the <libgsm> library. */
 ++#undef HAVE_GSM
 ++
 + /* Define to 1 if you have the <ilbc> library. */
 + #undef HAVE_ILBC
 + 
diff --cc debian/patches/z99-configure-boost.patch
index ad4d1cb,0000000..7a1d5c6
mode 100644,000000..100644
--- a/debian/patches/z99-configure-boost.patch
+++ b/debian/patches/z99-configure-boost.patch
@@@ -1,6653 -1,0 +1,7067 @@@
- diff -Nur twinkle-1.1/configure twinkle-1.1.new/configure
- --- twinkle-1.1/configure	2007-07-21 20:11:10.000000000 +0100
- +++ twinkle-1.1.new/configure	2007-07-25 22:28:06.000000000 +0100
++diff -Nur twinkle-1.2/configure twinkle-1.2.new/configure
++--- twinkle-1.2/configure	2008-03-15 22:34:44.000000000 +0100
+++++ twinkle-1.2.new/configure	2008-03-15 22:36:20.000000000 +0100
 +@@ -1,6 +1,6 @@
 + #! /bin/sh
 + # Guess values for system-dependent variables and create Makefiles.
 +-# Generated by GNU Autoconf 2.60.
 ++# Generated by GNU Autoconf 2.61.
 + #
 + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 + # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 +@@ -10,7 +10,8 @@
 + ## M4sh Initialization.  ##
 + ## --------------------- ##
 + 
 +-# Be Bourne compatible
 ++# Be more Bourne compatible
 ++DUALCASE=1; export DUALCASE # for MKS sh
 + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
 +   emulate sh
 +   NULLCMD=:
 +@@ -19,10 +20,13 @@
 +   alias -g '${1+"$@"}'='"$@"'
 +   setopt NO_GLOB_SUBST
 + else
 +-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 ++  case `(set -o) 2>/dev/null` in
 ++  *posix*) set -o posix ;;
 ++esac
 ++
 + fi
 +-BIN_SH=xpg4; export BIN_SH # for Tru64
 +-DUALCASE=1; export DUALCASE # for MKS sh
 ++
 ++
 + 
 + 
 + # PATH needs CR
 +@@ -215,7 +219,7 @@
 + else
 +   as_candidate_shells=
 +     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +-for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 ++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 + do
 +   IFS=$as_save_IFS
 +   test -z "$as_dir" && as_dir=.
 +@@ -233,7 +237,6 @@
 + 	 # Try only shells that exist, to save several forks.
 + 	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
 + 		{ ("$as_shell") 2> /dev/null <<\_ASEOF
 +-# Be Bourne compatible
 + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
 +   emulate sh
 +   NULLCMD=:
 +@@ -242,10 +245,12 @@
 +   alias -g '${1+"$@"}'='"$@"'
 +   setopt NO_GLOB_SUBST
 + else
 +-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 ++  case `(set -o) 2>/dev/null` in
 ++  *posix*) set -o posix ;;
 ++esac
 ++
 + fi
 +-BIN_SH=xpg4; export BIN_SH # for Tru64
 +-DUALCASE=1; export DUALCASE # for MKS sh
 ++
 + 
 + :
 + _ASEOF
 +@@ -253,7 +258,6 @@
 +   CONFIG_SHELL=$as_shell
 + 	       as_have_required=yes
 + 	       if { "$as_shell" 2> /dev/null <<\_ASEOF
 +-# Be Bourne compatible
 + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
 +   emulate sh
 +   NULLCMD=:
 +@@ -262,10 +266,12 @@
 +   alias -g '${1+"$@"}'='"$@"'
 +   setopt NO_GLOB_SUBST
 + else
 +-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 ++  case `(set -o) 2>/dev/null` in
 ++  *posix*) set -o posix ;;
 ++esac
 ++
 + fi
 +-BIN_SH=xpg4; export BIN_SH # for Tru64
 +-DUALCASE=1; export DUALCASE # for MKS sh
 ++
 + 
 + :
 + (as_func_return () {
 +@@ -512,19 +518,28 @@
 +   as_mkdir_p=false
 + fi
 + 
 +-# Find out whether ``test -x'' works.  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
 +-  as_executable_p="test -x"
 ++if test -x / >/dev/null 2>&1; then
 ++  as_test_x='test -x'
 + else
 +-  as_executable_p=:
 ++  if ls -dL / >/dev/null 2>&1; then
 ++    as_ls_L_option=L
 ++  else
 ++    as_ls_L_option=
 ++  fi
 ++  as_test_x='
 ++    eval sh -c '\''
 ++      if test -d "$1"; then
 ++        test -d "$1/.";
 ++      else
 ++	case $1 in
 ++        -*)set "./$1";;
 ++	esac;
 ++	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 ++	???[sx]*):;;*)false;;esac;fi
 ++    '\'' sh
 ++  '
 + fi
 +-rm -f conf$$.file
 ++as_executable_p=$as_test_x
 + 
 + # Sed expression to map a string onto a valid CPP name.
 + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 +@@ -565,36 +580,36 @@
 + # Factoring default headers for most tests.
 + ac_includes_default="\
 + #include <stdio.h>
 +-#if HAVE_SYS_TYPES_H
 ++#ifdef HAVE_SYS_TYPES_H
 + # include <sys/types.h>
 + #endif
 +-#if HAVE_SYS_STAT_H
 ++#ifdef HAVE_SYS_STAT_H
 + # include <sys/stat.h>
 + #endif
 +-#if STDC_HEADERS
 ++#ifdef STDC_HEADERS
 + # include <stdlib.h>
 + # include <stddef.h>
 + #else
 +-# if HAVE_STDLIB_H
 ++# ifdef HAVE_STDLIB_H
 + #  include <stdlib.h>
 + # endif
 + #endif
 +-#if HAVE_STRING_H
 +-# if !STDC_HEADERS && HAVE_MEMORY_H
 ++#ifdef HAVE_STRING_H
 ++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
 + #  include <memory.h>
 + # endif
 + # include <string.h>
 + #endif
 +-#if HAVE_STRINGS_H
 ++#ifdef HAVE_STRINGS_H
 + # include <strings.h>
 + #endif
 +-#if HAVE_INTTYPES_H
 ++#ifdef HAVE_INTTYPES_H
 + # include <inttypes.h>
 + #endif
 +-#if HAVE_STDINT_H
 ++#ifdef HAVE_STDINT_H
 + # include <stdint.h>
 + #endif
 +-#if HAVE_UNISTD_H
 ++#ifdef HAVE_UNISTD_H
 + # include <unistd.h>
 + #endif"
 + 
 +@@ -696,8 +711,8 @@
 + CXXCPP
 + RANLIB
 + LEX
 +-LEXLIB
 + LEX_OUTPUT_ROOT
 ++LEXLIB
 + YACC
 + YFLAGS
 + GREP
- @@ -837,6 +852,7 @@
++@@ -838,6 +853,7 @@
 + CC
 + CFLAGS
 + LDFLAGS
 ++LIBS
 + CPPFLAGS
 + CXX
 + CXXFLAGS
- @@ -951,10 +967,10 @@
++@@ -952,10 +968,10 @@
 +   -disable-* | --disable-*)
 +     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
 +     # Reject names that are not valid shell variable names.
 +-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
 ++    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
 +       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
 +    { (exit 1); exit 1; }; }
 +-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
 ++    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
 +     eval enable_$ac_feature=no ;;
 + 
 +   -docdir | --docdir | --docdi | --doc | --do)
- @@ -970,10 +986,10 @@
++@@ -971,10 +987,10 @@
 +   -enable-* | --enable-*)
 +     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
 +     # Reject names that are not valid shell variable names.
 +-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
 ++    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
 +       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
 +    { (exit 1); exit 1; }; }
 +-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
 ++    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
 +     eval enable_$ac_feature=\$ac_optarg ;;
 + 
 +   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
- @@ -1167,19 +1183,19 @@
++@@ -1168,19 +1184,19 @@
 +   -with-* | --with-*)
 +     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
 +     # Reject names that are not valid shell variable names.
 +-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
 ++    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
 +       { echo "$as_me: error: invalid package name: $ac_package" >&2
 +    { (exit 1); exit 1; }; }
 +-    ac_package=`echo $ac_package| sed 's/-/_/g'`
 ++    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
 +     eval with_$ac_package=\$ac_optarg ;;
 + 
 +   -without-* | --without-*)
 +     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
 +     # Reject names that are not valid shell variable names.
 +-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
 ++    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
 +       { echo "$as_me: error: invalid package name: $ac_package" >&2
 +    { (exit 1); exit 1; }; }
 +-    ac_package=`echo $ac_package | sed 's/-/_/g'`
 ++    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
 +     eval with_$ac_package=no ;;
 + 
 +   --x)
- @@ -1458,6 +1474,7 @@
++@@ -1459,6 +1475,7 @@
 +   CFLAGS      C compiler flags
 +   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
 +               nonstandard directory <lib dir>
 ++  LIBS        libraries to pass to the linker, e.g. -l<library>
 +   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
 +               you have headers in a nonstandard directory <include dir>
 +   CXX         C++ compiler command
- @@ -1535,7 +1552,7 @@
++@@ -1536,7 +1553,7 @@
 + if $ac_init_version; then
 +   cat <<\_ACEOF
 + configure
 +-generated by GNU Autoconf 2.60
 ++generated by GNU Autoconf 2.61
 + 
 + Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 + 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- @@ -1549,7 +1566,7 @@
++@@ -1550,7 +1567,7 @@
 + running configure, to aid debugging if configure makes a mistake.
 + 
 + It was created by $as_me, which was
 +-generated by GNU Autoconf 2.60.  Invocation command line was
 ++generated by GNU Autoconf 2.61.  Invocation command line was
 + 
 +   $ $0 $@
 + 
- @@ -2147,7 +2164,7 @@
++@@ -2148,7 +2165,7 @@
 +     # by default.
 +     for ac_prog in ginstall scoinst install; do
 +       for ac_exec_ext in '' $ac_executable_extensions; do
 +-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
 ++	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
 + 	  if test $ac_prog = install &&
 + 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 + 	    # AIX install.  It has an incompatible calling convention.
- @@ -2341,7 +2358,7 @@
++@@ -2342,7 +2359,7 @@
 +   IFS=$as_save_IFS
 +   test -z "$as_dir" && as_dir=.
 +   for ac_exec_ext in '' $ac_executable_extensions; do
 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
 ++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +     ac_cv_prog_AWK="$ac_prog"
 +     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +     break 2
- @@ -2476,7 +2493,7 @@
++@@ -2477,7 +2494,7 @@
 +   IFS=$as_save_IFS
 +   test -z "$as_dir" && as_dir=.
 +   for ac_exec_ext in '' $ac_executable_extensions; do
 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
 ++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
 +     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +     break 2
- @@ -2516,7 +2533,7 @@
++@@ -2517,7 +2534,7 @@
 +   IFS=$as_save_IFS
 +   test -z "$as_dir" && as_dir=.
 +   for ac_exec_ext in '' $ac_executable_extensions; do
 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
 ++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +     ac_cv_prog_ac_ct_STRIP="strip"
 +     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +     break 2
- @@ -2597,7 +2614,7 @@
++@@ -2598,7 +2615,7 @@
 +   IFS=$as_save_IFS
 +   test -z "$as_dir" && as_dir=.
 +   for ac_exec_ext in '' $ac_executable_extensions; do
 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
 ++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +     ac_cv_prog_CC="${ac_tool_prefix}gcc"
 +     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +     break 2
- @@ -2637,7 +2654,7 @@
++@@ -2638,7 +2655,7 @@
 +   IFS=$as_save_IFS
 +   test -z "$as_dir" && as_dir=.
 +   for ac_exec_ext in '' $ac_executable_extensions; do
 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
 ++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +     ac_cv_prog_ac_ct_CC="gcc"
 +     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +     break 2
- @@ -2694,7 +2711,7 @@
++@@ -2695,7 +2712,7 @@
 +   IFS=$as_save_IFS
 +   test -z "$as_dir" && as_dir=.
 +   for ac_exec_ext in '' $ac_executable_extensions; do
 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
 ++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +     ac_cv_prog_CC="${ac_tool_prefix}cc"
 +     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +     break 2
- @@ -2735,7 +2752,7 @@
++@@ -2736,7 +2753,7 @@
 +   IFS=$as_save_IFS
 +   test -z "$as_dir" && as_dir=.
 +   for ac_exec_ext in '' $ac_executable_extensions; do
 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
 ++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
 +        ac_prog_rejected=yes
 +        continue
- @@ -2793,7 +2810,7 @@
++@@ -2794,7 +2811,7 @@
 +   IFS=$as_save_IFS
 +   test -z "$as_dir" && as_dir=.
 +   for ac_exec_ext in '' $ac_executable_extensions; do
 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
 ++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
 +     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +     break 2
- @@ -2837,7 +2854,7 @@
++@@ -2838,7 +2855,7 @@
 +   IFS=$as_save_IFS
 +   test -z "$as_dir" && as_dir=.
 +   for ac_exec_ext in '' $ac_executable_extensions; do
 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
 ++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +     ac_cv_prog_ac_ct_CC="$ac_prog"
 +     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +     break 2
- @@ -2978,7 +2995,7 @@
++@@ -2979,7 +2996,7 @@
 + # in a Makefile.  We should not override ac_cv_exeext if it was cached,
 + # so that the user can short-circuit this test for compilers unknown to
 + # Autoconf.
 +-for ac_file in $ac_files
 ++for ac_file in $ac_files ''
 + do
 +   test -f "$ac_file" || continue
 +   case $ac_file in
- @@ -3006,6 +3023,12 @@
++@@ -3007,6 +3024,12 @@
 + test "$ac_cv_exeext" = no && ac_cv_exeext=
 + 
 + else
 ++  ac_file=''
 ++fi
 ++
 ++{ echo "$as_me:$LINENO: result: $ac_file" >&5
 ++echo "${ECHO_T}$ac_file" >&6; }
 ++if test -z "$ac_file"; then
 +   echo "$as_me: failed program was:" >&5
 + sed 's/^/| /' conftest.$ac_ext >&5
 + 
- @@ -3017,8 +3040,6 @@
++@@ -3018,8 +3041,6 @@
 + fi
 + 
 + ac_exeext=$ac_cv_exeext
 +-{ echo "$as_me:$LINENO: result: $ac_file" >&5
 +-echo "${ECHO_T}$ac_file" >&6; }
 + 
 + # Check that the compiler produces executables we can run.  If not, either
 + # the compiler is broken, or we cross compile.
- @@ -3196,27 +3217,10 @@
++@@ -3197,27 +3218,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_c_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_compiler_gnu=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -3271,27 +3275,10 @@
++@@ -3272,27 +3276,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_c_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_cv_prog_cc_g=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -3326,27 +3313,10 @@
++@@ -3327,27 +3314,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_c_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   :
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -3382,27 +3352,10 @@
++@@ -3383,27 +3353,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_c_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_cv_prog_cc_g=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -3518,27 +3471,10 @@
++@@ -3519,27 +3472,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_c_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_cv_prog_cc_c89=$ac_arg
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -3777,7 +3713,7 @@
++@@ -3778,7 +3714,7 @@
 +   IFS=$as_save_IFS
 +   test -z "$as_dir" && as_dir=.
 +   for ac_exec_ext in '' $ac_executable_extensions; do
 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
 ++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
 +     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +     break 2
- @@ -3821,7 +3757,7 @@
++@@ -3822,7 +3758,7 @@
 +   IFS=$as_save_IFS
 +   test -z "$as_dir" && as_dir=.
 +   for ac_exec_ext in '' $ac_executable_extensions; do
 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
 ++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +     ac_cv_prog_ac_ct_CXX="$ac_prog"
 +     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +     break 2
- @@ -3934,27 +3870,10 @@
++@@ -3935,27 +3871,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_compiler_gnu=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -4009,27 +3928,10 @@
++@@ -4010,27 +3929,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_cv_prog_cxx_g=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -4064,27 +3966,10 @@
++@@ -4065,27 +3967,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   :
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -4120,27 +4005,10 @@
++@@ -4121,27 +4006,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_cv_prog_cxx_g=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -4342,17 +4210,10 @@
++@@ -4343,17 +4211,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } >/dev/null; then
 +-  if test -s conftest.err; then
 +-    ac_cpp_err=$ac_c_preproc_warn_flag
 +-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
 +-  else
 +-    ac_cpp_err=
 +-  fi
 +-else
 +-  ac_cpp_err=yes
 +-fi
 +-if test -z "$ac_cpp_err"; then
 ++  (exit $ac_status); } >/dev/null && {
 ++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       }; then
 +   :
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -4386,17 +4247,10 @@
++@@ -4387,17 +4248,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } >/dev/null; then
 +-  if test -s conftest.err; then
 +-    ac_cpp_err=$ac_c_preproc_warn_flag
 +-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
 +-  else
 +-    ac_cpp_err=
 +-  fi
 +-else
 +-  ac_cpp_err=yes
 +-fi
 +-if test -z "$ac_cpp_err"; then
 ++  (exit $ac_status); } >/dev/null && {
 ++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       }; then
 +   # Broken: success on invalid input.
 + continue
 + else
- @@ -4461,17 +4315,10 @@
++@@ -4462,17 +4316,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } >/dev/null; then
 +-  if test -s conftest.err; then
 +-    ac_cpp_err=$ac_c_preproc_warn_flag
 +-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
 +-  else
 +-    ac_cpp_err=
 +-  fi
 +-else
 +-  ac_cpp_err=yes
 +-fi
 +-if test -z "$ac_cpp_err"; then
 ++  (exit $ac_status); } >/dev/null && {
 ++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       }; then
 +   :
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -4505,17 +4352,10 @@
++@@ -4506,17 +4353,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } >/dev/null; then
 +-  if test -s conftest.err; then
 +-    ac_cpp_err=$ac_c_preproc_warn_flag
 +-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
 +-  else
 +-    ac_cpp_err=
 +-  fi
 +-else
 +-  ac_cpp_err=yes
 +-fi
 +-if test -z "$ac_cpp_err"; then
 ++  (exit $ac_status); } >/dev/null && {
 ++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       }; then
 +   # Broken: success on invalid input.
 + continue
 + else
- @@ -4596,17 +4436,10 @@
++@@ -4597,17 +4437,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } >/dev/null; then
 +-  if test -s conftest.err; then
 +-    ac_cpp_err=$ac_cxx_preproc_warn_flag
 +-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
 +-  else
 +-    ac_cpp_err=
 +-  fi
 +-else
 +-  ac_cpp_err=yes
 +-fi
 +-if test -z "$ac_cpp_err"; then
 ++  (exit $ac_status); } >/dev/null && {
 ++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       }; then
 +   :
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -4640,17 +4473,10 @@
++@@ -4641,17 +4474,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } >/dev/null; then
 +-  if test -s conftest.err; then
 +-    ac_cpp_err=$ac_cxx_preproc_warn_flag
 +-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
 +-  else
 +-    ac_cpp_err=
 +-  fi
 +-else
 +-  ac_cpp_err=yes
 +-fi
 +-if test -z "$ac_cpp_err"; then
 ++  (exit $ac_status); } >/dev/null && {
 ++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       }; then
 +   # Broken: success on invalid input.
 + continue
 + else
- @@ -4715,17 +4541,10 @@
++@@ -4716,17 +4542,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } >/dev/null; then
 +-  if test -s conftest.err; then
 +-    ac_cpp_err=$ac_cxx_preproc_warn_flag
 +-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
 +-  else
 +-    ac_cpp_err=
 +-  fi
 +-else
 +-  ac_cpp_err=yes
 +-fi
 +-if test -z "$ac_cpp_err"; then
 ++  (exit $ac_status); } >/dev/null && {
 ++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       }; then
 +   :
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -4759,17 +4578,10 @@
++@@ -4760,17 +4579,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } >/dev/null; then
 +-  if test -s conftest.err; then
 +-    ac_cpp_err=$ac_cxx_preproc_warn_flag
 +-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
 +-  else
 +-    ac_cpp_err=
 +-  fi
 +-else
 +-  ac_cpp_err=yes
 +-fi
 +-if test -z "$ac_cpp_err"; then
 ++  (exit $ac_status); } >/dev/null && {
 ++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       }; then
 +   # Broken: success on invalid input.
 + continue
 + else
- @@ -4819,7 +4631,7 @@
++@@ -4820,7 +4632,7 @@
 +   IFS=$as_save_IFS
 +   test -z "$as_dir" && as_dir=.
 +   for ac_exec_ext in '' $ac_executable_extensions; do
 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
 ++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
 +     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +     break 2
- @@ -4859,7 +4671,7 @@
++@@ -4860,7 +4672,7 @@
 +   IFS=$as_save_IFS
 +   test -z "$as_dir" && as_dir=.
 +   for ac_exec_ext in '' $ac_executable_extensions; do
 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
 ++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +     ac_cv_prog_ac_ct_RANLIB="ranlib"
 +     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +     break 2
- @@ -4917,7 +4729,7 @@
++@@ -4918,7 +4730,7 @@
 +   IFS=$as_save_IFS
 +   test -z "$as_dir" && as_dir=.
 +   for ac_exec_ext in '' $ac_executable_extensions; do
 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
 ++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +     ac_cv_prog_LEX="$ac_prog"
 +     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +     break 2
- @@ -4942,116 +4754,69 @@
++@@ -4943,116 +4755,69 @@
 + done
 + test -n "$LEX" || LEX=":"
 + 
 +-if test -z "$LEXLIB"
 +-then
 +-  { echo "$as_me:$LINENO: checking for yywrap in -lfl" >&5
 +-echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6; }
 +-if test "${ac_cv_lib_fl_yywrap+set}" = set; then
 +-  echo $ECHO_N "(cached) $ECHO_C" >&6
 +-else
 +-  ac_check_lib_save_LIBS=$LIBS
 +-LIBS="-lfl  $LIBS"
 +-cat >conftest.$ac_ext <<_ACEOF
 +-/* confdefs.h.  */
 +-_ACEOF
 +-cat confdefs.h >>conftest.$ac_ext
 +-cat >>conftest.$ac_ext <<_ACEOF
 +-/* end confdefs.h.  */
 +-
 +-/* Override any GCC internal prototype to avoid an error.
 +-   Use char because int might match the return type of a GCC
 +-   builtin and then its argument prototype would still apply.  */
 +-#ifdef __cplusplus
 +-extern "C"
 ++if test "x$LEX" != "x:"; then
 ++  cat >conftest.l <<_ACEOF
 ++%%
 ++a { ECHO; }
 ++b { REJECT; }
 ++c { yymore (); }
 ++d { yyless (1); }
 ++e { yyless (input () != 0); }
 ++f { unput (yytext[0]); }
 ++. { BEGIN INITIAL; }
 ++%%
 ++#ifdef YYTEXT_POINTER
 ++extern char *yytext;
 + #endif
 +-char yywrap ();
 + int
 +-main ()
 ++main (void)
 + {
 +-return yywrap ();
 +-  ;
 +-  return 0;
 ++  return ! yylex () + ! yywrap ();
 + }
 + _ACEOF
 +-rm -f conftest.$ac_objext conftest$ac_exeext
 +-if { (ac_try="$ac_link"
 ++{ (ac_try="$LEX conftest.l"
 + case "(($ac_try" in
 +   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +   *) ac_try_echo=$ac_try;;
 + esac
 + eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_link") 2>conftest.er1
 +-  ac_status=$?
 +-  grep -v '^ *+' conftest.er1 >conftest.err
 +-  rm -f conftest.er1
 +-  cat conftest.err >&5
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 ++  (eval "$LEX conftest.l") 2>&5
 +   ac_status=$?
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 +-  ac_cv_lib_fl_yywrap=yes
 ++  (exit $ac_status); }
 ++{ echo "$as_me:$LINENO: checking lex output file root" >&5
 ++echo $ECHO_N "checking lex output file root... $ECHO_C" >&6; }
 ++if test "${ac_cv_prog_lex_root+set}" = set; then
 ++  echo $ECHO_N "(cached) $ECHO_C" >&6
 + else
 +-  echo "$as_me: failed program was:" >&5
 +-sed 's/^/| /' conftest.$ac_ext >&5
 + 
 +-	ac_cv_lib_fl_yywrap=no
 ++if test -f lex.yy.c; then
 ++  ac_cv_prog_lex_root=lex.yy
 ++elif test -f lexyy.c; then
 ++  ac_cv_prog_lex_root=lexyy
 ++else
 ++  { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
 ++echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
 ++   { (exit 1); exit 1; }; }
 + fi
 +-
 +-rm -f core conftest.err conftest.$ac_objext \
 +-      conftest$ac_exeext conftest.$ac_ext
 +-LIBS=$ac_check_lib_save_LIBS
 + fi
 +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5
 +-echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6; }
 +-if test $ac_cv_lib_fl_yywrap = yes; then
 +-  LEXLIB="-lfl"
 +-else
 +-  { echo "$as_me:$LINENO: checking for yywrap in -ll" >&5
 +-echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6; }
 +-if test "${ac_cv_lib_l_yywrap+set}" = set; then
 ++{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
 ++echo "${ECHO_T}$ac_cv_prog_lex_root" >&6; }
 ++LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
 ++
 ++if test -z "${LEXLIB+set}"; then
 ++  { echo "$as_me:$LINENO: checking lex library" >&5
 ++echo $ECHO_N "checking lex library... $ECHO_C" >&6; }
 ++if test "${ac_cv_lib_lex+set}" = set; then
 +   echo $ECHO_N "(cached) $ECHO_C" >&6
 + else
 +-  ac_check_lib_save_LIBS=$LIBS
 +-LIBS="-ll  $LIBS"
 +-cat >conftest.$ac_ext <<_ACEOF
 +-/* confdefs.h.  */
 +-_ACEOF
 +-cat confdefs.h >>conftest.$ac_ext
 +-cat >>conftest.$ac_ext <<_ACEOF
 +-/* end confdefs.h.  */
 + 
 +-/* Override any GCC internal prototype to avoid an error.
 +-   Use char because int might match the return type of a GCC
 +-   builtin and then its argument prototype would still apply.  */
 +-#ifdef __cplusplus
 +-extern "C"
 +-#endif
 +-char yywrap ();
 +-int
 +-main ()
 +-{
 +-return yywrap ();
 +-  ;
 +-  return 0;
 +-}
 ++    ac_save_LIBS=$LIBS
 ++    ac_cv_lib_lex='none needed'
 ++    for ac_lib in '' -lfl -ll; do
 ++      LIBS="$ac_lib $ac_save_LIBS"
 ++      cat >conftest.$ac_ext <<_ACEOF
 ++`cat $LEX_OUTPUT_ROOT.c`
 + _ACEOF
 + rm -f conftest.$ac_objext conftest$ac_exeext
 + if { (ac_try="$ac_link"
- @@ -5066,85 +4831,31 @@
++@@ -5067,85 +4832,31 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 +-  ac_cv_lib_l_yywrap=yes
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_c_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 ++  ac_cv_lib_lex=$ac_lib
 + else
 +   echo "$as_me: failed program was:" >&5
 + sed 's/^/| /' conftest.$ac_ext >&5
 + 
 +-	ac_cv_lib_l_yywrap=no
 ++
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 +-LIBS=$ac_check_lib_save_LIBS
 +-fi
 +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_l_yywrap" >&5
 +-echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6; }
 +-if test $ac_cv_lib_l_yywrap = yes; then
 +-  LEXLIB="-ll"
 +-fi
 ++      test "$ac_cv_lib_lex" != 'none needed' && break
 ++    done
 ++    LIBS=$ac_save_LIBS
 + 
 + fi
 +-
 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5
 ++echo "${ECHO_T}$ac_cv_lib_lex" >&6; }
 ++  test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
 + fi
 + 
 +-if test "x$LEX" != "x:"; then
 +-  { echo "$as_me:$LINENO: checking lex output file root" >&5
 +-echo $ECHO_N "checking lex output file root... $ECHO_C" >&6; }
 +-if test "${ac_cv_prog_lex_root+set}" = set; then
 +-  echo $ECHO_N "(cached) $ECHO_C" >&6
 +-else
 +-  # The minimal lex program is just a single line: %%.  But some broken lexes
 +-# (Solaris, I think it was) want two %% lines, so accommodate them.
 +-cat >conftest.l <<_ACEOF
 +-%%
 +-%%
 +-_ACEOF
 +-{ (ac_try="$LEX conftest.l"
 +-case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$LEX conftest.l") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }
 +-if test -f lex.yy.c; then
 +-  ac_cv_prog_lex_root=lex.yy
 +-elif test -f lexyy.c; then
 +-  ac_cv_prog_lex_root=lexyy
 +-else
 +-  { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
 +-echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
 +-   { (exit 1); exit 1; }; }
 +-fi
 +-fi
 +-{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
 +-echo "${ECHO_T}$ac_cv_prog_lex_root" >&6; }
 +-rm -f conftest.l
 +-LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
 + 
 + { echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
 + echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6; }
- @@ -5152,13 +4863,13 @@
++@@ -5153,13 +4864,13 @@
 +   echo $ECHO_N "(cached) $ECHO_C" >&6
 + else
 +   # POSIX says lex can declare yytext either as a pointer or an array; the
 +-# default is implementation-dependent. Figure out which it is, since
 ++# default is implementation-dependent.  Figure out which it is, since
 + # not all implementations provide the %pointer and %array declarations.
 + ac_cv_prog_lex_yytext_pointer=no
 +-echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
 + ac_save_LIBS=$LIBS
 +-LIBS="$LIBS $LEXLIB"
 ++LIBS="$LEXLIB $ac_save_LIBS"
 + cat >conftest.$ac_ext <<_ACEOF
 ++#define YYTEXT_POINTER 1
 + `cat $LEX_OUTPUT_ROOT.c`
 + _ACEOF
 + rm -f conftest.$ac_objext conftest$ac_exeext
- @@ -5174,27 +4885,11 @@
++@@ -5175,27 +4886,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_c_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   ac_cv_prog_lex_yytext_pointer=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -5203,10 +4898,9 @@
++@@ -5204,10 +4899,9 @@
 + 
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS=$ac_save_LIBS
 +-rm -f "${LEX_OUTPUT_ROOT}.c"
 + 
 + fi
 + { echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
- @@ -5218,6 +4912,7 @@
++@@ -5219,6 +4913,7 @@
 + _ACEOF
 + 
 + fi
 ++rm -f conftest.l $LEX_OUTPUT_ROOT.c
 + 
 + fi
 + for ac_prog in 'bison -y' byacc
- @@ -5238,7 +4933,7 @@
++@@ -5239,7 +4934,7 @@
 +   IFS=$as_save_IFS
 +   test -z "$as_dir" && as_dir=.
 +   for ac_exec_ext in '' $ac_executable_extensions; do
 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
 ++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +     ac_cv_prog_YACC="$ac_prog"
 +     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +     break 2
- @@ -5285,7 +4980,7 @@
++@@ -5286,7 +4981,7 @@
 +   for ac_prog in grep ggrep; do
 +   for ac_exec_ext in '' $ac_executable_extensions; do
 +     ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
 +-    { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
 ++    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
 +     # Check for GNU ac_path_GREP and select it if it is found.
 +   # Check for GNU $ac_path_GREP
 + case `"$ac_path_GREP" --version 2>&1` in
- @@ -5367,7 +5062,7 @@
++@@ -5368,7 +5063,7 @@
 +   for ac_prog in egrep; do
 +   for ac_exec_ext in '' $ac_executable_extensions; do
 +     ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
 +-    { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
 ++    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
 +     # Check for GNU ac_path_EGREP and select it if it is found.
 +   # Check for GNU $ac_path_EGREP
 + case `"$ac_path_EGREP" --version 2>&1` in
- @@ -5463,27 +5158,10 @@
++@@ -5464,27 +5159,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_c_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_cv_header_stdc=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -5659,27 +5337,10 @@
++@@ -5660,27 +5338,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_c_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   eval "$as_ac_Header=yes"
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -5721,7 +5382,8 @@
++@@ -5722,7 +5383,8 @@
 + int
 + main ()
 + {
 +-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
 ++#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
 ++	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
 +  bogus endian macros
 + #endif
 + 
- @@ -5742,27 +5404,10 @@
++@@ -5743,27 +5405,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_c_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   # It does; now see whether it defined to BIG_ENDIAN or not.
 + cat >conftest.$ac_ext <<_ACEOF
 + /* confdefs.h.  */
- @@ -5797,27 +5442,10 @@
++@@ -5798,27 +5443,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_c_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_cv_c_bigendian=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -5868,27 +5496,10 @@
++@@ -5869,27 +5497,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_c_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
 +   ac_cv_c_bigendian=yes
 + fi
- @@ -6012,8 +5623,7 @@
++@@ -6013,8 +5624,7 @@
 + main ()
 + {
 + #ifndef strerror_r
 +-  char *p = (char *) strerror_r;
 +-  return !p;
 ++  (void) strerror_r;
 + #endif
 + 
 +   ;
- @@ -6033,27 +5643,10 @@
++@@ -6034,27 +5644,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_cv_have_decl_strerror_r=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -6149,27 +5742,11 @@
++@@ -6150,27 +5743,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   eval "$as_ac_var=yes"
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -6178,7 +5755,7 @@
++@@ -6179,7 +5756,7 @@
 + 	eval "$as_ac_var=no"
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + fi
 + ac_res=`eval echo '${'$as_ac_var'}'`
- @@ -6233,27 +5810,10 @@
++@@ -6234,27 +5811,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_cv_func_strerror_r_char_p=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -6376,27 +5936,10 @@
++@@ -6377,27 +5937,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_header_compiler=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -6432,17 +5975,10 @@
++@@ -6433,17 +5976,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } >/dev/null; then
 +-  if test -s conftest.err; then
 +-    ac_cpp_err=$ac_cxx_preproc_warn_flag
 +-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
 +-  else
 +-    ac_cpp_err=
 +-  fi
 +-else
 +-  ac_cpp_err=yes
 +-fi
 +-if test -z "$ac_cpp_err"; then
 ++  (exit $ac_status); } >/dev/null && {
 ++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       }; then
 +   ac_header_preproc=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -6536,27 +6072,10 @@
++@@ -6537,27 +6073,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   eval "$as_ac_Header=yes"
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -6606,7 +6125,7 @@
++@@ -6607,7 +6126,7 @@
 +   IFS=$as_save_IFS
 +   test -z "$as_dir" && as_dir=.
 +   for ac_exec_ext in '' $ac_executable_extensions; do
 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
 ++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +     ac_cv_path_CCGNU2_CONFIG="$as_dir/$ac_word$ac_exec_ext"
 +     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +     break 2
- @@ -6736,7 +6255,7 @@
++@@ -6737,7 +6256,7 @@
 +   IFS=$as_save_IFS
 +   test -z "$as_dir" && as_dir=.
 +   for ac_exec_ext in '' $ac_executable_extensions; do
 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
 ++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
 +     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +     break 2
- @@ -6836,7 +6355,7 @@
++@@ -6837,7 +6356,7 @@
 +   IFS=$as_save_IFS
 +   test -z "$as_dir" && as_dir=.
 +   for ac_exec_ext in '' $ac_executable_extensions; do
 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
 ++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
 +     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +     break 2
- @@ -6940,7 +6459,7 @@
++@@ -6941,7 +6460,7 @@
 +   IFS=$as_save_IFS
 +   test -z "$as_dir" && as_dir=.
 +   for ac_exec_ext in '' $ac_executable_extensions; do
 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
 ++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
 +     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +     break 2
- @@ -7114,27 +6633,10 @@
++@@ -7115,27 +6634,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   kde_cv_func_strlcat=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -7231,27 +6733,11 @@
++@@ -7232,27 +6734,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +    kde_cv_func_strlcat=yes
 +   kde_cv_proto_strlcat=yes
 + else
- @@ -7262,7 +6748,7 @@
++@@ -7263,7 +6749,7 @@
 + 
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS=$kde_safe_libs
 + ac_ext=cpp
- @@ -7358,27 +6844,10 @@
++@@ -7359,27 +6845,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   kde_cv_func_strlcpy=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -7474,27 +6943,11 @@
++@@ -7475,27 +6944,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +    kde_cv_func_strlcpy=yes
 +   kde_cv_proto_strlcpy=yes
 + else
- @@ -7505,7 +6958,7 @@
++@@ -7506,7 +6959,7 @@
 + 
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS=$kde_safe_libs
 + ac_ext=cpp
- @@ -7578,27 +7031,11 @@
++@@ -7579,27 +7032,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   ac_cv_lib_util_main=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -7607,7 +7044,7 @@
++@@ -7608,7 +7045,7 @@
 + 	ac_cv_lib_util_main=no
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS=$ac_check_lib_save_LIBS
 + fi
- @@ -7653,27 +7090,11 @@
++@@ -7654,27 +7091,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   ac_cv_lib_compat_main=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -7682,7 +7103,7 @@
++@@ -7683,7 +7104,7 @@
 + 	ac_cv_lib_compat_main=no
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS=$ac_check_lib_save_LIBS
 + fi
- @@ -7735,27 +7156,11 @@
++@@ -7736,27 +7157,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   ac_cv_lib_crypt_crypt=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -7764,7 +7169,7 @@
++@@ -7765,7 +7170,7 @@
 + 	ac_cv_lib_crypt_crypt=no
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS=$ac_check_lib_save_LIBS
 + fi
- @@ -7815,27 +7220,11 @@
++@@ -7816,27 +7221,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   ac_cv_lib_c_crypt=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -7844,7 +7233,7 @@
++@@ -7845,7 +7234,7 @@
 + 	ac_cv_lib_c_crypt=no
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS=$ac_check_lib_save_LIBS
 + fi
- @@ -7922,27 +7311,10 @@
++@@ -7923,27 +7312,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 + 
 +          kde_cv_socklen_t=yes
 +          kde_cv_socklen_t_equiv=socklen_t
- @@ -8015,27 +7387,10 @@
++@@ -8016,27 +7388,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 + 
 +                kde_cv_socklen_t_equiv="$t"
 +                break
- @@ -8114,27 +7469,11 @@
++@@ -8115,27 +7470,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   ac_cv_lib_dnet_dnet_ntoa=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -8143,7 +7482,7 @@
++@@ -8144,7 +7483,7 @@
 + 	ac_cv_lib_dnet_dnet_ntoa=no
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS=$ac_check_lib_save_LIBS
 + fi
- @@ -8196,27 +7535,11 @@
++@@ -8197,27 +7536,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -8225,7 +7548,7 @@
++@@ -8226,7 +7549,7 @@
 + 	ac_cv_lib_dnet_stub_dnet_ntoa=no
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS=$ac_check_lib_save_LIBS
 + fi
- @@ -8299,27 +7622,11 @@
++@@ -8300,27 +7623,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   ac_cv_func_inet_ntoa=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -8328,7 +7635,7 @@
++@@ -8329,7 +7636,7 @@
 + 	ac_cv_func_inet_ntoa=no
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + fi
 + { echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
- @@ -8377,27 +7684,11 @@
++@@ -8378,27 +7685,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   ac_cv_lib_nsl_inet_ntoa=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -8406,7 +7697,7 @@
++@@ -8407,7 +7698,7 @@
 + 	ac_cv_lib_nsl_inet_ntoa=no
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS=$ac_check_lib_save_LIBS
 + fi
- @@ -8480,27 +7771,11 @@
++@@ -8481,27 +7772,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   ac_cv_func_connect=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -8509,7 +7784,7 @@
++@@ -8510,7 +7785,7 @@
 + 	ac_cv_func_connect=no
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + fi
 + { echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
- @@ -8558,27 +7833,11 @@
++@@ -8559,27 +7834,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   ac_cv_lib_socket_connect=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -8587,7 +7846,7 @@
++@@ -8588,7 +7847,7 @@
 + 	ac_cv_lib_socket_connect=no
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS=$ac_check_lib_save_LIBS
 + fi
- @@ -8662,27 +7921,11 @@
++@@ -8663,27 +7922,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   ac_cv_func_remove=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -8691,7 +7934,7 @@
++@@ -8692,7 +7935,7 @@
 + 	ac_cv_func_remove=no
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + fi
 + { echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
- @@ -8740,27 +7983,11 @@
++@@ -8741,27 +7984,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   ac_cv_lib_posix_remove=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -8769,7 +7996,7 @@
++@@ -8770,7 +7997,7 @@
 + 	ac_cv_lib_posix_remove=no
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS=$ac_check_lib_save_LIBS
 + fi
- @@ -8845,27 +8072,11 @@
++@@ -8846,27 +8073,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   ac_cv_func_shmat=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -8874,7 +8085,7 @@
++@@ -8875,7 +8086,7 @@
 + 	ac_cv_func_shmat=no
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + fi
 + { echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
- @@ -8924,27 +8135,11 @@
++@@ -8925,27 +8136,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   ac_cv_lib_ipc_shmat=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -8953,7 +8148,7 @@
++@@ -8954,7 +8149,7 @@
 + 	ac_cv_lib_ipc_shmat=no
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS=$ac_check_lib_save_LIBS
 + fi
- @@ -9007,27 +8202,10 @@
++@@ -9008,27 +8203,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_header_compiler=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -9063,17 +8241,10 @@
++@@ -9064,17 +8242,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } >/dev/null; then
 +-  if test -s conftest.err; then
 +-    ac_cpp_err=$ac_cxx_preproc_warn_flag
 +-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
 +-  else
 +-    ac_cpp_err=
 +-  fi
 +-else
 +-  ac_cpp_err=yes
 +-fi
 +-if test -z "$ac_cpp_err"; then
 ++  (exit $ac_status); } >/dev/null && {
 ++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       }; then
 +   ac_header_preproc=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -9173,27 +8344,10 @@
++@@ -9174,27 +8345,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_header_compiler=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -9229,17 +8383,10 @@
++@@ -9230,17 +8384,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } >/dev/null; then
 +-  if test -s conftest.err; then
 +-    ac_cpp_err=$ac_cxx_preproc_warn_flag
 +-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
 +-  else
 +-    ac_cpp_err=
 +-  fi
 +-else
 +-  ac_cpp_err=yes
 +-fi
 +-if test -z "$ac_cpp_err"; then
 ++  (exit $ac_status); } >/dev/null && {
 ++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       }; then
 +   ac_header_preproc=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -9342,27 +8489,11 @@
++@@ -9343,27 +8490,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   ac_cv_lib_poll_poll=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -9371,7 +8502,7 @@
++@@ -9372,7 +8503,7 @@
 + 	ac_cv_lib_poll_poll=no
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS=$ac_check_lib_save_LIBS
 + fi
- @@ -9422,27 +8553,10 @@
++@@ -9423,27 +8554,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_header_compiler=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -9478,17 +8592,10 @@
++@@ -9479,17 +8593,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } >/dev/null; then
 +-  if test -s conftest.err; then
 +-    ac_cpp_err=$ac_cxx_preproc_warn_flag
 +-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
 +-  else
 +-    ac_cpp_err=
 +-  fi
 +-else
 +-  ac_cpp_err=yes
 +-fi
 +-if test -z "$ac_cpp_err"; then
 ++  (exit $ac_status); } >/dev/null && {
 ++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       }; then
 +   ac_header_preproc=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -9583,27 +8690,10 @@
++@@ -9584,27 +8691,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_header_compiler=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -9639,17 +8729,10 @@
++@@ -9640,17 +8730,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } >/dev/null; then
 +-  if test -s conftest.err; then
 +-    ac_cpp_err=$ac_cxx_preproc_warn_flag
 +-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
 +-  else
 +-    ac_cpp_err=
 +-  fi
 +-else
 +-  ac_cpp_err=yes
 +-fi
 +-if test -z "$ac_cpp_err"; then
 ++  (exit $ac_status); } >/dev/null && {
 ++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       }; then
 +   ac_header_preproc=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -9751,27 +8834,11 @@
++@@ -9752,27 +8835,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 + 
 +       LIBRESOLV="-lresolv"
 +       { echo "$as_me:$LINENO: result: yes" >&5
- @@ -9791,7 +8858,7 @@
++@@ -9792,7 +8859,7 @@
 + 
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 +   LIBS=$kde_libs_safe
 + 
- @@ -9858,27 +8925,10 @@
++@@ -9859,27 +8926,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   kde_cv_func_res_init=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -9975,27 +9025,11 @@
++@@ -9976,27 +9026,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +    kde_cv_func_res_init=yes
 +   kde_cv_proto_res_init=yes
 + else
- @@ -10006,7 +9040,7 @@
++@@ -10007,7 +9041,7 @@
 + 
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS=$kde_safe_libs
 + ac_ext=cpp
- @@ -10089,27 +9123,11 @@
++@@ -10090,27 +9124,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   ac_cv_lib_ucb_killpg=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -10118,7 +9136,7 @@
++@@ -10119,7 +9137,7 @@
 + 	ac_cv_lib_ucb_killpg=no
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS=$ac_check_lib_save_LIBS
 + fi
- @@ -10177,27 +9195,11 @@
++@@ -10178,27 +9196,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   ac_cv_lib_bsd_gethostbyname=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -10206,7 +9208,7 @@
++@@ -10207,7 +9209,7 @@
 + 	ac_cv_lib_bsd_gethostbyname=no
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS=$ac_check_lib_save_LIBS
 + fi
- @@ -10255,27 +9257,10 @@
++@@ -10256,27 +9258,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_cv_type_int=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -10289,16 +9274,15 @@
++@@ -10290,16 +9275,15 @@
 + { echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
 + echo "${ECHO_T}$ac_cv_type_int" >&6; }
 + 
 ++# The cast to long int works around a bug in the HP C Compiler
 ++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 ++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 ++# This bug is HP SR number 8606223364.
 + { echo "$as_me:$LINENO: checking size of int" >&5
 + echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
 + if test "${ac_cv_sizeof_int+set}" = set; then
 +   echo $ECHO_N "(cached) $ECHO_C" >&6
 + else
 +-  if test "$ac_cv_type_int" = yes; then
 +-  # The cast to long int works around a bug in the HP C Compiler
 +-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 +-  # This bug is HP SR number 8606223364.
 +   if test "$cross_compiling" = yes; then
 +   # Depending upon the size, compute the lo and hi bounds.
 + cat >conftest.$ac_ext <<_ACEOF
- @@ -10308,7 +9292,7 @@
++@@ -10309,7 +9293,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef int ac__type_sizeof_;
 ++   typedef int ac__type_sizeof_;
 + int
 + main ()
 + {
- @@ -10332,27 +9316,10 @@
++@@ -10333,27 +9317,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_lo=0 ac_mid=0
 +   while :; do
 +     cat >conftest.$ac_ext <<_ACEOF
- @@ -10362,7 +9329,7 @@
++@@ -10363,7 +9330,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef int ac__type_sizeof_;
 ++   typedef int ac__type_sizeof_;
 + int
 + main ()
 + {
- @@ -10386,27 +9353,10 @@
++@@ -10387,27 +9354,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_hi=$ac_mid; break
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -10433,7 +9383,7 @@
++@@ -10434,7 +9384,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef int ac__type_sizeof_;
 ++   typedef int ac__type_sizeof_;
 + int
 + main ()
 + {
- @@ -10457,27 +9407,10 @@
++@@ -10458,27 +9408,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_hi=-1 ac_mid=-1
 +   while :; do
 +     cat >conftest.$ac_ext <<_ACEOF
- @@ -10487,7 +9420,7 @@
++@@ -10488,7 +9421,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef int ac__type_sizeof_;
 ++   typedef int ac__type_sizeof_;
 + int
 + main ()
 + {
- @@ -10511,27 +9444,10 @@
++@@ -10512,27 +9445,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_lo=$ac_mid; break
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -10568,7 +9484,7 @@
++@@ -10569,7 +9485,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef int ac__type_sizeof_;
 ++   typedef int ac__type_sizeof_;
 + int
 + main ()
 + {
- @@ -10592,27 +9508,10 @@
++@@ -10593,27 +9509,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_hi=$ac_mid
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -10625,11 +9524,15 @@
++@@ -10626,11 +9525,15 @@
 + done
 + case $ac_lo in
 + ?*) ac_cv_sizeof_int=$ac_lo;;
 +-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
 ++'') if test "$ac_cv_type_int" = yes; then
 ++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
 + See \`config.log' for more details." >&5
 + echo "$as_me: error: cannot compute sizeof (int)
 + See \`config.log' for more details." >&2;}
 +-   { (exit 77); exit 77; }; } ;;
 ++   { (exit 77); exit 77; }; }
 ++   else
 ++     ac_cv_sizeof_int=0
 ++   fi ;;
 + esac
 + else
 +   cat >conftest.$ac_ext <<_ACEOF
- @@ -10639,7 +9542,7 @@
++@@ -10640,7 +9543,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef int ac__type_sizeof_;
 ++   typedef int ac__type_sizeof_;
 + static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
 + static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
 + #include <stdio.h>
- @@ -10698,21 +9601,25 @@
++@@ -10699,21 +9602,25 @@
 + sed 's/^/| /' conftest.$ac_ext >&5
 + 
 + ( exit $ac_status )
 +-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
 ++if test "$ac_cv_type_int" = yes; then
 ++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
 + See \`config.log' for more details." >&5
 + echo "$as_me: error: cannot compute sizeof (int)
 + See \`config.log' for more details." >&2;}
 +    { (exit 77); exit 77; }; }
 ++   else
 ++     ac_cv_sizeof_int=0
 ++   fi
 + fi
 + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 + fi
 + rm -f conftest.val
 +-else
 +-  ac_cv_sizeof_int=0
 +-fi
 + fi
 + { echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
 + echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
 ++
 ++
 ++
 + cat >>confdefs.h <<_ACEOF
 + #define SIZEOF_INT $ac_cv_sizeof_int
 + _ACEOF
- @@ -10754,27 +9661,10 @@
++@@ -10755,27 +9662,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_cv_type_short=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -10788,16 +9678,15 @@
++@@ -10789,16 +9679,15 @@
 + { echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
 + echo "${ECHO_T}$ac_cv_type_short" >&6; }
 + 
 ++# The cast to long int works around a bug in the HP C Compiler
 ++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 ++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 ++# This bug is HP SR number 8606223364.
 + { echo "$as_me:$LINENO: checking size of short" >&5
 + echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
 + if test "${ac_cv_sizeof_short+set}" = set; then
 +   echo $ECHO_N "(cached) $ECHO_C" >&6
 + else
 +-  if test "$ac_cv_type_short" = yes; then
 +-  # The cast to long int works around a bug in the HP C Compiler
 +-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 +-  # This bug is HP SR number 8606223364.
 +   if test "$cross_compiling" = yes; then
 +   # Depending upon the size, compute the lo and hi bounds.
 + cat >conftest.$ac_ext <<_ACEOF
- @@ -10807,7 +9696,7 @@
++@@ -10808,7 +9697,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef short ac__type_sizeof_;
 ++   typedef short ac__type_sizeof_;
 + int
 + main ()
 + {
- @@ -10831,27 +9720,10 @@
++@@ -10832,27 +9721,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_lo=0 ac_mid=0
 +   while :; do
 +     cat >conftest.$ac_ext <<_ACEOF
- @@ -10861,7 +9733,7 @@
++@@ -10862,7 +9734,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef short ac__type_sizeof_;
 ++   typedef short ac__type_sizeof_;
 + int
 + main ()
 + {
- @@ -10885,27 +9757,10 @@
++@@ -10886,27 +9758,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_hi=$ac_mid; break
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -10932,7 +9787,7 @@
++@@ -10933,7 +9788,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef short ac__type_sizeof_;
 ++   typedef short ac__type_sizeof_;
 + int
 + main ()
 + {
- @@ -10956,27 +9811,10 @@
++@@ -10957,27 +9812,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_hi=-1 ac_mid=-1
 +   while :; do
 +     cat >conftest.$ac_ext <<_ACEOF
- @@ -10986,7 +9824,7 @@
++@@ -10987,7 +9825,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef short ac__type_sizeof_;
 ++   typedef short ac__type_sizeof_;
 + int
 + main ()
 + {
- @@ -11010,27 +9848,10 @@
++@@ -11011,27 +9849,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_lo=$ac_mid; break
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -11067,7 +9888,7 @@
++@@ -11068,7 +9889,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef short ac__type_sizeof_;
 ++   typedef short ac__type_sizeof_;
 + int
 + main ()
 + {
- @@ -11091,27 +9912,10 @@
++@@ -11092,27 +9913,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_hi=$ac_mid
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -11124,11 +9928,15 @@
++@@ -11125,11 +9929,15 @@
 + done
 + case $ac_lo in
 + ?*) ac_cv_sizeof_short=$ac_lo;;
 +-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
 ++'') if test "$ac_cv_type_short" = yes; then
 ++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
 + See \`config.log' for more details." >&5
 + echo "$as_me: error: cannot compute sizeof (short)
 + See \`config.log' for more details." >&2;}
 +-   { (exit 77); exit 77; }; } ;;
 ++   { (exit 77); exit 77; }; }
 ++   else
 ++     ac_cv_sizeof_short=0
 ++   fi ;;
 + esac
 + else
 +   cat >conftest.$ac_ext <<_ACEOF
- @@ -11138,7 +9946,7 @@
++@@ -11139,7 +9947,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef short ac__type_sizeof_;
 ++   typedef short ac__type_sizeof_;
 + static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
 + static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
 + #include <stdio.h>
- @@ -11197,21 +10005,25 @@
++@@ -11198,21 +10006,25 @@
 + sed 's/^/| /' conftest.$ac_ext >&5
 + 
 + ( exit $ac_status )
 +-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
 ++if test "$ac_cv_type_short" = yes; then
 ++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
 + See \`config.log' for more details." >&5
 + echo "$as_me: error: cannot compute sizeof (short)
 + See \`config.log' for more details." >&2;}
 +    { (exit 77); exit 77; }; }
 ++   else
 ++     ac_cv_sizeof_short=0
 ++   fi
 + fi
 + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 + fi
 + rm -f conftest.val
 +-else
 +-  ac_cv_sizeof_short=0
 +-fi
 + fi
 + { echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
 + echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
 ++
 ++
 ++
 + cat >>confdefs.h <<_ACEOF
 + #define SIZEOF_SHORT $ac_cv_sizeof_short
 + _ACEOF
- @@ -11253,27 +10065,10 @@
++@@ -11254,27 +10066,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_cv_type_long=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -11287,16 +10082,15 @@
++@@ -11288,16 +10083,15 @@
 + { echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
 + echo "${ECHO_T}$ac_cv_type_long" >&6; }
 + 
 ++# The cast to long int works around a bug in the HP C Compiler
 ++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 ++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 ++# This bug is HP SR number 8606223364.
 + { echo "$as_me:$LINENO: checking size of long" >&5
 + echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
 + if test "${ac_cv_sizeof_long+set}" = set; then
 +   echo $ECHO_N "(cached) $ECHO_C" >&6
 + else
 +-  if test "$ac_cv_type_long" = yes; then
 +-  # The cast to long int works around a bug in the HP C Compiler
 +-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 +-  # This bug is HP SR number 8606223364.
 +   if test "$cross_compiling" = yes; then
 +   # Depending upon the size, compute the lo and hi bounds.
 + cat >conftest.$ac_ext <<_ACEOF
- @@ -11306,7 +10100,7 @@
++@@ -11307,7 +10101,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef long ac__type_sizeof_;
 ++   typedef long ac__type_sizeof_;
 + int
 + main ()
 + {
- @@ -11330,27 +10124,10 @@
++@@ -11331,27 +10125,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_lo=0 ac_mid=0
 +   while :; do
 +     cat >conftest.$ac_ext <<_ACEOF
- @@ -11360,7 +10137,7 @@
++@@ -11361,7 +10138,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef long ac__type_sizeof_;
 ++   typedef long ac__type_sizeof_;
 + int
 + main ()
 + {
- @@ -11384,27 +10161,10 @@
++@@ -11385,27 +10162,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_hi=$ac_mid; break
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -11431,7 +10191,7 @@
++@@ -11432,7 +10192,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef long ac__type_sizeof_;
 ++   typedef long ac__type_sizeof_;
 + int
 + main ()
 + {
- @@ -11455,27 +10215,10 @@
++@@ -11456,27 +10216,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_hi=-1 ac_mid=-1
 +   while :; do
 +     cat >conftest.$ac_ext <<_ACEOF
- @@ -11485,7 +10228,7 @@
++@@ -11486,7 +10229,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef long ac__type_sizeof_;
 ++   typedef long ac__type_sizeof_;
 + int
 + main ()
 + {
- @@ -11509,27 +10252,10 @@
++@@ -11510,27 +10253,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_lo=$ac_mid; break
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -11566,7 +10292,7 @@
++@@ -11567,7 +10293,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef long ac__type_sizeof_;
 ++   typedef long ac__type_sizeof_;
 + int
 + main ()
 + {
- @@ -11590,27 +10316,10 @@
++@@ -11591,27 +10317,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_hi=$ac_mid
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -11623,11 +10332,15 @@
++@@ -11624,11 +10333,15 @@
 + done
 + case $ac_lo in
 + ?*) ac_cv_sizeof_long=$ac_lo;;
 +-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
 ++'') if test "$ac_cv_type_long" = yes; then
 ++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
 + See \`config.log' for more details." >&5
 + echo "$as_me: error: cannot compute sizeof (long)
 + See \`config.log' for more details." >&2;}
 +-   { (exit 77); exit 77; }; } ;;
 ++   { (exit 77); exit 77; }; }
 ++   else
 ++     ac_cv_sizeof_long=0
 ++   fi ;;
 + esac
 + else
 +   cat >conftest.$ac_ext <<_ACEOF
- @@ -11637,7 +10350,7 @@
++@@ -11638,7 +10351,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef long ac__type_sizeof_;
 ++   typedef long ac__type_sizeof_;
 + static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
 + static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
 + #include <stdio.h>
- @@ -11696,21 +10409,25 @@
++@@ -11697,21 +10410,25 @@
 + sed 's/^/| /' conftest.$ac_ext >&5
 + 
 + ( exit $ac_status )
 +-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
 ++if test "$ac_cv_type_long" = yes; then
 ++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
 + See \`config.log' for more details." >&5
 + echo "$as_me: error: cannot compute sizeof (long)
 + See \`config.log' for more details." >&2;}
 +    { (exit 77); exit 77; }; }
 ++   else
 ++     ac_cv_sizeof_long=0
 ++   fi
 + fi
 + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 + fi
 + rm -f conftest.val
 +-else
 +-  ac_cv_sizeof_long=0
 +-fi
 + fi
 + { echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
 + echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
 ++
 ++
 ++
 + cat >>confdefs.h <<_ACEOF
 + #define SIZEOF_LONG $ac_cv_sizeof_long
 + _ACEOF
- @@ -11752,27 +10469,10 @@
++@@ -11753,27 +10470,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_cv_type_char_p=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -11786,16 +10486,15 @@
++@@ -11787,16 +10487,15 @@
 + { echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
 + echo "${ECHO_T}$ac_cv_type_char_p" >&6; }
 + 
 ++# The cast to long int works around a bug in the HP C Compiler
 ++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 ++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 ++# This bug is HP SR number 8606223364.
 + { echo "$as_me:$LINENO: checking size of char *" >&5
 + echo $ECHO_N "checking size of char *... $ECHO_C" >&6; }
 + if test "${ac_cv_sizeof_char_p+set}" = set; then
 +   echo $ECHO_N "(cached) $ECHO_C" >&6
 + else
 +-  if test "$ac_cv_type_char_p" = yes; then
 +-  # The cast to long int works around a bug in the HP C Compiler
 +-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 +-  # This bug is HP SR number 8606223364.
 +   if test "$cross_compiling" = yes; then
 +   # Depending upon the size, compute the lo and hi bounds.
 + cat >conftest.$ac_ext <<_ACEOF
- @@ -11805,7 +10504,7 @@
++@@ -11806,7 +10505,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef char * ac__type_sizeof_;
 ++   typedef char * ac__type_sizeof_;
 + int
 + main ()
 + {
- @@ -11829,27 +10528,10 @@
++@@ -11830,27 +10529,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_lo=0 ac_mid=0
 +   while :; do
 +     cat >conftest.$ac_ext <<_ACEOF
- @@ -11859,7 +10541,7 @@
++@@ -11860,7 +10542,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef char * ac__type_sizeof_;
 ++   typedef char * ac__type_sizeof_;
 + int
 + main ()
 + {
- @@ -11883,27 +10565,10 @@
++@@ -11884,27 +10566,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_hi=$ac_mid; break
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -11930,7 +10595,7 @@
++@@ -11931,7 +10596,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef char * ac__type_sizeof_;
 ++   typedef char * ac__type_sizeof_;
 + int
 + main ()
 + {
- @@ -11954,27 +10619,10 @@
++@@ -11955,27 +10620,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_hi=-1 ac_mid=-1
 +   while :; do
 +     cat >conftest.$ac_ext <<_ACEOF
- @@ -11984,7 +10632,7 @@
++@@ -11985,7 +10633,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef char * ac__type_sizeof_;
 ++   typedef char * ac__type_sizeof_;
 + int
 + main ()
 + {
- @@ -12008,27 +10656,10 @@
++@@ -12009,27 +10657,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_lo=$ac_mid; break
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -12065,7 +10696,7 @@
++@@ -12066,7 +10697,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef char * ac__type_sizeof_;
 ++   typedef char * ac__type_sizeof_;
 + int
 + main ()
 + {
- @@ -12089,27 +10720,10 @@
++@@ -12090,27 +10721,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_hi=$ac_mid
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -12122,11 +10736,15 @@
++@@ -12123,11 +10737,15 @@
 + done
 + case $ac_lo in
 + ?*) ac_cv_sizeof_char_p=$ac_lo;;
 +-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
 ++'') if test "$ac_cv_type_char_p" = yes; then
 ++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
 + See \`config.log' for more details." >&5
 + echo "$as_me: error: cannot compute sizeof (char *)
 + See \`config.log' for more details." >&2;}
 +-   { (exit 77); exit 77; }; } ;;
 ++   { (exit 77); exit 77; }; }
 ++   else
 ++     ac_cv_sizeof_char_p=0
 ++   fi ;;
 + esac
 + else
 +   cat >conftest.$ac_ext <<_ACEOF
- @@ -12136,7 +10754,7 @@
++@@ -12137,7 +10755,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef char * ac__type_sizeof_;
 ++   typedef char * ac__type_sizeof_;
 + static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
 + static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
 + #include <stdio.h>
- @@ -12195,21 +10813,25 @@
++@@ -12196,21 +10814,25 @@
 + sed 's/^/| /' conftest.$ac_ext >&5
 + 
 + ( exit $ac_status )
 +-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
 ++if test "$ac_cv_type_char_p" = yes; then
 ++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
 + See \`config.log' for more details." >&5
 + echo "$as_me: error: cannot compute sizeof (char *)
 + See \`config.log' for more details." >&2;}
 +    { (exit 77); exit 77; }; }
 ++   else
 ++     ac_cv_sizeof_char_p=0
 ++   fi
 + fi
 + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 + fi
 + rm -f conftest.val
 +-else
 +-  ac_cv_sizeof_char_p=0
 +-fi
 + fi
 + { echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
 + echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6; }
 ++
 ++
 ++
 + cat >>confdefs.h <<_ACEOF
 + #define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
 + _ACEOF
- @@ -12258,27 +10880,11 @@
++@@ -12259,27 +10881,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   ac_cv_lib_dl_dlopen=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -12287,7 +10893,7 @@
++@@ -12288,7 +10894,7 @@
 + 	ac_cv_lib_dl_dlopen=no
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS=$ac_check_lib_save_LIBS
 + fi
- @@ -12343,27 +10949,11 @@
++@@ -12344,27 +10950,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   ac_cv_lib_dld_shl_unload=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -12372,7 +10962,7 @@
++@@ -12373,7 +10963,7 @@
 + 	ac_cv_lib_dld_shl_unload=no
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS=$ac_check_lib_save_LIBS
 + fi
- @@ -12428,27 +11018,10 @@
++@@ -12429,27 +11019,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_cv_type_size_t=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -12462,16 +11035,15 @@
++@@ -12463,16 +11036,15 @@
 + { echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
 + echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
 + 
 ++# The cast to long int works around a bug in the HP C Compiler
 ++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 ++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 ++# This bug is HP SR number 8606223364.
 + { echo "$as_me:$LINENO: checking size of size_t" >&5
 + echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; }
 + if test "${ac_cv_sizeof_size_t+set}" = set; then
 +   echo $ECHO_N "(cached) $ECHO_C" >&6
 + else
 +-  if test "$ac_cv_type_size_t" = yes; then
 +-  # The cast to long int works around a bug in the HP C Compiler
 +-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 +-  # This bug is HP SR number 8606223364.
 +   if test "$cross_compiling" = yes; then
 +   # Depending upon the size, compute the lo and hi bounds.
 + cat >conftest.$ac_ext <<_ACEOF
- @@ -12481,7 +11053,7 @@
++@@ -12482,7 +11054,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef size_t ac__type_sizeof_;
 ++   typedef size_t ac__type_sizeof_;
 + int
 + main ()
 + {
- @@ -12505,27 +11077,10 @@
++@@ -12506,27 +11078,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_lo=0 ac_mid=0
 +   while :; do
 +     cat >conftest.$ac_ext <<_ACEOF
- @@ -12535,7 +11090,7 @@
++@@ -12536,7 +11091,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef size_t ac__type_sizeof_;
 ++   typedef size_t ac__type_sizeof_;
 + int
 + main ()
 + {
- @@ -12559,27 +11114,10 @@
++@@ -12560,27 +11115,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_hi=$ac_mid; break
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -12606,7 +11144,7 @@
++@@ -12607,7 +11145,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef size_t ac__type_sizeof_;
 ++   typedef size_t ac__type_sizeof_;
 + int
 + main ()
 + {
- @@ -12630,27 +11168,10 @@
++@@ -12631,27 +11169,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_hi=-1 ac_mid=-1
 +   while :; do
 +     cat >conftest.$ac_ext <<_ACEOF
- @@ -12660,7 +11181,7 @@
++@@ -12661,7 +11182,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef size_t ac__type_sizeof_;
 ++   typedef size_t ac__type_sizeof_;
 + int
 + main ()
 + {
- @@ -12684,27 +11205,10 @@
++@@ -12685,27 +11206,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_lo=$ac_mid; break
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -12741,7 +11245,7 @@
++@@ -12742,7 +11246,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef size_t ac__type_sizeof_;
 ++   typedef size_t ac__type_sizeof_;
 + int
 + main ()
 + {
- @@ -12765,27 +11269,10 @@
++@@ -12766,27 +11270,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_hi=$ac_mid
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -12798,11 +11285,15 @@
++@@ -12799,11 +11286,15 @@
 + done
 + case $ac_lo in
 + ?*) ac_cv_sizeof_size_t=$ac_lo;;
 +-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
 ++'') if test "$ac_cv_type_size_t" = yes; then
 ++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
 + See \`config.log' for more details." >&5
 + echo "$as_me: error: cannot compute sizeof (size_t)
 + See \`config.log' for more details." >&2;}
 +-   { (exit 77); exit 77; }; } ;;
 ++   { (exit 77); exit 77; }; }
 ++   else
 ++     ac_cv_sizeof_size_t=0
 ++   fi ;;
 + esac
 + else
 +   cat >conftest.$ac_ext <<_ACEOF
- @@ -12812,7 +11303,7 @@
++@@ -12813,7 +11304,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef size_t ac__type_sizeof_;
 ++   typedef size_t ac__type_sizeof_;
 + static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
 + static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
 + #include <stdio.h>
- @@ -12871,21 +11362,25 @@
++@@ -12872,21 +11363,25 @@
 + sed 's/^/| /' conftest.$ac_ext >&5
 + 
 + ( exit $ac_status )
 +-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
 ++if test "$ac_cv_type_size_t" = yes; then
 ++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
 + See \`config.log' for more details." >&5
 + echo "$as_me: error: cannot compute sizeof (size_t)
 + See \`config.log' for more details." >&2;}
 +    { (exit 77); exit 77; }; }
 ++   else
 ++     ac_cv_sizeof_size_t=0
 ++   fi
 + fi
 + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 + fi
 + rm -f conftest.val
 +-else
 +-  ac_cv_sizeof_size_t=0
 +-fi
 + fi
 + { echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
 + echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; }
 ++
 ++
 ++
 + cat >>confdefs.h <<_ACEOF
 + #define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
 + _ACEOF
- @@ -12913,42 +11408,25 @@
-    return 0;
-    ;
-    return 0;
- -}
- -_ACEOF
- -rm -f conftest.$ac_objext
- -if { (ac_try="$ac_compile"
- -case "(($ac_try" in
- -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- -  *) ac_try_echo=$ac_try;;
- -esac
- -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- -  (eval "$ac_compile") 2>conftest.er1
- -  ac_status=$?
- -  grep -v '^ *+' conftest.er1 >conftest.err
- -  rm -f conftest.er1
- -  cat conftest.err >&5
- -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++@@ -12929,27 +11424,10 @@
++   rm -f conftest.er1
++   cat conftest.err >&5
++   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
- +}
- +_ACEOF
- +rm -f conftest.$ac_objext
- +if { (ac_try="$ac_compile"
- +case "(($ac_try" in
-    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-    *) ac_try_echo=$ac_try;;
-  esac
-  eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++-  *) ac_try_echo=$ac_try;;
++-esac
++-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
- +  (eval "$ac_compile") 2>conftest.er1
-    ac_status=$?
- +  grep -v '^ *+' conftest.er1 >conftest.err
- +  rm -f conftest.er1
- +  cat conftest.err >&5
-    echo "$as_me:$LINENO: \$? = $ac_status" >&5
++-  ac_status=$?
++-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_cv_type_unsigned_long=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -12962,16 +11440,15 @@
++@@ -12963,16 +11441,15 @@
 + { echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
 + echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6; }
 + 
 ++# The cast to long int works around a bug in the HP C Compiler
 ++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 ++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 ++# This bug is HP SR number 8606223364.
 + { echo "$as_me:$LINENO: checking size of unsigned long" >&5
 + echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; }
 + if test "${ac_cv_sizeof_unsigned_long+set}" = set; then
 +   echo $ECHO_N "(cached) $ECHO_C" >&6
 + else
 +-  if test "$ac_cv_type_unsigned_long" = yes; then
 +-  # The cast to long int works around a bug in the HP C Compiler
 +-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 +-  # This bug is HP SR number 8606223364.
 +   if test "$cross_compiling" = yes; then
 +   # Depending upon the size, compute the lo and hi bounds.
 + cat >conftest.$ac_ext <<_ACEOF
- @@ -12981,7 +11458,7 @@
++@@ -12982,7 +11459,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef unsigned long ac__type_sizeof_;
 ++   typedef unsigned long ac__type_sizeof_;
 + int
 + main ()
 + {
- @@ -13005,27 +11482,10 @@
++@@ -13006,27 +11483,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_lo=0 ac_mid=0
 +   while :; do
 +     cat >conftest.$ac_ext <<_ACEOF
- @@ -13035,7 +11495,7 @@
++@@ -13036,7 +11496,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef unsigned long ac__type_sizeof_;
 ++   typedef unsigned long ac__type_sizeof_;
 + int
 + main ()
 + {
- @@ -13059,27 +11519,10 @@
++@@ -13060,27 +11520,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_hi=$ac_mid; break
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -13106,7 +11549,7 @@
++@@ -13107,7 +11550,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef unsigned long ac__type_sizeof_;
 ++   typedef unsigned long ac__type_sizeof_;
 + int
 + main ()
 + {
- @@ -13130,27 +11573,10 @@
++@@ -13131,27 +11574,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_hi=-1 ac_mid=-1
 +   while :; do
 +     cat >conftest.$ac_ext <<_ACEOF
- @@ -13160,7 +11586,7 @@
++@@ -13161,7 +11587,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef unsigned long ac__type_sizeof_;
 ++   typedef unsigned long ac__type_sizeof_;
 + int
 + main ()
 + {
- @@ -13184,27 +11610,10 @@
++@@ -13185,27 +11611,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_lo=$ac_mid; break
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -13241,7 +11650,7 @@
++@@ -13242,7 +11651,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef unsigned long ac__type_sizeof_;
 ++   typedef unsigned long ac__type_sizeof_;
 + int
 + main ()
 + {
- @@ -13265,27 +11674,10 @@
++@@ -13266,27 +11675,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_hi=$ac_mid
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -13298,11 +11690,15 @@
++@@ -13299,11 +11691,15 @@
 + done
 + case $ac_lo in
 + ?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
 +-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
 ++'') if test "$ac_cv_type_unsigned_long" = yes; then
 ++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
 + See \`config.log' for more details." >&5
 + echo "$as_me: error: cannot compute sizeof (unsigned long)
 + See \`config.log' for more details." >&2;}
 +-   { (exit 77); exit 77; }; } ;;
 ++   { (exit 77); exit 77; }; }
 ++   else
 ++     ac_cv_sizeof_unsigned_long=0
 ++   fi ;;
 + esac
 + else
 +   cat >conftest.$ac_ext <<_ACEOF
- @@ -13312,7 +11708,7 @@
++@@ -13313,7 +11709,7 @@
 + cat >>conftest.$ac_ext <<_ACEOF
 + /* end confdefs.h.  */
 + $ac_includes_default
 +-		   typedef unsigned long ac__type_sizeof_;
 ++   typedef unsigned long ac__type_sizeof_;
 + static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
 + static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
 + #include <stdio.h>
- @@ -13371,21 +11767,25 @@
++@@ -13372,21 +11768,25 @@
 + sed 's/^/| /' conftest.$ac_ext >&5
 + 
 + ( exit $ac_status )
 +-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
 ++if test "$ac_cv_type_unsigned_long" = yes; then
 ++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
 + See \`config.log' for more details." >&5
 + echo "$as_me: error: cannot compute sizeof (unsigned long)
 + See \`config.log' for more details." >&2;}
 +    { (exit 77); exit 77; }; }
 ++   else
 ++     ac_cv_sizeof_unsigned_long=0
 ++   fi
 + fi
 + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 + fi
 + rm -f conftest.val
 +-else
 +-  ac_cv_sizeof_unsigned_long=0
 +-fi
 + fi
 + { echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
 + echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; }
 ++
 ++
 ++
 + cat >>confdefs.h <<_ACEOF
 + #define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long
 + _ACEOF
- @@ -13426,27 +11826,10 @@
++@@ -13427,27 +11827,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   { echo "$as_me:$LINENO: result: yes" >&5
 + echo "${ECHO_T}yes" >&6; }
 + else
- @@ -13511,27 +11894,10 @@
++@@ -13512,27 +11895,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_header_compiler=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -13567,17 +11933,10 @@
++@@ -13568,17 +11934,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } >/dev/null; then
 +-  if test -s conftest.err; then
 +-    ac_cpp_err=$ac_cxx_preproc_warn_flag
 +-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
 +-  else
 +-    ac_cpp_err=
 +-  fi
 +-else
 +-  ac_cpp_err=yes
 +-fi
 +-if test -z "$ac_cpp_err"; then
 ++  (exit $ac_status); } >/dev/null && {
 ++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       }; then
 +   ac_header_preproc=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -13699,27 +12058,11 @@
++@@ -13700,27 +12059,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   ac_cv_func__NSGetEnviron=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -13728,7 +12071,7 @@
++@@ -13729,7 +12072,7 @@
 + 	ac_cv_func__NSGetEnviron=no
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + fi
 + { echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
- @@ -13816,27 +12159,11 @@
++@@ -13817,27 +12160,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   eval "$as_ac_var=yes"
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -13845,7 +12172,7 @@
++@@ -13846,7 +12173,7 @@
 + 	eval "$as_ac_var=no"
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + fi
 + ac_res=`eval echo '${'$as_ac_var'}'`
- @@ -13995,17 +12322,10 @@
++@@ -13996,17 +12323,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } >/dev/null; then
 +-  if test -s conftest.err; then
 +-    ac_cpp_err=$ac_cxx_preproc_warn_flag
 +-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
 +-  else
 +-    ac_cpp_err=
 +-  fi
 +-else
 +-  ac_cpp_err=yes
 +-fi
 +-if test -z "$ac_cpp_err"; then
 ++  (exit $ac_status); } >/dev/null && {
 ++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       }; then
 +   # We can compile using X headers with no special include directory.
 + ac_x_includes=
 + else
- @@ -14098,27 +12418,11 @@
++@@ -14099,27 +12419,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   LIBS="$ac_save_LIBS"
 + # We can link X programs with no special library path.
 + ac_x_libraries=
- @@ -14175,7 +12479,7 @@
++@@ -14176,7 +12480,7 @@
 + done
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + fi # $ac_x_libraries = NO
 + 
- @@ -14340,27 +12644,11 @@
++@@ -14341,27 +12645,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   ac_cv_lib_ICE_IceConnectionNumber=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -14369,7 +12657,7 @@
++@@ -14370,7 +12658,7 @@
 + 	ac_cv_lib_ICE_IceConnectionNumber=no
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS=$ac_check_lib_save_LIBS
 + fi
- @@ -14430,27 +12718,11 @@
++@@ -14431,27 +12719,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   kde_cv_have_libXext=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -14460,7 +12732,7 @@
++@@ -14461,7 +12733,7 @@
 + 
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + 
 + LDFLAGS=$kde_ldflags_safe
- @@ -14652,42 +12924,26 @@
-  return pthread_create ();
-    ;
-    return 0;
- -}
- -_ACEOF
- -rm -f conftest.$ac_objext conftest$ac_exeext
- -if { (ac_try="$ac_link"
- -case "(($ac_try" in
- -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- -  *) ac_try_echo=$ac_try;;
- -esac
- -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- -  (eval "$ac_link") 2>conftest.er1
- -  ac_status=$?
- -  grep -v '^ *+' conftest.er1 >conftest.err
- -  rm -f conftest.er1
- -  cat conftest.err >&5
- -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++@@ -14668,27 +12940,11 @@
++   rm -f conftest.er1
++   cat conftest.err >&5
++   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
- +}
- +_ACEOF
- +rm -f conftest.$ac_objext conftest$ac_exeext
- +if { (ac_try="$ac_link"
- +case "(($ac_try" in
-    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-    *) ac_try_echo=$ac_try;;
-  esac
-  eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++-  *) ac_try_echo=$ac_try;;
++-esac
++-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
- +  (eval "$ac_link") 2>conftest.er1
-    ac_status=$?
- +  grep -v '^ *+' conftest.er1 >conftest.err
- +  rm -f conftest.er1
- +  cat conftest.err >&5
-    echo "$as_me:$LINENO: \$? = $ac_status" >&5
++-  ac_status=$?
++-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   eval "$as_ac_Lib=yes"
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -14696,7 +12952,7 @@
++@@ -14697,7 +12953,7 @@
 + 	eval "$as_ac_Lib=no"
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS=$ac_check_lib_save_LIBS
 + fi
- @@ -14757,27 +13013,11 @@
++@@ -14758,27 +13014,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   ac_cv_lib_pthread_pthread_create=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -14786,7 +13026,7 @@
++@@ -14787,7 +13027,7 @@
 + 	ac_cv_lib_pthread_pthread_create=no
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS=$ac_check_lib_save_LIBS
 + fi
- @@ -14831,27 +13071,11 @@
++@@ -14832,27 +13072,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 + 
 +         { echo "$as_me:$LINENO: result: yes" >&5
 + echo "${ECHO_T}yes" >&6; }
- @@ -14865,7 +13089,7 @@
++@@ -14866,7 +13090,7 @@
 + echo "${ECHO_T}no" >&6; }
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 +     LIBS=$kde_safe_libs
 +   fi
- @@ -14927,27 +13151,11 @@
++@@ -14928,27 +13152,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   eval "kde_cv_prog_cxx_$kde_cache=yes"
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -14956,7 +13164,7 @@
++@@ -14957,7 +13165,7 @@
 + 
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 +   CXXFLAGS="$save_CXXFLAGS"
 +   ac_ext=cpp
- @@ -15034,27 +13242,11 @@
++@@ -15035,27 +13243,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   eval "kde_cv_prog_cxx_$kde_cache=yes"
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -15063,7 +13255,7 @@
++@@ -15064,7 +13256,7 @@
 + 
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 +   CXXFLAGS="$save_CXXFLAGS"
 +   ac_ext=cpp
- @@ -15223,27 +13415,11 @@
++@@ -15224,27 +13416,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   eval "ac_cv_lib_z='-lz'"
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -15252,7 +13428,7 @@
++@@ -15253,7 +13429,7 @@
 + 	eval "ac_cv_lib_z=no"
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS="$kde_save_LIBS"
 + CFLAGS="$kde_save_CFLAGS"
- @@ -15335,27 +13511,11 @@
++@@ -15336,27 +13512,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   eval "ac_cv_lib_png='-lpng $LIBZ -lm'"
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -15365,7 +13525,7 @@
++@@ -15366,7 +13526,7 @@
 + 
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS="$kde_save_LIBS"
 + CFLAGS="$kde_save_CFLAGS"
- @@ -15442,27 +13602,11 @@
++@@ -15443,27 +13603,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   eval "ac_cv_lib_jpeg_6b=-ljpeg6b"
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -15471,7 +13615,7 @@
++@@ -15472,7 +13616,7 @@
 + 	eval "ac_cv_lib_jpeg_6b=no"
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS="$ac_save_LIBS"
 + CFLAGS="$ac_save_CFLAGS"
- @@ -15539,27 +13683,11 @@
++@@ -15540,27 +13684,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   eval "ac_cv_lib_jpeg_normal=-ljpeg"
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -15568,7 +13696,7 @@
++@@ -15569,7 +13697,7 @@
 + 	eval "ac_cv_lib_jpeg_normal=no"
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS="$ac_save_LIBS"
 + CFLAGS="$ac_save_CFLAGS"
- @@ -15602,7 +13730,7 @@
++@@ -15603,7 +13731,7 @@
 + do
 +   for j in jpeglib.h;
 +   do
- -    echo "configure: 15605: $i/$j" >&5
- +    echo "configure: 13733: $i/$j" >&5
++-    echo "configure: 15606: $i/$j" >&5
+++    echo "configure: 13734: $i/$j" >&5
 +     if test -r "$i/$j"; then
 +       echo "taking that" >&5
 +       jpeg_incdir=$i
- @@ -15910,7 +14038,7 @@
++@@ -15911,7 +14039,7 @@
 + do
 +   for j in $kde_qt_header;
 +   do
- -    echo "configure: 15913: $i/$j" >&5
- +    echo "configure: 14041: $i/$j" >&5
++-    echo "configure: 15914: $i/$j" >&5
+++    echo "configure: 14042: $i/$j" >&5
 +     if test -r "$i/$j"; then
 +       echo "taking that" >&5
 +       qt_incdir=$i
- @@ -16588,27 +14716,11 @@
++@@ -16589,27 +14717,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   eval "kde_cv_qt_jpeg=no"
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -16617,7 +14729,7 @@
++@@ -16618,7 +14730,7 @@
 + 	eval "kde_cv_qt_jpeg=yes"
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS="$ac_save_LIBS"
 + CXXFLAGS="$ac_save_CXXFLAGS"
- @@ -16681,7 +14793,7 @@
++@@ -16682,7 +14794,7 @@
 +   IFS=$as_save_IFS
 +   test -z "$as_dir" && as_dir=.
 +   for ac_exec_ext in '' $ac_executable_extensions; do
 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
 ++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +     ac_cv_prog_have_lrelease="yes"
 +     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +     break 2
- @@ -16740,7 +14852,7 @@
++@@ -16757,7 +14869,7 @@
 +   IFS=$as_save_IFS
 +   test -z "$as_dir" && as_dir=.
 +   for ac_exec_ext in '' $ac_executable_extensions; do
 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
 ++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +     ac_cv_prog_have_kde="yes"
 +     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +     break 2
- @@ -17043,27 +15155,10 @@
++@@ -17060,27 +15172,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   kde_cv_stl_works=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -17199,7 +15294,7 @@
++@@ -17216,7 +15311,7 @@
 + do
 +   for j in $kde_check_header;
 +   do
- -    echo "configure: 17202: $i/$j" >&5
- +    echo "configure: 15297: $i/$j" >&5
++-    echo "configure: 17219: $i/$j" >&5
+++    echo "configure: 15314: $i/$j" >&5
 +     if test -r "$i/$j"; then
 +       echo "taking that" >&5
 +       kde_incdir=$i
- @@ -17229,7 +15324,7 @@
++@@ -17246,7 +15341,7 @@
 + do
 +   for j in $kde_check_lib;
 +   do
- -    echo "configure: 17232: $i/$j" >&5
- +    echo "configure: 15327: $i/$j" >&5
++-    echo "configure: 17249: $i/$j" >&5
+++    echo "configure: 15344: $i/$j" >&5
 +     if test -r "$i/$j"; then
 +       echo "taking that" >&5
 +       kde_libdir=$i
- @@ -17247,7 +15342,7 @@
++@@ -17264,7 +15359,7 @@
 + do
 +   for j in "kde3/plugins/designer/kdewidgets.la";
 +   do
- -    echo "configure: 17250: $i/$j" >&5
- +    echo "configure: 15345: $i/$j" >&5
++-    echo "configure: 17267: $i/$j" >&5
+++    echo "configure: 15362: $i/$j" >&5
 +     if test -r "$i/$j"; then
 +       echo "taking that" >&5
 +       kde_widgetdir=$i
- @@ -18747,7 +16842,7 @@
++@@ -18764,7 +16859,7 @@
 + do
 +   for j in apps/ksgmltools2/customization/kde-chunk.xsl;
 +   do
- -    echo "configure: 18750: $i/$j" >&5
- +    echo "configure: 16845: $i/$j" >&5
++-    echo "configure: 18767: $i/$j" >&5
+++    echo "configure: 16862: $i/$j" >&5
 +     if test -r "$i/$j"; then
 +       echo "taking that" >&5
 +       KDE_XSL_STYLESHEET=$i
- @@ -18979,27 +17074,11 @@
++@@ -18996,27 +17091,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   ac_cv_lib_bind_main=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -19008,7 +17087,7 @@
++@@ -19025,7 +17104,7 @@
 + 	ac_cv_lib_bind_main=no
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS=$ac_check_lib_save_LIBS
 + fi
- @@ -19060,27 +17139,10 @@
++@@ -19077,27 +17156,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_header_compiler=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -19116,17 +17178,10 @@
++@@ -19133,17 +17195,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } >/dev/null; then
 +-  if test -s conftest.err; then
 +-    ac_cpp_err=$ac_cxx_preproc_warn_flag
 +-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
 +-  else
 +-    ac_cpp_err=
 +-  fi
 +-else
 +-  ac_cpp_err=yes
 +-fi
 +-if test -z "$ac_cpp_err"; then
 ++  (exit $ac_status); } >/dev/null && {
 ++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       }; then
 +   ac_header_preproc=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -19227,27 +17282,11 @@
++@@ -19244,27 +17299,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   ac_cv_lib_sndfile_sf_open=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -19256,7 +17295,7 @@
++@@ -19273,7 +17312,7 @@
 + 	ac_cv_lib_sndfile_sf_open=no
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS=$ac_check_lib_save_LIBS
 + fi
- @@ -19307,33 +17346,17 @@
-    *) ac_try_echo=$ac_try;;
-  esac
-  eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- -  (eval "$ac_link") 2>conftest.er1
- -  ac_status=$?
- -  grep -v '^ *+' conftest.er1 >conftest.err
- -  rm -f conftest.er1
- -  cat conftest.err >&5
- -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++@@ -19295,42 +17334,250 @@
++ 
++ # This check does not work on all platforms
++ # Check if libgsm is available
++-# AC_CHECK_LIB(gsm, sf_open, [
++-#	AC_CHECK_HEADER(gsm.h, [],
++-#		[AC_MSG_ERROR([gsm header files missing (gsm.h)])])
++-#	AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the <libgsm> library.])
++-#	GSM_LIBS="-lgsm"
++-#	echo "LIBS += -lgsm" >> $QT_INCL_PRO
++-#	have_gsm="yes" ], [
++-#	have_gsm="no"
++-#	GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
++-#	echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
++-have_gsm="no"
++-GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
++-echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO
+++{ echo "$as_me:$LINENO: checking for sf_open in -lgsm" >&5
+++echo $ECHO_N "checking for sf_open in -lgsm... $ECHO_C" >&6; }
+++if test "${ac_cv_lib_gsm_sf_open+set}" = set; then
+++  echo $ECHO_N "(cached) $ECHO_C" >&6
+++else
+++  ac_check_lib_save_LIBS=$LIBS
+++LIBS="-lgsm  $LIBS"
+++cat >conftest.$ac_ext <<_ACEOF
+++/* confdefs.h.  */
+++_ACEOF
+++cat confdefs.h >>conftest.$ac_ext
+++cat >>conftest.$ac_ext <<_ACEOF
+++/* end confdefs.h.  */
++ 
+++/* Override any GCC internal prototype to avoid an error.
+++   Use char because int might match the return type of a GCC
+++   builtin and then its argument prototype would still apply.  */
+++#ifdef __cplusplus
+++extern "C"
+++#endif
+++char sf_open ();
+++int
+++main ()
+++{
+++return sf_open ();
+++  ;
+++  return 0;
+++}
+++_ACEOF
+++rm -f conftest.$ac_objext conftest$ac_exeext
+++if { (ac_try="$ac_link"
+++case "(($ac_try" in
+++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+++  *) ac_try_echo=$ac_try;;
+++esac
+++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+++  (eval "$ac_link") 2>conftest.er1
+++  ac_status=$?
+++  grep -v '^ *+' conftest.er1 >conftest.err
+++  rm -f conftest.er1
+++  cat conftest.err >&5
+++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+++  (exit $ac_status); } && {
+++	 test -z "$ac_cxx_werror_flag" ||
+++	 test ! -s conftest.err
+++       } && test -s conftest$ac_exeext &&
+++       $as_test_x conftest$ac_exeext; then
+++  ac_cv_lib_gsm_sf_open=yes
+++else
+++  echo "$as_me: failed program was:" >&5
+++sed 's/^/| /' conftest.$ac_ext >&5
++ 
+++	ac_cv_lib_gsm_sf_open=no
+++fi
++ 
++-# Check if ALSA is available
++-{ echo "$as_me:$LINENO: checking for main in -lasound" >&5
++-echo $ECHO_N "checking for main in -lasound... $ECHO_C" >&6; }
++-if test "${ac_cv_lib_asound_main+set}" = set; then
+++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+++      conftest$ac_exeext conftest.$ac_ext
+++LIBS=$ac_check_lib_save_LIBS
+++fi
+++{ echo "$as_me:$LINENO: result: $ac_cv_lib_gsm_sf_open" >&5
+++echo "${ECHO_T}$ac_cv_lib_gsm_sf_open" >&6; }
+++if test $ac_cv_lib_gsm_sf_open = yes; then
+++
+++	if test "${ac_cv_header_gsm_h+set}" = set; then
+++  { echo "$as_me:$LINENO: checking for gsm.h" >&5
+++echo $ECHO_N "checking for gsm.h... $ECHO_C" >&6; }
+++if test "${ac_cv_header_gsm_h+set}" = set; then
++   echo $ECHO_N "(cached) $ECHO_C" >&6
+++fi
+++{ echo "$as_me:$LINENO: result: $ac_cv_header_gsm_h" >&5
+++echo "${ECHO_T}$ac_cv_header_gsm_h" >&6; }
++ else
++-  ac_check_lib_save_LIBS=$LIBS
++-LIBS="-lasound  $LIBS"
+++  # Is the header compilable?
+++{ echo "$as_me:$LINENO: checking gsm.h usability" >&5
+++echo $ECHO_N "checking gsm.h usability... $ECHO_C" >&6; }
++ cat >conftest.$ac_ext <<_ACEOF
++ /* confdefs.h.  */
++ _ACEOF
++ cat confdefs.h >>conftest.$ac_ext
++ cat >>conftest.$ac_ext <<_ACEOF
++ /* end confdefs.h.  */
+++$ac_includes_default
+++#include <gsm.h>
+++_ACEOF
+++rm -f conftest.$ac_objext
+++if { (ac_try="$ac_compile"
+++case "(($ac_try" in
+++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+++  *) ac_try_echo=$ac_try;;
+++esac
+++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+++  (eval "$ac_compile") 2>conftest.er1
+++  ac_status=$?
+++  grep -v '^ *+' conftest.er1 >conftest.err
+++  rm -f conftest.er1
+++  cat conftest.err >&5
+++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+++  (exit $ac_status); } && {
+++	 test -z "$ac_cxx_werror_flag" ||
+++	 test ! -s conftest.err
+++       } && test -s conftest.$ac_objext; then
+++  ac_header_compiler=yes
+++else
+++  echo "$as_me: failed program was:" >&5
+++sed 's/^/| /' conftest.$ac_ext >&5
+++
+++	ac_header_compiler=no
+++fi
++ 
+++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+++echo "${ECHO_T}$ac_header_compiler" >&6; }
++ 
+++# Is the header present?
+++{ echo "$as_me:$LINENO: checking gsm.h presence" >&5
+++echo $ECHO_N "checking gsm.h presence... $ECHO_C" >&6; }
+++cat >conftest.$ac_ext <<_ACEOF
+++/* confdefs.h.  */
+++_ACEOF
+++cat confdefs.h >>conftest.$ac_ext
+++cat >>conftest.$ac_ext <<_ACEOF
+++/* end confdefs.h.  */
+++#include <gsm.h>
+++_ACEOF
+++if { (ac_try="$ac_cpp conftest.$ac_ext"
+++case "(($ac_try" in
+++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+++  *) ac_try_echo=$ac_try;;
+++esac
+++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+++  ac_status=$?
+++  grep -v '^ *+' conftest.er1 >conftest.err
+++  rm -f conftest.er1
+++  cat conftest.err >&5
+++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+++  (exit $ac_status); } >/dev/null && {
+++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+++	 test ! -s conftest.err
+++       }; then
+++  ac_header_preproc=yes
+++else
+++  echo "$as_me: failed program was:" >&5
+++sed 's/^/| /' conftest.$ac_ext >&5
+++
+++  ac_header_preproc=no
+++fi
+++
+++rm -f conftest.err conftest.$ac_ext
+++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+++echo "${ECHO_T}$ac_header_preproc" >&6; }
+++
+++# So?  What about this header?
+++case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+++  yes:no: )
+++    { echo "$as_me:$LINENO: WARNING: gsm.h: accepted by the compiler, rejected by the preprocessor!" >&5
+++echo "$as_me: WARNING: gsm.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+++    { echo "$as_me:$LINENO: WARNING: gsm.h: proceeding with the compiler's result" >&5
+++echo "$as_me: WARNING: gsm.h: proceeding with the compiler's result" >&2;}
+++    ac_header_preproc=yes
+++    ;;
+++  no:yes:* )
+++    { echo "$as_me:$LINENO: WARNING: gsm.h: present but cannot be compiled" >&5
+++echo "$as_me: WARNING: gsm.h: present but cannot be compiled" >&2;}
+++    { echo "$as_me:$LINENO: WARNING: gsm.h:     check for missing prerequisite headers?" >&5
+++echo "$as_me: WARNING: gsm.h:     check for missing prerequisite headers?" >&2;}
+++    { echo "$as_me:$LINENO: WARNING: gsm.h: see the Autoconf documentation" >&5
+++echo "$as_me: WARNING: gsm.h: see the Autoconf documentation" >&2;}
+++    { echo "$as_me:$LINENO: WARNING: gsm.h:     section \"Present But Cannot Be Compiled\"" >&5
+++echo "$as_me: WARNING: gsm.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+++    { echo "$as_me:$LINENO: WARNING: gsm.h: proceeding with the preprocessor's result" >&5
+++echo "$as_me: WARNING: gsm.h: proceeding with the preprocessor's result" >&2;}
+++    { echo "$as_me:$LINENO: WARNING: gsm.h: in the future, the compiler will take precedence" >&5
+++echo "$as_me: WARNING: gsm.h: in the future, the compiler will take precedence" >&2;}
+++
+++    ;;
+++esac
+++{ echo "$as_me:$LINENO: checking for gsm.h" >&5
+++echo $ECHO_N "checking for gsm.h... $ECHO_C" >&6; }
+++if test "${ac_cv_header_gsm_h+set}" = set; then
+++  echo $ECHO_N "(cached) $ECHO_C" >&6
+++else
+++  ac_cv_header_gsm_h=$ac_header_preproc
+++fi
+++{ echo "$as_me:$LINENO: result: $ac_cv_header_gsm_h" >&5
+++echo "${ECHO_T}$ac_cv_header_gsm_h" >&6; }
+++
+++fi
+++if test $ac_cv_header_gsm_h = yes; then
+++  :
+++else
+++  { { echo "$as_me:$LINENO: error: gsm header files missing (gsm.h)" >&5
+++echo "$as_me: error: gsm header files missing (gsm.h)" >&2;}
+++   { (exit 1); exit 1; }; }
+++fi
+++
+++
+++
+++cat >>confdefs.h <<\_ACEOF
+++#define HAVE_GSM 1
+++_ACEOF
+++
+++	GSM_LIBS="-lgsm"
+++	echo "LIBS += -lgsm" >> $QT_INCL_PRO
+++	have_gsm="yes"
+++else
+++
+++	have_gsm="no"
+++	GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
+++	echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO
+++fi
+++
+++#have_gsm="no"
+++#GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
+++#echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO
+++
+++
+++
+++# Check if libgsm is available
+++{ echo "$as_me:$LINENO: checking for sf_open in -lgsm" >&5
+++echo $ECHO_N "checking for sf_open in -lgsm... $ECHO_C" >&6; }
+++if test "${ac_cv_lib_gsm_sf_open+set}" = set; then
+++  echo $ECHO_N "(cached) $ECHO_C" >&6
+++else
+++  ac_check_lib_save_LIBS=$LIBS
+++LIBS="-lgsm  $LIBS"
+++cat >conftest.$ac_ext <<_ACEOF
+++/* confdefs.h.  */
+++_ACEOF
+++cat confdefs.h >>conftest.$ac_ext
+++cat >>conftest.$ac_ext <<_ACEOF
+++/* end confdefs.h.  */
+++
+++/* Override any GCC internal prototype to avoid an error.
+++   Use char because int might match the return type of a GCC
+++   builtin and then its argument prototype would still apply.  */
+++#ifdef __cplusplus
+++extern "C"
+++#endif
+++char sf_open ();
++ int
++ main ()
++ {
++-return main ();
+++return sf_open ();
++   ;
++   return 0;
++ }
++@@ -19348,27 +17595,218 @@
++   rm -f conftest.er1
++   cat conftest.err >&5
++   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
- -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- -  *) ac_try_echo=$ac_try;;
- -esac
- -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+++  (exit $ac_status); } && {
+++	 test -z "$ac_cxx_werror_flag" ||
+++	 test ! -s conftest.err
+++       } && test -s conftest$ac_exeext &&
+++       $as_test_x conftest$ac_exeext; then
+++  ac_cv_lib_gsm_sf_open=yes
+++else
+++  echo "$as_me: failed program was:" >&5
+++sed 's/^/| /' conftest.$ac_ext >&5
+++
+++	ac_cv_lib_gsm_sf_open=no
+++fi
+++
+++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+++      conftest$ac_exeext conftest.$ac_ext
+++LIBS=$ac_check_lib_save_LIBS
+++fi
+++{ echo "$as_me:$LINENO: result: $ac_cv_lib_gsm_sf_open" >&5
+++echo "${ECHO_T}$ac_cv_lib_gsm_sf_open" >&6; }
+++if test $ac_cv_lib_gsm_sf_open = yes; then
+++
+++	if test "${ac_cv_header_gsm_h+set}" = set; then
+++  { echo "$as_me:$LINENO: checking for gsm.h" >&5
+++echo $ECHO_N "checking for gsm.h... $ECHO_C" >&6; }
+++if test "${ac_cv_header_gsm_h+set}" = set; then
+++  echo $ECHO_N "(cached) $ECHO_C" >&6
+++fi
+++{ echo "$as_me:$LINENO: result: $ac_cv_header_gsm_h" >&5
+++echo "${ECHO_T}$ac_cv_header_gsm_h" >&6; }
+++else
+++  # Is the header compilable?
+++{ echo "$as_me:$LINENO: checking gsm.h usability" >&5
+++echo $ECHO_N "checking gsm.h usability... $ECHO_C" >&6; }
+++cat >conftest.$ac_ext <<_ACEOF
+++/* confdefs.h.  */
+++_ACEOF
+++cat confdefs.h >>conftest.$ac_ext
+++cat >>conftest.$ac_ext <<_ACEOF
+++/* end confdefs.h.  */
+++$ac_includes_default
+++#include <gsm.h>
+++_ACEOF
+++rm -f conftest.$ac_objext
+++if { (ac_try="$ac_compile"
+++case "(($ac_try" in
++   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++   *) ac_try_echo=$ac_try;;
++ esac
++ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
- -  ac_status=$?
- -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+++  (eval "$ac_compile") 2>conftest.er1
++   ac_status=$?
+++  grep -v '^ *+' conftest.er1 >conftest.err
+++  rm -f conftest.er1
+++  cat conftest.err >&5
++   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
- -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- -  *) ac_try_echo=$ac_try;;
- -esac
- -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+++  (exit $ac_status); } && {
+++	 test -z "$ac_cxx_werror_flag" ||
+++	 test ! -s conftest.err
+++       } && test -s conftest.$ac_objext; then
+++  ac_header_compiler=yes
+++else
+++  echo "$as_me: failed program was:" >&5
+++sed 's/^/| /' conftest.$ac_ext >&5
+++
+++	ac_header_compiler=no
+++fi
+++
+++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+++echo "${ECHO_T}$ac_header_compiler" >&6; }
+++
+++# Is the header present?
+++{ echo "$as_me:$LINENO: checking gsm.h presence" >&5
+++echo $ECHO_N "checking gsm.h presence... $ECHO_C" >&6; }
+++cat >conftest.$ac_ext <<_ACEOF
+++/* confdefs.h.  */
+++_ACEOF
+++cat confdefs.h >>conftest.$ac_ext
+++cat >>conftest.$ac_ext <<_ACEOF
+++/* end confdefs.h.  */
+++#include <gsm.h>
+++_ACEOF
+++if { (ac_try="$ac_cpp conftest.$ac_ext"
+++case "(($ac_try" in
++   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++   *) ac_try_echo=$ac_try;;
++ esac
++ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
+++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+++  ac_status=$?
+++  grep -v '^ *+' conftest.er1 >conftest.err
+++  rm -f conftest.er1
+++  cat conftest.err >&5
+++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+++  (exit $ac_status); } >/dev/null && {
+++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+++	 test ! -s conftest.err
+++       }; then
+++  ac_header_preproc=yes
+++else
+++  echo "$as_me: failed program was:" >&5
+++sed 's/^/| /' conftest.$ac_ext >&5
+++
+++  ac_header_preproc=no
+++fi
+++
+++rm -f conftest.err conftest.$ac_ext
+++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+++echo "${ECHO_T}$ac_header_preproc" >&6; }
+++
+++# So?  What about this header?
+++case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+++  yes:no: )
+++    { echo "$as_me:$LINENO: WARNING: gsm.h: accepted by the compiler, rejected by the preprocessor!" >&5
+++echo "$as_me: WARNING: gsm.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+++    { echo "$as_me:$LINENO: WARNING: gsm.h: proceeding with the compiler's result" >&5
+++echo "$as_me: WARNING: gsm.h: proceeding with the compiler's result" >&2;}
+++    ac_header_preproc=yes
+++    ;;
+++  no:yes:* )
+++    { echo "$as_me:$LINENO: WARNING: gsm.h: present but cannot be compiled" >&5
+++echo "$as_me: WARNING: gsm.h: present but cannot be compiled" >&2;}
+++    { echo "$as_me:$LINENO: WARNING: gsm.h:     check for missing prerequisite headers?" >&5
+++echo "$as_me: WARNING: gsm.h:     check for missing prerequisite headers?" >&2;}
+++    { echo "$as_me:$LINENO: WARNING: gsm.h: see the Autoconf documentation" >&5
+++echo "$as_me: WARNING: gsm.h: see the Autoconf documentation" >&2;}
+++    { echo "$as_me:$LINENO: WARNING: gsm.h:     section \"Present But Cannot Be Compiled\"" >&5
+++echo "$as_me: WARNING: gsm.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+++    { echo "$as_me:$LINENO: WARNING: gsm.h: proceeding with the preprocessor's result" >&5
+++echo "$as_me: WARNING: gsm.h: proceeding with the preprocessor's result" >&2;}
+++    { echo "$as_me:$LINENO: WARNING: gsm.h: in the future, the compiler will take precedence" >&5
+++echo "$as_me: WARNING: gsm.h: in the future, the compiler will take precedence" >&2;}
+++
+++    ;;
+++esac
+++{ echo "$as_me:$LINENO: checking for gsm.h" >&5
+++echo $ECHO_N "checking for gsm.h... $ECHO_C" >&6; }
+++if test "${ac_cv_header_gsm_h+set}" = set; then
+++  echo $ECHO_N "(cached) $ECHO_C" >&6
+++else
+++  ac_cv_header_gsm_h=$ac_header_preproc
+++fi
+++{ echo "$as_me:$LINENO: result: $ac_cv_header_gsm_h" >&5
+++echo "${ECHO_T}$ac_cv_header_gsm_h" >&6; }
+++
+++fi
+++if test $ac_cv_header_gsm_h = yes; then
+++  :
+++else
+++  { { echo "$as_me:$LINENO: error: gsm header files missing (gsm.h)" >&5
+++echo "$as_me: error: gsm header files missing (gsm.h)" >&2;}
+++   { (exit 1); exit 1; }; }
+++fi
+++
+++
+++
+++cat >>confdefs.h <<\_ACEOF
+++#define HAVE_GSM 1
+++_ACEOF
+++
+++	LIBS="-lgsm $LIBS"
+++	echo "LIBS += -lgsm" >> $QT_INCL_PRO
+++	have_gsm="yes"
+++else
+++
+++	have_gsm="no"
+++	echo "$(top_builddir)/src/audio/gsm/libgsm.a" >> $QT_INCL_PRO
+++fi
+++
+++
+++# Check if ALSA is available
+++{ echo "$as_me:$LINENO: checking for main in -lasound" >&5
+++echo $ECHO_N "checking for main in -lasound... $ECHO_C" >&6; }
+++if test "${ac_cv_lib_asound_main+set}" = set; then
+++  echo $ECHO_N "(cached) $ECHO_C" >&6
+++else
+++  ac_check_lib_save_LIBS=$LIBS
+++LIBS="-lasound  $LIBS"
+++cat >conftest.$ac_ext <<_ACEOF
+++/* confdefs.h.  */
+++_ACEOF
+++cat confdefs.h >>conftest.$ac_ext
+++cat >>conftest.$ac_ext <<_ACEOF
+++/* end confdefs.h.  */
+++
+++
+++int
+++main ()
+++{
+++return main ();
+++  ;
+++  return 0;
+++}
+++_ACEOF
+++rm -f conftest.$ac_objext conftest$ac_exeext
+++if { (ac_try="$ac_link"
+++case "(($ac_try" in
+++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+++  *) ac_try_echo=$ac_try;;
+++esac
+++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 ++  (eval "$ac_link") 2>conftest.er1
 +   ac_status=$?
 ++  grep -v '^ *+' conftest.er1 >conftest.err
 ++  rm -f conftest.er1
 ++  cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   ac_cv_lib_asound_main=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -19342,7 +17365,7 @@
++@@ -19377,7 +17815,7 @@
 + 	ac_cv_lib_asound_main=no
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS=$ac_check_lib_save_LIBS
 + fi
- @@ -19384,27 +17407,10 @@
++@@ -19419,27 +17857,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_header_compiler=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -19440,17 +17446,10 @@
++@@ -19475,17 +17896,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } >/dev/null; then
 +-  if test -s conftest.err; then
 +-    ac_cpp_err=$ac_cxx_preproc_warn_flag
 +-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
 +-  else
 +-    ac_cpp_err=
 +-  fi
 +-else
 +-  ac_cpp_err=yes
 +-fi
 +-if test -z "$ac_cpp_err"; then
 ++  (exit $ac_status); } >/dev/null && {
 ++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       }; then
 +   ac_header_preproc=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -19561,27 +17560,11 @@
++@@ -19596,27 +18010,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   ac_cv_lib_speex_main=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -19590,7 +17573,7 @@
++@@ -19625,7 +18023,7 @@
 + 	ac_cv_lib_speex_main=no
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS=$ac_check_lib_save_LIBS
 + fi
- @@ -19632,27 +17615,10 @@
++@@ -19667,27 +18065,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_header_compiler=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -19688,17 +17654,10 @@
++@@ -19723,17 +18104,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } >/dev/null; then
 +-  if test -s conftest.err; then
 +-    ac_cpp_err=$ac_cxx_preproc_warn_flag
 +-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
 +-  else
 +-    ac_cpp_err=
 +-  fi
 +-else
 +-  ac_cpp_err=yes
 +-fi
 +-if test -z "$ac_cpp_err"; then
 ++  (exit $ac_status); } >/dev/null && {
 ++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       }; then
 +   ac_header_preproc=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -19818,27 +17777,11 @@
++@@ -19853,27 +18227,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   ac_cv_lib_ilbc_iLBC_decode=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -19847,7 +17790,7 @@
++@@ -19882,7 +18240,7 @@
 + 	ac_cv_lib_ilbc_iLBC_decode=no
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS=$ac_check_lib_save_LIBS
 + fi
- @@ -19889,27 +17832,10 @@
++@@ -19924,27 +18282,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_header_compiler=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -19945,17 +17871,10 @@
++@@ -19980,17 +18321,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } >/dev/null; then
 +-  if test -s conftest.err; then
 +-    ac_cpp_err=$ac_cxx_preproc_warn_flag
 +-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
 +-  else
 +-    ac_cpp_err=
 +-  fi
 +-else
 +-  ac_cpp_err=yes
 +-fi
 +-if test -z "$ac_cpp_err"; then
 ++  (exit $ac_status); } >/dev/null && {
 ++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       }; then
 +   ac_header_preproc=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -20078,27 +17997,11 @@
++@@ -20113,27 +18447,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   ac_cv_lib_zrtpcpp_main=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -20107,7 +18010,7 @@
++@@ -20142,7 +18460,7 @@
 + 	ac_cv_lib_zrtpcpp_main=no
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS=$ac_check_lib_save_LIBS
 + fi
- @@ -20149,27 +18052,10 @@
++@@ -20184,27 +18502,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_header_compiler=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -20205,17 +18091,10 @@
++@@ -20240,17 +18541,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } >/dev/null; then
 +-  if test -s conftest.err; then
 +-    ac_cpp_err=$ac_cxx_preproc_warn_flag
 +-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
 +-  else
 +-    ac_cpp_err=
 +-  fi
 +-else
 +-  ac_cpp_err=yes
 +-fi
 +-if test -z "$ac_cpp_err"; then
 ++  (exit $ac_status); } >/dev/null && {
 ++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       }; then
 +   ac_header_preproc=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -20325,27 +18204,10 @@
++@@ -20360,27 +18654,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest.$ac_objext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest.$ac_objext; then
 +   ac_header_compiler=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -20381,17 +18243,10 @@
++@@ -20416,17 +18693,10 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } >/dev/null; then
 +-  if test -s conftest.err; then
 +-    ac_cpp_err=$ac_cxx_preproc_warn_flag
 +-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
 +-  else
 +-    ac_cpp_err=
 +-  fi
 +-else
 +-  ac_cpp_err=yes
 +-fi
 +-if test -z "$ac_cpp_err"; then
 ++  (exit $ac_status); } >/dev/null && {
 ++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       }; then
 +   ac_header_preproc=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -20485,27 +18340,11 @@
++@@ -20520,27 +18790,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   ac_cv_lib_boost_regex_main=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -20514,7 +18353,7 @@
++@@ -20549,7 +18803,7 @@
 + 	ac_cv_lib_boost_regex_main=no
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS=$ac_check_lib_save_LIBS
 + fi
- @@ -20562,27 +18401,11 @@
++@@ -20597,27 +18851,11 @@
 +   rm -f conftest.er1
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); } &&
 +-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; } &&
 +-	 { ac_try='test -s conftest$ac_exeext'
 +-  { (case "(($ac_try" in
 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +-  *) ac_try_echo=$ac_try;;
 +-esac
 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +-  (eval "$ac_try") 2>&5
 +-  ac_status=$?
 +-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +-  (exit $ac_status); }; }; then
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 +   ac_cv_lib_boost_regex_gcc_main=yes
 + else
 +   echo "$as_me: failed program was:" >&5
- @@ -20591,7 +18414,7 @@
++@@ -20626,7 +18864,7 @@
 + 	ac_cv_lib_boost_regex_gcc_main=no
 + fi
 + 
 +-rm -f core conftest.err conftest.$ac_objext \
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +       conftest$ac_exeext conftest.$ac_ext
 + LIBS=$ac_check_lib_save_LIBS
 + fi
- @@ -20602,6 +18425,67 @@
++@@ -20637,6 +18875,67 @@
 + 		LIBS="-lboost_regex-gcc $LIBS"
 + 		echo "LIBS += -lboost_regex-gcc" >> $QT_INCL_PRO
 + else
 ++
 ++		{ echo "$as_me:$LINENO: checking for main in -lboost_regex-mt" >&5
 ++echo $ECHO_N "checking for main in -lboost_regex-mt... $ECHO_C" >&6; }
 ++if test "${ac_cv_lib_boost_regex_mt_main+set}" = set; then
 ++  echo $ECHO_N "(cached) $ECHO_C" >&6
 ++else
 ++  ac_check_lib_save_LIBS=$LIBS
 ++LIBS="-lboost_regex-mt  $LIBS"
 ++cat >conftest.$ac_ext <<_ACEOF
 ++/* confdefs.h.  */
 ++_ACEOF
 ++cat confdefs.h >>conftest.$ac_ext
 ++cat >>conftest.$ac_ext <<_ACEOF
 ++/* end confdefs.h.  */
 ++
 ++
 ++int
 ++main ()
 ++{
 ++return main ();
 ++  ;
 ++  return 0;
 ++}
 ++_ACEOF
 ++rm -f conftest.$ac_objext conftest$ac_exeext
 ++if { (ac_try="$ac_link"
 ++case "(($ac_try" in
 ++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 ++  *) ac_try_echo=$ac_try;;
 ++esac
 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 ++  (eval "$ac_link") 2>conftest.er1
 ++  ac_status=$?
 ++  grep -v '^ *+' conftest.er1 >conftest.err
 ++  rm -f conftest.er1
 ++  cat conftest.err >&5
 ++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 ++  (exit $ac_status); } && {
 ++	 test -z "$ac_cxx_werror_flag" ||
 ++	 test ! -s conftest.err
 ++       } && test -s conftest$ac_exeext &&
 ++       $as_test_x conftest$ac_exeext; then
 ++  ac_cv_lib_boost_regex_mt_main=yes
 ++else
 ++  echo "$as_me: failed program was:" >&5
 ++sed 's/^/| /' conftest.$ac_ext >&5
 ++
 ++	ac_cv_lib_boost_regex_mt_main=no
 ++fi
 ++
 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 ++      conftest$ac_exeext conftest.$ac_ext
 ++LIBS=$ac_check_lib_save_LIBS
 ++fi
 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_boost_regex_mt_main" >&5
 ++echo "${ECHO_T}$ac_cv_lib_boost_regex_mt_main" >&6; }
 ++if test $ac_cv_lib_boost_regex_mt_main = yes; then
 ++
 ++			LIBS="-lboost_regex-mt $LIBS"
 ++			echo "LIBS += -lboost_regex-mt" >> $QT_INCL_PRO
 ++else
 +   { { echo "$as_me:$LINENO: error: libboost_regex library is missing (boost package)." >&5
 + echo "$as_me: error: libboost_regex library is missing (boost package)." >&2;}
 +    { (exit 1); exit 1; }; }
- @@ -20609,6 +18493,8 @@
++@@ -20644,6 +18943,8 @@
 + 
 + fi
 + 
 ++fi
 ++
 + 
 + 
-  $QTDIR/bin/qmake -o src/gui/Makefile src/gui/twinkle.pro
- @@ -20777,7 +18663,8 @@
++ { echo "$as_me:$LINENO: checking LRELEASE OPTIONS" >&5
++@@ -20824,7 +19125,8 @@
 + ## M4sh Initialization.  ##
 + ## --------------------- ##
 + 
 +-# Be Bourne compatible
 ++# Be more Bourne compatible
 ++DUALCASE=1; export DUALCASE # for MKS sh
 + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
 +   emulate sh
 +   NULLCMD=:
- @@ -20786,10 +18673,13 @@
++@@ -20833,10 +19135,13 @@
 +   alias -g '${1+"$@"}'='"$@"'
 +   setopt NO_GLOB_SUBST
 + else
 +-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 ++  case `(set -o) 2>/dev/null` in
 ++  *posix*) set -o posix ;;
 ++esac
 ++
 + fi
 +-BIN_SH=xpg4; export BIN_SH # for Tru64
 +-DUALCASE=1; export DUALCASE # for MKS sh
 ++
 ++
 + 
 + 
 + # PATH needs CR
- @@ -21013,19 +18903,28 @@
++@@ -21060,19 +19365,28 @@
 +   as_mkdir_p=false
 + fi
 + 
 +-# Find out whether ``test -x'' works.  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
 +-  as_executable_p="test -x"
 ++if test -x / >/dev/null 2>&1; then
 ++  as_test_x='test -x'
 + else
 +-  as_executable_p=:
 ++  if ls -dL / >/dev/null 2>&1; then
 ++    as_ls_L_option=L
 ++  else
 ++    as_ls_L_option=
 ++  fi
 ++  as_test_x='
 ++    eval sh -c '\''
 ++      if test -d "$1"; then
 ++        test -d "$1/.";
 ++      else
 ++	case $1 in
 ++        -*)set "./$1";;
 ++	esac;
 ++	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 ++	???[sx]*):;;*)false;;esac;fi
 ++    '\'' sh
 ++  '
 + fi
 +-rm -f conf$$.file
 ++as_executable_p=$as_test_x
 + 
 + # Sed expression to map a string onto a valid CPP name.
 + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
- @@ -21041,7 +18940,7 @@
++@@ -21088,7 +19402,7 @@
 + # values after options handling.
 + ac_log="
 + This file was extended by $as_me, which was
 +-generated by GNU Autoconf 2.60.  Invocation command line was
 ++generated by GNU Autoconf 2.61.  Invocation command line was
 + 
 +   CONFIG_FILES    = $CONFIG_FILES
 +   CONFIG_HEADERS  = $CONFIG_HEADERS
- @@ -21070,7 +18969,7 @@
++@@ -21117,7 +19431,7 @@
 + Usage: $0 [OPTIONS] [FILE]...
 + 
 +   -h, --help       print this help, then exit
 +-  -V, --version    print version number, then exit
 ++  -V, --version    print version number and configuration settings, then exit
 +   -q, --quiet      do not print progress messages
 +   -d, --debug      don't remove temporary files
 +       --recheck    update $as_me by reconfiguring in the same conditions
- @@ -21094,7 +18993,7 @@
++@@ -21141,7 +19455,7 @@
 + cat >>$CONFIG_STATUS <<_ACEOF
 + ac_cs_version="\\
 + config.status
 +-configured by $0, generated by GNU Autoconf 2.60,
 ++configured by $0, generated by GNU Autoconf 2.61,
 +   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 + 
 + Copyright (C) 2006 Free Software Foundation, Inc.
- @@ -21383,7 +19282,7 @@
++@@ -21431,7 +19745,7 @@
 + CXXCPP!$CXXCPP$ac_delim
 + RANLIB!$RANLIB$ac_delim
 + LEX!$LEX$ac_delim
 +-LEXLIB!$LEXLIB$ac_delim
 ++LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim
 + _ACEOF
 + 
 +   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
- @@ -21425,7 +19324,7 @@
++@@ -21473,7 +19787,7 @@
 + ac_delim='%!_!# '
 + for ac_last_try in false false false false false :; do
 +   cat >conf$$subs.sed <<_ACEOF
 +-LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim
 ++LEXLIB!$LEXLIB$ac_delim
 + YACC!$YACC$ac_delim
 + YFLAGS!$YFLAGS$ac_delim
 + GREP!$GREP$ac_delim
++@@ -22262,3 +20576,5 @@
++ echo "${ECHO_T}iLBC:        $have_ilbc" >&6; }
++ { echo "$as_me:$LINENO: result: ZRTP:        $have_zrtp" >&5
++ echo "${ECHO_T}ZRTP:        $have_zrtp" >&6; }
+++{ echo "$as_me:$LINENO: result: Libgsm dynamic link:	$have_gsm" >&5
+++echo "${ECHO_T}Libgsm dynamic link:	$have_gsm" >&6; }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/twinkle.git



More information about the Pkg-voip-commits mailing list