[Pkg-voip-commits] r5289 - in /twinkle/trunk/debian: changelog control patches/configure-boost.patch patches/libgsm.patch patches/z99-configure-boost.patch
mikma-guest at alioth.debian.org
mikma-guest at alioth.debian.org
Sat Mar 15 22:51:36 UTC 2008
Author: mikma-guest
Date: Sat Mar 15 22:51:36 2008
New Revision: 5289
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5289
Log:
* 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.
Added:
twinkle/trunk/debian/patches/z99-configure-boost.patch
- copied, changed from r5288, twinkle/trunk/debian/patches/configure-boost.patch
Removed:
twinkle/trunk/debian/patches/configure-boost.patch
Modified:
twinkle/trunk/debian/changelog
twinkle/trunk/debian/control
twinkle/trunk/debian/patches/libgsm.patch
Modified: twinkle/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/twinkle/trunk/debian/changelog?rev=5289&op=diff
==============================================================================
--- twinkle/trunk/debian/changelog (original)
+++ twinkle/trunk/debian/changelog Sat Mar 15 22:51:36 2008
@@ -1,11 +1,20 @@
-twinkle (1:1.1-3) UNRELEASED; urgency=low
-
+twinkle (1:1.2-1) UNRELEASED; urgency=low
+
+ [ Kilian Krause ]
* NOT RELEASED YET
* Fix menu entry Apps -> Applications
* Add Homepage field as added in dpkg-dev 1.14.6.
- -- Kilian Krause <kilian at debian.org> Sat, 22 Sep 2007 12:08:51 +0200
+ [ 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
Modified: twinkle/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/twinkle/trunk/debian/control?rev=5289&op=diff
==============================================================================
--- twinkle/trunk/debian/control (original)
+++ twinkle/trunk/debian/control Sat Mar 15 22:51:36 2008
@@ -2,7 +2,7 @@
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
Homepage: http://www.twinklephone.com/
@@ -42,8 +42,8 @@
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
@@ -60,7 +60,8 @@
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)
Modified: twinkle/trunk/debian/patches/libgsm.patch
URL: http://svn.debian.org/wsvn/pkg-voip/twinkle/trunk/debian/patches/libgsm.patch?rev=5289&op=diff
==============================================================================
--- twinkle/trunk/debian/patches/libgsm.patch (original)
+++ twinkle/trunk/debian/patches/libgsm.patch Sat Mar 15 22:51:36 2008
@@ -1,9 +1,38 @@
-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, [
@@ -19,76 +48,14 @@
# 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
Copied: twinkle/trunk/debian/patches/z99-configure-boost.patch (from r5288, twinkle/trunk/debian/patches/configure-boost.patch)
URL: http://svn.debian.org/wsvn/pkg-voip/twinkle/trunk/debian/patches/z99-configure-boost.patch?rev=5289&op=diff
==============================================================================
--- twinkle/trunk/debian/patches/configure-boost.patch (original)
+++ twinkle/trunk/debian/patches/z99-configure-boost.patch Sat Mar 15 22:51:36 2008
@@ -1,6 +1,6 @@
-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.
@@ -190,7 +190,7 @@
YACC
YFLAGS
GREP
-@@ -837,6 +852,7 @@
+@@ -838,6 +853,7 @@
CC
CFLAGS
LDFLAGS
@@ -198,7 +198,7 @@
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.
@@ -211,7 +211,7 @@
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.
@@ -224,7 +224,7 @@
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.
@@ -248,7 +248,7 @@
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>
@@ -256,7 +256,7 @@
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
@@ -265,7 +265,7 @@
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
@@ -274,7 +274,7 @@
$ $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
@@ -283,7 +283,7 @@
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
@@ -292,7 +292,7 @@
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
@@ -301,7 +301,7 @@
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
@@ -310,7 +310,7 @@
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
@@ -319,7 +319,7 @@
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
@@ -328,7 +328,7 @@
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
@@ -337,7 +337,7 @@
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
@@ -346,7 +346,7 @@
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
@@ -355,7 +355,7 @@
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
@@ -364,7 +364,7 @@
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.
@@ -373,7 +373,7 @@
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
@@ -386,7 +386,7 @@
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
@@ -395,7 +395,7 @@
# 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
@@ -427,7 +427,7 @@
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
@@ -459,7 +459,7 @@
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
@@ -491,7 +491,7 @@
:
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
@@ -523,7 +523,7 @@
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
@@ -555,7 +555,7 @@
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
@@ -564,7 +564,7 @@
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
@@ -573,7 +573,7 @@
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
@@ -605,7 +605,7 @@
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
@@ -637,7 +637,7 @@
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
@@ -669,7 +669,7 @@
:
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
@@ -701,7 +701,7 @@
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
@@ -723,7 +723,7 @@
:
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
@@ -745,7 +745,7 @@
# 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
@@ -767,7 +767,7 @@
:
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
@@ -789,7 +789,7 @@
# 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
@@ -811,7 +811,7 @@
:
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
@@ -833,7 +833,7 @@
# 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
@@ -855,7 +855,7 @@
:
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
@@ -877,7 +877,7 @@
# 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
@@ -886,7 +886,7 @@
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
@@ -895,7 +895,7 @@
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
@@ -904,7 +904,7 @@
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=":"
@@ -1065,7 +1065,7 @@
_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
@@ -1165,7 +1165,7 @@
{ 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
@@ -1182,7 +1182,7 @@
`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
@@ -1215,7 +1215,7 @@
ac_cv_prog_lex_yytext_pointer=yes
else
echo "$as_me: failed program was:" >&5
-@@ -5203,10 +4898,9 @@
+@@ -5204,10 +4899,9 @@
fi
@@ -1227,7 +1227,7 @@
fi
{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
-@@ -5218,6 +4912,7 @@
+@@ -5219,6 +4913,7 @@
_ACEOF
fi
@@ -1235,7 +1235,7 @@
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
@@ -1244,7 +1244,7 @@
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"
@@ -1253,7 +1253,7 @@
# 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"
@@ -1262,7 +1262,7 @@
# 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
@@ -1294,7 +1294,7 @@
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
@@ -1326,7 +1326,7 @@
eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -5721,7 +5382,8 @@
+@@ -5722,7 +5383,8 @@
int
main ()
{
@@ -1336,7 +1336,7 @@
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
@@ -1368,7 +1368,7 @@
# 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
@@ -1400,7 +1400,7 @@
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
@@ -1432,7 +1432,7 @@
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
@@ -1442,7 +1442,7 @@
#endif
;
-@@ -6033,27 +5643,10 @@
+@@ -6034,27 +5644,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1474,7 +1474,7 @@
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
@@ -1507,7 +1507,7 @@
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
@@ -1516,7 +1516,7 @@
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
@@ -1548,7 +1548,7 @@
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
@@ -1580,7 +1580,7 @@
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
@@ -1602,7 +1602,7 @@
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
@@ -1634,7 +1634,7 @@
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
@@ -1643,7 +1643,7 @@
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
@@ -1652,7 +1652,7 @@
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
@@ -1661,7 +1661,7 @@
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
@@ -1670,7 +1670,7 @@
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
@@ -1702,7 +1702,7 @@
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
@@ -1735,7 +1735,7 @@
kde_cv_func_strlcat=yes
kde_cv_proto_strlcat=yes
else
-@@ -7262,7 +6748,7 @@
+@@ -7263,7 +6749,7 @@
fi
@@ -1744,7 +1744,7 @@
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
@@ -1776,7 +1776,7 @@
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
@@ -1809,7 +1809,7 @@
kde_cv_func_strlcpy=yes
kde_cv_proto_strlcpy=yes
else
-@@ -7505,7 +6958,7 @@
+@@ -7506,7 +6959,7 @@
fi
@@ -1818,7 +1818,7 @@
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
@@ -1851,7 +1851,7 @@
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
@@ -1860,7 +1860,7 @@
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
@@ -1893,7 +1893,7 @@
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
@@ -1902,7 +1902,7 @@
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
@@ -1935,7 +1935,7 @@
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
@@ -1944,7 +1944,7 @@
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
@@ -1977,7 +1977,7 @@
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
@@ -1986,7 +1986,7 @@
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
@@ -2018,7 +2018,7 @@
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
@@ -2050,7 +2050,7 @@
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
@@ -2083,7 +2083,7 @@
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
@@ -2092,7 +2092,7 @@
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
@@ -2125,7 +2125,7 @@
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
@@ -2134,7 +2134,7 @@
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
@@ -2167,7 +2167,7 @@
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
@@ -2176,7 +2176,7 @@
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
@@ -2209,7 +2209,7 @@
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
@@ -2218,7 +2218,7 @@
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
@@ -2251,7 +2251,7 @@
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
@@ -2260,7 +2260,7 @@
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
@@ -2293,7 +2293,7 @@
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
@@ -2302,7 +2302,7 @@
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
@@ -2335,7 +2335,7 @@
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
@@ -2344,7 +2344,7 @@
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
@@ -2377,7 +2377,7 @@
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
@@ -2386,7 +2386,7 @@
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
@@ -2419,7 +2419,7 @@
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
@@ -2428,7 +2428,7 @@
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
@@ -2461,7 +2461,7 @@
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
@@ -2470,7 +2470,7 @@
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
@@ -2502,7 +2502,7 @@
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
@@ -2524,7 +2524,7 @@
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
@@ -2556,7 +2556,7 @@
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
@@ -2578,7 +2578,7 @@
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
@@ -2611,7 +2611,7 @@
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
@@ -2620,7 +2620,7 @@
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
@@ -2652,7 +2652,7 @@
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
@@ -2674,7 +2674,7 @@
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
@@ -2706,7 +2706,7 @@
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
@@ -2728,7 +2728,7 @@
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
@@ -2761,7 +2761,7 @@
LIBRESOLV="-lresolv"
{ echo "$as_me:$LINENO: result: yes" >&5
-@@ -9791,7 +8858,7 @@
+@@ -9792,7 +8859,7 @@
fi
@@ -2770,7 +2770,7 @@
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
@@ -2802,7 +2802,7 @@
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
@@ -2835,7 +2835,7 @@
kde_cv_func_res_init=yes
kde_cv_proto_res_init=yes
else
-@@ -10006,7 +9040,7 @@
+@@ -10007,7 +9041,7 @@
fi
@@ -2844,7 +2844,7 @@
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
@@ -2877,7 +2877,7 @@
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
@@ -2886,7 +2886,7 @@
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
@@ -2919,7 +2919,7 @@
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
@@ -2928,7 +2928,7 @@
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
@@ -2960,7 +2960,7 @@
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; }
@@ -2981,7 +2981,7 @@
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
@@ -2990,7 +2990,7 @@
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
@@ -3022,7 +3022,7 @@
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
@@ -3031,7 +3031,7 @@
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
@@ -3063,7 +3063,7 @@
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
@@ -3072,7 +3072,7 @@
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
@@ -3104,7 +3104,7 @@
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
@@ -3113,7 +3113,7 @@
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
@@ -3145,7 +3145,7 @@
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
@@ -3154,7 +3154,7 @@
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
@@ -3186,7 +3186,7 @@
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;;
@@ -3204,7 +3204,7 @@
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
@@ -3213,7 +3213,7 @@
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 )
@@ -3243,7 +3243,7 @@
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
@@ -3275,7 +3275,7 @@
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; }
@@ -3296,7 +3296,7 @@
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
@@ -3305,7 +3305,7 @@
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
@@ -3337,7 +3337,7 @@
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
@@ -3346,7 +3346,7 @@
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
@@ -3378,7 +3378,7 @@
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
@@ -3387,7 +3387,7 @@
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
@@ -3419,7 +3419,7 @@
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
@@ -3428,7 +3428,7 @@
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
@@ -3460,7 +3460,7 @@
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
@@ -3469,7 +3469,7 @@
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
@@ -3501,7 +3501,7 @@
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;;
@@ -3519,7 +3519,7 @@
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
@@ -3528,7 +3528,7 @@
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 )
@@ -3558,7 +3558,7 @@
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
@@ -3590,7 +3590,7 @@
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; }
@@ -3611,7 +3611,7 @@
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
@@ -3620,7 +3620,7 @@
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
@@ -3652,7 +3652,7 @@
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
@@ -3661,7 +3661,7 @@
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
@@ -3693,7 +3693,7 @@
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
@@ -3702,7 +3702,7 @@
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
@@ -3734,7 +3734,7 @@
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
@@ -3743,7 +3743,7 @@
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
@@ -3775,7 +3775,7 @@
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
@@ -3784,7 +3784,7 @@
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
@@ -3816,7 +3816,7 @@
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;;
@@ -3834,7 +3834,7 @@
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
@@ -3843,7 +3843,7 @@
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 )
@@ -3873,7 +3873,7 @@
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
@@ -3905,7 +3905,7 @@
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; }
@@ -3926,7 +3926,7 @@
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
@@ -3935,7 +3935,7 @@
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
@@ -3967,7 +3967,7 @@
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
@@ -3976,7 +3976,7 @@
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
@@ -4008,7 +4008,7 @@
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
@@ -4017,7 +4017,7 @@
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
@@ -4049,7 +4049,7 @@
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
@@ -4058,7 +4058,7 @@
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
@@ -4090,7 +4090,7 @@
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
@@ -4099,7 +4099,7 @@
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
@@ -4131,7 +4131,7 @@
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;;
@@ -4149,7 +4149,7 @@
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
@@ -4158,7 +4158,7 @@
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 )
@@ -4188,7 +4188,7 @@
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
@@ -4221,7 +4221,7 @@
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
@@ -4230,7 +4230,7 @@
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
@@ -4263,7 +4263,7 @@
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
@@ -4272,7 +4272,7 @@
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
@@ -4304,7 +4304,7 @@
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; }
@@ -4325,7 +4325,7 @@
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
@@ -4334,7 +4334,7 @@
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
@@ -4366,7 +4366,7 @@
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
@@ -4375,7 +4375,7 @@
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
@@ -4407,7 +4407,7 @@
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
@@ -4416,7 +4416,7 @@
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
@@ -4448,7 +4448,7 @@
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
@@ -4457,7 +4457,7 @@
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
@@ -4489,7 +4489,7 @@
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
@@ -4498,7 +4498,7 @@
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
@@ -4530,7 +4530,7 @@
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;;
@@ -4548,7 +4548,7 @@
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
@@ -4557,7 +4557,7 @@
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 )
@@ -4587,54 +4587,30 @@
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
-- (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
-- (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
+@@ -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
+- *\"* | *\`* | *\\*) 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" ||
@@ -4643,7 +4619,7 @@
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; }
@@ -4664,7 +4640,7 @@
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
@@ -4673,7 +4649,7 @@
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
@@ -4705,7 +4681,7 @@
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
@@ -4714,7 +4690,7 @@
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
@@ -4746,7 +4722,7 @@
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
@@ -4755,7 +4731,7 @@
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
@@ -4787,7 +4763,7 @@
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
@@ -4796,7 +4772,7 @@
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
@@ -4828,7 +4804,7 @@
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
@@ -4837,7 +4813,7 @@
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
@@ -4869,7 +4845,7 @@
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;;
@@ -4887,7 +4863,7 @@
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
@@ -4896,7 +4872,7 @@
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 )
@@ -4926,7 +4902,7 @@
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
@@ -4958,7 +4934,7 @@
{ 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
@@ -4990,7 +4966,7 @@
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
@@ -5012,7 +4988,7 @@
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
@@ -5045,7 +5021,7 @@
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
@@ -5054,7 +5030,7 @@
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
@@ -5087,7 +5063,7 @@
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
@@ -5096,7 +5072,7 @@
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
@@ -5118,7 +5094,7 @@
# 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
@@ -5151,7 +5127,7 @@
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
@@ -5160,7 +5136,7 @@
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
@@ -5193,7 +5169,7 @@
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
@@ -5202,7 +5178,7 @@
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
@@ -5235,7 +5211,7 @@
kde_cv_have_libXext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -14460,7 +12732,7 @@
+@@ -14461,7 +12733,7 @@
fi
@@ -5244,25 +5220,10 @@
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
@@ -5276,22 +5237,13 @@
- (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
-- (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_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" ||
@@ -5301,7 +5253,7 @@
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
@@ -5310,7 +5262,7 @@
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
@@ -5343,7 +5295,7 @@
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
@@ -5352,7 +5304,7 @@
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
@@ -5385,7 +5337,7 @@
{ 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
@@ -5394,7 +5346,7 @@
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
@@ -5427,7 +5379,7 @@
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
@@ -5436,7 +5388,7 @@
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
@@ -5469,7 +5421,7 @@
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
@@ -5478,7 +5430,7 @@
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
@@ -5511,7 +5463,7 @@
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
@@ -5520,7 +5472,7 @@
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
@@ -5553,7 +5505,7 @@
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
@@ -5562,7 +5514,7 @@
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
@@ -5595,7 +5547,7 @@
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
@@ -5604,7 +5556,7 @@
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
@@ -5637,7 +5589,7 @@
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
@@ -5646,25 +5598,25 @@
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
@@ -5697,7 +5649,7 @@
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
@@ -5706,7 +5658,7 @@
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
@@ -5715,7 +5667,7 @@
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
@@ -5724,7 +5676,7 @@
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
@@ -5756,43 +5708,43 @@
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
@@ -5825,7 +5777,7 @@
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
@@ -5834,7 +5786,7 @@
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
@@ -5866,7 +5818,7 @@
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
@@ -5888,7 +5840,7 @@
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
@@ -5921,7 +5873,7 @@
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
@@ -5930,34 +5882,490 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -19307,33 +17346,17 @@
+@@ -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
++ (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_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_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
+- (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
- (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
++ (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
@@ -5973,7 +6381,7 @@
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
@@ -5982,7 +6390,7 @@
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
@@ -6014,7 +6422,7 @@
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
@@ -6036,7 +6444,7 @@
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
@@ -6069,7 +6477,7 @@
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
@@ -6078,7 +6486,7 @@
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
@@ -6110,7 +6518,7 @@
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
@@ -6132,7 +6540,7 @@
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
@@ -6165,7 +6573,7 @@
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
@@ -6174,7 +6582,7 @@
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
@@ -6206,7 +6614,7 @@
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
@@ -6228,7 +6636,7 @@
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
@@ -6261,7 +6669,7 @@
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
@@ -6270,7 +6678,7 @@
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
@@ -6302,7 +6710,7 @@
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
@@ -6324,7 +6732,7 @@
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
@@ -6356,7 +6764,7 @@
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
@@ -6378,7 +6786,7 @@
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
@@ -6411,7 +6819,7 @@
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
@@ -6420,7 +6828,7 @@
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
@@ -6453,7 +6861,7 @@
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
@@ -6462,7 +6870,7 @@
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
@@ -6530,7 +6938,7 @@
{ { 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
@@ -6538,8 +6946,8 @@
+
- $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. ##
## --------------------- ##
@@ -6549,7 +6957,7 @@
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
@@ -6566,7 +6974,7 @@
# PATH needs CR
-@@ -21013,19 +18903,28 @@
+@@ -21060,19 +19365,28 @@
as_mkdir_p=false
fi
@@ -6606,7 +7014,7 @@
# 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
@@ -6615,7 +7023,7 @@
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
@@ -6624,7 +7032,7 @@
-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
@@ -6633,7 +7041,7 @@
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
@@ -6642,7 +7050,7 @@
_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
@@ -6651,3 +7059,9 @@
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; }
More information about the Pkg-voip-commits
mailing list