[Pkg-voip-commits] r1768 - in iaxclient/trunk/debian: . patches

Mikael Magnusson mikma-guest at costa.debian.org
Sat May 20 16:14:53 UTC 2006


Author: mikma-guest
Date: 2006-05-20 16:14:40 +0000 (Sat, 20 May 2006)
New Revision: 1768

Added:
   iaxclient/trunk/debian/patches/230_unicode.dpatch
   iaxclient/trunk/debian/patches/250_incoming_ringing.dpatch
   iaxclient/trunk/debian/patches/260_timer.dpatch
Removed:
   iaxclient/trunk/debian/patches/120_separate_streams.dpatch
   iaxclient/trunk/debian/patches/160_umask.dpatch
   iaxclient/trunk/debian/patches/180_filter.dpatch
   iaxclient/trunk/debian/patches/20_lib.dpatch
   iaxclient/trunk/debian/patches/210_ringback.dpatch
Modified:
   iaxclient/trunk/debian/changelog
   iaxclient/trunk/debian/control
   iaxclient/trunk/debian/patches/00list
   iaxclient/trunk/debian/patches/10_autoconf.dpatch
   iaxclient/trunk/debian/patches/110_xrcdirectory.dpatch
   iaxclient/trunk/debian/patches/12_autoconf_gen.dpatch
   iaxclient/trunk/debian/patches/150_iax2_newjb.dpatch
   iaxclient/trunk/debian/patches/170_deadlock.dpatch
   iaxclient/trunk/debian/patches/200_version.dpatch
   iaxclient/trunk/debian/patches/40_fixes.dpatch
   iaxclient/trunk/debian/patches/90_mixer.dpatch
   iaxclient/trunk/debian/rules
Log:
* New upstream release (0.0+svn20060520-1)
* Use wxWidgets 2.6 and GTK+ 2.x
* Fix some Unicode related issues
* Fix segfault during startup.
* Remove patches applied by upstream: 160_umask, 170_deadlock, 180_filter,
  210_ringback.



Modified: iaxclient/trunk/debian/changelog
===================================================================
--- iaxclient/trunk/debian/changelog	2006-05-16 10:42:26 UTC (rev 1767)
+++ iaxclient/trunk/debian/changelog	2006-05-20 16:14:40 UTC (rev 1768)
@@ -1,3 +1,16 @@
+iaxclient (0.0+svn20060520-1) unstable; urgency=low
+
+  [ Mikael Magnusson ]
+  * New upstream release
+  * Use wxWidgets 2.6 and GTK+ 2.x (Closes: #342150: iaxcomm: build
+    against wxWidgets 2.6)
+  * Fix some Unicode related issues
+  * Fix segfault during startup.
+  * Remove patches applied by upstream: 160_umask, 170_deadlock,
+    180_filter, 210_ringback.
+
+ -- Mikael Magnusson <mikma at users.sourceforge.net>  Sat, 20 May 2006 18:12:13 +0200
+
 iaxclient (0.0+cvs20050725-6) unstable; urgency=low
 
   [ Mikael Magnusson ]

Modified: iaxclient/trunk/debian/control
===================================================================
--- iaxclient/trunk/debian/control	2006-05-16 10:42:26 UTC (rev 1767)
+++ iaxclient/trunk/debian/control	2006-05-20 16:14:40 UTC (rev 1768)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>, Mikael Magnusson <mikma at users.sourceforge.net>, Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>
-Build-Depends: debhelper (>= 4.0.0), dpatch, autotools-dev, libgsm1-dev, libspeex-dev (>= 1.1.10-1), libportaudio-dev, libwxgtk2.4-dev, libgtk1.2-dev, libwxgtk2.4-contrib-dev (>= 2.4.2.5)
+Build-Depends: debhelper (>= 4.0.0), dpatch, autotools-dev, libgsm1-dev, libspeex-dev (>= 1.1.10-1), libportaudio-dev, libwxgtk2.6-dev, libgtk2.0-dev
 Standards-Version: 3.6.1
 
 Package: libiaxclient-dev

Modified: iaxclient/trunk/debian/patches/00list
===================================================================
--- iaxclient/trunk/debian/patches/00list	2006-05-16 10:42:26 UTC (rev 1767)
+++ iaxclient/trunk/debian/patches/00list	2006-05-20 16:14:40 UTC (rev 1768)
@@ -2,17 +2,14 @@
 12_autoconf_gen
 14_autoconf_chmod
 13_config
-#20_lib
 40_fixes
 50_wish
 80_jiaxc
 110_xrcdirectory
-#120_separate_streams
 150_iax2_newjb
-160_umask
-170_deadlock
-180_filter
 90_mixer
-200_version
-210_ringback
 220_audio_encode
+230_unicode
+250_incoming_ringing
+200_version
+260_timer

Modified: iaxclient/trunk/debian/patches/10_autoconf.dpatch
===================================================================
--- iaxclient/trunk/debian/patches/10_autoconf.dpatch	2006-05-16 10:42:26 UTC (rev 1767)
+++ iaxclient/trunk/debian/patches/10_autoconf.dpatch	2006-05-20 16:14:40 UTC (rev 1768)
@@ -7,9 +7,9 @@
 ## DP: ./debian/rules autoreconf
 
 @DPATCH@
-diff -urNad iaxclient-0.0+cvs20050725/AUTHORS /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/AUTHORS
---- iaxclient-0.0+cvs20050725/AUTHORS	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/AUTHORS	2005-08-10 15:14:49.000000000 +0200
+diff -urNad iaxclient-0.0+svn20060520~/AUTHORS iaxclient-0.0+svn20060520/AUTHORS
+--- iaxclient-0.0+svn20060520~/AUTHORS	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/AUTHORS	2006-05-20 15:46:18.000000000 +0200
 @@ -0,0 +1,8 @@
 +Steve Kann <stevek at stevek.com>
 +Shawn Lawrence <shawn.lawrence at terracecomm.com>
@@ -19,406 +19,9 @@
 +Steven Sokol <ssokol at sokol-associates.com> [ Debugging, Blind Transfer ]
 +Stephan Kauss <Stephan at kauss.org> [ 32-bit alignment for IAX2 ]
 +Stephen Uhler <suhler at sun.com> [Solaris build, tkiaxphone]
-diff -urNad iaxclient-0.0+cvs20050725/autogen.sh /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/autogen.sh
---- iaxclient-0.0+cvs20050725/autogen.sh	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/autogen.sh	2005-08-10 15:14:49.000000000 +0200
-@@ -0,0 +1,12 @@
-+#!/bin/sh -e
-+
-+aclocal -I macros
-+autoheader
-+autoconf
-+libtoolize -c
-+automake -a -c
-+
-+if test -x ./config.status; then
-+	./config.status --recheck
-+	./config.status
-+fi
-diff -urNad iaxclient-0.0+cvs20050725/ChangeLog /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/ChangeLog
---- iaxclient-0.0+cvs20050725/ChangeLog	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/ChangeLog	2005-08-10 15:14:49.000000000 +0200
-@@ -0,0 +1,2 @@
-+
-+
-diff -urNad iaxclient-0.0+cvs20050725/clean.sh /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/clean.sh
---- iaxclient-0.0+cvs20050725/clean.sh	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/clean.sh	2005-08-10 15:14:49.000000000 +0200
-@@ -0,0 +1,6 @@
-+#!/bin/sh
-+
-+rm -f aclocal.m4 compile config.guess config.h.in config.sub configure depcomp install-sh ltmain.sh missing
-+
-+rm -f {.,lib,simpleclient,simpleclient/iaxcomm,simpleclient/iaxphone,simpleclient/testcall,simpleclient/tkphone,simpleclient/WinIAX,simpleclient/wx}/Makefile.in 
-+rm -rf autom4te.cache
-diff -urNad iaxclient-0.0+cvs20050725/configure.ac /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/configure.ac
---- iaxclient-0.0+cvs20050725/configure.ac	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/configure.ac	2005-08-08 23:26:09.000000000 +0200
-@@ -0,0 +1,361 @@
-+dnl Copyright (C) 2004-2005  Mikael Magnusson <mikma at users.sourceforge.net>
-+
-+AC_PREREQ(2.59)
-+AC_INIT([iaxclient], 0.0+cvs20050725)
-+AC_CONFIG_SRCDIR([lib/iaxclient.h])
-+AC_CONFIG_MACRO_DIR([macros])
-+AM_INIT_AUTOMAKE
-+AM_MAINTAINER_MODE
-+
-+dnl create a config.h file (Automake will add -DHAVE_CONFIG_H)
-+AM_CONFIG_HEADER([config.h])
-+
-+dnl Default CFLAGS and CXXFLAGS if unset
-+CFLAGS=${CFLAGS-"-O2 -g -Wall --std=gnu99"}
-+CXXFLAGS=${CXXFLAGS-"-O2 -g -Wall"}
-+
-+ISODATE=`date +%Y-%m-%d`
-+AC_SUBST(ISODATE)
-+
-+# AC_ARG_ENABLE saves the option's argument in enable_FEATURE
-+AC_ARG_ENABLE(local-gsm,
-+	[AS_HELP_STRING([--enable-local-gsm],[Use local gsm library [default=auto]])],,
-+	[enable_local_gsm="auto"])
-+
-+AC_ARG_ENABLE(local-speex,
-+	[AS_HELP_STRING([--disable-local-speex],[Use local speex library [default=auto]])],,
-+	[enable_local_speex="yes"])
-+
-+AC_ARG_ENABLE(local-iax,
-+	[AS_HELP_STRING([--disable-local-iax],[Don't use local iax library])],,
-+	[enable_local_iax="yes"])
-+
-+AC_ARG_ENABLE(local-portaudio,
-+	[AS_HELP_STRING([--disable-local-portaudio],[Don't use local portaudio library])],,
-+	[enable_local_portaudio="yes"])
-+
-+AC_ARG_ENABLE(speex_preprocess,
-+	[AS_HELP_STRING([--disable-speex-preprocess],[Turn off speex preprocessing])],,
-+	[enable_speex_preprocess="yes"])
-+
-+AC_ARG_ENABLE(jitterbuf,
-+	[AS_HELP_STRING([--disable-jitterbuf],[Don't use jitter buffer])],,
-+	[enable_jitterbuf="yes"])
-+
-+AC_ARG_WITH(echo-can,
-+	[AS_HELP_STRING([--with-echo-can],
-+		[use echo can (span, speex or mec2) [default=speex]])],
-+	use_echo_can=$withval, use_echo_can="speex")
-+
-+with_iax="iax2"
-+
-+AC_ARG_ENABLE(clients,
-+	[AS_HELP_STRING([--enable-clients],
-+		[Select clients (all iaxcomm iaxphone testcall tkphone WinIAX wx) [default=auto]])],,
-+	enable_clients="auto")
-+
-+AC_ARG_WITH(ilbc,
-+	[AS_HELP_STRING([--with-ilbc],
-+		[Enable iLBC support (You need to place the iLBC reference sources in lib/iLBC) [default=auto]])],,with_ilbc="auto")
-+
-+case "$with_ilbc" in
-+     yes)  enable_local_ilbc=yes ;;
-+     no)   enable_local_ilbc=no ;;
-+     auto) AC_MSG_CHECKING([for iLBC reference sources in lib/iLBC])
-+	   if test -r lib/iLBC/iLBC_encode.c; then
-+	     enable_local_ilbc=yes
-+	   else
-+	     enable_local_ilbc=no
-+	   fi
-+	   AC_MSG_RESULT([$enable_local_ilbc]) ;;
-+
-+     *)    AC_MSG_ERROR([bad value ${with_ilbc} for --with-ilbc]) ;;
-+esac
-+
-+AC_ARG_WITH(wxrc,
-+	[AS_HELP_STRING([--with-wxrc],
-+		[Path to command line compiler for wx xml resources])],
-+	WXRC="${with_wxrc}",with_wxrc="auto")
-+
-+AC_ARG_WITH(wish,
-+	[AS_HELP_STRING([--with-wish],
-+		[Path to Tcl command language interpreter])],
-+	WISH="${with_wish}",with_wish="auto")
-+
-+if test ! "x$enable_clients" = "xauto"; then
-+   for client in ${enable_clients}
-+   do
-+      case "$client" in
-+	   iaxcomm | iaxphone | testcall | tkphone | WinIAX | wx) clients="$clients $client" ;;
-+	   all) clients="$clients iaxcomm iaxphone testcall tkphone WinIAX wx" ;;
-+	   *) AC_MSG_ERROR(bad value ${client} for --enable-clients) ;;
-+      esac
-+   done
-+fi
-+
-+AM_OPTIONS_WXCONFIG
-+
-+AC_CANONICAL_HOST
-+
-+dnl Checks for programs.
-+AC_PROG_CC
-+AM_PROG_CC_C_O
-+AC_PROG_CXX
-+AC_PROG_INSTALL
-+AC_LIBTOOL_WIN32_DLL
-+AC_PROG_LIBTOOL
-+AC_PATH_PROG([WXRC],[wxrc])
-+AC_PATH_PROG([WISH],[wish])
-+AC_LIBTOOL_RC
-+AC_PROG_MAKE_SET
-+
-+dnl Checks for libraries.
-+
-+dnl Checks for header files.
-+AC_HEADER_STDC
-+dnl AC_CHECK_HEADERS([arpa/inet.h fcntl.h malloc.h memory.h netdb.h netinet/in.h stddef.h stdlib.h string.h strings.h sys/ioctl.h sys/socket.h unistd.h])
-+AC_CHECK_HEADERS([sys/time.h varargs.h])
-+
-+dnl Checks for typedefs, structures, and compiler characteristics.
-+AC_HEADER_STDBOOL
-+AC_C_CONST
-+AC_C_INLINE
-+AC_TYPE_PID_T
-+AC_TYPE_SIZE_T
-+AC_HEADER_TIME
-+AC_C_VOLATILE
-+
-+case $host_os in
-+     *mingw32*|*cygwin* )  OSTYPE=WIN32
-+		 AC_DEFINE(WIN32,,[mingw or cygwin]);;
-+
-+     *linux* )   OSTYPE=LINUX
-+	         AC_DEFINE(LINUX,,[linux]);;
-+
-+     *darwin* )  OSTYPE=MACOSX
-+	         AC_DEFINE(MACOSX,,[darwin]);;
-+
-+     *solaris* ) OSTYPE=SOLARIS
-+	         AC_DEFINE(SOLARIS,,[solaris]);;
-+
-+dnl     *freebsd* ) OSTYPE=FREEBSD;;
-+dnl	         AC_DEFINE(FREEBSD,,[freebsd]);;
-+     * ) AC_MSG_WARN([OSTYPE cannot be detected, assuming Linux ($host_os)])
-+		 OSTYPE=LINUX
-+	         AC_DEFINE(LINUX,,[linux]);;
-+esac
-+
-+AC_SUBST(OSTYPE)
-+
-+dnl Checks for library functions.
-+AC_PROG_GCC_TRADITIONAL
-+dnl AC_FUNC_MALLOC
-+dnl AC_FUNC_REALLOC
-+dnl AC_FUNC_SELECT_ARGTYPES
-+dnl AC_TYPE_SIGNAL
-+dnl AC_FUNC_VPRINTF
-+dnl AC_CHECK_FUNCS([atexit bzero floor gethostbyname gethostname gettimeofday inet_ntoa memmove memset pow select socket sqrt strcasecmp strchr strdup strerror strncasecmp strstr])
-+AC_CHECK_FUNCS([vsnprintf _vsnprintf])
-+
-+dnl Check gsm library
-+has_gsm=no
-+if test ! x$enable_local_gsm = xyes; then
-+   AM_PATH_GSM(has_gsm=yes,has_gsm=no)
-+fi
-+
-+if test x$has_gsm = xno && test ! x$enable_local_gsm = xno; then
-+   has_gsm=yes
-+   enable_local_gsm=yes
-+   GSM_CFLAGS='-I$(top_srcdir)/lib/gsm/inc'
-+fi
-+
-+dnl Check speex library
-+has_speex=no
-+if test ! x$enable_local_speex = xyes; then
-+   AM_PATH_SPEEX(1.1.6,has_speex=yes,has_speex=no)
-+fi
-+
-+if test x$has_speex = xno && test ! x$enable_local_speex = xno; then
-+   has_speex=yes
-+   enable_local_speex=yes
-+   SPEEX_CFLAGS='-I$(top_srcdir)/lib/libspeex/include'
-+fi
-+
-+IAX_CFLAGS=""
-+IAX_LIBS=""
-+AC_SUBST(IAX_CFLAGS)
-+AC_SUBST(IAX_LIBS)
-+
-+   has_iax2=no
-+   if test ! x$enable_local_iax = xyes; then
-+      AM_PATH_IAX2(0.2.3,has_iax2=yes,has_iax2=no)
-+   fi
-+
-+   if test x$has_iax2 = xno && test ! x$enable_local_iax = xno; then
-+      has_iax2=yes
-+      enable_local_iax2=yes
-+      IAX2_CFLAGS='-I$(top_srcdir)/lib/libiax2/src -DLIBIAX'
-+      IAX2_LIBS=""
-+      IAX2_CONFIG=""
-+   fi
-+dnl fi
-+
-+dnl Check portaudio
-+has_portaudio=no
-+if test ! x$enable_local_portaudio = xyes; then
-+   AM_PATH_PORTAUDIO(has_portaudio="yes",has_portaudio="no")
-+fi
-+
-+if test x$has_portaudio = xno && test ! x$enable_local_portaudio = xno; then
-+   has_portaudio=yes
-+   enable_local_portaudio=yes
-+   PORTAUDIO_CFLAGS='-I$(top_srcdir)/lib/portaudio/pa_common'
-+fi
-+
-+if ! test x$OSTYPE = xWIN32; then
-+   AM_PATH_GTK(,has_gtk=yes)
-+fi
-+
-+AM_PATH_WXCONFIG(,has_wx=yes)
-+
-+dnl Begin wx xrc check
-+save_CPPFLAGS="$CPPFLAGS"
-+save_CXXFLAGS="$CXXFLAGS"
-+save_LIBS="$LIBS"
-+
-+CPPFLAGS="$WX_CPPFLAGS"
-+CXXFLAGS="$WX_CXXFLAGS_ONLY"
-+
-+AC_LANG_PUSH(C++)
-+if test x$has_wx = xyes; then
-+   AC_CHECK_HEADER(wx/xrc/xmlres.h,has_wx_xrc=yes,
-+		   [AC_MSG_WARN([Can't find wx/xrc/xml.h])
-+		    has_wx_xrc=no])
-+fi
-+
-+if test x$has_wx_xrc = xyes; then
-+
-+dnl Check for debug libraries
-+   wx_lib_prefix=
-+
-+   case $WX_CXXFLAGS in
-+       *__WXDEBUG__*) wx_lib_prefix=d
-+   esac
-+
-+   has_wx_xrc=xno
-+   AC_MSG_CHECKING([for wx xrc library])
-+   for wx_xrc_lib in " " "-lwx_gtk${wx_lib_prefix}_xrc-2.4" "-lwx_msw${wx_lib_prefix}_xrc-2.4" "-lwxxrc"; do
-+       LIBS="$wx_xrc_lib $WX_LIBS $save_LIBS"
-+       AC_LINK_IFELSE([
-+#include <wx/xrc/xmlres.h>
-+int main()
-+{
-+	wxXmlResource *res;
-+	res->Get();
-+	return 0;
-+}],[has_wx_xrc=yes
-+	WX_XRC_LIBS="$wx_xrc_lib"
-+	break])
-+   done
-+
-+   AC_MSG_RESULT([$has_wx_xrc ($WX_XRC_LIBS)])
-+fi
-+AC_SUBST(WX_XRC_LIBS)
-+
-+AC_LANG_POP(C++)
-+
-+LIBS="$save_LIBS"
-+CPPFLAGS="$save_CPPFLAGS"
-+CXXFLAGS="$save_CXXFLAGS"
-+dnl End wx xrc check
-+
-+if test x$enable_speex_preprocess = xyes; then
-+   AC_DEFINE(SPEEX_PREPROCESS, 1, [Speex preprocess])
-+fi
-+
-+AM_CONDITIONAL(SPAN_EC, test x$use_echo_can = xspan)
-+if test x$use_echo_can = xspan; then
-+   AC_DEFINE(SPAN_EC, 1, [Span echo can])
-+fi
-+
-+if test x$use_echo_can = xspeex; then
-+   AC_DEFINE(SPEEX_EC, 1, [Speex echo can])
-+fi
-+
-+if test x$use_echo_can = xmec2; then
-+   AC_DEFINE(MEC2_EC, 1, [Mec echo can])
-+fi
-+
-+AM_CONDITIONAL(JITTERBUF, test x$enable_jitterbuf = xyes)
-+if test x$enable_jitterbuf = xyes; then
-+   AC_DEFINE(NEWJB, 1, [Jitter buffer])
-+fi
-+
-+if test x$enable_local_ilbc = xyes; then
-+   AC_DEFINE(CODEC_ILBC,,[Enable ILBC support])
-+fi
-+
-+AM_CONDITIONAL(USE_LOCAL_GSM, test x$enable_local_gsm = xyes)
-+AM_CONDITIONAL(USE_LOCAL_SPEEX, test x$enable_local_speex = xyes)
-+AM_CONDITIONAL(USE_LOCAL_IAX2, test x$enable_local_iax2 = xyes)
-+AM_CONDITIONAL(USE_LOCAL_PORTAUDIO, test x$enable_local_portaudio = xyes)
-+AM_CONDITIONAL(USE_LOCAL_ILBC, test x$enable_local_ilbc = xyes)
-+AM_CONDITIONAL(LINUX, test x$OSTYPE = xLINUX)
-+AM_CONDITIONAL(WIN32, test x$OSTYPE = xWIN32)
-+AM_CONDITIONAL(SOLARIS, test x$OSTYPE = xSOLARIS)
-+AM_CONDITIONAL(MACOSX, test x$OSTYPE = xMACOSX)
-+dnl AM_CONDITIONAL(FREEBSD, test x$OSTYPE = xFREEBSD)
-+
-+# Autodetect clients
-+if test "x$enable_clients" = "xauto"; then
-+   clients="$clients testcall"
-+
-+   if test x$has_wx = xyes; then
-+      clients="$clients iaxphone wx"
-+
-+      if test x$has_wx_xrc = xyes; then
-+	 clients="$clients iaxcomm"
-+      fi
-+   fi
-+
-+   if test x$OSTYPE = xWIN32; then
-+      clients="$clients WinIAX"
-+   fi
-+
-+   if test ! x$WISH = x; then
-+      clients="$clients tkphone"
-+   fi
-+fi
-+
-+AC_CONFIG_FILES(Makefile lib/Makefile simpleclient/Makefile)
-+
-+for client in $clients
-+do
-+      case "$client" in
-+	   testcall) AC_CONFIG_FILES([simpleclient/testcall/Makefile]) 
-+		     CLIENTS="$CLIENTS $client";;
-+
-+	   iaxcomm)  AC_CONFIG_FILES([simpleclient/iaxcomm/Makefile])
-+		     CLIENTS="$CLIENTS $client";;
-+
-+	   iaxphone) AC_CONFIG_FILES([simpleclient/iaxphone/Makefile])
-+		     CLIENTS="$CLIENTS $client";;
-+
-+	   tkphone)  AC_CONFIG_FILES([simpleclient/tkphone/Makefile])
-+		     CLIENTS="$CLIENTS $client";;
-+
-+	   WinIAX)   AC_CONFIG_FILES([simpleclient/WinIAX/Makefile])
-+		     CLIENTS="$CLIENTS $client";;
-+
-+	   wx)	     AC_CONFIG_FILES([simpleclient/wx/Makefile])
-+		     CLIENTS="$CLIENTS $client";;
-+
-+	   *) ;;
-+      esac
-+done
-+
-+AC_SUBST(CLIENTS)
-+
-+AC_OUTPUT
-+
-+AC_MSG_NOTICE([Configured clients: $clients])
-diff -urNad iaxclient-0.0+cvs20050725/COPYING /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/COPYING
---- iaxclient-0.0+cvs20050725/COPYING	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/COPYING	2005-08-10 15:14:49.000000000 +0200
+diff -urNad iaxclient-0.0+svn20060520~/COPYING iaxclient-0.0+svn20060520/COPYING
+--- iaxclient-0.0+svn20060520~/COPYING	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/COPYING	2006-05-20 15:46:18.000000000 +0200
 @@ -0,0 +1,340 @@
 +		    GNU GENERAL PUBLIC LICENSE
 +		       Version 2, June 1991
@@ -760,9 +363,15 @@
 +consider it more useful to permit linking proprietary applications with the
 +library.  If this is what you want to do, use the GNU Library General
 +Public License instead of this License.
-diff -urNad iaxclient-0.0+cvs20050725/INSTALL /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/INSTALL
---- iaxclient-0.0+cvs20050725/INSTALL	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/INSTALL	2005-08-10 15:14:49.000000000 +0200
+diff -urNad iaxclient-0.0+svn20060520~/ChangeLog iaxclient-0.0+svn20060520/ChangeLog
+--- iaxclient-0.0+svn20060520~/ChangeLog	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/ChangeLog	2006-05-20 15:46:18.000000000 +0200
+@@ -0,0 +1,2 @@
++
++
+diff -urNad iaxclient-0.0+svn20060520~/INSTALL iaxclient-0.0+svn20060520/INSTALL
+--- iaxclient-0.0+svn20060520~/INSTALL	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/INSTALL	2006-05-20 15:46:18.000000000 +0200
 @@ -0,0 +1,229 @@
 +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
 +Foundation, Inc.
@@ -993,9 +602,421 @@
 +`configure' also accepts some other, not widely useful, options.  Run
 +`configure --help' for more details.
 +
-diff -urNad iaxclient-0.0+cvs20050725/lib/Makefile.am /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/lib/Makefile.am
---- iaxclient-0.0+cvs20050725/lib/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/lib/Makefile.am	2005-08-10 15:14:49.000000000 +0200
+diff -urNad iaxclient-0.0+svn20060520~/Makefile.am iaxclient-0.0+svn20060520/Makefile.am
+--- iaxclient-0.0+svn20060520~/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/Makefile.am	2006-05-20 15:46:18.000000000 +0200
+@@ -0,0 +1,5 @@
++ACLOCAL_AMFLAGS = -I macros
++
++SUBDIRS = lib simpleclient
++
++#EXTRA_DIST += iaxclient conf
+diff -urNad iaxclient-0.0+svn20060520~/NEWS iaxclient-0.0+svn20060520/NEWS
+--- iaxclient-0.0+svn20060520~/NEWS	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/NEWS	2006-05-20 15:46:18.000000000 +0200
+@@ -0,0 +1,2 @@
++
++
+diff -urNad iaxclient-0.0+svn20060520~/autogen.sh iaxclient-0.0+svn20060520/autogen.sh
+--- iaxclient-0.0+svn20060520~/autogen.sh	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/autogen.sh	2006-05-20 15:46:18.000000000 +0200
+@@ -0,0 +1,12 @@
++#!/bin/sh -e
++
++aclocal -I macros
++autoheader
++autoconf
++libtoolize -c
++automake -a -c
++
++if test -x ./config.status; then
++	./config.status --recheck
++	./config.status
++fi
+diff -urNad iaxclient-0.0+svn20060520~/clean.sh iaxclient-0.0+svn20060520/clean.sh
+--- iaxclient-0.0+svn20060520~/clean.sh	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/clean.sh	2006-05-20 15:46:18.000000000 +0200
+@@ -0,0 +1,6 @@
++#!/bin/sh
++
++rm -f aclocal.m4 compile config.guess config.h.in config.sub configure depcomp install-sh ltmain.sh missing
++
++rm -f {.,lib,simpleclient,simpleclient/iaxcomm,simpleclient/iaxphone,simpleclient/testcall,simpleclient/tkphone,simpleclient/WinIAX,simpleclient/wx}/Makefile.in 
++rm -rf autom4te.cache
+diff -urNad iaxclient-0.0+svn20060520~/configure.ac iaxclient-0.0+svn20060520/configure.ac
+--- iaxclient-0.0+svn20060520~/configure.ac	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/configure.ac	2006-05-20 15:46:34.000000000 +0200
+@@ -0,0 +1,367 @@
++dnl Copyright (C) 2004-2005  Mikael Magnusson <mikma at users.sourceforge.net>
++
++AC_PREREQ(2.59)
++AC_INIT([iaxclient], 0.0+cvs20060520)
++AC_CONFIG_SRCDIR([lib/iaxclient.h])
++AC_CONFIG_MACRO_DIR([macros])
++AM_INIT_AUTOMAKE
++AM_MAINTAINER_MODE
++
++dnl create a config.h file (Automake will add -DHAVE_CONFIG_H)
++AM_CONFIG_HEADER([config.h])
++
++dnl Default CFLAGS and CXXFLAGS if unset
++CFLAGS=${CFLAGS-"-O2 -g -Wall --std=gnu99"}
++CXXFLAGS=${CXXFLAGS-"-O2 -g -Wall"}
++
++ISODATE=`date +%Y-%m-%d`
++AC_SUBST(ISODATE)
++
++# AC_ARG_ENABLE saves the option's argument in enable_FEATURE
++AC_ARG_ENABLE(local-gsm,
++	[AS_HELP_STRING([--enable-local-gsm],[Use local gsm library [default=auto]])],,
++	[enable_local_gsm="auto"])
++
++AC_ARG_ENABLE(local-speex,
++	[AS_HELP_STRING([--disable-local-speex],[Use local speex library [default=auto]])],,
++	[enable_local_speex="yes"])
++
++AC_ARG_ENABLE(local-iax,
++	[AS_HELP_STRING([--disable-local-iax],[Don't use local iax library])],,
++	[enable_local_iax="yes"])
++
++AC_ARG_ENABLE(local-portaudio,
++	[AS_HELP_STRING([--disable-local-portaudio],[Don't use local portaudio library])],,
++	[enable_local_portaudio="yes"])
++
++AC_ARG_ENABLE(speex_preprocess,
++	[AS_HELP_STRING([--disable-speex-preprocess],[Turn off speex preprocessing])],,
++	[enable_speex_preprocess="yes"])
++
++AC_ARG_ENABLE(jitterbuf,
++	[AS_HELP_STRING([--disable-jitterbuf],[Don't use jitter buffer])],,
++	[enable_jitterbuf="yes"])
++
++AC_ARG_WITH(echo-can,
++	[AS_HELP_STRING([--with-echo-can],
++		[use echo can (span, speex or mec2) [default=speex]])],
++	use_echo_can=$withval, use_echo_can="speex")
++
++with_iax="iax2"
++
++AC_ARG_ENABLE(clients,
++	[AS_HELP_STRING([--enable-clients],
++		[Select clients (all iaxcomm iaxphone testcall tkphone WinIAX wx) [default=auto]])],,
++	enable_clients="auto")
++
++AC_ARG_WITH(ilbc,
++	[AS_HELP_STRING([--with-ilbc],
++		[Enable iLBC support (You need to place the iLBC reference sources in lib/iLBC) [default=auto]])],,with_ilbc="auto")
++
++case "$with_ilbc" in
++     yes)  enable_local_ilbc=yes ;;
++     no)   enable_local_ilbc=no ;;
++     auto) AC_MSG_CHECKING([for iLBC reference sources in lib/iLBC])
++	   if test -r lib/iLBC/iLBC_encode.c; then
++	     enable_local_ilbc=yes
++	   else
++	     enable_local_ilbc=no
++	   fi
++	   AC_MSG_RESULT([$enable_local_ilbc]) ;;
++
++     *)    AC_MSG_ERROR([bad value ${with_ilbc} for --with-ilbc]) ;;
++esac
++
++AC_ARG_WITH(wxrc,
++	[AS_HELP_STRING([--with-wxrc],
++		[Path to command line compiler for wx xml resources])],
++	WXRC="${with_wxrc}",with_wxrc="auto")
++
++AC_ARG_WITH(wish,
++	[AS_HELP_STRING([--with-wish],
++		[Path to Tcl command language interpreter])],
++	WISH="${with_wish}",with_wish="auto")
++
++if test ! "x$enable_clients" = "xauto"; then
++   for client in ${enable_clients}
++   do
++      case "$client" in
++	   iaxcomm | iaxphone | testcall | tkphone | WinIAX | wx) clients="$clients $client" ;;
++	   all) clients="$clients iaxcomm iaxphone testcall tkphone WinIAX wx" ;;
++	   *) AC_MSG_ERROR(bad value ${client} for --enable-clients) ;;
++      esac
++   done
++fi
++
++AM_OPTIONS_WXCONFIG
++
++AC_CANONICAL_HOST
++
++dnl Checks for programs.
++AC_PROG_CC
++AM_PROG_CC_C_O
++AC_PROG_CXX
++AC_PROG_INSTALL
++AC_LIBTOOL_WIN32_DLL
++AC_PROG_LIBTOOL
++AC_PATH_PROG([WXRC],[wxrc])
++AC_PATH_PROG([WISH],[wish])
++AC_LIBTOOL_RC
++AC_PROG_MAKE_SET
++
++dnl Checks for libraries.
++
++dnl Checks for header files.
++AC_HEADER_STDC
++dnl AC_CHECK_HEADERS([arpa/inet.h fcntl.h malloc.h memory.h netdb.h netinet/in.h stddef.h stdlib.h string.h strings.h sys/ioctl.h sys/socket.h unistd.h])
++AC_CHECK_HEADERS([sys/time.h varargs.h])
++
++dnl Checks for typedefs, structures, and compiler characteristics.
++AC_HEADER_STDBOOL
++AC_C_CONST
++AC_C_INLINE
++AC_TYPE_PID_T
++AC_TYPE_SIZE_T
++AC_HEADER_TIME
++AC_C_VOLATILE
++
++case $host_os in
++     *mingw32*|*cygwin* )  OSTYPE=WIN32
++		 AC_DEFINE(WIN32,,[mingw or cygwin]);;
++
++     *linux* )   OSTYPE=LINUX
++	         AC_DEFINE(LINUX,,[linux]);;
++
++     *darwin* )  OSTYPE=MACOSX
++	         AC_DEFINE(MACOSX,,[darwin]);;
++
++     *solaris* ) OSTYPE=SOLARIS
++	         AC_DEFINE(SOLARIS,,[solaris]);;
++
++dnl     *freebsd* ) OSTYPE=FREEBSD;;
++dnl	         AC_DEFINE(FREEBSD,,[freebsd]);;
++     * ) AC_MSG_WARN([OSTYPE cannot be detected, assuming Linux ($host_os)])
++		 OSTYPE=LINUX
++	         AC_DEFINE(LINUX,,[linux]);;
++esac
++
++AC_SUBST(OSTYPE)
++
++dnl Checks for library functions.
++AC_PROG_GCC_TRADITIONAL
++dnl AC_FUNC_MALLOC
++dnl AC_FUNC_REALLOC
++dnl AC_FUNC_SELECT_ARGTYPES
++dnl AC_TYPE_SIGNAL
++dnl AC_FUNC_VPRINTF
++dnl AC_CHECK_FUNCS([atexit bzero floor gethostbyname gethostname gettimeofday inet_ntoa memmove memset pow select socket sqrt strcasecmp strchr strdup strerror strncasecmp strstr])
++AC_CHECK_FUNCS([vsnprintf _vsnprintf])
++
++dnl Check gsm library
++has_gsm=no
++if test ! x$enable_local_gsm = xyes; then
++   AM_PATH_GSM(has_gsm=yes,has_gsm=no)
++fi
++
++if test x$has_gsm = xno && test ! x$enable_local_gsm = xno; then
++   has_gsm=yes
++   enable_local_gsm=yes
++   GSM_CFLAGS='-I$(top_srcdir)/lib/gsm/inc'
++fi
++
++dnl Check speex library
++has_speex=no
++if test ! x$enable_local_speex = xyes; then
++   AM_PATH_SPEEX(1.1.6,has_speex=yes,has_speex=no)
++fi
++
++if test x$has_speex = xno && test ! x$enable_local_speex = xno; then
++   has_speex=yes
++   enable_local_speex=yes
++   SPEEX_CFLAGS='-I$(top_srcdir)/lib/libspeex/include'
++fi
++
++IAX_CFLAGS=""
++IAX_LIBS=""
++AC_SUBST(IAX_CFLAGS)
++AC_SUBST(IAX_LIBS)
++
++   has_iax2=no
++   if test ! x$enable_local_iax = xyes; then
++      AM_PATH_IAX2(0.2.3,has_iax2=yes,has_iax2=no)
++   fi
++
++   if test x$has_iax2 = xno && test ! x$enable_local_iax = xno; then
++      has_iax2=yes
++      enable_local_iax2=yes
++      IAX2_CFLAGS='-I$(top_srcdir)/lib/libiax2/src -DLIBIAX'
++      IAX2_LIBS=""
++      IAX2_CONFIG=""
++   fi
++dnl fi
++
++dnl Check portaudio
++has_portaudio=no
++if test ! x$enable_local_portaudio = xyes; then
++   AM_PATH_PORTAUDIO(has_portaudio="yes",has_portaudio="no")
++fi
++
++if test x$has_portaudio = xno && test ! x$enable_local_portaudio = xno; then
++   has_portaudio=yes
++   enable_local_portaudio=yes
++   PORTAUDIO_CFLAGS='-I$(top_srcdir)/lib/portaudio/pa_common'
++fi
++
++has_wx="no"
++AM_PATH_WXCONFIG(2.6.0, [has_wx="2.6"],
++   [AM_PATH_WXCONFIG(2.4.0, [has_wx="2.4"])])
++
++ if ! test x$OSTYPE = xWIN32; then
++   if test x$has_wx = x2.4; then
++      AM_PATH_GTK(,has_gtk=yes)
++   elif test x$has_wx = x2.6; then
++      AM_PATH_GTK_2_0(,has_gtk=yes)
++   fi
++fi
++
++dnl Begin wx xrc check
++save_CPPFLAGS="$CPPFLAGS"
++save_CXXFLAGS="$CXXFLAGS"
++save_LIBS="$LIBS"
++
++CPPFLAGS="$WX_CPPFLAGS"
++CXXFLAGS="$WX_CXXFLAGS_ONLY"
++
++AC_LANG_PUSH(C++)
++if test ! x$has_wx = xno; then
++   AC_CHECK_HEADER(wx/xrc/xmlres.h,has_wx_xrc=yes,
++		   [AC_MSG_WARN([Can't find wx/xrc/xml.h])
++		    has_wx_xrc=no])
++fi
++
++if test x$has_wx_xrc = xyes; then
++
++dnl Check for debug libraries
++   wx_lib_prefix=
++
++   case $WX_CXXFLAGS in
++       *__WXDEBUG__*) wx_lib_prefix=d
++   esac
++
++   has_wx_xrc=xno
++   AC_MSG_CHECKING([for wx xrc library])
++   for wx_xrc_lib in " " "-lwx_gtk${wx_lib_prefix}_xrc-2.4" "-lwx_msw${wx_lib_prefix}_xrc-2.4" "-lwxxrc"; do
++       LIBS="$wx_xrc_lib $WX_LIBS $save_LIBS"
++       AC_LINK_IFELSE([
++#include <wx/xrc/xmlres.h>
++int main()
++{
++	wxXmlResource *res;
++	res->Get();
++	return 0;
++}],[has_wx_xrc=yes
++	WX_XRC_LIBS="$wx_xrc_lib"
++	break])
++   done
++
++   AC_MSG_RESULT([$has_wx_xrc ($WX_XRC_LIBS)])
++fi
++AC_SUBST(WX_XRC_LIBS)
++
++AC_LANG_POP(C++)
++
++LIBS="$save_LIBS"
++CPPFLAGS="$save_CPPFLAGS"
++CXXFLAGS="$save_CXXFLAGS"
++dnl End wx xrc check
++
++if test x$enable_speex_preprocess = xyes; then
++   AC_DEFINE(SPEEX_PREPROCESS, 1, [Speex preprocess])
++fi
++
++AM_CONDITIONAL(SPAN_EC, test x$use_echo_can = xspan)
++if test x$use_echo_can = xspan; then
++   AC_DEFINE(SPAN_EC, 1, [Span echo can])
++fi
++
++if test x$use_echo_can = xspeex; then
++   AC_DEFINE(SPEEX_EC, 1, [Speex echo can])
++fi
++
++if test x$use_echo_can = xmec2; then
++   AC_DEFINE(MEC2_EC, 1, [Mec echo can])
++fi
++
++AM_CONDITIONAL(JITTERBUF, test x$enable_jitterbuf = xyes)
++if test x$enable_jitterbuf = xyes; then
++   AC_DEFINE(NEWJB, 1, [Jitter buffer])
++fi
++
++if test x$enable_local_ilbc = xyes; then
++   AC_DEFINE(CODEC_ILBC,,[Enable ILBC support])
++fi
++
++AM_CONDITIONAL(USE_LOCAL_GSM, test x$enable_local_gsm = xyes)
++AM_CONDITIONAL(USE_LOCAL_SPEEX, test x$enable_local_speex = xyes)
++AM_CONDITIONAL(USE_LOCAL_IAX2, test x$enable_local_iax2 = xyes)
++AM_CONDITIONAL(USE_LOCAL_PORTAUDIO, test x$enable_local_portaudio = xyes)
++AM_CONDITIONAL(USE_LOCAL_ILBC, test x$enable_local_ilbc = xyes)
++AM_CONDITIONAL(LINUX, test x$OSTYPE = xLINUX)
++AM_CONDITIONAL(WIN32, test x$OSTYPE = xWIN32)
++AM_CONDITIONAL(SOLARIS, test x$OSTYPE = xSOLARIS)
++AM_CONDITIONAL(MACOSX, test x$OSTYPE = xMACOSX)
++dnl AM_CONDITIONAL(FREEBSD, test x$OSTYPE = xFREEBSD)
++
++# Autodetect clients
++if test "x$enable_clients" = "xauto"; then
++   clients="$clients testcall"
++
++   if test ! x$has_wx = xno; then
++      clients="$clients iaxphone wx"
++
++      if test x$has_wx_xrc = xyes; then
++	 clients="$clients iaxcomm"
++      fi
++   fi
++
++   if test x$OSTYPE = xWIN32; then
++      clients="$clients WinIAX"
++   fi
++
++   if test ! x$WISH = x; then
++      clients="$clients tkphone"
++   fi
++fi
++
++AC_CONFIG_FILES(Makefile lib/Makefile simpleclient/Makefile)
++
++for client in $clients
++do
++      case "$client" in
++	   testcall) AC_CONFIG_FILES([simpleclient/testcall/Makefile]) 
++		     CLIENTS="$CLIENTS $client";;
++
++	   iaxcomm)  AC_CONFIG_FILES([simpleclient/iaxcomm/Makefile])
++		     CLIENTS="$CLIENTS $client";;
++
++	   iaxphone) AC_CONFIG_FILES([simpleclient/iaxphone/Makefile])
++		     CLIENTS="$CLIENTS $client";;
++
++	   tkphone)  AC_CONFIG_FILES([simpleclient/tkphone/Makefile])
++		     CLIENTS="$CLIENTS $client";;
++
++	   WinIAX)   AC_CONFIG_FILES([simpleclient/WinIAX/Makefile])
++		     CLIENTS="$CLIENTS $client";;
++
++	   wx)	     AC_CONFIG_FILES([simpleclient/wx/Makefile])
++		     CLIENTS="$CLIENTS $client";;
++
++	   *) ;;
++      esac
++done
++
++AC_SUBST(CLIENTS)
++
++AC_OUTPUT
++
++AC_MSG_NOTICE([Configured clients: $clients])
+diff -urNad iaxclient-0.0+svn20060520~/lib/Makefile.am iaxclient-0.0+svn20060520/lib/Makefile.am
+--- iaxclient-0.0+svn20060520~/lib/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/lib/Makefile.am	2006-05-20 15:46:18.000000000 +0200
 @@ -0,0 +1,322 @@
 +# Autoconf etc. macros
 +AUTOMAKE_OPTIONS = subdir-objects
@@ -1319,9 +1340,9 @@
 +portmixer/px_tests portmixer/px_unix_oss/Makefile			\
 +portmixer/px_win_wmme/Makefile portmixer/winproj libiax sox
 +endif
-diff -urNad iaxclient-0.0+cvs20050725/macros/gsm.m4 /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/macros/gsm.m4
---- iaxclient-0.0+cvs20050725/macros/gsm.m4	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/macros/gsm.m4	2005-08-10 15:14:49.000000000 +0200
+diff -urNad iaxclient-0.0+svn20060520~/macros/gsm.m4 iaxclient-0.0+svn20060520/macros/gsm.m4
+--- iaxclient-0.0+svn20060520~/macros/gsm.m4	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/macros/gsm.m4	2006-05-20 15:46:18.000000000 +0200
 @@ -0,0 +1,63 @@
 +dnl 20041024 Downloaded from http://digium-cvs.netmonks.ca/viewcvs.cgi/*checkout*/gnophone/m4/gsm.m4?rev=1.2 
 +dnl This is a little s script written by Rob Flynn of Linux Support Services, Inc.
@@ -1386,11 +1407,11 @@
 +fi
 +
 +])
-diff -urNad iaxclient-0.0+cvs20050725/macros/iax2.m4 /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/macros/iax2.m4
---- iaxclient-0.0+cvs20050725/macros/iax2.m4	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/macros/iax2.m4	2005-08-10 15:14:49.000000000 +0200
+diff -urNad iaxclient-0.0+svn20060520~/macros/iax.m4 iaxclient-0.0+svn20060520/macros/iax.m4
+--- iaxclient-0.0+svn20060520~/macros/iax.m4	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/macros/iax.m4	2006-05-20 15:46:18.000000000 +0200
 @@ -0,0 +1,166 @@
-+# 20041024 Mikael Magnusson
++# 20041025 Mikael Magnusson modifications
 +# 20041024 Downloaded from http://digium-cvs.netmonks.ca/viewcvs.cgi/*checkout*/gnophone/m4/iax.m4?rev=1.2
 +# Configure paths for IAX
 +# Stolen and modifed by Rob Flynn
@@ -1399,53 +1420,53 @@
 +# stolen from Manish Singh
 +# Shamelessly stolen from Owen Taylor
 +
-+dnl AM_PATH_IAX2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-+dnl Test for IAX2, and define IAX2_CFLAGS and IAX2_LIBS
++dnl AM_PATH_GIAX([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
++dnl Test for IAX, and define IAX_CFLAGS and IAX_LIBS
 +dnl
-+AC_DEFUN([AM_PATH_IAX2],
++AC_DEFUN([AM_PATH_GIAX],
 +[
 +
-+AC_ARG_WITH(iax2-prefix,[AS_HELP_STRING([--with-iax2-prefix=PFX],[Prefix where IAX is installed (optional)])],
-+            iax2_prefix="$withval", iax2_prefix="")
-+AC_ARG_WITH(iax2-exec-prefix,[AS_HELP_STRING([--with-iax2-exec-prefix=PFX],[Exec prefix where IAX is installed (optional)])],
-+            iax2_exec_prefix="$withval", iax2_exec_prefix="")
-+AC_ARG_ENABLE(iax2test, [AS_HELP_STRING([--disable-iax2test],[Do not try to compile and run a test IAX program])],
-+		    , enable_iax2test=yes)
++AC_ARG_WITH(iax-prefix,[AS_HELP_STRING([--with-iax-prefix=PFX],[Prefix where IAX is installed (optional)])],
++            iax_prefix="$withval", iax_prefix="")
++AC_ARG_WITH(iax-exec-prefix,[AS_HELP_STRING([--with-iax-exec-prefix=PFX],[Exec prefix where IAX is installed (optional)])],
++            iax_exec_prefix="$withval", iax_exec_prefix="")
++AC_ARG_ENABLE(iaxtest, [AS_HELP_STRING([--disable-iaxtest],[Do not try to compile and run a test IAX program])],
++		    , enable_iaxtest=yes)
 +
-+  if test x$iax2_exec_prefix != x ; then
-+     iax2_args="$iax2_args --exec-prefix=$iax2_exec_prefix"
-+     if test x${IAX2_CONFIG+set} != xset ; then
-+        IAX2_CONFIG=$iax2_exec_prefix/bin/iax-config
++  if test x$iax_exec_prefix != x ; then
++     iax_args="$iax_args --exec-prefix=$iax_exec_prefix"
++     if test x${IAX_CONFIG+set} != xset ; then
++        IAX_CONFIG=$iax_exec_prefix/bin/iax-config
 +     fi
 +  fi
-+  if test x$iax2_prefix != x ; then
-+     iax2_args="$iax2_args --prefix=$iax2_prefix"
-+     if test x${IAX2_CONFIG+set} != xset ; then
-+        IAX2_CONFIG=$iax2_prefix/bin/iax-config
++  if test x$iax_prefix != x ; then
++     iax_args="$iax_args --prefix=$iax_prefix"
++     if test x${IAX_CONFIG+set} != xset ; then
++        IAX_CONFIG=$iax_prefix/bin/iax-config
 +     fi
 +  fi
 +
-+  AC_PATH_PROG(IAX2_CONFIG, iax-config, no)
-+  min_iax2_version=ifelse([$1], ,0.2.2,$1)
-+  AC_MSG_CHECKING(for IAX - version >= $min_iax2_version)
++  AC_PATH_PROG(IAX_CONFIG, iax-config, no)
++  min_iax_version=ifelse([$1], ,0.2.2,$1)
++  AC_MSG_CHECKING(for IAX - version >= $min_iax_version)
 +  no_iax=""
-+  if test "$IAX2_CONFIG" = "no" ; then
++  if test "$IAX_CONFIG" = "no" ; then
 +    no_iax=yes
 +  else
-+    IAX2_CFLAGS=`$IAX2_CONFIG $iaxconf_args --cflags`
-+    IAX2_LIBS=`$IAX2_CONFIG $iaxconf_args --libs`
++    IAX_CFLAGS=`$IAX_CONFIG $iaxconf_args --cflags`
++    IAX_LIBS=`$IAX_CONFIG $iaxconf_args --libs`
 +
-+    iax2_major_version=`$IAX2_CONFIG $iax2_args --version | \
++    iax_major_version=`$IAX_CONFIG $iax_args --version | \
 +           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-+    iax2_minor_version=`$IAX2_CONFIG $iax2_args --version | \
++    iax_minor_version=`$IAX_CONFIG $iax_args --version | \
 +           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-+    iax2_micro_version=`$IAX2_CONFIG $iax2_config_args --version | \
++    iax_micro_version=`$IAX_CONFIG $iax_config_args --version | \
 +           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-+    if test "x$enable_iax2test" = "xyes" ; then
++    if test "x$enable_iaxtest" = "xyes" ; then
 +      ac_save_CFLAGS="$CFLAGS"
 +      ac_save_LIBS="$LIBS"
-+      CFLAGS="$CFLAGS $IAX2_CFLAGS"
-+      LIBS="$LIBS $IAX2_LIBS"
++      CFLAGS="$CFLAGS $IAX_CFLAGS"
++      LIBS="$LIBS $IAX_LIBS"
 +dnl
 +dnl Now check if the installed IAX is sufficiently new. (Also sanity
 +dnl checks the results of iax-config to some extent
@@ -1455,7 +1476,7 @@
 +#include <stdio.h>
 +#include <stdlib.h>
 +#include <string.h>
-+#include <iax/iax2.h>
++#include <iax/iax.h>
 +
 +char*
 +my_strdup (char *str)
@@ -1481,21 +1502,21 @@
 +  system ("touch conf.iaxtest");
 +
 +  /* HP/UX 9 (%@#!) writes to sscanf strings */
-+  tmp_version = my_strdup("$min_iax2_version");
++  tmp_version = my_strdup("$min_iax_version");
 +  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-+     printf("%s, bad version string\n", "$min_iax2_version");
++     printf("%s, bad version string\n", "$min_iax_version");
 +     exit(1);
 +   }
 +
-+   if (($iax2_major_version > major) ||
-+      (($iax2_major_version == major) && ($iax2_minor_version > minor)) ||
-+      (($iax2_major_version == major) && ($iax2_minor_version == minor) && ($iax2_micro_version >= micro)))
++   if (($iax_major_version > major) ||
++      (($iax_major_version == major) && ($iax_minor_version > minor)) ||
++      (($iax_major_version == major) && ($iax_minor_version == minor) && ($iax_micro_version >= micro)))
 +    {
 +      return 0;
 +    }
 +  else
 +    {
-+      printf("\n*** 'iax-config --version' returned %d.%d.%d, but the minimum version\n", $iax2_major_version, $iax2_minor_version, $iax2_micro_version);
++      printf("\n*** 'iax-config --version' returned %d.%d.%d, but the minimum version\n", $iax_major_version, $iax_minor_version, $iax_micro_version);
 +      printf("*** of IAX required is %d.%d.%d. If iax-config is correct, then it is\n", major, minor, micro);
 +      printf("*** best to upgrade to the required version.\n");
 +      printf("*** If iax-config was wrong, set the environment variable IAX_CONFIG\n");
@@ -1515,7 +1536,7 @@
 +     ifelse([$2], , :, [$2])     
 +  else
 +     AC_MSG_RESULT(no)
-+     if test "$IAX2_CONFIG" = "no" ; then
++     if test "$IAX_CONFIG" = "no" ; then
 +       echo "*** The iax-config script installed by IAX could not be found"
 +       echo "*** If IAX was installed in PREFIX, make sure PREFIX/bin is in"
 +       echo "*** your path, or set the IAX_CONFIG environment variable to the"
@@ -1525,11 +1546,11 @@
 +        :
 +       else
 +          echo "*** Could not run IAX test program, checking why..."
-+          CFLAGS="$CFLAGS $IAX2_CFLAGS"
-+          LIBS="$LIBS $IAX2_LIBS"
++          CFLAGS="$CFLAGS $IAX_CFLAGS"
++          LIBS="$LIBS $IAX_LIBS"
 +          AC_TRY_LINK([
 +#include <stdio.h>
-+#include <iax/iax2.h>
++#include <iax/iax.h>
 +],      [ return 0; ],
 +        [ echo "*** The test program compiled, but did not run. This usually means"
 +          echo "*** that the run-time linker is not finding IAX or finding the wrong"
@@ -1543,24 +1564,24 @@
 +        [ echo "*** The test program failed to compile or link. See the file config.log for the"
 +          echo "*** exact error that occured. This usually means IAX was incorrectly installed"
 +          echo "*** or that you have moved IAX since it was installed. In the latter case, you"
-+          echo "*** may want to edit the iax-config script: $IAX2_CONFIG" ])
++          echo "*** may want to edit the iax-config script: $IAX_CONFIG" ])
 +          CFLAGS="$ac_save_CFLAGS"
 +          LIBS="$ac_save_LIBS"
 +       fi
 +     fi
-+     IAX2_CFLAGS=""
-+     IAX2_LIBS=""
++     IAX_CFLAGS=""
++     IAX_LIBS=""
 +     ifelse([$3], , :, [$3])
 +  fi
-+  AC_SUBST(IAX2_CFLAGS)
-+  AC_SUBST(IAX2_LIBS)
++  AC_SUBST(IAX_CFLAGS)
++  AC_SUBST(IAX_LIBS)
 +  rm -f conf.iaxtest
 +])
-diff -urNad iaxclient-0.0+cvs20050725/macros/iax.m4 /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/macros/iax.m4
---- iaxclient-0.0+cvs20050725/macros/iax.m4	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/macros/iax.m4	2005-08-10 15:14:49.000000000 +0200
+diff -urNad iaxclient-0.0+svn20060520~/macros/iax2.m4 iaxclient-0.0+svn20060520/macros/iax2.m4
+--- iaxclient-0.0+svn20060520~/macros/iax2.m4	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/macros/iax2.m4	2006-05-20 15:46:18.000000000 +0200
 @@ -0,0 +1,166 @@
-+# 20041025 Mikael Magnusson modifications
++# 20041024 Mikael Magnusson
 +# 20041024 Downloaded from http://digium-cvs.netmonks.ca/viewcvs.cgi/*checkout*/gnophone/m4/iax.m4?rev=1.2
 +# Configure paths for IAX
 +# Stolen and modifed by Rob Flynn
@@ -1569,53 +1590,53 @@
 +# stolen from Manish Singh
 +# Shamelessly stolen from Owen Taylor
 +
-+dnl AM_PATH_GIAX([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-+dnl Test for IAX, and define IAX_CFLAGS and IAX_LIBS
++dnl AM_PATH_IAX2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
++dnl Test for IAX2, and define IAX2_CFLAGS and IAX2_LIBS
 +dnl
-+AC_DEFUN([AM_PATH_GIAX],
++AC_DEFUN([AM_PATH_IAX2],
 +[
 +
-+AC_ARG_WITH(iax-prefix,[AS_HELP_STRING([--with-iax-prefix=PFX],[Prefix where IAX is installed (optional)])],
-+            iax_prefix="$withval", iax_prefix="")
-+AC_ARG_WITH(iax-exec-prefix,[AS_HELP_STRING([--with-iax-exec-prefix=PFX],[Exec prefix where IAX is installed (optional)])],
-+            iax_exec_prefix="$withval", iax_exec_prefix="")
-+AC_ARG_ENABLE(iaxtest, [AS_HELP_STRING([--disable-iaxtest],[Do not try to compile and run a test IAX program])],
-+		    , enable_iaxtest=yes)
++AC_ARG_WITH(iax2-prefix,[AS_HELP_STRING([--with-iax2-prefix=PFX],[Prefix where IAX is installed (optional)])],
++            iax2_prefix="$withval", iax2_prefix="")
++AC_ARG_WITH(iax2-exec-prefix,[AS_HELP_STRING([--with-iax2-exec-prefix=PFX],[Exec prefix where IAX is installed (optional)])],
++            iax2_exec_prefix="$withval", iax2_exec_prefix="")
++AC_ARG_ENABLE(iax2test, [AS_HELP_STRING([--disable-iax2test],[Do not try to compile and run a test IAX program])],
++		    , enable_iax2test=yes)
 +
-+  if test x$iax_exec_prefix != x ; then
-+     iax_args="$iax_args --exec-prefix=$iax_exec_prefix"
-+     if test x${IAX_CONFIG+set} != xset ; then
-+        IAX_CONFIG=$iax_exec_prefix/bin/iax-config
++  if test x$iax2_exec_prefix != x ; then
++     iax2_args="$iax2_args --exec-prefix=$iax2_exec_prefix"
++     if test x${IAX2_CONFIG+set} != xset ; then
++        IAX2_CONFIG=$iax2_exec_prefix/bin/iax-config
 +     fi
 +  fi
-+  if test x$iax_prefix != x ; then
-+     iax_args="$iax_args --prefix=$iax_prefix"
-+     if test x${IAX_CONFIG+set} != xset ; then
-+        IAX_CONFIG=$iax_prefix/bin/iax-config
++  if test x$iax2_prefix != x ; then
++     iax2_args="$iax2_args --prefix=$iax2_prefix"
++     if test x${IAX2_CONFIG+set} != xset ; then
++        IAX2_CONFIG=$iax2_prefix/bin/iax-config
 +     fi
 +  fi
 +
-+  AC_PATH_PROG(IAX_CONFIG, iax-config, no)
-+  min_iax_version=ifelse([$1], ,0.2.2,$1)
-+  AC_MSG_CHECKING(for IAX - version >= $min_iax_version)
++  AC_PATH_PROG(IAX2_CONFIG, iax-config, no)
++  min_iax2_version=ifelse([$1], ,0.2.2,$1)
++  AC_MSG_CHECKING(for IAX - version >= $min_iax2_version)
 +  no_iax=""
-+  if test "$IAX_CONFIG" = "no" ; then
++  if test "$IAX2_CONFIG" = "no" ; then
 +    no_iax=yes
 +  else
-+    IAX_CFLAGS=`$IAX_CONFIG $iaxconf_args --cflags`
-+    IAX_LIBS=`$IAX_CONFIG $iaxconf_args --libs`
++    IAX2_CFLAGS=`$IAX2_CONFIG $iaxconf_args --cflags`
++    IAX2_LIBS=`$IAX2_CONFIG $iaxconf_args --libs`
 +
-+    iax_major_version=`$IAX_CONFIG $iax_args --version | \
++    iax2_major_version=`$IAX2_CONFIG $iax2_args --version | \
 +           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-+    iax_minor_version=`$IAX_CONFIG $iax_args --version | \
++    iax2_minor_version=`$IAX2_CONFIG $iax2_args --version | \
 +           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-+    iax_micro_version=`$IAX_CONFIG $iax_config_args --version | \
++    iax2_micro_version=`$IAX2_CONFIG $iax2_config_args --version | \
 +           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-+    if test "x$enable_iaxtest" = "xyes" ; then
++    if test "x$enable_iax2test" = "xyes" ; then
 +      ac_save_CFLAGS="$CFLAGS"
 +      ac_save_LIBS="$LIBS"
-+      CFLAGS="$CFLAGS $IAX_CFLAGS"
-+      LIBS="$LIBS $IAX_LIBS"
++      CFLAGS="$CFLAGS $IAX2_CFLAGS"
++      LIBS="$LIBS $IAX2_LIBS"
 +dnl
 +dnl Now check if the installed IAX is sufficiently new. (Also sanity
 +dnl checks the results of iax-config to some extent
@@ -1625,7 +1646,7 @@
 +#include <stdio.h>
 +#include <stdlib.h>
 +#include <string.h>
-+#include <iax/iax.h>
++#include <iax/iax2.h>
 +
 +char*
 +my_strdup (char *str)
@@ -1651,21 +1672,21 @@
 +  system ("touch conf.iaxtest");
 +
 +  /* HP/UX 9 (%@#!) writes to sscanf strings */
-+  tmp_version = my_strdup("$min_iax_version");
++  tmp_version = my_strdup("$min_iax2_version");
 +  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-+     printf("%s, bad version string\n", "$min_iax_version");
++     printf("%s, bad version string\n", "$min_iax2_version");
 +     exit(1);
 +   }
 +
-+   if (($iax_major_version > major) ||
-+      (($iax_major_version == major) && ($iax_minor_version > minor)) ||
-+      (($iax_major_version == major) && ($iax_minor_version == minor) && ($iax_micro_version >= micro)))
++   if (($iax2_major_version > major) ||
++      (($iax2_major_version == major) && ($iax2_minor_version > minor)) ||
++      (($iax2_major_version == major) && ($iax2_minor_version == minor) && ($iax2_micro_version >= micro)))
 +    {
 +      return 0;
 +    }
 +  else
 +    {
-+      printf("\n*** 'iax-config --version' returned %d.%d.%d, but the minimum version\n", $iax_major_version, $iax_minor_version, $iax_micro_version);
++      printf("\n*** 'iax-config --version' returned %d.%d.%d, but the minimum version\n", $iax2_major_version, $iax2_minor_version, $iax2_micro_version);
 +      printf("*** of IAX required is %d.%d.%d. If iax-config is correct, then it is\n", major, minor, micro);
 +      printf("*** best to upgrade to the required version.\n");
 +      printf("*** If iax-config was wrong, set the environment variable IAX_CONFIG\n");
@@ -1685,7 +1706,7 @@
 +     ifelse([$2], , :, [$2])     
 +  else
 +     AC_MSG_RESULT(no)
-+     if test "$IAX_CONFIG" = "no" ; then
++     if test "$IAX2_CONFIG" = "no" ; then
 +       echo "*** The iax-config script installed by IAX could not be found"
 +       echo "*** If IAX was installed in PREFIX, make sure PREFIX/bin is in"
 +       echo "*** your path, or set the IAX_CONFIG environment variable to the"
@@ -1695,11 +1716,11 @@
 +        :
 +       else
 +          echo "*** Could not run IAX test program, checking why..."
-+          CFLAGS="$CFLAGS $IAX_CFLAGS"
-+          LIBS="$LIBS $IAX_LIBS"
++          CFLAGS="$CFLAGS $IAX2_CFLAGS"
++          LIBS="$LIBS $IAX2_LIBS"
 +          AC_TRY_LINK([
 +#include <stdio.h>
-+#include <iax/iax.h>
++#include <iax/iax2.h>
 +],      [ return 0; ],
 +        [ echo "*** The test program compiled, but did not run. This usually means"
 +          echo "*** that the run-time linker is not finding IAX or finding the wrong"
@@ -1713,22 +1734,22 @@
 +        [ echo "*** The test program failed to compile or link. See the file config.log for the"
 +          echo "*** exact error that occured. This usually means IAX was incorrectly installed"
 +          echo "*** or that you have moved IAX since it was installed. In the latter case, you"
-+          echo "*** may want to edit the iax-config script: $IAX_CONFIG" ])
++          echo "*** may want to edit the iax-config script: $IAX2_CONFIG" ])
 +          CFLAGS="$ac_save_CFLAGS"
 +          LIBS="$ac_save_LIBS"
 +       fi
 +     fi
-+     IAX_CFLAGS=""
-+     IAX_LIBS=""
++     IAX2_CFLAGS=""
++     IAX2_LIBS=""
 +     ifelse([$3], , :, [$3])
 +  fi
-+  AC_SUBST(IAX_CFLAGS)
-+  AC_SUBST(IAX_LIBS)
++  AC_SUBST(IAX2_CFLAGS)
++  AC_SUBST(IAX2_LIBS)
 +  rm -f conf.iaxtest
 +])
-diff -urNad iaxclient-0.0+cvs20050725/macros/portaudio.m4 /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/macros/portaudio.m4
---- iaxclient-0.0+cvs20050725/macros/portaudio.m4	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/macros/portaudio.m4	2005-08-10 15:14:49.000000000 +0200
+diff -urNad iaxclient-0.0+svn20060520~/macros/portaudio.m4 iaxclient-0.0+svn20060520/macros/portaudio.m4
+--- iaxclient-0.0+svn20060520~/macros/portaudio.m4	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/macros/portaudio.m4	2006-05-20 15:46:18.000000000 +0200
 @@ -0,0 +1,132 @@
 +# 2004-10-25 Mikael Magnusson stolen from speex.m4
 +# Configure paths for libspeex
@@ -1862,9 +1883,9 @@
 +  AC_SUBST(PORTAUDIO_CFLAGS)
 +  AC_SUBST(PORTAUDIO_LIBS)
 +])
-diff -urNad iaxclient-0.0+cvs20050725/macros/speex.m4 /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/macros/speex.m4
---- iaxclient-0.0+cvs20050725/macros/speex.m4	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/macros/speex.m4	2005-08-10 15:14:49.000000000 +0200
+diff -urNad iaxclient-0.0+svn20060520~/macros/speex.m4 iaxclient-0.0+svn20060520/macros/speex.m4
+--- iaxclient-0.0+svn20060520~/macros/speex.m4	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/macros/speex.m4	2006-05-20 15:46:18.000000000 +0200
 @@ -0,0 +1,148 @@
 +# 2004-10-25 Modified by Mikael Magnusson
 +# Configure paths for libspeex
@@ -2014,27 +2035,38 @@
 +  AC_SUBST(SPEEX_LIBS)
 +  rm -f conf.speextest
 +])
-diff -urNad iaxclient-0.0+cvs20050725/Makefile.am /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/Makefile.am
---- iaxclient-0.0+cvs20050725/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/Makefile.am	2005-08-10 15:14:49.000000000 +0200
-@@ -0,0 +1,5 @@
-+ACLOCAL_AMFLAGS = -I macros
+diff -urNad iaxclient-0.0+svn20060520~/simpleclient/Makefile.am iaxclient-0.0+svn20060520/simpleclient/Makefile.am
+--- iaxclient-0.0+svn20060520~/simpleclient/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/simpleclient/Makefile.am	2006-05-20 15:46:18.000000000 +0200
+@@ -0,0 +1,3 @@
++SUBDIRS = $(CLIENTS)
 +
-+SUBDIRS = lib simpleclient
++EXTRA_DIST = win32
+diff -urNad iaxclient-0.0+svn20060520~/simpleclient/WinIAX/Makefile.am iaxclient-0.0+svn20060520/simpleclient/WinIAX/Makefile.am
+--- iaxclient-0.0+svn20060520~/simpleclient/WinIAX/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/simpleclient/WinIAX/Makefile.am	2006-05-20 15:46:18.000000000 +0200
+@@ -0,0 +1,15 @@
++bin_PROGRAMS = WinIAX
 +
-+#EXTRA_DIST += iaxclient conf
-diff -urNad iaxclient-0.0+cvs20050725/NEWS /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/NEWS
---- iaxclient-0.0+cvs20050725/NEWS	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/NEWS	2005-08-10 15:14:49.000000000 +0200
-@@ -0,0 +1,2 @@
++WinIAX_SOURCES = StdAfx.cpp StdAfx.h WinIAX.cpp winiax.h resource.rc	\
++	default1.bin resource.h icon1.ico
 +
++AM_CPPFLAGS = -I$(top_srcdir)/lib -D_WIN32_IE=0x0300
++LDADD = $(top_builddir)/lib/libiaxclient.la -lcomdlg32 -lgdi32 -lcomctl32 -lmingwthrd
 +
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/Makefile.am /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/Makefile.am
---- iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/Makefile.am	2005-08-10 15:14:49.000000000 +0200
++RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS)
++
++.rc.o:
++	$(RCCOMPILE) -o $@ -i $<
++
++EXTRA_DIST = ReadMe.txt WinIAX.dsp WinIAX.dsw
+diff -urNad iaxclient-0.0+svn20060520~/simpleclient/iaxcomm/Makefile.am iaxclient-0.0+svn20060520/simpleclient/iaxcomm/Makefile.am
+--- iaxclient-0.0+svn20060520~/simpleclient/iaxcomm/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/simpleclient/iaxcomm/Makefile.am	2006-05-20 15:46:47.000000000 +0200
 @@ -0,0 +1,88 @@
 +PROG=iaxcomm
-+IAXCOMM_VERSION=1.0rc3
++IAXCOMM_VERSION=1.1.0final
 +
 +iaxcommdatadir = ${datadir}/iaxcomm
 +
@@ -2121,9 +2153,9 @@
 +endif MACOSX
 +
 +EXTRA_DIST = QUICKSTART ring.raw
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/iaxphone/Makefile.am /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/simpleclient/iaxphone/Makefile.am
---- iaxclient-0.0+cvs20050725/simpleclient/iaxphone/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/simpleclient/iaxphone/Makefile.am	2005-08-10 15:14:49.000000000 +0200
+diff -urNad iaxclient-0.0+svn20060520~/simpleclient/iaxphone/Makefile.am iaxclient-0.0+svn20060520/simpleclient/iaxphone/Makefile.am
+--- iaxclient-0.0+svn20060520~/simpleclient/iaxphone/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/simpleclient/iaxphone/Makefile.am	2006-05-20 15:46:18.000000000 +0200
 @@ -0,0 +1,51 @@
 +PROG=iaxphone
 +
@@ -2176,16 +2208,9 @@
 +	$(INSTALL_PROGRAM) $(PROG) "`pwd`/$@/Contents/MacOS/$(PROG)"
 +
 +endif MACOSX
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/Makefile.am /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/simpleclient/Makefile.am
---- iaxclient-0.0+cvs20050725/simpleclient/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/simpleclient/Makefile.am	2005-08-10 15:14:49.000000000 +0200
-@@ -0,0 +1,3 @@
-+SUBDIRS = $(CLIENTS)
-+
-+EXTRA_DIST = win32
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/testcall/Makefile.am /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/simpleclient/testcall/Makefile.am
---- iaxclient-0.0+cvs20050725/simpleclient/testcall/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/simpleclient/testcall/Makefile.am	2005-08-10 15:14:49.000000000 +0200
+diff -urNad iaxclient-0.0+svn20060520~/simpleclient/testcall/Makefile.am iaxclient-0.0+svn20060520/simpleclient/testcall/Makefile.am
+--- iaxclient-0.0+svn20060520~/simpleclient/testcall/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/simpleclient/testcall/Makefile.am	2006-05-20 15:46:18.000000000 +0200
 @@ -0,0 +1,12 @@
 +bin_PROGRAMS=testcall
 +testcall_SOURCES=testcall.c
@@ -2199,9 +2224,9 @@
 +
 +EXTRA_DIST = .cvsignore
 +
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/tkphone/Makefile.am /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/simpleclient/tkphone/Makefile.am
---- iaxclient-0.0+cvs20050725/simpleclient/tkphone/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/simpleclient/tkphone/Makefile.am	2005-08-10 15:14:49.000000000 +0200
+diff -urNad iaxclient-0.0+svn20060520~/simpleclient/tkphone/Makefile.am iaxclient-0.0+svn20060520/simpleclient/tkphone/Makefile.am
+--- iaxclient-0.0+svn20060520~/simpleclient/tkphone/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/simpleclient/tkphone/Makefile.am	2006-05-20 15:46:18.000000000 +0200
 @@ -0,0 +1,29 @@
 +# Should support LINUX MACOSX WIN32 SOLARIS FREEBSD
 +bin_SCRIPTS = tkphone
@@ -2215,7 +2240,7 @@
 +dist_iaxcli_DATA = monitor.ui monitor.ui.tcl phone.ui phone.ui.tcl pref.ui pref.ui.tcl
 +
 +LDADD = $(top_builddir)/lib/libiaxclient.la $(GTK_LIBS)
-+AM_CPPFLAGS = -I$(top_srcdir)/lib -DUSE_HOTKEY
++AM_CPPFLAGS = -I$(top_srcdir)/lib -DUSE_HOTKEY=0
 +AM_CFLAGS = $(GTK_CFLAGS)
 +
 +if ! WIN32
@@ -2232,28 +2257,9 @@
 +CLEANFILES = tkphone tkiaxphone
 +
 +EXTRA_DIST = License tkphone.in tkiaxphone.in
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/WinIAX/Makefile.am /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/simpleclient/WinIAX/Makefile.am
---- iaxclient-0.0+cvs20050725/simpleclient/WinIAX/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/simpleclient/WinIAX/Makefile.am	2005-08-10 15:14:49.000000000 +0200
-@@ -0,0 +1,15 @@
-+bin_PROGRAMS = WinIAX
-+
-+WinIAX_SOURCES = StdAfx.cpp StdAfx.h WinIAX.cpp winiax.h resource.rc	\
-+	default1.bin resource.h icon1.ico
-+
-+AM_CPPFLAGS = -I$(top_srcdir)/lib -D_WIN32_IE=0x0300
-+LDADD = $(top_builddir)/lib/libiaxclient.la -lcomdlg32 -lgdi32 -lcomctl32 -lmingwthrd
-+
-+RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS)
-+
-+.rc.o:
-+	$(RCCOMPILE) -o $@ -i $<
-+
-+EXTRA_DIST = ReadMe.txt WinIAX.dsp WinIAX.dsw
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/wx/Makefile.am /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/simpleclient/wx/Makefile.am
---- iaxclient-0.0+cvs20050725/simpleclient/wx/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.snFake/iaxclient-0.0+cvs20050725/simpleclient/wx/Makefile.am	2005-08-10 15:14:49.000000000 +0200
+diff -urNad iaxclient-0.0+svn20060520~/simpleclient/wx/Makefile.am iaxclient-0.0+svn20060520/simpleclient/wx/Makefile.am
+--- iaxclient-0.0+svn20060520~/simpleclient/wx/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/simpleclient/wx/Makefile.am	2006-05-20 15:46:18.000000000 +0200
 @@ -0,0 +1,38 @@
 +# Should support LINUX MACOSX WIN32
 +bin_PROGRAMS = wxiax

Modified: iaxclient/trunk/debian/patches/110_xrcdirectory.dpatch
===================================================================
--- iaxclient/trunk/debian/patches/110_xrcdirectory.dpatch	2006-05-16 10:42:26 UTC (rev 1767)
+++ iaxclient/trunk/debian/patches/110_xrcdirectory.dpatch	2006-05-20 16:14:40 UTC (rev 1768)
@@ -7,65 +7,71 @@
 ## DP: Call wxFatalError if the resources can't be loaded.
 
 @DPATCH@
-diff -urNad iaxclient-20050503/simpleclient/iaxcomm/accounts.cc /tmp/dpep.fuiNPa/iaxclient-20050503/simpleclient/iaxcomm/accounts.cc
---- iaxclient-20050503/simpleclient/iaxcomm/accounts.cc	2005-04-13 12:28:06.000000000 +0200
-+++ /tmp/dpep.fuiNPa/iaxclient-20050503/simpleclient/iaxcomm/accounts.cc	2005-05-10 22:29:33.048910062 +0200
+diff -urNad iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/accounts.cc iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/accounts.cc
+--- iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/accounts.cc	2006-03-06 16:26:22.000000000 +0100
++++ iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/accounts.cc	2006-05-18 19:58:10.000000000 +0200
 @@ -63,7 +63,9 @@
  
  AccountsDialog::AccountsDialog( wxWindow* parent )
  {
 -    wxXmlResource::Get()->LoadDialog(this, parent, wxT("Accounts"));
 +    if ( !wxXmlResource::Get()->LoadDialog(this, parent, wxT("Accounts")) ) {
-+      wxFatalError(_("Can't load Accounts dialog"));
++      wxLogFatalError(_("Can't load Accounts dialog"));
 +    }
  
      //----Reach in for our controls-----------------------------------------------------
      AccountList  = XRCCTRL(*this, "AccountList", wxListCtrl);
-diff -urNad iaxclient-20050503/simpleclient/iaxcomm/devices.cc /tmp/dpep.fuiNPa/iaxclient-20050503/simpleclient/iaxcomm/devices.cc
---- iaxclient-20050503/simpleclient/iaxcomm/devices.cc	2005-04-13 12:28:06.000000000 +0200
-+++ /tmp/dpep.fuiNPa/iaxclient-20050503/simpleclient/iaxcomm/devices.cc	2005-05-10 22:29:33.049909831 +0200
+diff -urNad iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/devices.cc iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/devices.cc
+--- iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/devices.cc	2006-03-06 16:26:22.000000000 +0100
++++ iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/devices.cc	2006-05-18 19:58:10.000000000 +0200
 @@ -66,7 +66,9 @@
  
  DevicesDialog::DevicesDialog(wxWindow* parent)
  {    
 -    wxXmlResource::Get()->LoadDialog(this, parent, wxT("Devices"));
 +    if ( !wxXmlResource::Get()->LoadDialog(this, parent, wxT("Devices")) ) {
-+      wxFatalError(_("Can't load Devices dialog"));
++      wxLogFatalError(_("Can't load Devices dialog"));
 +    }
  
      // Reach in for our controls
  
-diff -urNad iaxclient-20050503/simpleclient/iaxcomm/directory.cc /tmp/dpep.fuiNPa/iaxclient-20050503/simpleclient/iaxcomm/directory.cc
---- iaxclient-20050503/simpleclient/iaxcomm/directory.cc	2005-04-13 12:28:06.000000000 +0200
-+++ /tmp/dpep.fuiNPa/iaxclient-20050503/simpleclient/iaxcomm/directory.cc	2005-05-10 22:29:33.028914674 +0200
+diff -urNad iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/directory.cc iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/directory.cc
+--- iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/directory.cc	2006-03-06 16:26:22.000000000 +0100
++++ iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/directory.cc	2006-05-18 19:58:10.000000000 +0200
 @@ -72,7 +72,9 @@
  
  DirectoryDialog::DirectoryDialog( wxWindow* parent )
  {
 -    wxXmlResource::Get()->LoadDialog(this, parent, wxT("Directory"));
 +    if ( !wxXmlResource::Get()->LoadDialog(this, parent, wxT("Directory")) ) {
-+      wxFatalError(_("Can't load Directory dialog"));
++      wxLogFatalError(_("Can't load Directory dialog"));
 +    }
  
      //----Reach in for our controls-----------------------------------------------------
      DirectoryNotebook  = XRCCTRL(*this, "DirectoryNotebook", wxNotebook);
-diff -urNad iaxclient-20050503/simpleclient/iaxcomm/frame.cc /tmp/dpep.fuiNPa/iaxclient-20050503/simpleclient/iaxcomm/frame.cc
---- iaxclient-20050503/simpleclient/iaxcomm/frame.cc	2005-05-10 22:29:11.578861901 +0200
-+++ /tmp/dpep.fuiNPa/iaxclient-20050503/simpleclient/iaxcomm/frame.cc	2005-05-10 22:29:33.029914444 +0200
+diff -urNad iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/frame.cc iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/frame.cc
+--- iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/frame.cc	2006-05-18 19:58:09.000000000 +0200
++++ iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/frame.cc	2006-05-18 19:58:10.000000000 +0200
 @@ -142,7 +142,9 @@
      // However, the current approach has source code that can be recycled
      // in case code to moves to having an invisible frame as the top level window.
  
 -    wxXmlResource::Get()->LoadFrame(this, parent, _T("MyFrame"));
 +    if ( !wxXmlResource::Get()->LoadFrame(this, parent, _T("MyFrame")) ) {
-+	wxFatalError(_("Can't load MyFrame frame"));
++	wxLogFatalError(_("Can't load MyFrame frame"));
 +    }
  
      //----Set the icon------------------------------------------------------------------
  #ifdef __WXMSW__   
-diff -urNad iaxclient-20050503/simpleclient/iaxcomm/main.cc /tmp/dpep.fuiNPa/iaxclient-20050503/simpleclient/iaxcomm/main.cc
---- iaxclient-20050503/simpleclient/iaxcomm/main.cc	2005-04-13 12:28:11.000000000 +0200
-+++ /tmp/dpep.fuiNPa/iaxclient-20050503/simpleclient/iaxcomm/main.cc	2005-05-10 22:29:33.050909601 +0200
+diff -urNad iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/main.cc iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/main.cc
+--- iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/main.cc	2006-05-18 16:37:46.000000000 +0200
++++ iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/main.cc	2006-05-18 19:59:45.000000000 +0200
+@@ -1,4 +1,4 @@
+-//----------------------------------------------------------------------------------------
++//----------------------------------------------------------------------------------------
+ // Name:        main.cc
+ // Purpose:     Core application
+ // Author:      Michael Van Donselaar
 @@ -60,6 +60,13 @@
       int        doTestCall(int ac, char **av);
  }
@@ -80,15 +86,15 @@
  //----------------------------------------------------------------------------------------
  // Static variables
  //----------------------------------------------------------------------------------------
-@@ -114,6 +121,7 @@
+@@ -115,6 +122,7 @@
+     // Load up XML resources
  
-     // Load up enough XML resources to construct a main frame
- 
-+    load_xrc_resource(_T("accounts.xrc"));
+     load_xrc_resource(_T("preferences.xrc"));
++    load_xrc_resource(_T("accounts.xrc")); 
      load_xrc_resource(_T("frame.xrc"));
      load_xrc_resource(_T("menubar.xrc"));
      load_xrc_resource(_T("panel.xrc"));
-@@ -121,7 +129,6 @@
+@@ -122,7 +130,6 @@
      load_xrc_resource(_T("directory.xrc"));
      load_xrc_resource(_T("devices.xrc"));
  
@@ -96,13 +102,13 @@
      InitXmlResource();
  
      IncomingRing.Init( 880, 960, 16000, 48000, 10);
-@@ -332,6 +339,15 @@
+@@ -330,6 +337,15 @@
          }
      }
  
 +    // Next, check XRCDIRECTORY
 +#ifdef XRCDIRECTORY
-+    xrc_fullname = wxString(XRCDIRECTORY) + wxFILE_SEP_PATH + xrc_filename;
++    xrc_fullname = wxString(XRCDIRECTORY, wxConvUTF8) + wxFILE_SEP_PATH + xrc_filename;
 +    if ( ::wxFileExists( xrc_fullname ) ) {
 +      wxXmlResource::Get()->Load( xrc_fullname );
 +      return;
@@ -112,16 +118,16 @@
      // Third, check in cwd
      xrc_fullname = wxGetCwd() + wxFILE_SEP_PATH + _T("rc") + wxFILE_SEP_PATH + xrc_filename;
      if ( ::wxFileExists( xrc_fullname ) ) {
-diff -urNad iaxclient-20050503/simpleclient/iaxcomm/prefs.cc /tmp/dpep.fuiNPa/iaxclient-20050503/simpleclient/iaxcomm/prefs.cc
---- iaxclient-20050503/simpleclient/iaxcomm/prefs.cc	2005-04-13 12:28:11.000000000 +0200
-+++ /tmp/dpep.fuiNPa/iaxclient-20050503/simpleclient/iaxcomm/prefs.cc	2005-05-10 22:29:33.007919517 +0200
+diff -urNad iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/prefs.cc iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/prefs.cc
+--- iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/prefs.cc	2006-03-06 16:26:22.000000000 +0100
++++ iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/prefs.cc	2006-05-18 19:58:10.000000000 +0200
 @@ -125,7 +125,9 @@
      bool      bCont;
      wxString  str;
  
 -    wxXmlResource::Get()->LoadDialog(this, parent, wxT("Prefs"));
 +    if ( !wxXmlResource::Get()->LoadDialog(this, parent, wxT("Prefs")) ) {
-+      wxFatalError(_("Can't load Prefs dialog"));
++      wxLogFatalError(_("Can't load Prefs dialog"));
 +    }
  
      // Reach in for our controls

Deleted: iaxclient/trunk/debian/patches/120_separate_streams.dpatch
===================================================================
--- iaxclient/trunk/debian/patches/120_separate_streams.dpatch	2006-05-16 10:42:26 UTC (rev 1767)
+++ iaxclient/trunk/debian/patches/120_separate_streams.dpatch	2006-05-20 16:14:40 UTC (rev 1768)
@@ -1,61 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 120_separate_streams.dpatch by  <mikma at users.sourceforge.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad iaxclient-20050503/lib/audio_portaudio.c /tmp/dpep.YQBCQ2/iaxclient-20050503/lib/audio_portaudio.c
---- iaxclient-20050503/lib/audio_portaudio.c	2005-05-18 11:39:44.000000000 +0200
-+++ /tmp/dpep.YQBCQ2/iaxclient-20050503/lib/audio_portaudio.c	2005-05-18 11:40:09.377259610 +0200
-@@ -498,6 +498,50 @@
- static int pa_openstreams (struct iaxc_audio_driver *d ) {
-     PaError err;
- 
-+#ifdef LINUX
-+    /* First try, separate streams */
-+    err = Pa_OpenStream(&iStream, 
-+			/* input info */
-+			selectedOutput,  1, paInt16, NULL,
-+			/* output info */
-+			paNoDevice, 0, paInt16, NULL,
-+			sample_rate, 
-+			/* frames per buffer -- 10ms */
-+			SAMPLES_PER_FRAME,	
-+			/* numbuffers */  /* use default */
-+			PA_NUMBUFFERS,
-+			0,   /* flags */
-+			pa_callback, 
-+			NULL /* userdata */ );
-+
-+    if (err == paNoError) 
-+    {
-+	err = Pa_OpenStream(&oStream, 
-+			    /* input info */
-+			    paNoDevice, 0, paInt16, NULL,
-+			    /* output info */
-+			    selectedOutput,  1, paInt16, NULL,
-+			    sample_rate, 
-+			    /* frames per buffer -- 10ms */
-+			    SAMPLES_PER_FRAME,	
-+			    /* numbuffers */  /* use default */
-+			    PA_NUMBUFFERS,
-+			    0,   /* flags */
-+			    pa_callback, 
-+			    NULL /* userdata */ );
-+	if (err == paNoError)
-+	{
-+	    oneStream = 0;
-+	    virtualMonoIn = 0;
-+	    virtualMonoOut = 0;
-+	    return 0;
-+	} else {
-+	    Pa_CloseStream(iStream);
-+	    iStream = NULL;
-+	}
-+    }
-+#endif /* LINUX */
-+
- #ifndef MACOSX
-     /* first, try opening one stream for in/out, Mono */
-     /* except for MacOSX, which needs virtual stereo */

Modified: iaxclient/trunk/debian/patches/12_autoconf_gen.dpatch
===================================================================
--- iaxclient/trunk/debian/patches/12_autoconf_gen.dpatch	2006-05-16 10:42:26 UTC (rev 1767)
+++ iaxclient/trunk/debian/patches/12_autoconf_gen.dpatch	2006-05-20 16:14:40 UTC (rev 1768)
@@ -5,14 +5,695 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad iaxclient-0.0+cvs20050725/aclocal.m4 /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/aclocal.m4
---- iaxclient-0.0+cvs20050725/aclocal.m4	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/aclocal.m4	2005-08-10 15:15:32.000000000 +0200
-@@ -0,0 +1,7328 @@
-+# generated automatically by aclocal 1.8.5 -*- Autoconf -*-
+diff -urNad iaxclient-0.0+svn20060520~/Makefile.in iaxclient-0.0+svn20060520/Makefile.in
+--- iaxclient-0.0+svn20060520~/Makefile.in	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/Makefile.in	2006-05-20 15:47:43.000000000 +0200
+@@ -0,0 +1,677 @@
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# @configure_input@
 +
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-+# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++ at SET_MAKE@
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = .
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++build_triplet = @build@
++host_triplet = @host@
++DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
++	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
++	$(top_srcdir)/configure AUTHORS COPYING COPYING.LIB ChangeLog \
++	INSTALL NEWS compile config.guess config.sub depcomp \
++	install-sh ltmain.sh missing
++subdir = .
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/macros/gsm.m4 \
++	$(top_srcdir)/macros/iax2.m4 $(top_srcdir)/macros/portaudio.m4 \
++	$(top_srcdir)/macros/speex.m4 $(top_srcdir)/configure.ac
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
++ configure.lineno configure.status.lineno
++mkinstalldirs = $(install_sh) -d
++CONFIG_HEADER = config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++distdir = $(PACKAGE)-$(VERSION)
++top_distdir = $(distdir)
++am__remove_distdir = \
++  { test ! -d $(distdir) \
++    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
++         && rm -fr $(distdir); }; }
++DIST_ARCHIVES = $(distdir).tar.gz
++GZIP_ENV = --best
++distuninstallcheck_listfiles = find . -type f -print
++distcleancheck_listfiles = find . -type f -print
++ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
++AMTAR = @AMTAR@
++AR = @AR@
++AS = @AS@
++AUTOCONF = @AUTOCONF@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
++CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CLIENTS = @CLIENTS@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CXX = @CXX@
++CXXCPP = @CXXCPP@
++CXXDEPMODE = @CXXDEPMODE@
++CXXFLAGS = @CXXFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
++EXEEXT = @EXEEXT@
++F77 = @F77@
++FFLAGS = @FFLAGS@
++GSM_CFLAGS = @GSM_CFLAGS@
++GSM_LIBS = @GSM_LIBS@
++GTK_CFLAGS = @GTK_CFLAGS@
++GTK_CONFIG = @GTK_CONFIG@
++GTK_LIBS = @GTK_LIBS@
++IAX2_CFLAGS = @IAX2_CFLAGS@
++IAX2_CONFIG = @IAX2_CONFIG@
++IAX2_LIBS = @IAX2_LIBS@
++IAX_CFLAGS = @IAX_CFLAGS@
++IAX_LIBS = @IAX_LIBS@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++ISODATE = @ISODATE@
++JITTERBUF_FALSE = @JITTERBUF_FALSE@
++JITTERBUF_TRUE = @JITTERBUF_TRUE@
++LDFLAGS = @LDFLAGS@
++LIBOBJS = @LIBOBJS@
++LIBS = @LIBS@
++LIBTOOL = @LIBTOOL@
++LINUX_FALSE = @LINUX_FALSE@
++LINUX_TRUE = @LINUX_TRUE@
++LN_S = @LN_S@
++LTLIBOBJS = @LTLIBOBJS@
++MACOSX_FALSE = @MACOSX_FALSE@
++MACOSX_TRUE = @MACOSX_TRUE@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
++MAKEINFO = @MAKEINFO@
++OBJDUMP = @OBJDUMP@
++OBJEXT = @OBJEXT@
++OSTYPE = @OSTYPE@
++PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++PKG_CONFIG = @PKG_CONFIG@
++PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
++PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
++RANLIB = @RANLIB@
++RC = @RC@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
++SOLARIS_FALSE = @SOLARIS_FALSE@
++SOLARIS_TRUE = @SOLARIS_TRUE@
++SPAN_EC_FALSE = @SPAN_EC_FALSE@
++SPAN_EC_TRUE = @SPAN_EC_TRUE@
++SPEEX_CFLAGS = @SPEEX_CFLAGS@
++SPEEX_LIBS = @SPEEX_LIBS@
++STRIP = @STRIP@
++USE_LOCAL_GSM_FALSE = @USE_LOCAL_GSM_FALSE@
++USE_LOCAL_GSM_TRUE = @USE_LOCAL_GSM_TRUE@
++USE_LOCAL_IAX2_FALSE = @USE_LOCAL_IAX2_FALSE@
++USE_LOCAL_IAX2_TRUE = @USE_LOCAL_IAX2_TRUE@
++USE_LOCAL_ILBC_FALSE = @USE_LOCAL_ILBC_FALSE@
++USE_LOCAL_ILBC_TRUE = @USE_LOCAL_ILBC_TRUE@
++USE_LOCAL_PORTAUDIO_FALSE = @USE_LOCAL_PORTAUDIO_FALSE@
++USE_LOCAL_PORTAUDIO_TRUE = @USE_LOCAL_PORTAUDIO_TRUE@
++USE_LOCAL_SPEEX_FALSE = @USE_LOCAL_SPEEX_FALSE@
++USE_LOCAL_SPEEX_TRUE = @USE_LOCAL_SPEEX_TRUE@
++VERSION = @VERSION@
++WIN32_FALSE = @WIN32_FALSE@
++WIN32_TRUE = @WIN32_TRUE@
++WISH = @WISH@
++WXRC = @WXRC@
++WX_CFLAGS = @WX_CFLAGS@
++WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
++WX_CONFIG_PATH = @WX_CONFIG_PATH@
++WX_CPPFLAGS = @WX_CPPFLAGS@
++WX_CXXFLAGS = @WX_CXXFLAGS@
++WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
++WX_LIBS = @WX_LIBS@
++WX_LIBS_STATIC = @WX_LIBS_STATIC@
++WX_VERSION = @WX_VERSION@
++WX_XRC_LIBS = @WX_XRC_LIBS@
++ac_ct_AR = @ac_ct_AR@
++ac_ct_AS = @ac_ct_AS@
++ac_ct_CC = @ac_ct_CC@
++ac_ct_CXX = @ac_ct_CXX@
++ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
++ac_ct_F77 = @ac_ct_F77@
++ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
++ac_ct_RANLIB = @ac_ct_RANLIB@
++ac_ct_RC = @ac_ct_RC@
++ac_ct_STRIP = @ac_ct_STRIP@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
++am__include = @am__include@
++am__leading_dot = @am__leading_dot@
++am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
++bindir = @bindir@
++build = @build@
++build_alias = @build_alias@
++build_cpu = @build_cpu@
++build_os = @build_os@
++build_vendor = @build_vendor@
++datadir = @datadir@
++exec_prefix = @exec_prefix@
++host = @host@
++host_alias = @host_alias@
++host_cpu = @host_cpu@
++host_os = @host_os@
++host_vendor = @host_vendor@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localstatedir = @localstatedir@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++sysconfdir = @sysconfdir@
++target_alias = @target_alias@
++ACLOCAL_AMFLAGS = -I macros
++SUBDIRS = lib simpleclient
++all: config.h
++	$(MAKE) $(AM_MAKEFLAGS) all-recursive
++
++.SUFFIXES:
++am--refresh:
++	@:
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
++	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --gnu  Makefile
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    echo ' $(SHELL) ./config.status'; \
++	    $(SHELL) ./config.status;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	$(SHELL) ./config.status --recheck
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++	cd $(srcdir) && $(AUTOCONF)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
++
++config.h: stamp-h1
++	@if test ! -f $@; then \
++	  rm -f stamp-h1; \
++	  $(MAKE) stamp-h1; \
++	else :; fi
++
++stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
++	@rm -f stamp-h1
++	cd $(top_builddir) && $(SHELL) ./config.status config.h
++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
++	cd $(top_srcdir) && $(AUTOHEADER)
++	rm -f stamp-h1
++	touch $@
++
++distclean-hdr:
++	-rm -f config.h stamp-h1
++
++mostlyclean-libtool:
++	-rm -f *.lo
++
++clean-libtool:
++	-rm -rf .libs _libs
++
++distclean-libtool:
++	-rm -f libtool
++uninstall-info-am:
++
++# This directory's subdirectories are mostly independent; you can cd
++# into them and run `make' without going through this Makefile.
++# To change the values of `make' variables: instead of editing Makefiles,
++# (1) if the variable is set in `config.status', edit `config.status'
++#     (which will cause the Makefiles to be regenerated when you run `make');
++# (2) otherwise, pass the desired values on the `make' command line.
++$(RECURSIVE_TARGETS):
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
++	dot_seen=no; \
++	target=`echo $@ | sed s/-recursive//`; \
++	list='$(SUBDIRS)'; for subdir in $$list; do \
++	  echo "Making $$target in $$subdir"; \
++	  if test "$$subdir" = "."; then \
++	    dot_seen=yes; \
++	    local_target="$$target-am"; \
++	  else \
++	    local_target="$$target"; \
++	  fi; \
++	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
++	  || eval $$failcom; \
++	done; \
++	if test "$$dot_seen" = "no"; then \
++	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
++	fi; test -z "$$fail"
++
++mostlyclean-recursive clean-recursive distclean-recursive \
++maintainer-clean-recursive:
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
++	dot_seen=no; \
++	case "$@" in \
++	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
++	  *) list='$(SUBDIRS)' ;; \
++	esac; \
++	rev=''; for subdir in $$list; do \
++	  if test "$$subdir" = "."; then :; else \
++	    rev="$$subdir $$rev"; \
++	  fi; \
++	done; \
++	rev="$$rev ."; \
++	target=`echo $@ | sed s/-recursive//`; \
++	for subdir in $$rev; do \
++	  echo "Making $$target in $$subdir"; \
++	  if test "$$subdir" = "."; then \
++	    local_target="$$target-am"; \
++	  else \
++	    local_target="$$target"; \
++	  fi; \
++	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
++	  || eval $$failcom; \
++	done && test -z "$$fail"
++tags-recursive:
++	list='$(SUBDIRS)'; for subdir in $$list; do \
++	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
++	done
++ctags-recursive:
++	list='$(SUBDIRS)'; for subdir in $$list; do \
++	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
++	done
++
++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
++	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++	unique=`for i in $$list; do \
++	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++	  done | \
++	  $(AWK) '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	mkid -fID $$unique
++tags: TAGS
++
++TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
++		$(TAGS_FILES) $(LISP)
++	tags=; \
++	here=`pwd`; \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
++	  include_option=--etags-include; \
++	  empty_fix=.; \
++	else \
++	  include_option=--include; \
++	  empty_fix=; \
++	fi; \
++	list='$(SUBDIRS)'; for subdir in $$list; do \
++	  if test "$$subdir" = .; then :; else \
++	    test ! -f $$subdir/TAGS || \
++	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
++	  fi; \
++	done; \
++	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
++	unique=`for i in $$list; do \
++	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++	  done | \
++	  $(AWK) '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
++ctags: CTAGS
++CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
++		$(TAGS_FILES) $(LISP)
++	tags=; \
++	here=`pwd`; \
++	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
++	unique=`for i in $$list; do \
++	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++	  done | \
++	  $(AWK) '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	test -z "$(CTAGS_ARGS)$$tags$$unique" \
++	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++	     $$tags $$unique
++
++GTAGS:
++	here=`$(am__cd) $(top_builddir) && pwd` \
++	  && cd $(top_srcdir) \
++	  && gtags -i $(GTAGS_ARGS) $$here
++
++distclean-tags:
++	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++
++distdir: $(DISTFILES)
++	$(am__remove_distdir)
++	mkdir $(distdir)
++	$(mkdir_p) $(distdir)/macros
++	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++	list='$(DISTFILES)'; for file in $$list; do \
++	  case $$file in \
++	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++	  esac; \
++	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++	    dir="/$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
++	  else \
++	    dir=''; \
++	  fi; \
++	  if test -d $$d/$$file; then \
++	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++	    fi; \
++	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
++	  else \
++	    test -f $(distdir)/$$file \
++	    || cp -p $$d/$$file $(distdir)/$$file \
++	    || exit 1; \
++	  fi; \
++	done
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++	  if test "$$subdir" = .; then :; else \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
++	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
++	    (cd $$subdir && \
++	      $(MAKE) $(AM_MAKEFLAGS) \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
++	        distdir) \
++	      || exit 1; \
++	  fi; \
++	done
++	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
++	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
++	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
++	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
++	|| chmod -R a+r $(distdir)
++dist-gzip: distdir
++	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
++	$(am__remove_distdir)
++
++dist-bzip2: distdir
++	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
++	$(am__remove_distdir)
++
++dist-tarZ: distdir
++	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
++	$(am__remove_distdir)
++
++dist-shar: distdir
++	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
++	$(am__remove_distdir)
++
++dist-zip: distdir
++	-rm -f $(distdir).zip
++	zip -rq $(distdir).zip $(distdir)
++	$(am__remove_distdir)
++
++dist dist-all: distdir
++	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
++	$(am__remove_distdir)
++
++# This target untars the dist file and tries a VPATH configuration.  Then
++# it guarantees that the distribution is self-contained by making another
++# tarfile.
++distcheck: dist
++	case '$(DIST_ARCHIVES)' in \
++	*.tar.gz*) \
++	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
++	*.tar.bz2*) \
++	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
++	*.tar.Z*) \
++	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
++	*.shar.gz*) \
++	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
++	*.zip*) \
++	  unzip $(distdir).zip ;;\
++	esac
++	chmod -R a-w $(distdir); chmod a+w $(distdir)
++	mkdir $(distdir)/_build
++	mkdir $(distdir)/_inst
++	chmod a-w $(distdir)
++	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
++	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
++	  && cd $(distdir)/_build \
++	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
++	    $(DISTCHECK_CONFIGURE_FLAGS) \
++	  && $(MAKE) $(AM_MAKEFLAGS) \
++	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
++	  && $(MAKE) $(AM_MAKEFLAGS) check \
++	  && $(MAKE) $(AM_MAKEFLAGS) install \
++	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
++	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
++	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
++	        distuninstallcheck \
++	  && chmod -R a-w "$$dc_install_base" \
++	  && ({ \
++	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
++	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
++	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
++	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
++	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
++	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
++	  && rm -rf "$$dc_destdir" \
++	  && $(MAKE) $(AM_MAKEFLAGS) dist \
++	  && rm -rf $(DIST_ARCHIVES) \
++	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
++	$(am__remove_distdir)
++	@(echo "$(distdir) archives ready for distribution: "; \
++	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
++	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
++distuninstallcheck:
++	@cd $(distuninstallcheck_dir) \
++	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
++	   || { echo "ERROR: files left after uninstall:" ; \
++	        if test -n "$(DESTDIR)"; then \
++	          echo "  (check DESTDIR support)"; \
++	        fi ; \
++	        $(distuninstallcheck_listfiles) ; \
++	        exit 1; } >&2
++distcleancheck: distclean
++	@if test '$(srcdir)' = . ; then \
++	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
++	  exit 1 ; \
++	fi
++	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
++	  || { echo "ERROR: files left in build directory after distclean:" ; \
++	       $(distcleancheck_listfiles) ; \
++	       exit 1; } >&2
++check-am: all-am
++check: check-recursive
++all-am: Makefile config.h
++installdirs: installdirs-recursive
++installdirs-am:
++install: install-recursive
++install-exec: install-exec-recursive
++install-data: install-data-recursive
++uninstall: uninstall-recursive
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++
++installcheck: installcheck-recursive
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++	  `test -z '$(STRIP)' || \
++	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++mostlyclean-generic:
++
++clean-generic:
++
++distclean-generic:
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++
++maintainer-clean-generic:
++	@echo "This command is intended for maintainers to use"
++	@echo "it deletes files that may require special tools to rebuild."
++clean: clean-recursive
++
++clean-am: clean-generic clean-libtool mostlyclean-am
++
++distclean: distclean-recursive
++	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
++	-rm -f Makefile
++distclean-am: clean-am distclean-generic distclean-hdr \
++	distclean-libtool distclean-tags
++
++dvi: dvi-recursive
++
++dvi-am:
++
++html: html-recursive
++
++info: info-recursive
++
++info-am:
++
++install-data-am:
++
++install-exec-am:
++
++install-info: install-info-recursive
++
++install-man:
++
++installcheck-am:
++
++maintainer-clean: maintainer-clean-recursive
++	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
++	-rm -rf $(top_srcdir)/autom4te.cache
++	-rm -f Makefile
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-recursive
++
++mostlyclean-am: mostlyclean-generic mostlyclean-libtool
++
++pdf: pdf-recursive
++
++pdf-am:
++
++ps: ps-recursive
++
++ps-am:
++
++uninstall-am: uninstall-info-am
++
++uninstall-info: uninstall-info-recursive
++
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
++	check-am clean clean-generic clean-libtool clean-recursive \
++	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
++	dist-shar dist-tarZ dist-zip distcheck distclean \
++	distclean-generic distclean-hdr distclean-libtool \
++	distclean-recursive distclean-tags distcleancheck distdir \
++	distuninstallcheck dvi dvi-am html html-am info info-am \
++	install install-am install-data install-data-am install-exec \
++	install-exec-am install-info install-info-am install-man \
++	install-strip installcheck installcheck-am installdirs \
++	installdirs-am maintainer-clean maintainer-clean-generic \
++	maintainer-clean-recursive mostlyclean mostlyclean-generic \
++	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
++	tags tags-recursive uninstall uninstall-am uninstall-info-am
++
++
++#EXTRA_DIST += iaxclient conf
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
+diff -urNad iaxclient-0.0+svn20060520~/aclocal.m4 iaxclient-0.0+svn20060520/aclocal.m4
+--- iaxclient-0.0+svn20060520~/aclocal.m4	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/aclocal.m4	2006-05-20 15:47:07.000000000 +0200
+@@ -0,0 +1,7841 @@
++# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
++
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
++# 2005  Free Software Foundation, Inc.
 +# This file is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
 +# with or without modifications, as long as this notice is preserved.
@@ -23,6 +704,203 @@
 +# PARTICULAR PURPOSE.
 +
 +# Configure paths for GTK+
++# Owen Taylor     1997-2001
++
++dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
++dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, 
++dnl pass to pkg-config
++dnl
++AC_DEFUN([AM_PATH_GTK_2_0],
++[dnl 
++dnl Get the cflags and libraries from pkg-config
++dnl
++AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run a test GTK+ program],
++		    , enable_gtktest=yes)
++
++  pkg_config_args=gtk+-2.0
++  for module in . $4
++  do
++      case "$module" in
++         gthread) 
++             pkg_config_args="$pkg_config_args gthread-2.0"
++         ;;
++      esac
++  done
++
++  no_gtk=""
++
++  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++
++  if test x$PKG_CONFIG != xno ; then
++    if pkg-config --atleast-pkgconfig-version 0.7 ; then
++      :
++    else
++      echo "*** pkg-config too old; version 0.7 or better required."
++      no_gtk=yes
++      PKG_CONFIG=no
++    fi
++  else
++    no_gtk=yes
++  fi
++
++  min_gtk_version=ifelse([$1], ,2.0.0,$1)
++  AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
++
++  if test x$PKG_CONFIG != xno ; then
++    ## don't try to run the test against uninstalled libtool libs
++    if $PKG_CONFIG --uninstalled $pkg_config_args; then
++	  echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
++	  enable_gtktest=no
++    fi
++
++    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
++	  :
++    else
++	  no_gtk=yes
++    fi
++  fi
++
++  if test x"$no_gtk" = x ; then
++    GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
++    GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
++    gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++    gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++    gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++    if test "x$enable_gtktest" = "xyes" ; then
++      ac_save_CFLAGS="$CFLAGS"
++      ac_save_LIBS="$LIBS"
++      CFLAGS="$CFLAGS $GTK_CFLAGS"
++      LIBS="$GTK_LIBS $LIBS"
++dnl
++dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
++dnl checks the results of pkg-config to some extent)
++dnl
++      rm -f conf.gtktest
++      AC_TRY_RUN([
++#include <gtk/gtk.h>
++#include <stdio.h>
++#include <stdlib.h>
++
++int 
++main ()
++{
++  int major, minor, micro;
++  char *tmp_version;
++
++  system ("touch conf.gtktest");
++
++  /* HP/UX 9 (%@#!) writes to sscanf strings */
++  tmp_version = g_strdup("$min_gtk_version");
++  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
++     printf("%s, bad version string\n", "$min_gtk_version");
++     exit(1);
++   }
++
++  if ((gtk_major_version != $gtk_config_major_version) ||
++      (gtk_minor_version != $gtk_config_minor_version) ||
++      (gtk_micro_version != $gtk_config_micro_version))
++    {
++      printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
++             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
++             gtk_major_version, gtk_minor_version, gtk_micro_version);
++      printf ("*** was found! If pkg-config was correct, then it is best\n");
++      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
++      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
++      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
++      printf("*** required on your system.\n");
++      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
++      printf("*** to point to the correct configuration files\n");
++    } 
++  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
++	   (gtk_minor_version != GTK_MINOR_VERSION) ||
++           (gtk_micro_version != GTK_MICRO_VERSION))
++    {
++      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
++	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
++      printf("*** library (version %d.%d.%d)\n",
++	     gtk_major_version, gtk_minor_version, gtk_micro_version);
++    }
++  else
++    {
++      if ((gtk_major_version > major) ||
++        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
++        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
++      {
++        return 0;
++       }
++     else
++      {
++        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
++               gtk_major_version, gtk_minor_version, gtk_micro_version);
++        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
++	       major, minor, micro);
++        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
++        printf("***\n");
++        printf("*** If you have already installed a sufficiently new version, this error\n");
++        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
++        printf("*** being found. The easiest way to fix this is to remove the old version\n");
++        printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
++        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
++        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
++        printf("*** so that the correct libraries are found at run-time))\n");
++      }
++    }
++  return 1;
++}
++],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++       CFLAGS="$ac_save_CFLAGS"
++       LIBS="$ac_save_LIBS"
++     fi
++  fi
++  if test "x$no_gtk" = x ; then
++     AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
++     ifelse([$2], , :, [$2])     
++  else
++     AC_MSG_RESULT(no)
++     if test "$PKG_CONFIG" = "no" ; then
++       echo "*** A new enough version of pkg-config was not found."
++       echo "*** See http://pkgconfig.sourceforge.net"
++     else
++       if test -f conf.gtktest ; then
++        :
++       else
++          echo "*** Could not run GTK+ test program, checking why..."
++	  ac_save_CFLAGS="$CFLAGS"
++	  ac_save_LIBS="$LIBS"
++          CFLAGS="$CFLAGS $GTK_CFLAGS"
++          LIBS="$LIBS $GTK_LIBS"
++          AC_TRY_LINK([
++#include <gtk/gtk.h>
++#include <stdio.h>
++],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
++        [ echo "*** The test program compiled, but did not run. This usually means"
++          echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
++          echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
++          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
++          echo "*** is required on your system"
++	  echo "***"
++          echo "*** If you have an old version installed, it is best to remove it, although"
++          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
++        [ echo "*** The test program failed to compile or link. See the file config.log for the"
++          echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
++          CFLAGS="$ac_save_CFLAGS"
++          LIBS="$ac_save_LIBS"
++       fi
++     fi
++     GTK_CFLAGS=""
++     GTK_LIBS=""
++     ifelse([$3], , :, [$3])
++  fi
++  AC_SUBST(GTK_CFLAGS)
++  AC_SUBST(GTK_LIBS)
++  rm -f conf.gtktest
++])
++
++# Configure paths for GTK+
 +# Owen Taylor     97-11-3
 +
 +dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
@@ -219,8 +1097,7 @@
 +
 +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 +
-+# serial 47 AC_PROG_LIBTOOL
-+# Debian $Rev: 214 $
++# serial 47 Debian 1.5.20-2 AC_PROG_LIBTOOL
 +
 +
 +# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -330,7 +1207,7 @@
 +
 +# Sed substitution that helps us do robust quoting.  It backslashifies
 +# metacharacters that are still active within double-quoted strings.
-+Xsed='sed -e s/^X//'
++Xsed='sed -e 1s/^X//'
 +[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
 +
 +# Same as above, but do not quote variable references.
@@ -350,7 +1227,7 @@
 +default_ofile=libtool
 +can_build_shared=yes
 +
-+# All known linkers require a `.a' archive for static linking (except M$VC,
++# All known linkers require a `.a' archive for static linking (except MSVC,
 +# which needs '.lib').
 +libext=a
 +ltmain="$ac_aux_dir/ltmain.sh"
@@ -398,6 +1275,8 @@
 +  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 +fi
 +
++_LT_CC_BASENAME([$compiler])
++
 +# Only perform the check for file, if the check method requires it
 +case $deplibs_check_method in
 +file_magic*)
@@ -443,6 +1322,48 @@
 +])# _LT_AC_SYS_COMPILER
 +
 +
++# _LT_CC_BASENAME(CC)
++# -------------------
++# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
++AC_DEFUN([_LT_CC_BASENAME],
++[for cc_temp in $1""; do
++  case $cc_temp in
++    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
++    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++])
++
++
++# _LT_COMPILER_BOILERPLATE
++# ------------------------
++# Check for compiler boilerplate output or warnings with
++# the simple compiler test code.
++AC_DEFUN([_LT_COMPILER_BOILERPLATE],
++[ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++])# _LT_COMPILER_BOILERPLATE
++
++
++# _LT_LINKER_BOILERPLATE
++# ----------------------
++# Check for linker boilerplate output or warnings with
++# the simple link test code.
++AC_DEFUN([_LT_LINKER_BOILERPLATE],
++[ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++])# _LT_LINKER_BOILERPLATE
++
++
 +# _LT_AC_SYS_LIBPATH_AIX
 +# ----------------------
 +# Links a minimal program and checks the executable
@@ -515,15 +1436,15 @@
 +
 +# The HP-UX ksh and POSIX shell print the target directory to stdout
 +# if CDPATH is set.
-+if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 +
 +if test -z "$ECHO"; then
 +if test "X${echo_test_string+set}" != Xset; then
 +# find a string as large as possible, as long as the shell can cope with it
 +  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
 +    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-+    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-+       echo_test_string="`eval $cmd`" &&
++    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
++       echo_test_string=`eval $cmd` &&
 +       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
 +    then
 +      break
@@ -692,7 +1613,7 @@
 +  # Find out which ABI we are using.
 +  echo 'int i;' > conftest.$ac_ext
 +  if AC_TRY_EVAL(ac_compile); then
-+    case "`/usr/bin/file conftest.o`" in
++    case `/usr/bin/file conftest.o` in
 +    *32-bit*)
 +      case $host in
 +        x86_64-*linux*)
@@ -774,7 +1695,7 @@
 +   # with a dollar sign (not a hyphen), so the echo should work correctly.
 +   # The option is referenced via a variable to avoid confusing sed.
 +   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 +   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
 +   -e 's:$: $lt_compiler_flag:'`
 +   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
@@ -784,8 +1705,10 @@
 +   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
 +   if (exit $ac_status) && test -s "$ac_outfile"; then
 +     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     if test ! -s conftest.err; then
++     # So say no if there are warnings other than the usual output.
++     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++     $SED '/^$/d' conftest.err >conftest.er2
++     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
 +       $2=yes
 +     fi
 +   fi
@@ -811,11 +1734,16 @@
 +   LDFLAGS="$LDFLAGS $3"
 +   printf "$lt_simple_link_test_code" > conftest.$ac_ext
 +   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-+     # The compiler can only warn and ignore the option if not recognized
++     # The linker can only warn and ignore the option if not recognized
 +     # So say no if there are warnings
 +     if test -s conftest.err; then
 +       # Append any errors to the config.log.
 +       cat conftest.err 1>&AS_MESSAGE_LOG_FD
++       $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
++       $SED '/^$/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         $2=yes
++       fi
 +     else
 +       $2=yes
 +     fi
@@ -874,11 +1802,38 @@
 +    lt_cv_sys_max_cmd_len=8192;
 +    ;;
 +
-+ *)
++  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++    # This has been around since 386BSD, at least.  Likely further.
++    if test -x /sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++    elif test -x /usr/sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++    else
++      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
++    fi
++    # And add a safety zone
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++    ;;
++  osf*)
++    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
++    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
++    # nice to cause kernel panics so lets avoid the loop below.
++    # First set a reasonable default.
++    lt_cv_sys_max_cmd_len=16384
++    #
++    if test -x /sbin/sysconfig; then
++      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
++        *1*) lt_cv_sys_max_cmd_len=-1 ;;
++      esac
++    fi
++    ;;
++  *)
 +    # If test is not a shell built-in, we'll probably end up computing a
 +    # maximum length that is only half of the actual maximum length, but
 +    # we can't tell.
-+    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
++    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
 +	       = "XX$teststring") >/dev/null 2>&1 &&
 +	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
 +	    lt_cv_sys_max_cmd_len=$new_result &&
@@ -983,7 +1938,7 @@
 +}]
 +EOF
 +  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) 2>/dev/null
++    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
 +    lt_status=$?
 +    case x$lt_status in
 +      x$lt_dlno_uscore) $1 ;;
@@ -1132,7 +2087,7 @@
 +   # Note that $ac_compile itself does not contain backslashes and begins
 +   # with a dollar sign (not a hyphen), so the echo should work correctly.
 +   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 +   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
 +   -e 's:$: $lt_compiler_flag:'`
 +   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
@@ -1144,11 +2099,13 @@
 +   then
 +     # The compiler can only warn and ignore the option if not recognized
 +     # So say no if there are warnings
-+     if test ! -s out/conftest.err; then
++     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
++     $SED '/^$/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
 +       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
 +     fi
 +   fi
-+   chmod u+w .
++   chmod u+w . 2>&AS_MESSAGE_LOG_FD
 +   $rm conftest*
 +   # SGI C++ compiler will create directory out/ii_files/ for
 +   # template instantiation
@@ -1212,8 +2169,8 @@
 +[AC_MSG_CHECKING([how to hardcode library paths into programs])
 +_LT_AC_TAGVAR(hardcode_action, $1)=
 +if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
-+   test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
-+   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
++   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
++   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
 +
 +  # We can hardcode non-existant directories.
 +  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
@@ -1380,7 +2337,7 @@
 +  shlibpath_var=LIBRARY_PATH
 +  ;;
 +
-+bsdi4*)
++bsdi[[45]]*)
 +  version_type=linux
 +  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -1408,7 +2365,8 @@
 +      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
 +      dldir=$destdir/`dirname \$dlpath`~
 +      test -d \$dldir || mkdir -p \$dldir~
-+      $install_prog $dir/$dlname \$dldir/$dlname'
++      $install_prog $dir/$dlname \$dldir/$dlname~
++      chmod a+x \$dldir/$dlname'
 +    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
 +      dlpath=$dir/\$dldll~
 +       $rm \$dlpath'
@@ -1438,7 +2396,7 @@
 +      ;;
 +    pw32*)
 +      # pw32 DLLs use 'pw' prefix rather than 'lib'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
 +      ;;
 +    esac
 +    ;;
@@ -1461,7 +2419,7 @@
 +  soname_spec='${libname}${release}${major}$shared_ext'
 +  shlibpath_overrides_runpath=yes
 +  shlibpath_var=DYLD_LIBRARY_PATH
-+  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
 +  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
 +  if test "$GCC" = yes; then
 +    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -1496,8 +2454,17 @@
 +  dynamic_linker='GNU ld.so'
 +  ;;
 +
-+freebsd*)
-+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++freebsd* | dragonfly*)
++  # DragonFly does not have aout.  When/if they implement a new
++  # versioning mechanism, adjust this.
++  if test -x /usr/bin/objformat; then
++    objformat=`/usr/bin/objformat`
++  else
++    case $host_os in
++    freebsd[[123]]*) objformat=aout ;;
++    *) objformat=elf ;;
++    esac
++  fi
 +  version_type=freebsd-$objformat
 +  case $version_type in
 +    freebsd-elf*)
@@ -1515,7 +2482,7 @@
 +  freebsd2*)
 +    shlibpath_overrides_runpath=yes
 +    ;;
-+  freebsd3.[01]* | freebsdelf3.[01]*)
++  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
 +    shlibpath_overrides_runpath=yes
 +    hardcode_into_libs=yes
 +    ;;
@@ -1542,7 +2509,7 @@
 +  version_type=sunos
 +  need_lib_prefix=no
 +  need_version=no
-+  case "$host_cpu" in
++  case $host_cpu in
 +  ia64*)
 +    shrext_cmds='.so'
 +    hardcode_into_libs=yes
@@ -1641,7 +2608,7 @@
 +
 +  # Append ld.so.conf contents to the search path
 +  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '`
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +  fi
 +
@@ -1716,7 +2683,11 @@
 +openbsd*)
 +  version_type=sunos
 +  need_lib_prefix=no
-+  need_version=yes
++  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++  case $host_os in
++    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++    *)                         need_version=no  ;;
++  esac
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
 +  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
 +  shlibpath_var=LD_LIBRARY_PATH
@@ -1882,7 +2853,9 @@
 +
 +      case $tagname in
 +      CXX)
-+	if test -n "$CXX" && test "X$CXX" != "Xno"; then
++	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++	    (test "X$CXX" != "Xg++"))) ; then
 +	  AC_LIBTOOL_LANG_CXX_CONFIG
 +	else
 +	  tagname=""
@@ -1944,7 +2917,7 @@
 +
 +# AC_LIBTOOL_WIN32_DLL
 +# --------------------
-+# declare package support for building win32 dll's
++# declare package support for building win32 DLLs
 +AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
 +[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
 +])# AC_LIBTOOL_WIN32_DLL
@@ -2118,7 +3091,7 @@
 +      if test -n "$file_magic_test_file"; then
 +	case $deplibs_check_method in
 +	"file_magic "*)
-+	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
 +	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 +	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 +	    $EGREP "$file_magic_regex" > /dev/null; then
@@ -2228,7 +3201,7 @@
 +    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
 +      lt_cv_path_LD="$ac_dir/$ac_prog"
 +      # Check to see if the program is GNU ld.  I'd rather use --version,
-+      # but apparently some GNU ld's only accept -v.
++      # but apparently some variants of GNU ld only accept -v.
 +      # Break only if it was the GNU/non-GNU ld that we prefer.
 +      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
 +      *GNU* | *'with BFD'*)
@@ -2260,7 +3233,7 @@
 +AC_DEFUN([AC_PROG_LD_GNU],
 +[AC_REQUIRE([AC_PROG_EGREP])dnl
 +AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
++[# I'd rather use --version here, but apparently some GNU lds only accept -v.
 +case `$LD -v 2>&1 </dev/null` in
 +*GNU* | *'with BFD'*)
 +  lt_cv_prog_gnu_ld=yes
@@ -2287,6 +3260,15 @@
 +*) reload_flag=" $reload_flag" ;;
 +esac
 +reload_cmds='$LD$reload_flag -o $output$reload_objs'
++case $host_os in
++  darwin*)
++    if test "$GCC" = yes; then
++      reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
++    else
++      reload_cmds='$LD$reload_flag -o $output$reload_objs'
++    fi
++    ;;
++esac
 +])# AC_PROG_LD_RELOAD_FLAG
 +
 +
@@ -2320,7 +3302,7 @@
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
 +
-+bsdi4*)
++bsdi[[45]]*)
 +  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
 +  lt_cv_file_magic_cmd='/usr/bin/file -L'
 +  lt_cv_file_magic_test_file=/shlib/libc.so
@@ -2343,13 +3325,13 @@
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
 +
-+freebsd* | kfreebsd*-gnu)
++freebsd* | kfreebsd*-gnu | dragonfly*)
 +  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
 +    case $host_cpu in
 +    i*86 )
 +      # Not sure whether the presence of OpenBSD here was a mistake.
 +      # Let's accept both of them until this is cleared up.
-+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
 +      lt_cv_file_magic_cmd=/usr/bin/file
 +      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
 +      ;;
@@ -2365,7 +3347,7 @@
 +
 +hpux10.20* | hpux11*)
 +  lt_cv_file_magic_cmd=/usr/bin/file
-+  case "$host_cpu" in
++  case $host_cpu in
 +  ia64*)
 +    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
 +    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
@@ -2415,12 +3397,10 @@
 +  ;;
 +
 +openbsd*)
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
 +  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
 +  else
-+    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
 +  fi
 +  ;;
 +
@@ -2541,13 +3521,13 @@
 +# -----------------------------------
 +# sets LIBLTDL to the link flags for the libltdl convenience library and
 +# LTDLINCL to the include flags for the libltdl header and adds
-+# --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL
-+# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
-+# DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will
-+# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
-+# '${top_srcdir}/' (note the single quotes!).  If your package is not
-+# flat and you're not using automake, define top_builddir and
-+# top_srcdir appropriately in the Makefiles.
++# --enable-ltdl-convenience to the configure arguments.  Note that
++# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
++# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
++# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
++# (note the single quotes!).  If your package is not flat and you're not
++# using automake, define top_builddir and top_srcdir appropriately in
++# the Makefiles.
 +AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
 +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 +  case $enable_ltdl_convenience in
@@ -2566,13 +3546,13 @@
 +# -----------------------------------
 +# sets LIBLTDL to the link flags for the libltdl installable library and
 +# LTDLINCL to the include flags for the libltdl header and adds
-+# --enable-ltdl-install to the configure arguments.  Note that LIBLTDL
-+# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
-+# DIRECTORY is not provided and an installed libltdl is not found, it is
-+# assumed to be `libltdl'.  LIBLTDL will be prefixed with '${top_builddir}/'
-+# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
-+# quotes!).  If your package is not flat and you're not using automake,
-+# define top_builddir and top_srcdir appropriately in the Makefiles.
++# --enable-ltdl-install to the configure arguments.  Note that
++# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
++# and an installed libltdl is not found, it is assumed to be `libltdl'.
++# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
++# '${top_srcdir}/' (note the single quotes!).  If your package is not
++# flat and you're not using automake, define top_builddir and top_srcdir
++# appropriately in the Makefiles.
 +# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
 +AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
 +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
@@ -2610,10 +3590,21 @@
 +# ---------------
 +AC_DEFUN([_LT_AC_LANG_CXX],
 +[AC_REQUIRE([AC_PROG_CXX])
-+AC_REQUIRE([AC_PROG_CXXCPP])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
 +_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
 +])# _LT_AC_LANG_CXX
 +
++# _LT_AC_PROG_CXXCPP
++# ---------------
++AC_DEFUN([_LT_AC_PROG_CXXCPP],
++[
++AC_REQUIRE([AC_PROG_CXX])
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++    (test "X$CXX" != "Xg++"))) ; then
++  AC_PROG_CXXCPP
++fi
++])# _LT_AC_PROG_CXXCPP
 +
 +# AC_LIBTOOL_F77
 +# --------------
@@ -2686,6 +3677,10 @@
 +
 +_LT_AC_SYS_COMPILER
 +
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
 +#
 +# Check for any special shared library compilation flags.
 +#
@@ -2736,7 +3731,7 @@
 +
 +# On AIX, shared libraries and static libraries use the same namespace, and
 +# are all built from PIC.
-+case "$host_os" in
++case $host_os in
 +aix3*)
 +  test "$enable_shared" = yes && enable_static=no
 +  if test -n "$RANLIB"; then
@@ -2749,43 +3744,6 @@
 +  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
 +    test "$enable_shared" = yes && enable_static=no
 +  fi
-+  ;;
-+  darwin* | rhapsody*)
-+  if test "$GCC" = yes; then
-+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+    case "$host_os" in
-+    rhapsody* | darwin1.[[012]])
-+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-+      ;;
-+    *) # Darwin 1.3 on
-+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+      else
-+        case ${MACOSX_DEPLOYMENT_TARGET} in
-+          10.[[012]])
-+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+            ;;
-+          10.*)
-+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-+            ;;
-+        esac
-+      fi
-+      ;;
-+    esac
-+    output_verbose_link_cmd='echo'
-+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
-+    _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+  else
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+  fi
 +    ;;
 +esac
 +AC_MSG_RESULT([$enable_shared])
@@ -2811,7 +3769,7 @@
 +AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
 +[AC_LANG_PUSH(C++)
 +AC_REQUIRE([AC_PROG_CXX])
-+AC_REQUIRE([AC_PROG_CXXCPP])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
 +
 +_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 +_LT_AC_TAGVAR(allow_undefined_flag, $1)=
@@ -2840,7 +3798,7 @@
 +_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
 +
 +# Source file extension for C++ test sources.
-+ac_ext=cc
++ac_ext=cpp
 +
 +# Object file extension for compiled C++ test sources.
 +objext=o
@@ -2855,6 +3813,10 @@
 +# ltmain only uses $CC for tagged configurations so make sure $CC is set.
 +_LT_AC_SYS_COMPILER
 +
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
 +# Allow CC to be a program name with arguments.
 +lt_save_CC=$CC
 +lt_save_LD=$LD
@@ -2876,7 +3838,7 @@
 +CC=${CXX-"c++"}
 +compiler=$CC
 +_LT_AC_TAGVAR(compiler, $1)=$CC
-+cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++_LT_CC_BASENAME([$compiler])
 +
 +# We don't want -fno-exception wen compiling C++ code, so set the
 +# no_builtin_flag separately
@@ -2983,7 +3945,7 @@
 +    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 +
 +    if test "$GXX" = yes; then
-+      case $host_os in aix4.[012]|aix4.[012].*)
++      case $host_os in aix4.[[012]]|aix4.[[012]].*)
 +      # We only want to do this on AIX 4.2 and lower, the check
 +      # below for broken collect2 doesn't work under 4.3+
 +	collect2name=`${CC} -print-prog-name=collect2`
@@ -3004,6 +3966,9 @@
 +	fi
 +      esac
 +      shared_flag='-shared'
++      if test "$aix_use_runtimelinking" = yes; then
++	shared_flag="$shared_flag "'${wl}-G'
++      fi
 +    else
 +      # not using gcc
 +      if test "$host_cpu" = ia64; then
@@ -3049,7 +4014,7 @@
 +	# Exported symbols can be pulled into shared objects from archives
 +	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
 +	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-+	# This is similar to how AIX traditionally builds it's shared libraries.
++	# This is similar to how AIX traditionally builds its shared libraries.
 +	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 +      fi
 +    fi
@@ -3063,6 +4028,7 @@
 +    esac
 +    ;;
 +
++
 +  cygwin* | mingw* | pw32*)
 +    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
 +    # as there is no search path for DLLs.
@@ -3086,65 +4052,76 @@
 +      _LT_AC_TAGVAR(ld_shlibs, $1)=no
 +    fi
 +  ;;
++      darwin* | rhapsody*)
++        case $host_os in
++        rhapsody* | darwin1.[[012]])
++         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[[012]])
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++        esac
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 +
-+  darwin* | rhapsody*)
-+  if test "$GXX" = yes; then
-+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+    case "$host_os" in
-+    rhapsody* | darwin1.[[012]])
-+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-+      ;;
-+    *) # Darwin 1.3 on
-+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
++    if test "$GXX" = yes ; then
++      lt_int_apple_cc_single_mod=no
++      output_verbose_link_cmd='echo'
++      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
++       lt_int_apple_cc_single_mod=yes
++      fi
++      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
 +      else
-+        case ${MACOSX_DEPLOYMENT_TARGET} in
-+          10.[[012]])
-+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+            ;;
-+          10.*)
-+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-+            ;;
-+        esac
++          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++        fi
++        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          else
++            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          fi
++            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      else
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         _LT_AC_TAGVAR(ld_shlibs, $1)=no
++          ;;
++      esac
 +      fi
-+      ;;
-+    esac
-+    lt_int_apple_cc_single_mod=no
-+    output_verbose_link_cmd='echo'
-+    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-+      lt_int_apple_cc_single_mod=yes
-+    fi
-+    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+    else
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+    fi
-+    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++        ;;
 +
-+    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-+    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    else
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    fi
-+    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+  else
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+  fi
-+    ;;
-+
 +  dgux*)
 +    case $cc_basename in
-+      ec++)
++      ec++*)
 +	# FIXME: insert proper C++ library support
 +	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 +	;;
-+      ghcx)
++      ghcx*)
 +	# Green Hills C++ Compiler
 +	# FIXME: insert proper C++ library support
 +	_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -3155,14 +4132,14 @@
 +	;;
 +    esac
 +    ;;
-+  freebsd[12]*)
++  freebsd[[12]]*)
 +    # C++ shared libraries reported to be fairly broken before switch to ELF
 +    _LT_AC_TAGVAR(ld_shlibs, $1)=no
 +    ;;
 +  freebsd-elf*)
 +    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 +    ;;
-+  freebsd* | kfreebsd*-gnu)
++  freebsd* | kfreebsd*-gnu | dragonfly*)
 +    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
 +    # conventions
 +    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
@@ -3179,11 +4156,11 @@
 +				# location of the library.
 +
 +    case $cc_basename in
-+    CC)
++    CC*)
 +      # FIXME: insert proper C++ library support
 +      _LT_AC_TAGVAR(ld_shlibs, $1)=no
 +      ;;
-+    aCC)
++    aCC*)
 +      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
 +      # Commands to make compiler produce verbose output that lists
 +      # what "hidden" libraries, object files and flags are used when
@@ -3193,7 +4170,7 @@
 +      # explicitly linking system object files so we need to strip them
 +      # from the output so that they don't get included in the library
 +      # dependencies.
-+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 +      ;;
 +    *)
 +      if test "$GXX" = yes; then
@@ -3207,7 +4184,7 @@
 +    ;;
 +  hpux10*|hpux11*)
 +    if test $with_gnu_ld = no; then
-+      case "$host_cpu" in
++      case $host_cpu in
 +      hppa*64*)
 +	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
 +	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
@@ -3223,7 +4200,7 @@
 +        ;;
 +      esac
 +    fi
-+    case "$host_cpu" in
++    case $host_cpu in
 +    hppa*64*)
 +      _LT_AC_TAGVAR(hardcode_direct, $1)=no
 +      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -3244,12 +4221,12 @@
 +    esac
 +
 +    case $cc_basename in
-+      CC)
++      CC*)
 +	# FIXME: insert proper C++ library support
 +	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 +	;;
-+      aCC)
-+	case "$host_cpu" in
++      aCC*)
++	case $host_cpu in
 +	hppa*64*|ia64*)
 +	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
 +	  ;;
@@ -3270,7 +4247,7 @@
 +      *)
 +	if test "$GXX" = yes; then
 +	  if test $with_gnu_ld = no; then
-+	    case "$host_cpu" in
++	    case $host_cpu in
 +	    ia64*|hppa*64*)
 +	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
 +	      ;;
@@ -3288,9 +4265,9 @@
 +    ;;
 +  irix5* | irix6*)
 +    case $cc_basename in
-+      CC)
++      CC*)
 +	# SGI C++
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 +
 +	# Archives containing C++ object files must be created using
 +	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
@@ -3301,7 +4278,7 @@
 +      *)
 +	if test "$GXX" = yes; then
 +	  if test "$with_gnu_ld" = no; then
-+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 +	  else
 +	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
 +	  fi
@@ -3314,7 +4291,7 @@
 +    ;;
 +  linux*)
 +    case $cc_basename in
-+      KCC)
++      KCC*)
 +	# Kuck and Associates, Inc. (KAI) C++ Compiler
 +
 +	# KCC will only create a shared library if the output file
@@ -3339,17 +4316,41 @@
 +	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
 +	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
 +	;;
-+      icpc)
++      icpc*)
 +	# Intel C++
 +	with_gnu_ld=yes
++	# version 8.0 and above of icpc choke on multiply defined symbols
++	# if we add $predep_objects and $postdep_objects, however 7.1 and
++	# earlier do not add the objects themselves.
++	case `$CC -V 2>&1` in
++	*"Version 7."*)
++  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	*)  # Version 8.0 or newer
++	  tmp_idyn=
++	  case $host_cpu in
++	    ia64*) tmp_idyn=' -i_dynamic';;
++	  esac
++  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	esac
 +	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 +	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
 +	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
 +	;;
-+      cxx)
++      pgCC*)
++        # Portland Group C++ compiler
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++        ;;
++      cxx*)
 +	# Compaq C++
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
@@ -3380,7 +4381,7 @@
 +    ;;
 +  mvs*)
 +    case $cc_basename in
-+      cxx)
++      cxx*)
 +	# FIXME: insert proper C++ library support
 +	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 +	;;
@@ -3401,9 +4402,25 @@
 +    # Workaround some broken pre-1.5 toolchains
 +    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
 +    ;;
++  openbsd2*)
++    # C++ shared libraries are fairly broken
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  openbsd*)
++    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    fi
++    output_verbose_link_cmd='echo'
++    ;;
 +  osf3*)
 +    case $cc_basename in
-+      KCC)
++      KCC*)
 +	# Kuck and Associates, Inc. (KAI) C++ Compiler
 +
 +	# KCC will only create a shared library if the output file
@@ -3419,14 +4436,14 @@
 +	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
 +
 +	;;
-+      RCC)
++      RCC*)
 +	# Rational C++ 2.4.1
 +	# FIXME: insert proper C++ library support
 +	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 +	;;
-+      cxx)
++      cxx*)
 +	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 +
 +	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 +	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -3444,7 +4461,7 @@
 +      *)
 +	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 +	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 +
 +	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 +	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -3463,7 +4480,7 @@
 +    ;;
 +  osf4* | osf5*)
 +    case $cc_basename in
-+      KCC)
++      KCC*)
 +	# Kuck and Associates, Inc. (KAI) C++ Compiler
 +
 +	# KCC will only create a shared library if the output file
@@ -3478,17 +4495,17 @@
 +	# the KAI C++ compiler.
 +	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
 +	;;
-+      RCC)
++      RCC*)
 +	# Rational C++ 2.4.1
 +	# FIXME: insert proper C++ library support
 +	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 +	;;
-+      cxx)
++      cxx*)
 +	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 +	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
 +	  echo "-hidden">> $lib.exp~
-+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
++	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
 +	  $rm $lib.exp'
 +
 +	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -3507,7 +4524,7 @@
 +      *)
 +	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 +	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 +
 +	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 +	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -3531,7 +4548,7 @@
 +  sco*)
 +    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 +    case $cc_basename in
-+      CC)
++      CC*)
 +	# FIXME: insert proper C++ library support
 +	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 +	;;
@@ -3543,12 +4560,12 @@
 +    ;;
 +  sunos4*)
 +    case $cc_basename in
-+      CC)
++      CC*)
 +	# Sun C++ 4.x
 +	# FIXME: insert proper C++ library support
 +	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 +	;;
-+      lcc)
++      lcc*)
 +	# Lucid
 +	# FIXME: insert proper C++ library support
 +	_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -3561,36 +4578,33 @@
 +    ;;
 +  solaris*)
 +    case $cc_basename in
-+      CC)
++      CC*)
 +	# Sun C++ 4.2, 5.x and Centerline C++
++        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
 +	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
 +
 +	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 +	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 +	case $host_os in
-+	  solaris2.[0-5] | solaris2.[0-5].*) ;;
++	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
 +	  *)
 +	    # The C++ compiler is used as linker so we must use $wl
 +	    # flag to pass the commands to the underlying system
-+	    # linker.
++	    # linker. We must also pass each convience library through
++	    # to the system linker between allextract/defaultextract.
++	    # The C++ compiler will combine linker options so we
++	    # cannot just pass the convience library names through
++	    # without $wl.
 +	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
 +	    ;;
 +	esac
 +	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 +
-+	# Commands to make compiler produce verbose output that lists
-+	# what "hidden" libraries, object files and flags are used when
-+	# linking a shared library.
-+	#
-+	# There doesn't appear to be a way to prevent this compiler from
-+	# explicitly linking system object files so we need to strip them
-+	# from the output so that they don't get included in the library
-+	# dependencies.
-+	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	output_verbose_link_cmd='echo'
 +
 +	# Archives containing C++ object files must be created using
 +	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -3598,7 +4612,7 @@
 +	# in the archive.
 +	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
 +	;;
-+      gcx)
++      gcx*)
 +	# Green Hills C++ Compiler
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 +
@@ -3641,7 +4655,7 @@
 +    ;;
 +  tandem*)
 +    case $cc_basename in
-+      NCC)
++      NCC*)
 +	# NonStop-UX NCC 3.20
 +	# FIXME: insert proper C++ library support
 +	_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -3747,7 +4761,7 @@
 +  # The `*' in the case matches for architectures that use `case' in
 +  # $output_verbose_cmd can trigger glob expansion during the loop
 +  # eval without this substitution.
-+  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
++  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
 +
 +  for p in `eval $output_verbose_link_cmd`; do
 +    case $p in
@@ -3823,6 +4837,21 @@
 +
 +$rm -f confest.$objext
 +
++# PORTME: override above test on systems where it is broken
++ifelse([$1],[CXX],
++[case $host_os in
++solaris*)
++  case $cc_basename in
++  CC*)
++    # Adding this requires a known-good setup of shared libraries for
++    # Sun compiler versions before 5.6, else PIC objects from an old
++    # archive will be linked into the output, leading to subtle bugs.
++    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
++    ;;
++  esac
++esac
++])
++
 +case " $_LT_AC_TAGVAR(postdeps, $1) " in
 +*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
 +esac
@@ -3873,12 +4902,16 @@
 +# ltmain only uses $CC for tagged configurations so make sure $CC is set.
 +_LT_AC_SYS_COMPILER
 +
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
 +# Allow CC to be a program name with arguments.
 +lt_save_CC="$CC"
 +CC=${F77-"f77"}
 +compiler=$CC
 +_LT_AC_TAGVAR(compiler, $1)=$CC
-+cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++_LT_CC_BASENAME([$compiler])
 +
 +AC_MSG_CHECKING([if libtool supports shared libraries])
 +AC_MSG_RESULT([$can_build_shared])
@@ -3888,7 +4921,7 @@
 +
 +# On AIX, shared libraries and static libraries use the same namespace, and
 +# are all built from PIC.
-+case "$host_os" in
++case $host_os in
 +aix3*)
 +  test "$enable_shared" = yes && enable_static=no
 +  if test -n "$RANLIB"; then
@@ -3897,7 +4930,9 @@
 +  fi
 +  ;;
 +aix4* | aix5*)
-+  test "$enable_shared" = yes && enable_static=no
++  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++    test "$enable_shared" = yes && enable_static=no
++  fi
 +  ;;
 +esac
 +AC_MSG_RESULT([$enable_shared])
@@ -3948,20 +4983,27 @@
 +lt_simple_compile_test_code="class foo {}\n"
 +
 +# Code to be used in simple link tests
-+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
 +
 +# ltmain only uses $CC for tagged configurations so make sure $CC is set.
 +_LT_AC_SYS_COMPILER
 +
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
 +# Allow CC to be a program name with arguments.
 +lt_save_CC="$CC"
 +CC=${GCJ-"gcj"}
 +compiler=$CC
 +_LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
 +
 +# GCJ did not exist at the time GCC didn't implicitly link libc in.
 +_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 +
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++
 +AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
 +AC_LIBTOOL_PROG_COMPILER_PIC($1)
 +AC_LIBTOOL_PROG_CC_C_O($1)
@@ -4004,11 +5046,16 @@
 +# ltmain only uses $CC for tagged configurations so make sure $CC is set.
 +_LT_AC_SYS_COMPILER
 +
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
 +# Allow CC to be a program name with arguments.
 +lt_save_CC="$CC"
 +CC=${RC-"windres"}
 +compiler=$CC
 +_LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
 +_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
 +
 +AC_LIBTOOL_CONFIG($1)
@@ -4144,7 +5191,7 @@
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 +#
 +# As a special exception to the GNU General Public License, if you
 +# distribute this file as part of a program that contains a
@@ -4155,11 +5202,11 @@
 +SED=$lt_SED
 +
 +# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-+Xsed="$SED -e s/^X//"
++Xsed="$SED -e 1s/^X//"
 +
 +# The HP-UX ksh and POSIX shell print the target directory to stdout
 +# if CDPATH is set.
-+if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 +
 +# The names of the tagged configurations supported by this script.
 +available_tags=
@@ -4190,7 +5237,13 @@
 +# The host system.
 +host_alias=$host_alias
 +host=$host
++host_os=$host_os
 +
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
++
 +# An echo program that does not interpret backslashes.
 +echo=$lt_echo
 +
@@ -4266,7 +5319,7 @@
 +# Does compiler simultaneously support -c and -o options?
 +compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
 +
-+# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
 +need_locks=$lt_need_locks
 +
 +# Do we need the lib prefix for modules?
@@ -4540,9 +5593,6 @@
 +# Regexp to match symbols that can be accessed directly from C.
 +sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
 +
-+# Transform the above into a raw symbol and a C symbol.
-+symxfrm='\1 \2\3 \3'
-+
 +# Transform an extracted symbol line into a proper C declaration
 +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
 +
@@ -4564,6 +5614,13 @@
 +  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
 +  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
 +  ;;
++linux*)
++  if test "$host_cpu" = ia64; then
++    symcode='[[ABCDGIRSTW]]'
++    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++  fi
++  ;;
 +irix* | nonstopux*)
 +  symcode='[[BCDEGRST]]'
 +  ;;
@@ -4595,8 +5652,11 @@
 +# Try without a prefix undercore, then with it.
 +for ac_symprfx in "" "_"; do
 +
++  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
++  symxfrm="\\1 $ac_symprfx\\2 \\2"
++
 +  # Write the raw and C identifiers.
-+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
 +
 +  # Check to see that the pipe works correctly.
 +  pipe_works=no
@@ -4760,7 +5820,7 @@
 +    hpux*)
 +      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
 +      # not for PA HP-UX.
-+      case "$host_cpu" in
++      case $host_cpu in
 +      hppa*64*|ia64*)
 +	;;
 +      *)
@@ -4785,18 +5845,28 @@
 +	;;
 +      chorus*)
 +	case $cc_basename in
-+	cxch68)
++	cxch68*)
 +	  # Green Hills C++ Compiler
 +	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
 +	  ;;
 +	esac
 +	;;
++       darwin*)
++         # PIC is the default on this platform
++         # Common symbols not allowed in MH_DYLIB files
++         case $cc_basename in
++           xlc*)
++           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++           ;;
++         esac
++       ;;
 +      dgux*)
 +	case $cc_basename in
-+	  ec++)
++	  ec++*)
 +	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +	    ;;
-+	  ghcx)
++	  ghcx*)
 +	    # Green Hills C++ Compiler
 +	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 +	    ;;
@@ -4804,22 +5874,22 @@
 +	    ;;
 +	esac
 +	;;
-+      freebsd* | kfreebsd*-gnu)
++      freebsd* | kfreebsd*-gnu | dragonfly*)
 +	# FreeBSD uses GNU C++
 +	;;
 +      hpux9* | hpux10* | hpux11*)
 +	case $cc_basename in
-+	  CC)
++	  CC*)
 +	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
 +	    if test "$host_cpu" != ia64; then
 +	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
 +	    fi
 +	    ;;
-+	  aCC)
++	  aCC*)
 +	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-+	    case "$host_cpu" in
++	    case $host_cpu in
 +	    hppa*64*|ia64*)
 +	      # +Z the default
 +	      ;;
@@ -4834,7 +5904,7 @@
 +	;;
 +      irix5* | irix6* | nonstopux*)
 +	case $cc_basename in
-+	  CC)
++	  CC*)
 +	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 +	    # CC pic flag -KPIC is the default.
@@ -4845,18 +5915,24 @@
 +	;;
 +      linux*)
 +	case $cc_basename in
-+	  KCC)
++	  KCC*)
 +	    # KAI C++ Compiler
 +	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
 +	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 +	    ;;
-+	  icpc)
++	  icpc* | ecpc*)
 +	    # Intel C++
 +	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
 +	    ;;
-+	  cxx)
++	  pgCC*)
++	    # Portland Group C++ compiler.
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	    ;;
++	  cxx*)
 +	    # Compaq C++
 +	    # Make sure the PIC flag is empty.  It appears that all Alpha
 +	    # Linux and Compaq Tru64 Unix objects are PIC.
@@ -4873,7 +5949,7 @@
 +	;;
 +      mvs*)
 +	case $cc_basename in
-+	  cxx)
++	  cxx*)
 +	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
 +	    ;;
 +	  *)
@@ -4884,14 +5960,14 @@
 +	;;
 +      osf3* | osf4* | osf5*)
 +	case $cc_basename in
-+	  KCC)
++	  KCC*)
 +	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
 +	    ;;
-+	  RCC)
++	  RCC*)
 +	    # Rational C++ 2.4.1
 +	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 +	    ;;
-+	  cxx)
++	  cxx*)
 +	    # Digital/Compaq C++
 +	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +	    # Make sure the PIC flag is empty.  It appears that all Alpha
@@ -4907,7 +5983,7 @@
 +	;;
 +      sco*)
 +	case $cc_basename in
-+	  CC)
++	  CC*)
 +	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 +	    ;;
 +	  *)
@@ -4916,13 +5992,13 @@
 +	;;
 +      solaris*)
 +	case $cc_basename in
-+	  CC)
++	  CC*)
 +	    # Sun C++ 4.2, 5.x and Centerline C++
 +	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
 +	    ;;
-+	  gcx)
++	  gcx*)
 +	    # Green Hills C++ Compiler
 +	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
 +	    ;;
@@ -4932,12 +6008,12 @@
 +	;;
 +      sunos4*)
 +	case $cc_basename in
-+	  CC)
++	  CC*)
 +	    # Sun C++ 4.x
 +	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 +	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +	    ;;
-+	  lcc)
++	  lcc*)
 +	    # Lucid
 +	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 +	    ;;
@@ -4947,7 +6023,7 @@
 +	;;
 +      tandem*)
 +	case $cc_basename in
-+	  NCC)
++	  NCC*)
 +	    # NonStop-UX NCC 3.20
 +	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +	    ;;
@@ -5018,7 +6094,7 @@
 +    hpux*)
 +      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
 +      # not for PA HP-UX.
-+      case "$host_cpu" in
++      case $host_cpu in
 +      hppa*64*|ia64*)
 +	# +Z the default
 +	;;
@@ -5044,6 +6120,16 @@
 +	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
 +      fi
 +      ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case $cc_basename in
++         xlc*)
++         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++         ;;
++       esac
++       ;;
 +
 +    mingw* | pw32* | os2*)
 +      # This hack is so that the source file can tell whether it is being
@@ -5055,7 +6141,7 @@
 +      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
 +      # not for PA HP-UX.
-+      case "$host_cpu" in
++      case $host_cpu in
 +      hppa*64*|ia64*)
 +	# +Z the default
 +	;;
@@ -5079,12 +6165,19 @@
 +      ;;
 +
 +    linux*)
-+      case $CC in
++      case $cc_basename in
 +      icc* | ecc*)
 +	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
 +        ;;
++      pgcc* | pgf77* | pgf90* | pgf95*)
++        # Portland Group compilers (*not* the Pentium gcc compiler,
++	# which looks to be a dead project)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++        ;;
 +      ccc*)
 +        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +        # All Alpha code is PIC.
@@ -5105,9 +6198,14 @@
 +      ;;
 +
 +    solaris*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      case $cc_basename in
++      f77* | f90* | f95*)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
++      *)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
++      esac
 +      ;;
 +
 +    sunos4*)
@@ -5129,6 +6227,11 @@
 +      fi
 +      ;;
 +
++    unicos*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++      ;;
++
 +    uts4*)
 +      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 +      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -5156,7 +6259,7 @@
 +    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
 +     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
 +fi
-+case "$host_os" in
++case $host_os in
 +  # For platforms which do not support PIC, -DPIC is meaningless:
 +  *djgpp*)
 +    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
@@ -5189,7 +6292,7 @@
 +    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
 +  ;;
 +  cygwin* | mingw*)
-+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
 +  ;;
 +  linux*)
 +    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
@@ -5235,7 +6338,8 @@
 +  # rely on this symbol name, it's probably fine to never include it in
 +  # preloaded symbol tables.
 +  extract_expsyms_cmds=
-+
++  # Just being paranoid about ensuring that cc_basename is set.
++  _LT_CC_BASENAME([$compiler])
 +  case $host_os in
 +  cygwin* | mingw* | pw32*)
 +    # FIXME: the MSVC++ port hasn't been tested in a loooong time
@@ -5255,6 +6359,27 @@
 +    # If archive_cmds runs LD, not CC, wlarc should be empty
 +    wlarc='${wl}'
 +
++    # Set some defaults for GNU ld with shared library support. These
++    # are reset later if shared libraries are not supported. Putting them
++    # here allows them to be overridden if necessary.
++    runpath_var=LD_RUN_PATH
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++    fi
++    supports_anon_versioning=no
++    case `$LD -v 2>/dev/null` in
++      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
++      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++      *\ 2.11.*) ;; # other 2.11 versions
++      *) supports_anon_versioning=yes ;;
++    esac
++
 +    # See if GNU ld supports shared libraries.
 +    case $host_os in
 +    aix3* | aix4* | aix5*)
@@ -5305,7 +6430,7 @@
 +      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
 +      _LT_AC_TAGVAR(always_export_symbols, $1)=no
 +      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
 +
 +      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
 +        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -5319,10 +6444,42 @@
 +	fi~
 +	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
 +      else
-+	ld_shlibs=no
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 +      fi
 +      ;;
 +
++    linux*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	tmp_addflag=
++	case $cc_basename,$host_cpu in
++	pgcc*)				# Portland Group C compiler
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag'
++	  ;;
++	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag -Mnomain' ;;
++	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
++	  tmp_addflag=' -i_dynamic' ;;
++	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
++	  tmp_addflag=' -i_dynamic -nofor_main' ;;
++	ifc* | ifort*)			# Intel Fortran compiler
++	  tmp_addflag=' -nofor_main' ;;
++	esac
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++	if test $supports_anon_versioning = yes; then
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
++  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++  $echo "local: *; };" >> $output_objdir/$libname.ver~
++	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	fi
++	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++
 +    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
 +      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -5361,32 +6518,6 @@
 +      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      ;;
 +
-+  linux*)
-+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	_LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
-+      supports_anon_versioning=no
-+      case `$LD -v 2>/dev/null` in
-+        *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-+        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+        *\ 2.11.*) ;; # other 2.11 versions
-+        *) supports_anon_versioning=yes ;;
-+      esac
-+      if test $supports_anon_versioning = yes; then
-+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+$echo "local: *; };" >> $output_objdir/$libname.ver~
-+        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+      else
-+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds"
-+      fi
-+      _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-+    else
-+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    fi
-+    ;;
-+
 +    *)
 +      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -5397,16 +6528,11 @@
 +      ;;
 +    esac
 +
-+    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
-+      runpath_var=LD_RUN_PATH
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+      # ancient GNU ld didn't support --whole-archive et. al.
-+      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-+ 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      else
-+  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-+      fi
++    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
++      runpath_var=
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
 +    fi
 +  else
 +    # PORTME fill in a description of your system's linker (not GNU ld)
@@ -5470,7 +6596,7 @@
 +      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 +
 +      if test "$GCC" = yes; then
-+	case $host_os in aix4.[012]|aix4.[012].*)
++	case $host_os in aix4.[[012]]|aix4.[[012]].*)
 +	# We only want to do this on AIX 4.2 and lower, the check
 +	# below for broken collect2 doesn't work under 4.3+
 +	  collect2name=`${CC} -print-prog-name=collect2`
@@ -5491,6 +6617,9 @@
 +	  fi
 +	esac
 +	shared_flag='-shared'
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag="$shared_flag "'${wl}-G'
++	fi
 +      else
 +	# not using gcc
 +	if test "$host_cpu" = ia64; then
@@ -5535,7 +6664,7 @@
 +	  # Exported symbols can be pulled into shared objects from archives
 +	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
 +	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-+	  # This is similar to how AIX traditionally builds it's shared libraries.
++	  # This is similar to how AIX traditionally builds its shared libraries.
 +	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 +	fi
 +      fi
@@ -5549,7 +6678,7 @@
 +      _LT_AC_TAGVAR(ld_shlibs, $1)=no
 +      ;;
 +
-+    bsdi4*)
++    bsdi[[45]]*)
 +      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
 +      ;;
 +
@@ -5570,57 +6699,57 @@
 +      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
 +      # FIXME: Should let the user specify the lib program.
 +      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
 +      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 +      ;;
 +
 +    darwin* | rhapsody*)
-+    if test "$GXX" = yes ; then
-+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+      case "$host_os" in
-+      rhapsody* | darwin1.[[012]])
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-+	;;
-+      *) # Darwin 1.3 on
-+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+      else
-+        case ${MACOSX_DEPLOYMENT_TARGET} in
-+          10.[[012]])
-+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+            ;;
-+          10.*)
-+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-+            ;;
-+        esac
-+      fi
-+	;;
++      case $host_os in
++        rhapsody* | darwin1.[[012]])
++         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[[012]])
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
 +      esac
-+    	lt_int_apple_cc_single_mod=no
-+    	output_verbose_link_cmd='echo'
-+    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-+    	  lt_int_apple_cc_single_mod=yes
-+    	fi
-+    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+    	else
-+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+      fi
-+      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-+        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+        else
-+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+        fi
-+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 +      _LT_AC_TAGVAR(hardcode_direct, $1)=no
 +      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
 +      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
 +      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +    else
-+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         _LT_AC_TAGVAR(ld_shlibs, $1)=no
++          ;;
++      esac
 +    fi
 +      ;;
 +
@@ -5654,7 +6783,7 @@
 +      ;;
 +
 +    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+    freebsd* | kfreebsd*-gnu)
++    freebsd* | kfreebsd*-gnu | dragonfly*)
 +      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
 +      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 +      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
@@ -5679,7 +6808,7 @@
 +
 +    hpux10* | hpux11*)
 +      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+	case "$host_cpu" in
++	case $host_cpu in
 +	hppa*64*|ia64*)
 +	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
@@ -5688,7 +6817,7 @@
 +	  ;;
 +	esac
 +      else
-+	case "$host_cpu" in
++	case $host_cpu in
 +	hppa*64*|ia64*)
 +	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
 +	  ;;
@@ -5698,7 +6827,7 @@
 +	esac
 +      fi
 +      if test "$with_gnu_ld" = no; then
-+	case "$host_cpu" in
++	case $host_cpu in
 +	hppa*64*)
 +	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
 +	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
@@ -5765,6 +6894,7 @@
 +      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
 +	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 +	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 +      else
@@ -5810,7 +6940,7 @@
 +	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 +	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
 +
 +	# Both c and cxx compiler support -rpath directly
 +	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -5829,10 +6959,12 @@
 +    solaris*)
 +      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
 +      if test "$GCC" = yes; then
++	wlarc='${wl}'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 +	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
 +      else
++	wlarc=''
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 +  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
@@ -5841,8 +6973,18 @@
 +      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      case $host_os in
 +      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++      *)
++ 	# The compiler driver will combine linker options so we
++ 	# cannot just pass the convience library names through
++ 	# without $wl, iff we do not link with $LD.
++ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
++ 	case $wlarc in
++ 	'')
++ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++ 	*)
++ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ 	esac ;;
 +      esac
 +      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 +      ;;
@@ -6103,7 +7245,7 @@
 +# Add /usr/xpg4/bin/sed as it is typically found on Solaris
 +# along with /bin/sed that truncates output.
 +for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-+  test ! -f $lt_ac_sed && break
++  test ! -f $lt_ac_sed && continue
 +  cat /dev/null > conftest.in
 +  lt_ac_count=0
 +  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -6128,64 +7270,110 @@
 +    fi
 +  done
 +done
-+SED=$lt_cv_path_SED
 +])
++SED=$lt_cv_path_SED
 +AC_MSG_RESULT([$SED])
 +])
 +
 +dnl ---------------------------------------------------------------------------
-+dnl Macros for wxWindows detection. Typically used in configure.in as:
++dnl Macros for wxWidgets detection. Typically used in configure.in as:
 +dnl
-+dnl 	AC_ARG_ENABLE(...)
-+dnl 	AC_ARG_WITH(...)
-+dnl	...
-+dnl	AM_OPTIONS_WXCONFIG
-+dnl	...
-+dnl	...
-+dnl	AM_PATH_WXCONFIG(2.3.4, wxWin=1)
++dnl     AC_ARG_ENABLE(...)
++dnl     AC_ARG_WITH(...)
++dnl        ...
++dnl     AM_OPTIONS_WXCONFIG
++dnl        ...
++dnl        ...
++dnl     AM_PATH_WXCONFIG(2.6.0, wxWin=1)
 +dnl     if test "$wxWin" != 1; then
 +dnl        AC_MSG_ERROR([
-+dnl     	   wxWindows must be installed on your system
-+dnl     	   but wx-config script couldn't be found.
-+dnl     
-+dnl     	   Please check that wx-config is in path, the directory
-+dnl     	   where wxWindows libraries are installed (returned by
-+dnl     	   'wx-config --libs' command) is in LD_LIBRARY_PATH or
-+dnl     	   equivalent variable and wxWindows version is 2.3.4 or above.
++dnl                wxWidgets must be installed on your system
++dnl                but wx-config script couldn't be found.
++dnl
++dnl                Please check that wx-config is in path, the directory
++dnl                where wxWidgets libraries are installed (returned by
++dnl                'wx-config --libs' command) is in LD_LIBRARY_PATH or
++dnl                equivalent variable and wxWidgets version is 2.3.4 or above.
 +dnl        ])
 +dnl     fi
 +dnl     CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
 +dnl     CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
 +dnl     CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
-+dnl     
-+dnl     LDFLAGS="$LDFLAGS $WX_LIBS"
++dnl
++dnl     LIBS="$LIBS $WX_LIBS"
 +dnl ---------------------------------------------------------------------------
 +
 +dnl ---------------------------------------------------------------------------
 +dnl AM_OPTIONS_WXCONFIG
 +dnl
-+dnl adds support for --wx-prefix, --wx-exec-prefix and --wx-config 
-+dnl command line options
++dnl adds support for --wx-prefix, --wx-exec-prefix, --with-wxdir and
++dnl --wx-config command line options
 +dnl ---------------------------------------------------------------------------
 +
 +AC_DEFUN([AM_OPTIONS_WXCONFIG],
 +[
-+   AC_ARG_WITH(wx-prefix, [  --with-wx-prefix=PREFIX   Prefix where wxWindows is installed (optional)],
-+               wx_config_prefix="$withval", wx_config_prefix="")
-+   AC_ARG_WITH(wx-exec-prefix,[  --with-wx-exec-prefix=PREFIX Exec prefix where wxWindows is installed (optional)],
-+               wx_config_exec_prefix="$withval", wx_config_exec_prefix="")
-+   AC_ARG_WITH(wx-config,[  --with-wx-config=CONFIG   wx-config script to use (optional)],
-+               wx_config_name="$withval", wx_config_name="")
++    AC_ARG_WITH(wxdir,
++                [  --with-wxdir=PATH       Use uninstalled version of wxWidgets in PATH],
++                [ wx_config_name="$withval/wx-config"
++                  wx_config_args="--inplace"])
++    AC_ARG_WITH(wx-config,
++                [  --with-wx-config=CONFIG wx-config script to use (optional)],
++                wx_config_name="$withval" )
++    AC_ARG_WITH(wx-prefix,
++                [  --with-wx-prefix=PREFIX Prefix where wxWidgets is installed (optional)],
++                wx_config_prefix="$withval", wx_config_prefix="")
++    AC_ARG_WITH(wx-exec-prefix,
++                [  --with-wx-exec-prefix=PREFIX
++                          Exec prefix where wxWidgets is installed (optional)],
++                wx_config_exec_prefix="$withval", wx_config_exec_prefix="")
 +])
 +
++dnl Helper macro for checking if wx version is at least $1.$2.$3, set's
++dnl wx_ver_ok=yes if it is:
++AC_DEFUN([_WX_PRIVATE_CHECK_VERSION],
++[
++    wx_ver_ok=""
++    if test "x$WX_VERSION" != x ; then
++      if test $wx_config_major_version -gt $1; then
++        wx_ver_ok=yes
++      else
++        if test $wx_config_major_version -eq $1; then
++           if test $wx_config_minor_version -gt $2; then
++              wx_ver_ok=yes
++           else
++              if test $wx_config_minor_version -eq $2; then
++                 if test $wx_config_micro_version -ge $3; then
++                    wx_ver_ok=yes
++                 fi
++              fi
++           fi
++        fi
++      fi
++    fi
++])
++
 +dnl ---------------------------------------------------------------------------
-+dnl AM_PATH_WXCONFIG(VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
++dnl AM_PATH_WXCONFIG(VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND
++dnl                  [, WX-LIBS [, ADDITIONAL-WX-CONFIG-FLAGS]]]])
 +dnl
-+dnl Test for wxWindows, and define WX_C*FLAGS, WX_LIBS and WX_LIBS_STATIC
-+dnl (the latter is for static linking against wxWindows). Set WX_CONFIG_NAME
++dnl Test for wxWidgets, and define WX_C*FLAGS, WX_LIBS and WX_LIBS_STATIC
++dnl (the latter is for static linking against wxWidgets). Set WX_CONFIG_NAME
 +dnl environment variable to override the default name of the wx-config script
 +dnl to use. Set WX_CONFIG_PATH to specify the full path to wx-config - in this
 +dnl case the macro won't even waste time on tests for its existence.
++dnl
++dnl Optional WX-LIBS argument contains comma- or space-separated list of
++dnl wxWidgets libraries to link against (it may include contrib libraries). If
++dnl it is not specified then WX_LIBS and WX_LIBS_STATIC will contain flags to
++dnl link with all of the core wxWidgets libraries.
++dnl
++dnl Optional ADDITIONAL-WX-CONFIG-FLAGS argument is appended to wx-config
++dnl invocation command in present. It can be used to fine-tune lookup of
++dnl best wxWidgets build available.
++dnl
++dnl Example use:
++dnl   AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], [html,core,net]
++dnl                    [--unicode --debug])
 +dnl ---------------------------------------------------------------------------
 +
 +dnl
@@ -6197,6 +7385,7 @@
 +  if test x${WX_CONFIG_NAME+set} != xset ; then
 +     WX_CONFIG_NAME=wx-config
 +  fi
++
 +  if test "x$wx_config_name" != x ; then
 +     WX_CONFIG_NAME="$wx_config_name"
 +  fi
@@ -6210,6 +7399,9 @@
 +     wx_config_args="$wx_config_args --prefix=$wx_config_prefix"
 +     WX_LOOKUP_PATH="$WX_LOOKUP_PATH:$wx_config_prefix/bin"
 +  fi
++  if test "$cross_compiling" = "yes"; then
++     wx_config_args="$wx_config_args --host=$host_alias"
++  fi
 +
 +  dnl don't search the PATH if WX_CONFIG_NAME is absolute filename
 +  if test -x "$WX_CONFIG_NAME" ; then
@@ -6222,14 +7414,17 @@
 +
 +  if test "$WX_CONFIG_PATH" != "no" ; then
 +    WX_VERSION=""
-+    no_wx=""
 +
 +    min_wx_version=ifelse([$1], ,2.2.1,$1)
-+    AC_MSG_CHECKING(for wxWindows version >= $min_wx_version)
++    if test -z "$5" ; then
++      AC_MSG_CHECKING([for wxWidgets version >= $min_wx_version])
++    else
++      AC_MSG_CHECKING([for wxWidgets version >= $min_wx_version ($5)])
++    fi
 +
-+    WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args"
++    WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $5 $4"
 +
-+    WX_VERSION=`$WX_CONFIG_WITH_ARGS --version`
++    WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
 +    wx_config_major_version=`echo $WX_VERSION | \
 +           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
 +    wx_config_minor_version=`echo $WX_VERSION | \
@@ -6244,29 +7439,27 @@
 +    wx_requested_micro_version=`echo $min_wx_version | \
 +           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
 +
-+    wx_ver_ok=""
-+    if test $wx_config_major_version -gt $wx_requested_major_version; then
-+      wx_ver_ok=yes
-+    else
-+      if test $wx_config_major_version -eq $wx_requested_major_version; then
-+         if test $wx_config_minor_version -gt $wx_requested_minor_version; then
-+            wx_ver_ok=yes
-+         else
-+            if test $wx_config_minor_version -eq $wx_requested_minor_version; then
-+               if test $wx_config_micro_version -ge $wx_requested_micro_version; then
-+                  wx_ver_ok=yes
-+               fi
-+            fi
-+         fi
-+      fi
-+    fi
++    _WX_PRIVATE_CHECK_VERSION([$wx_requested_major_version],
++                              [$wx_requested_minor_version],
++                              [$wx_requested_micro_version])
 +
-+    if test "x$wx_ver_ok" = x ; then
-+      no_wx=yes
-+    else
++    if test -n "$wx_ver_ok"; then
++
++      AC_MSG_RESULT(yes (version $WX_VERSION))
 +      WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`
-+      WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs`
 +
++      dnl is this even still appropriate?  --static is a real option now
++      dnl and WX_CONFIG_WITH_ARGS is likely to contain it if that is
++      dnl what the user actually wants, making this redundant at best.
++      dnl For now keep it in case anyone actually used it in the past.
++      AC_MSG_CHECKING([for wxWidgets static library])
++      WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs 2>/dev/null`
++      if test "x$WX_LIBS_STATIC" = "x"; then
++        AC_MSG_RESULT(no)
++      else
++        AC_MSG_RESULT(yes)
++      fi
++
 +      dnl starting with version 2.2.6 wx-config has --cppflags argument
 +      wx_has_cppflags=""
 +      if test $wx_config_major_version -gt 2; then
@@ -6302,17 +7495,16 @@
 +         WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
 +         WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
 +      fi
-+    fi
 +
-+    if test "x$no_wx" = x ; then
-+       AC_MSG_RESULT(yes (version $WX_VERSION))
-+       ifelse([$2], , :, [$2])
++      ifelse([$2], , :, [$2])
++
 +    else
++
 +       if test "x$WX_VERSION" = x; then
-+	  dnl no wx-config at all
-+	  AC_MSG_RESULT(no)
++          dnl no wx-config at all
++          AC_MSG_RESULT(no)
 +       else
-+	  AC_MSG_RESULT(no (version $WX_VERSION is not new enough))
++          AC_MSG_RESULT(no (version $WX_VERSION is not new enough))
 +       fi
 +
 +       WX_CFLAGS=""
@@ -6321,7 +7513,17 @@
 +       WX_LIBS=""
 +       WX_LIBS_STATIC=""
 +       ifelse([$3], , :, [$3])
++
 +    fi
++  else
++
++    WX_CFLAGS=""
++    WX_CPPFLAGS=""
++    WX_CXXFLAGS=""
++    WX_LIBS=""
++    WX_LIBS_STATIC=""
++    ifelse([$3], , :, [$3])
++
 +  fi
 +
 +  AC_SUBST(WX_CPPFLAGS)
@@ -6334,56 +7536,118 @@
 +  AC_SUBST(WX_VERSION)
 +])
 +
-+#                                                        -*- Autoconf -*-
-+# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-+# Generated from amversion.in; do not edit by hand.
++dnl ---------------------------------------------------------------------------
++dnl Get information on the wxrc program for making C++, Python and xrs
++dnl resource files.
++dnl
++dnl     AC_ARG_ENABLE(...)
++dnl     AC_ARG_WITH(...)
++dnl        ...
++dnl     AM_OPTIONS_WXCONFIG
++dnl     AM_OPTIONS_WXRC
++dnl        ...
++dnl     AM_PATH_WXCONFIG(2.6.0, wxWin=1)
++dnl     if test "$wxWin" != 1; then
++dnl        AC_MSG_ERROR([
++dnl                wxWidgets must be installed on your system
++dnl                but wx-config script couldn't be found.
++dnl
++dnl                Please check that wx-config is in path, the directory
++dnl                where wxWidgets libraries are installed (returned by
++dnl                'wx-config --libs' command) is in LD_LIBRARY_PATH or
++dnl                equivalent variable and wxWidgets version is 2.6.0 or above.
++dnl        ])
++dnl     fi
++dnl
++dnl     AM_PATH_WXRC([HAVE_WXRC=1], [HAVE_WXRC=0])
++dnl     if test "x$HAVE_WXRC" != x1; then
++dnl         AC_MSG_ERROR([
++dnl                The wxrc program was not installed or not found.
++dnl     
++dnl                Please check the wxWidgets installation.
++dnl         ])
++dnl     fi
++dnl
++dnl     CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
++dnl     CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
++dnl     CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
++dnl
++dnl     LDFLAGS="$LDFLAGS $WX_LIBS"
++dnl ---------------------------------------------------------------------------
 +
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
 +
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
 +
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++dnl ---------------------------------------------------------------------------
++dnl AM_PATH_WXRC([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
++dnl
++dnl Test for wxWidgets' wxrc program for creating either C++, Python or XRS
++dnl resources.  The variable WXRC will be set and substituted in the configure
++dnl script and Makefiles.
++dnl
++dnl Example use:
++dnl   AM_PATH_WXRC([wxrc=1], [wxrc=0])
++dnl ---------------------------------------------------------------------------
 +
++dnl
++dnl wxrc program from the wx-config script
++dnl
++AC_DEFUN([AM_PATH_WXRC],
++[
++  AC_ARG_VAR([WXRC], [Path to wxWidget's wxrc resource compiler])
++    
++  if test "x$WX_CONFIG_NAME" = x; then
++    AC_MSG_ERROR([The wxrc tests must run after wxWidgets test.])
++  else
++    
++    AC_MSG_CHECKING([for wxrc])
++    
++    if test "x$WXRC" = x ; then
++      dnl wx-config --utility is a new addition to wxWidgets:
++      _WX_PRIVATE_CHECK_VERSION(2,5,3)
++      if test -n "$wx_ver_ok"; then
++        WXRC=`$WX_CONFIG_WITH_ARGS --utility=wxrc`
++      fi
++    fi
++
++    if test "x$WXRC" = x ; then
++      AC_MSG_RESULT([not found])
++      ifelse([$2], , :, [$2])
++    else
++      AC_MSG_RESULT([$WXRC])
++      ifelse([$1], , :, [$1])
++    fi
++    
++    AC_SUBST(WXRC)
++  fi
++])
++
++# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
 +# AM_AUTOMAKE_VERSION(VERSION)
 +# ----------------------------
 +# Automake X.Y traces this macro to ensure aclocal.m4 has been
 +# generated from the m4 files accompanying Automake X.Y.
-+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"])
++AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
 +
 +# AM_SET_CURRENT_AUTOMAKE_VERSION
 +# -------------------------------
 +# Call AM_AUTOMAKE_VERSION so it can be traced.
 +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+	 [AM_AUTOMAKE_VERSION([1.8.5])])
++	 [AM_AUTOMAKE_VERSION([1.9.6])])
 +
-+# AM_AUX_DIR_EXPAND
++# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 +
-+# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
++# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
 +
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
 +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 +# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
 +# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -6429,27 +7693,17 @@
 +am_aux_dir=`cd $ac_aux_dir && pwd`
 +])
 +
-+# AM_CONDITIONAL                                              -*- Autoconf -*-
++# AM_CONDITIONAL                                            -*- Autoconf -*-
 +
-+# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
 +
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
++# serial 7
 +
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+# serial 6
-+
 +# AM_CONDITIONAL(NAME, SHELL-CONDITION)
 +# -------------------------------------
 +# Define a conditional.
@@ -6468,31 +7722,20 @@
 +fi
 +AC_CONFIG_COMMANDS_PRE(
 +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-+  AC_MSG_ERROR([conditional "$1" was never defined.
-+Usually this means the macro was only invoked conditionally.])
++  AC_MSG_ERROR([[conditional "$1" was never defined.
++Usually this means the macro was only invoked conditionally.]])
 +fi])])
 +
-+# serial 7						-*- Autoconf -*-
 +
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
 +# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
 +
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
++# serial 8
 +
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+
 +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 +# written in clear, in which case automake, when reading aclocal.m4,
 +# will think it sees a *use*, and therefore will trigger all it's
@@ -6500,7 +7743,6 @@
 +# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
 +
 +
-+
 +# _AM_DEPENDENCIES(NAME)
 +# ----------------------
 +# See how the compiler implements dependency checking.
@@ -6640,27 +7882,17 @@
 +AC_SUBST([AMDEPBACKSLASH])
 +])
 +
-+# Generate code to set up dependency tracking.   -*- Autoconf -*-
++# Generate code to set up dependency tracking.              -*- Autoconf -*-
 +
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
 +
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
++#serial 3
 +
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+#serial 2
-+
 +# _AM_OUTPUT_DEPENDENCY_COMMANDS
 +# ------------------------------
 +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -6678,27 +7910,21 @@
 +  else
 +    continue
 +  fi
-+  grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
-+  # Extract the definition of DEP_FILES from the Makefile without
-+  # running `make'.
++  # Extract the definition of DEPDIR, am__include, and am__quote
++  # from the Makefile without running `make'.
 +  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
 +  test -z "$DEPDIR" && continue
++  am__include=`sed -n 's/^am__include = //p' < "$mf"`
++  test -z "am__include" && continue
++  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
 +  # When using ansi2knr, U may be empty or an underscore; expand it
 +  U=`sed -n 's/^U = //p' < "$mf"`
-+  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-+  # We invoke sed twice because it is the simplest approach to
-+  # changing $(DEPDIR) to its actual value in the expansion.
-+  for file in `sed -n '
-+    /^DEP_FILES = .*\\\\$/ {
-+      s/^DEP_FILES = //
-+      :loop
-+	s/\\\\$//
-+	p
-+	n
-+	/\\\\$/ b loop
-+      p
-+    }
-+    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
++  # Find all dependency output files, they are included files with
++  # $(DEPDIR) in their names.  We invoke sed twice because it is the
++  # simplest approach to changing $(DEPDIR) to its actual value in the
++  # expansion.
++  for file in `sed -n "
++    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
 +       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
 +    # Make sure the directory exists.
 +    test -f "$dirpart/$file" && continue
@@ -6724,55 +7950,32 @@
 +     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 +])
 +
-+# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
 +
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
++# serial 8
 +
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+# serial 7
-+
 +# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
 +AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
 +
-+# Do all the work for Automake.                            -*- Autoconf -*-
++# Do all the work for Automake.                             -*- Autoconf -*-
 +
-+# This macro actually does too much some checks are only needed if
-+# your package does certain things.  But this isn't really a big deal.
-+
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 +# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
 +
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
++# serial 12
 +
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
++# This macro actually does too much.  Some checks are only needed if
++# your package does certain things.  But this isn't really a big deal.
 +
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+# serial 11
-+
 +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 +# AM_INIT_AUTOMAKE([OPTIONS])
 +# -----------------------------------------------
@@ -6829,7 +8032,6 @@
 +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
 +AM_MISSING_PROG(AUTOHEADER, autoheader)
 +AM_MISSING_PROG(MAKEINFO, makeinfo)
-+AM_MISSING_PROG(AMTAR, tar)
 +AM_PROG_INSTALL_SH
 +AM_PROG_INSTALL_STRIP
 +AC_REQUIRE([AM_PROG_MKDIR_P])dnl
@@ -6838,7 +8040,9 @@
 +AC_REQUIRE([AC_PROG_AWK])dnl
 +AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 +AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+
++_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
++              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
++	      		     [_AM_PROG_TAR([v7])])])
 +_AM_IF_OPTION([no-dependencies],,
 +[AC_PROVIDE_IFELSE([AC_PROG_CC],
 +                  [_AM_DEPENDENCIES(CC)],
@@ -6872,52 +8076,28 @@
 +done
 +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
 +
++# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
 +# AM_PROG_INSTALL_SH
 +# ------------------
 +# Define $install_sh.
-+
-+# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
 +AC_DEFUN([AM_PROG_INSTALL_SH],
 +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 +install_sh=${install_sh-"$am_aux_dir/install-sh"}
 +AC_SUBST(install_sh)])
 +
-+#                                                          -*- Autoconf -*-
-+# Copyright (C) 2003  Free Software Foundation, Inc.
++# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
 +
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
++# serial 2
 +
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+# serial 1
-+
 +# Check whether the underlying file-system supports filenames
 +# with a leading dot.  For instance MS-DOS doesn't.
 +AC_DEFUN([AM_SET_LEADING_DOT],
@@ -6931,29 +8111,18 @@
 +rmdir .tst 2>/dev/null
 +AC_SUBST([am__leading_dot])])
 +
-+# Add --enable-maintainer-mode option to configure.
++# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 +# From Jim Meyering
 +
-+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004
++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
 +# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
 +
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
++# serial 4
 +
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+# serial 3
-+
 +AC_DEFUN([AM_MAINTAINER_MODE],
 +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
 +  dnl maintainer-mode is disabled by default
@@ -6971,27 +8140,16 @@
 +
 +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
 +
-+# Check to see how 'make' treats includes.	-*- Autoconf -*-
++# Check to see how 'make' treats includes.	            -*- Autoconf -*-
 +
-+# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
++# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
 +
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
++# serial 3
 +
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+# serial 2
-+
 +# AM_MAKE_INCLUDE()
 +# -----------------
 +# Check to see how make treats includes.
@@ -7034,29 +8192,17 @@
 +rm -f confinc confmf
 +])
 +
-+# serial 2
++# Copyright (C) 1999, 2000, 2001, 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
 +
++# serial 3
++
 +# AM_PROG_CC_C_O
 +# --------------
 +# Like AC_PROG_CC_C_O, but changed for automake.
-+
-+# Copyright (C) 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
 +AC_DEFUN([AM_PROG_CC_C_O],
 +[AC_REQUIRE([AC_PROG_CC_C_O])dnl
 +AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
@@ -7074,28 +8220,17 @@
 +fi
 +])
 +
-+#  -*- Autoconf -*-
++# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 +
++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
 +
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
++# serial 4
 +
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+# serial 3
-+
 +# AM_MISSING_PROG(NAME, PROGRAM)
 +# ------------------------------
 +AC_DEFUN([AM_MISSING_PROG],
@@ -7120,27 +8255,16 @@
 +fi
 +])
 +
++# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
 +# AM_PROG_MKDIR_P
 +# ---------------
 +# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-+
-+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
++#
 +# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
 +# created by `make install' are always world readable, even if the
 +# installer happens to have an overly restrictive umask (e.g. 077).
@@ -7161,13 +8285,21 @@
 +# this.)
 +AC_DEFUN([AM_PROG_MKDIR_P],
 +[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-+  # Keeping the `.' argument allows $(mkdir_p) to be used without
-+  # argument.  Indeed, we sometimes output rules like
++  # We used to keeping the `.' as first argument, in order to
++  # allow $(mkdir_p) to be used without argument.  As in
 +  #   $(mkdir_p) $(somedir)
-+  # where $(somedir) is conditionally defined.
-+  # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
-+  # expensive solution, as it forces Make to start a sub-shell.)
-+  mkdir_p='mkdir -p -- .'
++  # where $(somedir) is conditionally defined.  However this is wrong
++  # for two reasons:
++  #  1. if the package is installed by a user who cannot write `.'
++  #     make install will fail,
++  #  2. the above comment should most certainly read
++  #     $(mkdir_p) $(DESTDIR)$(somedir)
++  #     so it does not work when $(somedir) is undefined and
++  #     $(DESTDIR) is not.
++  #  To support the latter case, we have to write
++  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
++  #  so the `.' trick is pointless.
++  mkdir_p='mkdir -p --'
 +else
 +  # On NextStep and OpenStep, the `mkdir' command does not
 +  # recognize any option.  It will interpret all options as
@@ -7186,27 +8318,16 @@
 +fi
 +AC_SUBST([mkdir_p])])
 +
-+# Helper functions for option handling.                    -*- Autoconf -*-
++# Helper functions for option handling.                     -*- Autoconf -*-
 +
-+# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
++# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
 +
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
++# serial 3
 +
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+# serial 2
-+
 +# _AM_MANGLE_OPTION(NAME)
 +# -----------------------
 +AC_DEFUN([_AM_MANGLE_OPTION],
@@ -7230,29 +8351,17 @@
 +AC_DEFUN([_AM_IF_OPTION],
 +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 +
++# Check to make sure that the build environment is sane.    -*- Autoconf -*-
++
++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
++# Free Software Foundation, Inc.
 +#
-+# Check to make sure that the build environment is sane.
-+#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
 +
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
++# serial 4
 +
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+# serial 3
-+
 +# AM_SANITY_CHECK
 +# ---------------
 +AC_DEFUN([AM_SANITY_CHECK],
@@ -7294,25 +8403,14 @@
 +fi
 +AC_MSG_RESULT(yes)])
 +
-+# AM_PROG_INSTALL_STRIP
++# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
 +
-+# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
++# AM_PROG_INSTALL_STRIP
++# ---------------------
 +# One issue with vendor `install' (even GNU) is that you can't
 +# specify the program used to strip binaries.  This is especially
 +# annoying in cross-compiling environments, where the build's strip
@@ -7333,13 +8431,125 @@
 +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 +AC_SUBST([INSTALL_STRIP_PROGRAM])])
 +
++# Check how to create a tarball.                            -*- Autoconf -*-
++
++# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 2
++
++# _AM_PROG_TAR(FORMAT)
++# --------------------
++# Check how to create a tarball in format FORMAT.
++# FORMAT should be one of `v7', `ustar', or `pax'.
++#
++# Substitute a variable $(am__tar) that is a command
++# writing to stdout a FORMAT-tarball containing the directory
++# $tardir.
++#     tardir=directory && $(am__tar) > result.tar
++#
++# Substitute a variable $(am__untar) that extract such
++# a tarball read from stdin.
++#     $(am__untar) < result.tar
++AC_DEFUN([_AM_PROG_TAR],
++[# Always define AMTAR for backward compatibility.
++AM_MISSING_PROG([AMTAR], [tar])
++m4_if([$1], [v7],
++     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
++     [m4_case([$1], [ustar],, [pax],,
++              [m4_fatal([Unknown tar format])])
++AC_MSG_CHECKING([how to create a $1 tar archive])
++# Loop over all known methods to create a tar archive until one works.
++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
++_am_tools=${am_cv_prog_tar_$1-$_am_tools}
++# Do not fold the above two line into one, because Tru64 sh and
++# Solaris sh will not grok spaces in the rhs of `-'.
++for _am_tool in $_am_tools
++do
++  case $_am_tool in
++  gnutar)
++    for _am_tar in tar gnutar gtar;
++    do
++      AM_RUN_LOG([$_am_tar --version]) && break
++    done
++    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
++    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
++    am__untar="$_am_tar -xf -"
++    ;;
++  plaintar)
++    # Must skip GNU tar: if it does not support --format= it doesn't create
++    # ustar tarball either.
++    (tar --version) >/dev/null 2>&1 && continue
++    am__tar='tar chf - "$$tardir"'
++    am__tar_='tar chf - "$tardir"'
++    am__untar='tar xf -'
++    ;;
++  pax)
++    am__tar='pax -L -x $1 -w "$$tardir"'
++    am__tar_='pax -L -x $1 -w "$tardir"'
++    am__untar='pax -r'
++    ;;
++  cpio)
++    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
++    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
++    am__untar='cpio -i -H $1 -d'
++    ;;
++  none)
++    am__tar=false
++    am__tar_=false
++    am__untar=false
++    ;;
++  esac
++
++  # If the value was cached, stop now.  We just wanted to have am__tar
++  # and am__untar set.
++  test -n "${am_cv_prog_tar_$1}" && break
++
++  # tar/untar a dummy directory, and stop if the command works
++  rm -rf conftest.dir
++  mkdir conftest.dir
++  echo GrepMe > conftest.dir/file
++  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
++  rm -rf conftest.dir
++  if test -s conftest.tar; then
++    AM_RUN_LOG([$am__untar <conftest.tar])
++    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
++  fi
++done
++rm -rf conftest.dir
++
++AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
++AC_MSG_RESULT([$am_cv_prog_tar_$1])])
++AC_SUBST([am__tar])
++AC_SUBST([am__untar])
++]) # _AM_PROG_TAR
++
 +m4_include([macros/gsm.m4])
 +m4_include([macros/iax2.m4])
 +m4_include([macros/portaudio.m4])
 +m4_include([macros/speex.m4])
-diff -urNad iaxclient-0.0+cvs20050725/autogen.sh /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/autogen.sh
---- iaxclient-0.0+cvs20050725/autogen.sh	2005-08-10 15:15:31.000000000 +0200
-+++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/autogen.sh	2005-08-10 15:15:32.000000000 +0200
+diff -urNad iaxclient-0.0+svn20060520~/autogen iaxclient-0.0+svn20060520/autogen
+--- iaxclient-0.0+svn20060520~/autogen	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/autogen	2006-05-20 15:47:10.000000000 +0200
+@@ -0,0 +1,12 @@
++#!/bin/sh -e
++
++aclocal -I macros
++autoheader
++autoconf
++libtoolize -c --force
++automake -a -c
++
++if test -x ./config.status; then
++	./config.status --recheck
++	./config.status
++fi
+diff -urNad iaxclient-0.0+svn20060520~/autogen.sh iaxclient-0.0+svn20060520/autogen.sh
+--- iaxclient-0.0+svn20060520~/autogen.sh	2006-05-20 15:47:06.000000000 +0200
++++ iaxclient-0.0+svn20060520/autogen.sh	2006-05-20 15:47:07.000000000 +0200
 @@ -3,7 +3,7 @@
  aclocal -I macros
  autoheader
@@ -7349,9 +8559,9 @@
  automake -a -c
  
  if test -x ./config.status; then
-diff -urNad iaxclient-0.0+cvs20050725/compile /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/compile
---- iaxclient-0.0+cvs20050725/compile	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/compile	2005-08-10 15:15:32.000000000 +0200
+diff -urNad iaxclient-0.0+svn20060520~/compile iaxclient-0.0+svn20060520/compile
+--- iaxclient-0.0+svn20060520~/compile	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/compile	2006-05-20 15:47:07.000000000 +0200
 @@ -0,0 +1,136 @@
 +#! /bin/sh
 +# Wrapper for compilers which do not understand `-c -o'.
@@ -7489,16 +8699,16 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -urNad iaxclient-0.0+cvs20050725/config.guess /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/config.guess
---- iaxclient-0.0+cvs20050725/config.guess	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/config.guess	2005-08-10 15:15:50.000000000 +0200
-@@ -0,0 +1,1465 @@
+diff -urNad iaxclient-0.0+svn20060520~/config.guess iaxclient-0.0+svn20060520/config.guess
+--- iaxclient-0.0+svn20060520~/config.guess	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/config.guess	2006-02-25 16:29:12.000000000 +0100
+@@ -0,0 +1,1497 @@
 +#! /bin/sh
 +# Attempt to guess a canonical system name.
 +#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 +#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 +
-+timestamp='2005-04-22'
++timestamp='2006-02-23'
 +
 +# This file is free software; you can redistribute it and/or modify it
 +# under the terms of the GNU General Public License as published by
@@ -7512,13 +8722,15 @@
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
++# 02110-1301, USA.
 +#
 +# As a special exception to the GNU General Public License, if you
 +# distribute this file as part of a program that contains a
 +# configuration script generated by Autoconf, you may include it under
 +# the same distribution terms that you use for the rest of that program.
 +
++
 +# Originally written by Per Bothner <per at bothner.com>.
 +# Please send patches to <config-patches at gnu.org>.  Submit a context
 +# diff and a properly formatted ChangeLog entry.
@@ -7561,11 +8773,11 @@
 +while test $# -gt 0 ; do
 +  case $1 in
 +    --time-stamp | --time* | -t )
-+       echo "$timestamp" ; exit 0 ;;
++       echo "$timestamp" ; exit ;;
 +    --version | -v )
-+       echo "$version" ; exit 0 ;;
++       echo "$version" ; exit ;;
 +    --help | --h* | -h )
-+       echo "$usage"; exit 0 ;;
++       echo "$usage"; exit ;;
 +    -- )     # Stop option processing
 +       shift; break ;;
 +    - )	# Use stdin as input.
@@ -7599,7 +8811,7 @@
 +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
 +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 +: ${TMPDIR=/tmp} ;
-+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
 + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
 + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
 + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -7618,7 +8830,7 @@
 +	;;
 + ,,*)   CC_FOR_BUILD=$CC ;;
 + ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-+esac ;'
++esac ; set_cc_for_build= ;'
 +
 +# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 +# (ghazi at noc.rutgers.edu 1994-08-24)
@@ -7691,55 +8903,23 @@
 +	# contains redundant information, the shorter form:
 +	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 +	echo "${machine}-${os}${release}"
-+	exit 0 ;;
-+    amd64:OpenBSD:*:*)
-+	echo x86_64-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    amiga:OpenBSD:*:*)
-+	echo m68k-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    cats:OpenBSD:*:*)
-+	echo arm-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    hp300:OpenBSD:*:*)
-+	echo m68k-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    luna88k:OpenBSD:*:*)
-+    	echo m88k-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    mac68k:OpenBSD:*:*)
-+	echo m68k-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    macppc:OpenBSD:*:*)
-+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    mvme68k:OpenBSD:*:*)
-+	echo m68k-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    mvme88k:OpenBSD:*:*)
-+	echo m88k-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    mvmeppc:OpenBSD:*:*)
-+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    sgi:OpenBSD:*:*)
-+	echo mips64-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    sun3:OpenBSD:*:*)
-+	echo m68k-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    *:OpenBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
++	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
++	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
++	exit ;;
 +    *:ekkoBSD:*:*)
 +	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
++    *:SolidBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
++	exit ;;
 +    macppc:MirBSD:*:*)
 +	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    *:MirBSD:*:*)
 +	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    alpha:OSF1:*:*)
 +	case $UNAME_RELEASE in
 +	*4.0)
@@ -7792,40 +8972,43 @@
 +	# A Xn.n version is an unreleased experimental baselevel.
 +	# 1.2 uses "1.2" for uname -r.
 +	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+	exit 0 ;;
++	exit ;;
 +    Alpha\ *:Windows_NT*:*)
 +	# How do we know it's Interix rather than the generic POSIX subsystem?
 +	# Should we change UNAME_MACHINE based on the output of uname instead
 +	# of the specific Alpha model?
 +	echo alpha-pc-interix
-+	exit 0 ;;
++	exit ;;
 +    21064:Windows_NT:50:3)
 +	echo alpha-dec-winnt3.5
-+	exit 0 ;;
++	exit ;;
 +    Amiga*:UNIX_System_V:4.0:*)
 +	echo m68k-unknown-sysv4
-+	exit 0;;
++	exit ;;
 +    *:[Aa]miga[Oo][Ss]:*:*)
 +	echo ${UNAME_MACHINE}-unknown-amigaos
-+	exit 0 ;;
++	exit ;;
 +    *:[Mm]orph[Oo][Ss]:*:*)
 +	echo ${UNAME_MACHINE}-unknown-morphos
-+	exit 0 ;;
++	exit ;;
 +    *:OS/390:*:*)
 +	echo i370-ibm-openedition
-+	exit 0 ;;
++	exit ;;
 +    *:z/VM:*:*)
 +	echo s390-ibm-zvmoe
-+	exit 0 ;;
++	exit ;;
 +    *:OS400:*:*)
 +        echo powerpc-ibm-os400
-+	exit 0 ;;
++	exit ;;
 +    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 +	echo arm-acorn-riscix${UNAME_RELEASE}
-+	exit 0;;
++	exit ;;
++    arm:riscos:*:*|arm:RISCOS:*:*)
++	echo arm-unknown-riscos
++	exit ;;
 +    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 +	echo hppa1.1-hitachi-hiuxmpp
-+	exit 0;;
++	exit ;;
 +    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 +	# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 +	if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -7833,32 +9016,32 @@
 +	else
 +		echo pyramid-pyramid-bsd
 +	fi
-+	exit 0 ;;
++	exit ;;
 +    NILE*:*:*:dcosx)
 +	echo pyramid-pyramid-svr4
-+	exit 0 ;;
++	exit ;;
 +    DRS?6000:unix:4.0:6*)
 +	echo sparc-icl-nx6
-+	exit 0 ;;
++	exit ;;
 +    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
 +	case `/usr/bin/uname -p` in
-+	    sparc) echo sparc-icl-nx7 && exit 0 ;;
++	    sparc) echo sparc-icl-nx7; exit ;;
 +	esac ;;
 +    sun4H:SunOS:5.*:*)
 +	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit 0 ;;
++	exit ;;
 +    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 +	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit 0 ;;
++	exit ;;
 +    i86pc:SunOS:5.*:*)
 +	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit 0 ;;
++	exit ;;
 +    sun4*:SunOS:6*:*)
 +	# According to config.sub, this is the proper way to canonicalize
 +	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
 +	# it's likely to be more like Solaris than SunOS4.
 +	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit 0 ;;
++	exit ;;
 +    sun4*:SunOS:*:*)
 +	case "`/usr/bin/arch -k`" in
 +	    Series*|S4*)
@@ -7867,10 +9050,10 @@
 +	esac
 +	# Japanese Language versions have a version number like `4.1.3-JL'.
 +	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-+	exit 0 ;;
++	exit ;;
 +    sun3*:SunOS:*:*)
 +	echo m68k-sun-sunos${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    sun*:*:4.2BSD:*)
 +	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
 +	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -7882,10 +9065,10 @@
 +		echo sparc-sun-sunos${UNAME_RELEASE}
 +		;;
 +	esac
-+	exit 0 ;;
++	exit ;;
 +    aushp:SunOS:*:*)
 +	echo sparc-auspex-sunos${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    # The situation for MiNT is a little confusing.  The machine name
 +    # can be virtually everything (everything which is not
 +    # "atarist" or "atariste" at least should have a processor
@@ -7896,40 +9079,40 @@
 +    # be no problem.
 +    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
 +        echo m68k-atari-mint${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 +	echo m68k-atari-mint${UNAME_RELEASE}
-+        exit 0 ;;
++        exit ;;
 +    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
 +        echo m68k-atari-mint${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
 +        echo m68k-milan-mint${UNAME_RELEASE}
-+        exit 0 ;;
++        exit ;;
 +    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
 +        echo m68k-hades-mint${UNAME_RELEASE}
-+        exit 0 ;;
++        exit ;;
 +    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
 +        echo m68k-unknown-mint${UNAME_RELEASE}
-+        exit 0 ;;
++        exit ;;
 +    m68k:machten:*:*)
 +	echo m68k-apple-machten${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    powerpc:machten:*:*)
 +	echo powerpc-apple-machten${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    RISC*:Mach:*:*)
 +	echo mips-dec-mach_bsd4.3
-+	exit 0 ;;
++	exit ;;
 +    RISC*:ULTRIX:*:*)
 +	echo mips-dec-ultrix${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    VAX*:ULTRIX*:*:*)
 +	echo vax-dec-ultrix${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    2020:CLIX:*:* | 2430:CLIX:*:*)
 +	echo clipper-intergraph-clix${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    mips:*:*:UMIPS | mips:*:*:RISCos)
 +	eval $set_cc_for_build
 +	sed 's/^	//' << EOF >$dummy.c
@@ -7953,32 +9136,33 @@
 +	  exit (-1);
 +	}
 +EOF
-+	$CC_FOR_BUILD -o $dummy $dummy.c \
-+	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-+	  && exit 0
++	$CC_FOR_BUILD -o $dummy $dummy.c &&
++	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
++	  SYSTEM_NAME=`$dummy $dummyarg` &&
++	    { echo "$SYSTEM_NAME"; exit; }
 +	echo mips-mips-riscos${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    Motorola:PowerMAX_OS:*:*)
 +	echo powerpc-motorola-powermax
-+	exit 0 ;;
++	exit ;;
 +    Motorola:*:4.3:PL8-*)
 +	echo powerpc-harris-powermax
-+	exit 0 ;;
++	exit ;;
 +    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
 +	echo powerpc-harris-powermax
-+	exit 0 ;;
++	exit ;;
 +    Night_Hawk:Power_UNIX:*:*)
 +	echo powerpc-harris-powerunix
-+	exit 0 ;;
++	exit ;;
 +    m88k:CX/UX:7*:*)
 +	echo m88k-harris-cxux7
-+	exit 0 ;;
++	exit ;;
 +    m88k:*:4*:R4*)
 +	echo m88k-motorola-sysv4
-+	exit 0 ;;
++	exit ;;
 +    m88k:*:3*:R3*)
 +	echo m88k-motorola-sysv3
-+	exit 0 ;;
++	exit ;;
 +    AViiON:dgux:*:*)
 +        # DG/UX returns AViiON for all architectures
 +        UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -7994,29 +9178,29 @@
 +	else
 +	    echo i586-dg-dgux${UNAME_RELEASE}
 +	fi
-+ 	exit 0 ;;
++ 	exit ;;
 +    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 +	echo m88k-dolphin-sysv3
-+	exit 0 ;;
++	exit ;;
 +    M88*:*:R3*:*)
 +	# Delta 88k system running SVR3
 +	echo m88k-motorola-sysv3
-+	exit 0 ;;
++	exit ;;
 +    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
 +	echo m88k-tektronix-sysv3
-+	exit 0 ;;
++	exit ;;
 +    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
 +	echo m68k-tektronix-bsd
-+	exit 0 ;;
++	exit ;;
 +    *:IRIX*:*:*)
 +	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-+	exit 0 ;;
++	exit ;;
 +    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-+	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-+	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
++	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
++	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
 +    i*86:AIX:*:*)
 +	echo i386-ibm-aix
-+	exit 0 ;;
++	exit ;;
 +    ia64:AIX:*:*)
 +	if [ -x /usr/bin/oslevel ] ; then
 +		IBM_REV=`/usr/bin/oslevel`
@@ -8024,7 +9208,7 @@
 +		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 +	fi
 +	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-+	exit 0 ;;
++	exit ;;
 +    *:AIX:2:3)
 +	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
 +		eval $set_cc_for_build
@@ -8039,14 +9223,18 @@
 +			exit(0);
 +			}
 +EOF
-+		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-+		echo rs6000-ibm-aix3.2.5
++		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
++		then
++			echo "$SYSTEM_NAME"
++		else
++			echo rs6000-ibm-aix3.2.5
++		fi
 +	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 +		echo rs6000-ibm-aix3.2.4
 +	else
 +		echo rs6000-ibm-aix3.2
 +	fi
-+	exit 0 ;;
++	exit ;;
 +    *:AIX:*:[45])
 +	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 +	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -8060,28 +9248,28 @@
 +		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 +	fi
 +	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-+	exit 0 ;;
++	exit ;;
 +    *:AIX:*:*)
 +	echo rs6000-ibm-aix
-+	exit 0 ;;
++	exit ;;
 +    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 +	echo romp-ibm-bsd4.4
-+	exit 0 ;;
++	exit ;;
 +    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
 +	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-+	exit 0 ;;                           # report: romp-ibm BSD 4.3
++	exit ;;                             # report: romp-ibm BSD 4.3
 +    *:BOSX:*:*)
 +	echo rs6000-bull-bosx
-+	exit 0 ;;
++	exit ;;
 +    DPX/2?00:B.O.S.:*:*)
 +	echo m68k-bull-sysv3
-+	exit 0 ;;
++	exit ;;
 +    9000/[34]??:4.3bsd:1.*:*)
 +	echo m68k-hp-bsd
-+	exit 0 ;;
++	exit ;;
 +    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 +	echo m68k-hp-bsd4.4
-+	exit 0 ;;
++	exit ;;
 +    9000/[34678]??:HP-UX:*:*)
 +	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 +	case "${UNAME_MACHINE}" in
@@ -8143,9 +9331,19 @@
 +	esac
 +	if [ ${HP_ARCH} = "hppa2.0w" ]
 +	then
-+	    # avoid double evaluation of $set_cc_for_build
-+	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
++	    eval $set_cc_for_build
++
++	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
++	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
++	    # generating 64-bit code.  GNU and HP use different nomenclature:
++	    #
++	    # $ CC_FOR_BUILD=cc ./config.guess
++	    # => hppa2.0w-hp-hpux11.23
++	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
++	    # => hppa64-hp-hpux11.23
++
++	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
++		grep __LP64__ >/dev/null
 +	    then
 +		HP_ARCH="hppa2.0w"
 +	    else
@@ -8153,11 +9351,11 @@
 +	    fi
 +	fi
 +	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-+	exit 0 ;;
++	exit ;;
 +    ia64:HP-UX:*:*)
 +	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 +	echo ia64-hp-hpux${HPUX_REV}
-+	exit 0 ;;
++	exit ;;
 +    3050*:HI-UX:*:*)
 +	eval $set_cc_for_build
 +	sed 's/^	//' << EOF >$dummy.c
@@ -8185,161 +9383,177 @@
 +	  exit (0);
 +	}
 +EOF
-+	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
++	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
++		{ echo "$SYSTEM_NAME"; exit; }
 +	echo unknown-hitachi-hiuxwe2
-+	exit 0 ;;
++	exit ;;
 +    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
 +	echo hppa1.1-hp-bsd
-+	exit 0 ;;
++	exit ;;
 +    9000/8??:4.3bsd:*:*)
 +	echo hppa1.0-hp-bsd
-+	exit 0 ;;
++	exit ;;
 +    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 +	echo hppa1.0-hp-mpeix
-+	exit 0 ;;
++	exit ;;
 +    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 +	echo hppa1.1-hp-osf
-+	exit 0 ;;
++	exit ;;
 +    hp8??:OSF1:*:*)
 +	echo hppa1.0-hp-osf
-+	exit 0 ;;
++	exit ;;
 +    i*86:OSF1:*:*)
 +	if [ -x /usr/sbin/sysversion ] ; then
 +	    echo ${UNAME_MACHINE}-unknown-osf1mk
 +	else
 +	    echo ${UNAME_MACHINE}-unknown-osf1
 +	fi
-+	exit 0 ;;
++	exit ;;
 +    parisc*:Lites*:*:*)
 +	echo hppa1.1-hp-lites
-+	exit 0 ;;
++	exit ;;
 +    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 +	echo c1-convex-bsd
-+        exit 0 ;;
++        exit ;;
 +    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 +	if getsysinfo -f scalar_acc
 +	then echo c32-convex-bsd
 +	else echo c2-convex-bsd
 +	fi
-+        exit 0 ;;
++        exit ;;
 +    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 +	echo c34-convex-bsd
-+        exit 0 ;;
++        exit ;;
 +    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 +	echo c38-convex-bsd
-+        exit 0 ;;
++        exit ;;
 +    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 +	echo c4-convex-bsd
-+        exit 0 ;;
++        exit ;;
 +    CRAY*Y-MP:*:*:*)
 +	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit 0 ;;
++	exit ;;
 +    CRAY*[A-Z]90:*:*:*)
 +	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 +	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
 +	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 +	      -e 's/\.[^.]*$/.X/'
-+	exit 0 ;;
++	exit ;;
 +    CRAY*TS:*:*:*)
 +	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit 0 ;;
++	exit ;;
 +    CRAY*T3E:*:*:*)
 +	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit 0 ;;
++	exit ;;
 +    CRAY*SV1:*:*:*)
 +	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit 0 ;;
++	exit ;;
 +    *:UNICOS/mp:*:*)
 +	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit 0 ;;
++	exit ;;
 +    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 +	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 +        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
 +        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
 +        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+        exit 0 ;;
++        exit ;;
 +    5000:UNIX_System_V:4.*:*)
 +        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
 +        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
 +        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+	exit 0 ;;
++	exit ;;
 +    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 +	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    sparc*:BSD/OS:*:*)
 +	echo sparc-unknown-bsdi${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    *:BSD/OS:*:*)
 +	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    *:FreeBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+	exit 0 ;;
++	case ${UNAME_MACHINE} in
++	    pc98)
++		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	    *)
++		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	esac
++	exit ;;
 +    i*:CYGWIN*:*)
 +	echo ${UNAME_MACHINE}-pc-cygwin
-+	exit 0 ;;
++	exit ;;
 +    i*:MINGW*:*)
 +	echo ${UNAME_MACHINE}-pc-mingw32
-+	exit 0 ;;
++	exit ;;
++    i*:MSYS_NT-*:*:*)
++	echo ${UNAME_MACHINE}-pc-mingw32
++	exit ;;
++    i*:windows32*:*)
++    	# uname -m includes "-pc" on this system.
++    	echo ${UNAME_MACHINE}-mingw32
++	exit ;;
 +    i*:PW*:*)
 +	echo ${UNAME_MACHINE}-pc-pw32
-+	exit 0 ;;
-+    x86:Interix*:[34]*)
-+	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-+	exit 0 ;;
++	exit ;;
++    x86:Interix*:[345]*)
++	echo i586-pc-interix${UNAME_RELEASE}
++	exit ;;
++    EM64T:Interix*:[345]*)
++	echo x86_64-unknown-interix${UNAME_RELEASE}
++	exit ;;
 +    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 +	echo i${UNAME_MACHINE}-pc-mks
-+	exit 0 ;;
++	exit ;;
 +    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 +	# How do we know it's Interix rather than the generic POSIX subsystem?
 +	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
 +	# UNAME_MACHINE based on the output of uname instead of i386?
 +	echo i586-pc-interix
-+	exit 0 ;;
++	exit ;;
 +    i*:UWIN*:*)
 +	echo ${UNAME_MACHINE}-pc-uwin
-+	exit 0 ;;
-+    amd64:CYGWIN*:*:*)
++	exit ;;
++    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
 +	echo x86_64-unknown-cygwin
-+	exit 0 ;;
++	exit ;;
 +    p*:CYGWIN*:*)
 +	echo powerpcle-unknown-cygwin
-+	exit 0 ;;
++	exit ;;
 +    prep*:SunOS:5.*:*)
 +	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit 0 ;;
++	exit ;;
 +    *:GNU:*:*)
 +	# the GNU system
 +	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-+	exit 0 ;;
++	exit ;;
 +    *:GNU/*:*:*)
 +	# other systems with GNU libc and userland
 +	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-+	exit 0 ;;
++	exit ;;
 +    i*86:Minix:*:*)
 +	echo ${UNAME_MACHINE}-pc-minix
-+	exit 0 ;;
++	exit ;;
 +    arm*:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit 0 ;;
++	exit ;;
 +    cris:Linux:*:*)
 +	echo cris-axis-linux-gnu
-+	exit 0 ;;
++	exit ;;
 +    crisv32:Linux:*:*)
 +	echo crisv32-axis-linux-gnu
-+	exit 0 ;;
++	exit ;;
 +    frv:Linux:*:*)
 +    	echo frv-unknown-linux-gnu
-+	exit 0 ;;
++	exit ;;
 +    ia64:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit 0 ;;
++	exit ;;
 +    m32r*:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit 0 ;;
++	exit ;;
 +    m68*:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit 0 ;;
++	exit ;;
 +    mips:Linux:*:*)
 +	eval $set_cc_for_build
 +	sed 's/^	//' << EOF >$dummy.c
@@ -8356,8 +9570,12 @@
 +	#endif
 +	#endif
 +EOF
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
++	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++	    /^CPU/{
++		s: ::g
++		p
++	    }'`"
++	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 +	;;
 +    mips64:Linux:*:*)
 +	eval $set_cc_for_build
@@ -8375,15 +9593,22 @@
 +	#endif
 +	#endif
 +EOF
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
++	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++	    /^CPU/{
++		s: ::g
++		p
++	    }'`"
++	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 +	;;
++    or32:Linux:*:*)
++	echo or32-unknown-linux-gnu
++	exit ;;
 +    ppc:Linux:*:*)
 +	echo powerpc-unknown-linux-gnu
-+	exit 0 ;;
++	exit ;;
 +    ppc64:Linux:*:*)
 +	echo powerpc64-unknown-linux-gnu
-+	exit 0 ;;
++	exit ;;
 +    alpha:Linux:*:*)
 +	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 +	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -8397,7 +9622,7 @@
 +	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 +	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 +	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+	exit 0 ;;
++	exit ;;
 +    parisc:Linux:*:* | hppa:Linux:*:*)
 +	# Look for CPU level
 +	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -8405,25 +9630,28 @@
 +	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
 +	  *)    echo hppa-unknown-linux-gnu ;;
 +	esac
-+	exit 0 ;;
++	exit ;;
 +    parisc64:Linux:*:* | hppa64:Linux:*:*)
 +	echo hppa64-unknown-linux-gnu
-+	exit 0 ;;
++	exit ;;
 +    s390:Linux:*:* | s390x:Linux:*:*)
 +	echo ${UNAME_MACHINE}-ibm-linux
-+	exit 0 ;;
++	exit ;;
 +    sh64*:Linux:*:*)
 +    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit 0 ;;
++	exit ;;
 +    sh*:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit 0 ;;
++	exit ;;
 +    sparc:Linux:*:* | sparc64:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit 0 ;;
++	exit ;;
++    vax:Linux:*:*)
++	echo ${UNAME_MACHINE}-dec-linux-gnu
++	exit ;;
 +    x86_64:Linux:*:*)
 +	echo x86_64-unknown-linux-gnu
-+	exit 0 ;;
++	exit ;;
 +    i*86:Linux:*:*)
 +	# The BFD linker knows what the default object file format is, so
 +	# first see if it will tell us. cd to the root directory to prevent
@@ -8441,15 +9669,15 @@
 +		;;
 +	  a.out-i386-linux)
 +		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-+		exit 0 ;;
++		exit ;;
 +	  coff-i386)
 +		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-+		exit 0 ;;
++		exit ;;
 +	  "")
 +		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 +		# one that does not give us useful --help.
 +		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-+		exit 0 ;;
++		exit ;;
 +	esac
 +	# Determine whether the default compiler is a.out or elf
 +	eval $set_cc_for_build
@@ -8466,7 +9694,7 @@
 +	LIBC=gnulibc1
 +	# endif
 +	#else
-+	#ifdef __INTEL_COMPILER
++	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
 +	LIBC=gnu
 +	#else
 +	LIBC=gnuaout
@@ -8476,16 +9704,23 @@
 +	LIBC=dietlibc
 +	#endif
 +EOF
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-+	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-+	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
++	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++	    /^LIBC/{
++		s: ::g
++		p
++	    }'`"
++	test x"${LIBC}" != x && {
++		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++		exit
++	}
++	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
 +	;;
 +    i*86:DYNIX/ptx:4*:*)
 +	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 +	# earlier versions are messed up and put the nodename in both
 +	# sysname and nodename.
 +	echo i386-sequent-sysv4
-+	exit 0 ;;
++	exit ;;
 +    i*86:UNIX_SV:4.2MP:2.*)
 +        # Unixware is an offshoot of SVR4, but it has its own version
 +        # number series starting with 2...
@@ -8493,27 +9728,27 @@
 +	# I just have to hope.  -- rms.
 +        # Use sysv4.2uw... so that sysv4* matches it.
 +	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-+	exit 0 ;;
++	exit ;;
 +    i*86:OS/2:*:*)
 +	# If we were able to find `uname', then EMX Unix compatibility
 +	# is probably installed.
 +	echo ${UNAME_MACHINE}-pc-os2-emx
-+	exit 0 ;;
++	exit ;;
 +    i*86:XTS-300:*:STOP)
 +	echo ${UNAME_MACHINE}-unknown-stop
-+	exit 0 ;;
++	exit ;;
 +    i*86:atheos:*:*)
 +	echo ${UNAME_MACHINE}-unknown-atheos
-+	exit 0 ;;
-+	i*86:syllable:*:*)
++	exit ;;
++    i*86:syllable:*:*)
 +	echo ${UNAME_MACHINE}-pc-syllable
-+	exit 0 ;;
++	exit ;;
 +    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 +	echo i386-unknown-lynxos${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    i*86:*DOS:*:*)
 +	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-+	exit 0 ;;
++	exit ;;
 +    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
 +	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 +	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -8521,15 +9756,16 @@
 +	else
 +		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 +	fi
-+	exit 0 ;;
-+    i*86:*:5:[78]*)
++	exit ;;
++    i*86:*:5:[678]*)
++    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 +	case `/bin/uname -X | grep "^Machine"` in
 +	    *486*)	     UNAME_MACHINE=i486 ;;
 +	    *Pentium)	     UNAME_MACHINE=i586 ;;
 +	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 +	esac
 +	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-+	exit 0 ;;
++	exit ;;
 +    i*86:*:3.2:*)
 +	if test -f /usr/options/cb.name; then
 +		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -8547,73 +9783,73 @@
 +	else
 +		echo ${UNAME_MACHINE}-pc-sysv32
 +	fi
-+	exit 0 ;;
++	exit ;;
 +    pc:*:*:*)
 +	# Left here for compatibility:
 +        # uname -m prints for DJGPP always 'pc', but it prints nothing about
 +        # the processor, so we play safe by assuming i386.
 +	echo i386-pc-msdosdjgpp
-+        exit 0 ;;
++        exit ;;
 +    Intel:Mach:3*:*)
 +	echo i386-pc-mach3
-+	exit 0 ;;
++	exit ;;
 +    paragon:*:*:*)
 +	echo i860-intel-osf1
-+	exit 0 ;;
++	exit ;;
 +    i860:*:4.*:*) # i860-SVR4
 +	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
 +	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
 +	else # Add other i860-SVR4 vendors below as they are discovered.
 +	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
 +	fi
-+	exit 0 ;;
++	exit ;;
 +    mini*:CTIX:SYS*5:*)
 +	# "miniframe"
 +	echo m68010-convergent-sysv
-+	exit 0 ;;
++	exit ;;
 +    mc68k:UNIX:SYSTEM5:3.51m)
 +	echo m68k-convergent-sysv
-+	exit 0 ;;
++	exit ;;
 +    M680?0:D-NIX:5.3:*)
 +	echo m68k-diab-dnix
-+	exit 0 ;;
++	exit ;;
 +    M68*:*:R3V[5678]*:*)
-+	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
++	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
 +    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
 +	OS_REL=''
 +	test -r /etc/.relid \
 +	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 +	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
++	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
 +	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-+	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
++	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
 +    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
 +        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+          && echo i486-ncr-sysv4 && exit 0 ;;
++          && { echo i486-ncr-sysv4; exit; } ;;
 +    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 +	echo m68k-unknown-lynxos${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    mc68030:UNIX_System_V:4.*:*)
 +	echo m68k-atari-sysv4
-+	exit 0 ;;
++	exit ;;
 +    TSUNAMI:LynxOS:2.*:*)
 +	echo sparc-unknown-lynxos${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    rs6000:LynxOS:2.*:*)
 +	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
 +	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    SM[BE]S:UNIX_SV:*:*)
 +	echo mips-dde-sysv${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    RM*:ReliantUNIX-*:*:*)
 +	echo mips-sni-sysv4
-+	exit 0 ;;
++	exit ;;
 +    RM*:SINIX-*:*:*)
 +	echo mips-sni-sysv4
-+	exit 0 ;;
++	exit ;;
 +    *:SINIX-*:*:*)
 +	if uname -p 2>/dev/null >/dev/null ; then
 +		UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -8621,73 +9857,72 @@
 +	else
 +		echo ns32k-sni-sysv
 +	fi
-+	exit 0 ;;
++	exit ;;
 +    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
 +                      # says <Richard.M.Bartel at ccMail.Census.GOV>
 +        echo i586-unisys-sysv4
-+        exit 0 ;;
++        exit ;;
 +    *:UNIX_System_V:4*:FTX*)
 +	# From Gerald Hewes <hewes at openmarket.com>.
 +	# How about differentiating between stratus architectures? -djm
 +	echo hppa1.1-stratus-sysv4
-+	exit 0 ;;
++	exit ;;
 +    *:*:*:FTX*)
 +	# From seanf at swdc.stratus.com.
 +	echo i860-stratus-sysv4
-+	exit 0 ;;
++	exit ;;
 +    i*86:VOS:*:*)
 +	# From Paul.Green at stratus.com.
 +	echo ${UNAME_MACHINE}-stratus-vos
-+	exit 0 ;;
++	exit ;;
 +    *:VOS:*:*)
 +	# From Paul.Green at stratus.com.
 +	echo hppa1.1-stratus-vos
-+	exit 0 ;;
++	exit ;;
 +    mc68*:A/UX:*:*)
 +	echo m68k-apple-aux${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    news*:NEWS-OS:6*:*)
 +	echo mips-sony-newsos6
-+	exit 0 ;;
++	exit ;;
 +    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 +	if [ -d /usr/nec ]; then
 +	        echo mips-nec-sysv${UNAME_RELEASE}
 +	else
 +	        echo mips-unknown-sysv${UNAME_RELEASE}
 +	fi
-+        exit 0 ;;
++        exit ;;
 +    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 +	echo powerpc-be-beos
-+	exit 0 ;;
++	exit ;;
 +    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
 +	echo powerpc-apple-beos
-+	exit 0 ;;
++	exit ;;
 +    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 +	echo i586-pc-beos
-+	exit 0 ;;
++	exit ;;
 +    SX-4:SUPER-UX:*:*)
 +	echo sx4-nec-superux${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    SX-5:SUPER-UX:*:*)
 +	echo sx5-nec-superux${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    SX-6:SUPER-UX:*:*)
 +	echo sx6-nec-superux${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    Power*:Rhapsody:*:*)
 +	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    *:Rhapsody:*:*)
 +	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    *:Darwin:*:*)
 +	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 +	case $UNAME_PROCESSOR in
-+	    *86) UNAME_PROCESSOR=i686 ;;
 +	    unknown) UNAME_PROCESSOR=powerpc ;;
 +	esac
 +	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    *:procnto*:*:* | *:QNX:[0123456789]*:*)
 +	UNAME_PROCESSOR=`uname -p`
 +	if test "$UNAME_PROCESSOR" = "x86"; then
@@ -8695,25 +9930,25 @@
 +		UNAME_MACHINE=pc
 +	fi
 +	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    *:QNX:*:4*)
 +	echo i386-pc-qnx
-+	exit 0 ;;
++	exit ;;
 +    NSE-?:NONSTOP_KERNEL:*:*)
 +	echo nse-tandem-nsk${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    NSR-?:NONSTOP_KERNEL:*:*)
 +	echo nsr-tandem-nsk${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    *:NonStop-UX:*:*)
 +	echo mips-compaq-nonstopux
-+	exit 0 ;;
++	exit ;;
 +    BS2000:POSIX*:*:*)
 +	echo bs2000-siemens-sysv
-+	exit 0 ;;
++	exit ;;
 +    DS/*:UNIX_System_V:*:*)
 +	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    *:Plan9:*:*)
 +	# "uname -m" is not consistent, so use $cputype instead. 386
 +	# is converted to i386 for consistency with other x86
@@ -8724,41 +9959,47 @@
 +	    UNAME_MACHINE="$cputype"
 +	fi
 +	echo ${UNAME_MACHINE}-unknown-plan9
-+	exit 0 ;;
++	exit ;;
 +    *:TOPS-10:*:*)
 +	echo pdp10-unknown-tops10
-+	exit 0 ;;
++	exit ;;
 +    *:TENEX:*:*)
 +	echo pdp10-unknown-tenex
-+	exit 0 ;;
++	exit ;;
 +    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 +	echo pdp10-dec-tops20
-+	exit 0 ;;
++	exit ;;
 +    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
 +	echo pdp10-xkl-tops20
-+	exit 0 ;;
++	exit ;;
 +    *:TOPS-20:*:*)
 +	echo pdp10-unknown-tops20
-+	exit 0 ;;
++	exit ;;
 +    *:ITS:*:*)
 +	echo pdp10-unknown-its
-+	exit 0 ;;
++	exit ;;
 +    SEI:*:*:SEIUX)
 +        echo mips-sei-seiux${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
 +    *:DragonFly:*:*)
 +	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+	exit 0 ;;
++	exit ;;
 +    *:*VMS:*:*)
 +    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 +	case "${UNAME_MACHINE}" in
-+	    A*) echo alpha-dec-vms && exit 0 ;;
-+	    I*) echo ia64-dec-vms && exit 0 ;;
-+	    V*) echo vax-dec-vms && exit 0 ;;
++	    A*) echo alpha-dec-vms ; exit ;;
++	    I*) echo ia64-dec-vms ; exit ;;
++	    V*) echo vax-dec-vms ; exit ;;
 +	esac ;;
 +    *:XENIX:*:SysV)
 +	echo i386-pc-xenix
-+	exit 0 ;;
++	exit ;;
++    i*86:skyos:*:*)
++	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
++	exit ;;
++    i*86:rdos:*:*)
++	echo ${UNAME_MACHINE}-pc-rdos
++	exit ;;
 +esac
 +
 +#echo '(No uname command or uname output not recognized.)' 1>&2
@@ -8790,7 +10031,7 @@
 +#endif
 +
 +#if defined (__arm) && defined (__acorn) && defined (__unix)
-+  printf ("arm-acorn-riscix"); exit (0);
++  printf ("arm-acorn-riscix\n"); exit (0);
 +#endif
 +
 +#if defined (hp300) && !defined (hpux)
@@ -8879,11 +10120,12 @@
 +}
 +EOF
 +
-+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
++$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
++	{ echo "$SYSTEM_NAME"; exit; }
 +
 +# Apollos put the system type in the environment.
 +
-+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
++test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
 +
 +# Convex versions that predate uname can use getsysinfo(1)
 +
@@ -8892,22 +10134,22 @@
 +    case `getsysinfo -f cpu_type` in
 +    c1*)
 +	echo c1-convex-bsd
-+	exit 0 ;;
++	exit ;;
 +    c2*)
 +	if getsysinfo -f scalar_acc
 +	then echo c32-convex-bsd
 +	else echo c2-convex-bsd
 +	fi
-+	exit 0 ;;
++	exit ;;
 +    c34*)
 +	echo c34-convex-bsd
-+	exit 0 ;;
++	exit ;;
 +    c38*)
 +	echo c38-convex-bsd
-+	exit 0 ;;
++	exit ;;
 +    c4*)
 +	echo c4-convex-bsd
-+	exit 0 ;;
++	exit ;;
 +    esac
 +fi
 +
@@ -8958,9 +10200,9 @@
 +# time-stamp-format: "%:y-%02m-%02d"
 +# time-stamp-end: "'"
 +# End:
-diff -urNad iaxclient-0.0+cvs20050725/config.h.in /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/config.h.in
---- iaxclient-0.0+cvs20050725/config.h.in	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/config.h.in	2005-08-10 15:15:32.000000000 +0200
+diff -urNad iaxclient-0.0+svn20060520~/config.h.in iaxclient-0.0+svn20060520/config.h.in
+--- iaxclient-0.0+svn20060520~/config.h.in	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/config.h.in	2006-05-20 15:47:07.000000000 +0200
 @@ -0,0 +1,128 @@
 +/* config.h.in.  Generated from configure.ac by autoheader.  */
 +
@@ -9090,16 +10332,16 @@
 +/* Define to empty if the keyword `volatile' does not work. Warning: valid
 +   code using `volatile' can become incorrect without. Disable with care. */
 +#undef volatile
-diff -urNad iaxclient-0.0+cvs20050725/config.sub /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/config.sub
---- iaxclient-0.0+cvs20050725/config.sub	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/config.sub	2005-08-10 15:15:50.000000000 +0200
-@@ -0,0 +1,1569 @@
+diff -urNad iaxclient-0.0+svn20060520~/config.sub iaxclient-0.0+svn20060520/config.sub
+--- iaxclient-0.0+svn20060520~/config.sub	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/config.sub	2006-02-25 16:29:12.000000000 +0100
+@@ -0,0 +1,1608 @@
 +#! /bin/sh
 +# Configuration validation subroutine script.
 +#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 +#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 +
-+timestamp='2005-04-22'
++timestamp='2006-02-23'
 +
 +# This file is (in principle) common to ALL GNU software.
 +# The presence of a machine in this file suggests that SOME GNU software
@@ -9117,14 +10359,15 @@
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330,
-+# Boston, MA 02111-1307, USA.
-+
++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
++# 02110-1301, USA.
++#
 +# As a special exception to the GNU General Public License, if you
 +# distribute this file as part of a program that contains a
 +# configuration script generated by Autoconf, you may include it under
 +# the same distribution terms that you use for the rest of that program.
 +
++
 +# Please send patches to <config-patches at gnu.org>.  Submit a context
 +# diff and a properly formatted ChangeLog entry.
 +#
@@ -9179,11 +10422,11 @@
 +while test $# -gt 0 ; do
 +  case $1 in
 +    --time-stamp | --time* | -t )
-+       echo "$timestamp" ; exit 0 ;;
++       echo "$timestamp" ; exit ;;
 +    --version | -v )
-+       echo "$version" ; exit 0 ;;
++       echo "$version" ; exit ;;
 +    --help | --h* | -h )
-+       echo "$usage"; exit 0 ;;
++       echo "$usage"; exit ;;
 +    -- )     # Stop option processing
 +       shift; break ;;
 +    - )	# Use stdin as input.
@@ -9195,7 +10438,7 @@
 +    *local*)
 +       # First pass through any local machine types.
 +       echo $1
-+       exit 0;;
++       exit ;;
 +
 +    * )
 +       break ;;
@@ -9214,8 +10457,9 @@
 +# Here we must recognize all the valid KERNEL-OS combinations.
 +maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 +case $maybe_os in
-+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
++  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
++  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
++  storm-chaos* | os2-emx* | rtmk-nova*)
 +    os=-$maybe_os
 +    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
 +    ;;
@@ -9266,6 +10510,10 @@
 +	-hiux*)
 +		os=-hiuxwe2
 +		;;
++	-sco6)
++		os=-sco5v6
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
 +	-sco5)
 +		os=-sco3.2v5
 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -9282,6 +10530,10 @@
 +		# Don't forget version if it is 3.2v4 or newer.
 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 +		;;
++	-sco5v6*)
++		# Don't forget version if it is 3.2v4 or newer.
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
 +	-sco*)
 +		os=-sco3.2v2
 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -9334,7 +10586,7 @@
 +	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 +	| i370 | i860 | i960 | ia64 \
 +	| ip2k | iq2000 \
-+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
++	| m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
 +	| mips | mipsbe | mipseb | mipsel | mipsle \
 +	| mips16 \
 +	| mips64 | mips64el \
@@ -9343,6 +10595,7 @@
 +	| mips64vr4100 | mips64vr4100el \
 +	| mips64vr4300 | mips64vr4300el \
 +	| mips64vr5000 | mips64vr5000el \
++	| mips64vr5900 | mips64vr5900el \
 +	| mipsisa32 | mipsisa32el \
 +	| mipsisa32r2 | mipsisa32r2el \
 +	| mipsisa64 | mipsisa64el \
@@ -9351,13 +10604,15 @@
 +	| mipsisa64sr71k | mipsisa64sr71kel \
 +	| mipstx39 | mipstx39el \
 +	| mn10200 | mn10300 \
++	| mt \
 +	| msp430 \
++	| nios | nios2 \
 +	| ns16k | ns32k \
-+	| openrisc | or32 \
++	| or32 \
 +	| pdp10 | pdp11 | pj | pjl \
 +	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 +	| pyramid \
-+	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
++	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 +	| sh64 | sh64le \
 +	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
 +	| sparcv8 | sparcv9 | sparcv9b \
@@ -9369,6 +10624,9 @@
 +	| z8k)
 +		basic_machine=$basic_machine-unknown
 +		;;
++	m32c)
++		basic_machine=$basic_machine-unknown
++		;;
 +	m6811 | m68hc11 | m6812 | m68hc12)
 +		# Motorola 68HC11/12.
 +		basic_machine=$basic_machine-unknown
@@ -9376,6 +10634,9 @@
 +		;;
 +	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 +		;;
++	ms1)
++		basic_machine=mt-unknown
++		;;
 +
 +	# We use `pc' rather than `unknown'
 +	# because (1) that's what they normally are, and
@@ -9417,6 +10678,7 @@
 +	| mips64vr4100-* | mips64vr4100el-* \
 +	| mips64vr4300-* | mips64vr4300el-* \
 +	| mips64vr5000-* | mips64vr5000el-* \
++	| mips64vr5900-* | mips64vr5900el-* \
 +	| mipsisa32-* | mipsisa32el-* \
 +	| mipsisa32r2-* | mipsisa32r2el-* \
 +	| mipsisa64-* | mipsisa64el-* \
@@ -9425,14 +10687,16 @@
 +	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 +	| mipstx39-* | mipstx39el-* \
 +	| mmix-* \
++	| mt-* \
 +	| msp430-* \
++	| nios-* | nios2-* \
 +	| none-* | np1-* | ns16k-* | ns32k-* \
 +	| orion-* \
 +	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 +	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 +	| pyramid-* \
 +	| romp-* | rs6000-* \
-+	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
++	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 +	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 +	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
 +	| sparclite-* \
@@ -9447,6 +10711,8 @@
 +	| ymp-* \
 +	| z8k-*)
 +		;;
++	m32c-*)
++		;;
 +	# Recognize the various machine names and aliases which stand
 +	# for a CPU type and a company and sometimes even an OS.
 +	386bsd)
@@ -9782,6 +11048,9 @@
 +		basic_machine=i386-pc
 +		os=-msdos
 +		;;
++	ms1-*)
++		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
++		;;
 +	mvs)
 +		basic_machine=i370-ibm
 +		os=-mvs
@@ -9857,9 +11126,8 @@
 +		basic_machine=hppa1.1-oki
 +		os=-proelf
 +		;;
-+	or32 | or32-*)
++	openrisc | openrisc-*)
 +		basic_machine=or32-unknown
-+		os=-coff
 +		;;
 +	os400)
 +		basic_machine=powerpc-ibm
@@ -9890,6 +11158,12 @@
 +	pc532 | pc532-*)
 +		basic_machine=ns32k-pc532
 +		;;
++	pc98)
++		basic_machine=i386-pc
++		;;
++	pc98-*)
++		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
 +	pentium | p5 | k5 | k6 | nexgen | viac3)
 +		basic_machine=i586-pc
 +		;;
@@ -9946,6 +11220,10 @@
 +		basic_machine=i586-unknown
 +		os=-pw32
 +		;;
++	rdos)
++		basic_machine=i386-pc
++		os=-rdos
++		;;
 +	rom68k)
 +		basic_machine=m68k-rom68k
 +		os=-coff
@@ -10185,12 +11463,9 @@
 +	we32k)
 +		basic_machine=we32k-att
 +		;;
-+	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
++	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 +		basic_machine=sh-unknown
 +		;;
-+	sh64)
-+		basic_machine=sh64-unknown
-+		;;
 +	sparc | sparcv8 | sparcv9 | sparcv9b)
 +		basic_machine=sparc-sun
 +		;;
@@ -10264,20 +11539,23 @@
 +	      | -aos* \
 +	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 +	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
++	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
++	      | -openbsd* | -solidbsd* \
 +	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 +	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 +	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 +	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 +	      | -chorusos* | -chorusrdb* \
 +	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-+	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
++	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++	      | -uxpv* | -beos* | -mpeix* | -udk* \
 +	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 +	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 +	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 +	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 +	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
++	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
++	      | -skyos* | -haiku* | -rdos*)
 +	# Remember, each alternative MUST END IN *, to match a version number.
 +		;;
 +	-qnx*)
@@ -10295,7 +11573,7 @@
 +		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 +		;;
 +	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
++	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
 +	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 +		;;
 +	-mac*)
@@ -10484,6 +11762,9 @@
 +	*-be)
 +		os=-beos
 +		;;
++	*-haiku)
++		os=-haiku
++		;;
 +	*-ibm)
 +		os=-aix
 +		;;
@@ -10655,7 +11936,7 @@
 +esac
 +
 +echo $basic_machine$os
-+exit 0
++exit
 +
 +# Local variables:
 +# eval: (add-hook 'write-file-hooks 'time-stamp)
@@ -10663,13 +11944,13 @@
 +# time-stamp-format: "%:y-%02m-%02d"
 +# time-stamp-end: "'"
 +# End:
-diff -urNad iaxclient-0.0+cvs20050725/configure /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/configure
---- iaxclient-0.0+cvs20050725/configure	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/configure	2005-08-10 15:15:49.000000000 +0200
-@@ -0,0 +1,24578 @@
+diff -urNad iaxclient-0.0+svn20060520~/configure iaxclient-0.0+svn20060520/configure
+--- iaxclient-0.0+svn20060520~/configure	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/configure	2006-05-20 15:47:35.000000000 +0200
+@@ -0,0 +1,25906 @@
 +#! /bin/sh
 +# Guess values for system-dependent variables and create Makefiles.
-+# Generated by GNU Autoconf 2.59 for iaxclient 0.0+cvs20050725.
++# Generated by GNU Autoconf 2.59 for iaxclient 0.0+cvs20060520.
 +#
 +# Copyright (C) 2003 Free Software Foundation, Inc.
 +# This configure script is free software; the Free Software Foundation
@@ -10947,15 +12228,15 @@
 +
 +# The HP-UX ksh and POSIX shell print the target directory to stdout
 +# if CDPATH is set.
-+if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 +
 +if test -z "$ECHO"; then
 +if test "X${echo_test_string+set}" != Xset; then
 +# find a string as large as possible, as long as the shell can cope with it
 +  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
 +    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-+    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-+       echo_test_string="`eval $cmd`" &&
++    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
++       echo_test_string=`eval $cmd` &&
 +       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
 +    then
 +      break
@@ -11092,8 +12373,8 @@
 +# Identity of this package.
 +PACKAGE_NAME='iaxclient'
 +PACKAGE_TARNAME='iaxclient'
-+PACKAGE_VERSION='0.0+cvs20050725'
-+PACKAGE_STRING='iaxclient 0.0+cvs20050725'
++PACKAGE_VERSION='0.0+cvs20060520'
++PACKAGE_STRING='iaxclient 0.0+cvs20060520'
 +PACKAGE_BUGREPORT=''
 +
 +ac_unique_file="lib/iaxclient.h"
@@ -11134,7 +12415,7 @@
 +# include <unistd.h>
 +#endif"
 +
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT ISODATE build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL WXRC WISH RC ac_ct_RC OSTYPE GSM_CFLAGS GSM_LIBS SPEEX_CFLAGS SPEEX_LIBS IAX_CFLAGS IAX_LIBS IAX2_CONFIG IAX2_CFLAGS IAX2_LIBS PORTAUDIO_CFLAGS PORTAUDIO_LIBS GTK_CONFIG GTK_CFLAGS GTK_LIBS WX_CONFIG_PATH WX_CPPFLAGS WX_CFLAGS WX_CXXFLAGS WX_CFLAGS_ONLY WX_CXXFLAGS_ONLY WX_LIBS WX_LIBS_STATIC WX_VERSION WX_XRC_LIBS SPAN_EC_TRUE SPAN_EC_FALSE JITTERBUF_TRUE JITTERBUF_FALSE USE_LOCAL_GSM_TRUE USE_LOCAL_GSM_FALSE USE_LOCAL_SPEEX_TRUE USE_LOCAL_SPEEX_FALSE USE_LOCAL_IAX2_TRUE USE_LOCAL_IAX2_FALSE USE_LOCAL_PORTAUDIO_TRUE USE_LOCAL_PORTAUDIO_FALSE USE_LOCAL_ILBC_TRUE USE_LOCAL_ILBC_FALSE LINUX_TRUE LINUX_FALSE WIN32_TRUE WIN32_FALSE SOLARIS_TRUE SOLARIS_FALSE MACOSX_TRUE MACOSX_FALSE CLIENTS LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT ISODATE build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL WXRC WISH RC ac_ct_RC OSTYPE GSM_CFLAGS GSM_LIBS SPEEX_CFLAGS SPEEX_LIBS IAX_CFLAGS IAX_LIBS IAX2_CONFIG IAX2_CFLAGS IAX2_LIBS PORTAUDIO_CFLAGS PORTAUDIO_LIBS WX_CONFIG_PATH WX_CPPFLAGS WX_CFLAGS WX_CXXFLAGS WX_CFLAGS_ONLY WX_CXXFLAGS_ONLY WX_LIBS WX_LIBS_STATIC WX_VERSION GTK_CONFIG GTK_CFLAGS GTK_LIBS PKG_CONFIG WX_XRC_LIBS SPAN_EC_TRUE SPAN_EC_FALSE JITTERBUF_TRUE JITTERBUF_FALSE USE_LOCAL_GSM_TRUE USE_LOCAL_GSM_FALSE USE_LOCAL_SPEEX_TRUE USE_LOCAL_SPEEX_FALSE USE_LOCAL_IAX2_TRUE USE_LOCAL_IAX2_FALSE USE_LOCAL_PORTAUDIO_TRUE USE_LOCAL_PORTAUDIO_FALSE USE_LOCAL_ILBC_TRUE USE_LOCAL_ILBC_FALSE LINUX_TRUE LINUX_FALSE WIN32_TRUE WIN32_FALSE SOLARIS_TRUE SOLARIS_FALSE MACOSX_TRUE MACOSX_FALSE CLIENTS LIBOBJS LTLIBOBJS'
 +ac_subst_files=''
 +
 +# Initialize some variables set by options.
@@ -11623,7 +12904,7 @@
 +  # Omit some internal or obsolete options to make the list less imposing.
 +  # This message is too long to be a string in the A/UX 3.1 sh.
 +  cat <<_ACEOF
-+\`configure' configures iaxclient 0.0+cvs20050725 to adapt to many kinds of systems.
++\`configure' configures iaxclient 0.0+cvs20060520 to adapt to many kinds of systems.
 +
 +Usage: $0 [OPTION]... [VAR=VALUE]...
 +
@@ -11689,7 +12970,7 @@
 +
 +if test -n "$ac_init_help"; then
 +  case $ac_init_help in
-+     short | recursive ) echo "Configuration of iaxclient 0.0+cvs20050725:";;
++     short | recursive ) echo "Configuration of iaxclient 0.0+cvs20060520:";;
 +   esac
 +  cat <<\_ACEOF
 +
@@ -11723,6 +13004,7 @@
 +  --disable-portaudiotest Do not try to compile and run a test Portaudio
 +                          program
 +  --disable-gtktest       Do not try to compile and run a test GTK program
++  --disable-gtktest       do not try to compile and run a test GTK+ program
 +
 +Optional Packages:
 +  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -11732,9 +13014,11 @@
 +                          reference sources in lib/iLBC) [default=auto]
 +  --with-wxrc             Path to command line compiler for wx xml resources
 +  --with-wish             Path to Tcl command language interpreter
-+  --with-wx-prefix=PREFIX   Prefix where wxWindows is installed (optional)
-+  --with-wx-exec-prefix=PREFIX Exec prefix where wxWindows is installed (optional)
-+  --with-wx-config=CONFIG   wx-config script to use (optional)
++  --with-wxdir=PATH       Use uninstalled version of wxWidgets in PATH
++  --with-wx-config=CONFIG wx-config script to use (optional)
++  --with-wx-prefix=PREFIX Prefix where wxWidgets is installed (optional)
++  --with-wx-exec-prefix=PREFIX
++                          Exec prefix where wxWidgets is installed (optional)
 +  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
 +  --with-pic              try to use only PIC/non-PIC objects [default=use
 +                          both]
@@ -11874,7 +13158,7 @@
 +test -n "$ac_init_help" && exit 0
 +if $ac_init_version; then
 +  cat <<\_ACEOF
-+iaxclient configure 0.0+cvs20050725
++iaxclient configure 0.0+cvs20060520
 +generated by GNU Autoconf 2.59
 +
 +Copyright (C) 2003 Free Software Foundation, Inc.
@@ -11888,7 +13172,7 @@
 +This file contains any messages produced by compilers while
 +running configure, to aid debugging if configure makes a mistake.
 +
-+It was created by iaxclient $as_me 0.0+cvs20050725, which was
++It was created by iaxclient $as_me 0.0+cvs20060520, which was
 +generated by GNU Autoconf 2.59.  Invocation command line was
 +
 +  $ $0 $@
@@ -12236,7 +13520,7 @@
 +   { (exit 1); exit 1; }; }
 +fi
 +
-+am__api_version="1.8"
++am__api_version="1.9"
 +ac_aux_dir=
 +for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
 +  if test -f $ac_dir/install-sh; then
@@ -12413,13 +13697,21 @@
 +fi
 +
 +if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-+  # Keeping the `.' argument allows $(mkdir_p) to be used without
-+  # argument.  Indeed, we sometimes output rules like
++  # We used to keeping the `.' as first argument, in order to
++  # allow $(mkdir_p) to be used without argument.  As in
 +  #   $(mkdir_p) $(somedir)
-+  # where $(somedir) is conditionally defined.
-+  # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
-+  # expensive solution, as it forces Make to start a sub-shell.)
-+  mkdir_p='mkdir -p -- .'
++  # where $(somedir) is conditionally defined.  However this is wrong
++  # for two reasons:
++  #  1. if the package is installed by a user who cannot write `.'
++  #     make install will fail,
++  #  2. the above comment should most certainly read
++  #     $(mkdir_p) $(DESTDIR)$(somedir)
++  #     so it does not work when $(somedir) is undefined and
++  #     $(DESTDIR) is not.
++  #  To support the latter case, we have to write
++  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
++  #  so the `.' trick is pointless.
++  mkdir_p='mkdir -p --'
 +else
 +  # On NextStep and OpenStep, the `mkdir' command does not
 +  # recognize any option.  It will interpret all options as
@@ -12535,7 +13827,7 @@
 +
 +# Define the identity of the package.
 + PACKAGE='iaxclient'
-+ VERSION='0.0+cvs20050725'
++ VERSION='0.0+cvs20060520'
 +
 +
 +cat >>confdefs.h <<_ACEOF
@@ -12563,9 +13855,6 @@
 +
 +MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 +
-+
-+AMTAR=${AMTAR-"${am_missing_run}tar"}
-+
 +install_sh=${install_sh-"$am_aux_dir/install-sh"}
 +
 +# Installed binaries are usually stripped using `strip' when the user
@@ -12658,9 +13947,16 @@
 +
 +# We need awk for the "check" target.  The system "awk" is bad on
 +# some platforms.
++# Always define AMTAR for backward compatibility.
 +
++AMTAR=${AMTAR-"${am_missing_run}tar"}
 +
++am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 +
++
++
++
++
 +echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
 +echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
 +    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
@@ -12823,6 +14119,19 @@
 +
 +
 +
++# Check whether --with-wxdir or --without-wxdir was given.
++if test "${with_wxdir+set}" = set; then
++  withval="$with_wxdir"
++   wx_config_name="$withval/wx-config"
++                  wx_config_args="--inplace"
++fi;
++
++# Check whether --with-wx-config or --without-wx-config was given.
++if test "${with_wx_config+set}" = set; then
++  withval="$with_wx_config"
++  wx_config_name="$withval"
++fi;
++
 +# Check whether --with-wx-prefix or --without-wx-prefix was given.
 +if test "${with_wx_prefix+set}" = set; then
 +  withval="$with_wx_prefix"
@@ -12839,15 +14148,7 @@
 +  wx_config_exec_prefix=""
 +fi;
 +
-+# Check whether --with-wx-config or --without-wx-config was given.
-+if test "${with_wx_config+set}" = set; then
-+  withval="$with_wx_config"
-+  wx_config_name="$withval"
-+else
-+  wx_config_name=""
-+fi;
 +
-+
 +# Make sure we can run config.sub.
 +$ac_config_sub sun4 >/dev/null 2>&1 ||
 +  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
@@ -14742,7 +16043,7 @@
 +# Add /usr/xpg4/bin/sed as it is typically found on Solaris
 +# along with /bin/sed that truncates output.
 +for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-+  test ! -f $lt_ac_sed && break
++  test ! -f $lt_ac_sed && continue
 +  cat /dev/null > conftest.in
 +  lt_ac_count=0
 +  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -14767,10 +16068,10 @@
 +    fi
 +  done
 +done
-+SED=$lt_cv_path_SED
 +
 +fi
 +
++SED=$lt_cv_path_SED
 +echo "$as_me:$LINENO: result: $SED" >&5
 +echo "${ECHO_T}$SED" >&6
 +
@@ -14847,7 +16148,7 @@
 +    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
 +      lt_cv_path_LD="$ac_dir/$ac_prog"
 +      # Check to see if the program is GNU ld.  I'd rather use --version,
-+      # but apparently some GNU ld's only accept -v.
++      # but apparently some variants of GNU ld only accept -v.
 +      # Break only if it was the GNU/non-GNU ld that we prefer.
 +      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
 +      *GNU* | *'with BFD'*)
@@ -14881,7 +16182,7 @@
 +if test "${lt_cv_prog_gnu_ld+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
 +else
-+  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
++  # I'd rather use --version here, but apparently some GNU lds only accept -v.
 +case `$LD -v 2>&1 </dev/null` in
 +*GNU* | *'with BFD'*)
 +  lt_cv_prog_gnu_ld=yes
@@ -14911,6 +16212,15 @@
 +*) reload_flag=" $reload_flag" ;;
 +esac
 +reload_cmds='$LD$reload_flag -o $output$reload_objs'
++case $host_os in
++  darwin*)
++    if test "$GCC" = yes; then
++      reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
++    else
++      reload_cmds='$LD$reload_flag -o $output$reload_objs'
++    fi
++    ;;
++esac
 +
 +echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
 +echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
@@ -14997,7 +16307,7 @@
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
 +
-+bsdi4*)
++bsdi[45]*)
 +  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
 +  lt_cv_file_magic_cmd='/usr/bin/file -L'
 +  lt_cv_file_magic_test_file=/shlib/libc.so
@@ -15020,13 +16330,13 @@
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
 +
-+freebsd* | kfreebsd*-gnu)
++freebsd* | kfreebsd*-gnu | dragonfly*)
 +  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
 +    case $host_cpu in
 +    i*86 )
 +      # Not sure whether the presence of OpenBSD here was a mistake.
 +      # Let's accept both of them until this is cleared up.
-+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
 +      lt_cv_file_magic_cmd=/usr/bin/file
 +      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
 +      ;;
@@ -15042,7 +16352,7 @@
 +
 +hpux10.20* | hpux11*)
 +  lt_cv_file_magic_cmd=/usr/bin/file
-+  case "$host_cpu" in
++  case $host_cpu in
 +  ia64*)
 +    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
 +    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
@@ -15092,12 +16402,10 @@
 +  ;;
 +
 +openbsd*)
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
 +  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
 +  else
-+    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
 +  fi
 +  ;;
 +
@@ -15190,7 +16498,7 @@
 +  ;;
 +*-*-irix6*)
 +  # Find out which ABI we are using.
-+  echo '#line 4524 "configure"' > conftest.$ac_ext
++  echo '#line 4551 "configure"' > conftest.$ac_ext
 +  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
@@ -15233,7 +16541,7 @@
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; then
-+    case "`/usr/bin/file conftest.o`" in
++    case `/usr/bin/file conftest.o` in
 +    *32-bit*)
 +      case $host in
 +        x86_64-*linux*)
@@ -16213,7 +17521,12 @@
 +
 +done
 +
-+ac_ext=cc
++
++
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++    (test "X$CXX" != "Xg++"))) ; then
++  ac_ext=cc
 +ac_cpp='$CXXCPP $CPPFLAGS'
 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -16443,7 +17756,9 @@
 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 +
++fi
 +
++
 +ac_ext=f
 +ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
 +ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -16536,7 +17851,7 @@
 +
 +
 +# Provide some information about the compiler.
-+echo "$as_me:5870:" \
++echo "$as_me:5904:" \
 +     "checking for Fortran 77 compiler version" >&5
 +ac_compiler=`set X $ac_compile; echo $2`
 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -16724,11 +18039,38 @@
 +    lt_cv_sys_max_cmd_len=8192;
 +    ;;
 +
-+ *)
++  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++    # This has been around since 386BSD, at least.  Likely further.
++    if test -x /sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++    elif test -x /usr/sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++    else
++      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
++    fi
++    # And add a safety zone
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++    ;;
++  osf*)
++    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
++    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
++    # nice to cause kernel panics so lets avoid the loop below.
++    # First set a reasonable default.
++    lt_cv_sys_max_cmd_len=16384
++    #
++    if test -x /sbin/sysconfig; then
++      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
++        *1*) lt_cv_sys_max_cmd_len=-1 ;;
++      esac
++    fi
++    ;;
++  *)
 +    # If test is not a shell built-in, we'll probably end up computing a
 +    # maximum length that is only half of the actual maximum length, but
 +    # we can't tell.
-+    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
++    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
 +	       = "XX$teststring") >/dev/null 2>&1 &&
 +	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
 +	    lt_cv_sys_max_cmd_len=$new_result &&
@@ -16774,9 +18116,6 @@
 +# Regexp to match symbols that can be accessed directly from C.
 +sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
 +
-+# Transform the above into a raw symbol and a C symbol.
-+symxfrm='\1 \2\3 \3'
-+
 +# Transform an extracted symbol line into a proper C declaration
 +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
 +
@@ -16798,6 +18137,13 @@
 +  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
 +  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
 +  ;;
++linux*)
++  if test "$host_cpu" = ia64; then
++    symcode='[ABCDGIRSTW]'
++    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++  fi
++  ;;
 +irix* | nonstopux*)
 +  symcode='[BCDEGRST]'
 +  ;;
@@ -16829,8 +18175,11 @@
 +# Try without a prefix undercore, then with it.
 +for ac_symprfx in "" "_"; do
 +
++  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
++  symxfrm="\\1 $ac_symprfx\\2 \\2"
++
 +  # Write the raw and C identifiers.
-+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
 +
 +  # Check to see that the pipe works correctly.
 +  pipe_works=no
@@ -16992,7 +18341,7 @@
 +
 +# Sed substitution that helps us do robust quoting.  It backslashifies
 +# metacharacters that are still active within double-quoted strings.
-+Xsed='sed -e s/^X//'
++Xsed='sed -e 1s/^X//'
 +sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
 +
 +# Same as above, but do not quote variable references.
@@ -17012,7 +18361,7 @@
 +default_ofile=libtool
 +can_build_shared=yes
 +
-+# All known linkers require a `.a' archive for static linking (except M$VC,
++# All known linkers require a `.a' archive for static linking (except MSVC,
 +# which needs '.lib').
 +libext=a
 +ltmain="$ac_aux_dir/ltmain.sh"
@@ -17297,6 +18646,17 @@
 +  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 +fi
 +
++for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++
++
 +# Only perform the check for file, if the check method requires it
 +case $deplibs_check_method in
 +file_magic*)
@@ -17322,7 +18682,7 @@
 +      if test -n "$file_magic_test_file"; then
 +	case $deplibs_check_method in
 +	"file_magic "*)
-+	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
 +	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 +	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 +	    $EGREP "$file_magic_regex" > /dev/null; then
@@ -17384,7 +18744,7 @@
 +      if test -n "$file_magic_test_file"; then
 +	case $deplibs_check_method in
 +	"file_magic "*)
-+	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
 +	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 +	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 +	    $EGREP "$file_magic_regex" > /dev/null; then
@@ -17483,6 +18843,20 @@
 +compiler=$CC
 +
 +
++# save warnings/boilerplate of simple test code
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++
++
 +#
 +# Check for any special shared library compilation flags.
 +#
@@ -17519,11 +18893,16 @@
 +   LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
 +   printf "$lt_simple_link_test_code" > conftest.$ac_ext
 +   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-+     # The compiler can only warn and ignore the option if not recognized
++     # The linker can only warn and ignore the option if not recognized
 +     # So say no if there are warnings
 +     if test -s conftest.err; then
 +       # Append any errors to the config.log.
 +       cat conftest.err 1>&5
++       $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
++       $SED '/^$/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         lt_prog_compiler_static_works=yes
++       fi
 +     else
 +       lt_prog_compiler_static_works=yes
 +     fi
@@ -17565,18 +18944,20 @@
 +   # with a dollar sign (not a hyphen), so the echo should work correctly.
 +   # The option is referenced via a variable to avoid confusing sed.
 +   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 +   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 +   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:6902: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7000: $lt_compile\"" >&5)
 +   (eval "$lt_compile" 2>conftest.err)
 +   ac_status=$?
 +   cat conftest.err >&5
-+   echo "$as_me:6906: \$? = $ac_status" >&5
++   echo "$as_me:7004: \$? = $ac_status" >&5
 +   if (exit $ac_status) && test -s "$ac_outfile"; then
 +     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     if test ! -s conftest.err; then
++     # So say no if there are warnings other than the usual output.
++     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++     $SED '/^$/d' conftest.err >conftest.er2
++     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
 +       lt_cv_prog_compiler_rtti_exceptions=yes
 +     fi
 +   fi
@@ -17653,7 +19034,7 @@
 +    hpux*)
 +      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
 +      # not for PA HP-UX.
-+      case "$host_cpu" in
++      case $host_cpu in
 +      hppa*64*|ia64*)
 +	# +Z the default
 +	;;
@@ -17679,6 +19060,16 @@
 +	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
 +      fi
 +      ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case $cc_basename in
++         xlc*)
++         lt_prog_compiler_pic='-qnocommon'
++         lt_prog_compiler_wl='-Wl,'
++         ;;
++       esac
++       ;;
 +
 +    mingw* | pw32* | os2*)
 +      # This hack is so that the source file can tell whether it is being
@@ -17690,7 +19081,7 @@
 +      lt_prog_compiler_wl='-Wl,'
 +      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
 +      # not for PA HP-UX.
-+      case "$host_cpu" in
++      case $host_cpu in
 +      hppa*64*|ia64*)
 +	# +Z the default
 +	;;
@@ -17714,12 +19105,19 @@
 +      ;;
 +
 +    linux*)
-+      case $CC in
++      case $cc_basename in
 +      icc* | ecc*)
 +	lt_prog_compiler_wl='-Wl,'
 +	lt_prog_compiler_pic='-KPIC'
 +	lt_prog_compiler_static='-static'
 +        ;;
++      pgcc* | pgf77* | pgf90* | pgf95*)
++        # Portland Group compilers (*not* the Pentium gcc compiler,
++	# which looks to be a dead project)
++	lt_prog_compiler_wl='-Wl,'
++	lt_prog_compiler_pic='-fpic'
++	lt_prog_compiler_static='-Bstatic'
++        ;;
 +      ccc*)
 +        lt_prog_compiler_wl='-Wl,'
 +        # All Alpha code is PIC.
@@ -17740,9 +19138,14 @@
 +      ;;
 +
 +    solaris*)
-+      lt_prog_compiler_wl='-Wl,'
 +      lt_prog_compiler_pic='-KPIC'
 +      lt_prog_compiler_static='-Bstatic'
++      case $cc_basename in
++      f77* | f90* | f95*)
++	lt_prog_compiler_wl='-Qoption ld ';;
++      *)
++	lt_prog_compiler_wl='-Wl,';;
++      esac
 +      ;;
 +
 +    sunos4*)
@@ -17764,6 +19167,11 @@
 +      fi
 +      ;;
 +
++    unicos*)
++      lt_prog_compiler_wl='-Wl,'
++      lt_prog_compiler_can_build_shared=no
++      ;;
++
 +    uts4*)
 +      lt_prog_compiler_pic='-pic'
 +      lt_prog_compiler_static='-Bstatic'
@@ -17798,18 +19206,20 @@
 +   # with a dollar sign (not a hyphen), so the echo should work correctly.
 +   # The option is referenced via a variable to avoid confusing sed.
 +   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 +   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 +   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:7135: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7262: $lt_compile\"" >&5)
 +   (eval "$lt_compile" 2>conftest.err)
 +   ac_status=$?
 +   cat conftest.err >&5
-+   echo "$as_me:7139: \$? = $ac_status" >&5
++   echo "$as_me:7266: \$? = $ac_status" >&5
 +   if (exit $ac_status) && test -s "$ac_outfile"; then
 +     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     if test ! -s conftest.err; then
++     # So say no if there are warnings other than the usual output.
++     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++     $SED '/^$/d' conftest.err >conftest.er2
++     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
 +       lt_prog_compiler_pic_works=yes
 +     fi
 +   fi
@@ -17830,7 +19240,7 @@
 +fi
 +
 +fi
-+case "$host_os" in
++case $host_os in
 +  # For platforms which do not support PIC, -DPIC is meaningless:
 +  *djgpp*)
 +    lt_prog_compiler_pic=
@@ -17858,23 +19268,25 @@
 +   # Note that $ac_compile itself does not contain backslashes and begins
 +   # with a dollar sign (not a hyphen), so the echo should work correctly.
 +   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 +   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 +   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:7195: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7324: $lt_compile\"" >&5)
 +   (eval "$lt_compile" 2>out/conftest.err)
 +   ac_status=$?
 +   cat out/conftest.err >&5
-+   echo "$as_me:7199: \$? = $ac_status" >&5
++   echo "$as_me:7328: \$? = $ac_status" >&5
 +   if (exit $ac_status) && test -s out/conftest2.$ac_objext
 +   then
 +     # The compiler can only warn and ignore the option if not recognized
 +     # So say no if there are warnings
-+     if test ! -s out/conftest.err; then
++     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
++     $SED '/^$/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
 +       lt_cv_prog_compiler_c_o=yes
 +     fi
 +   fi
-+   chmod u+w .
++   chmod u+w . 2>&5
 +   $rm conftest*
 +   # SGI C++ compiler will create directory out/ii_files/ for
 +   # template instantiation
@@ -17950,6 +19362,16 @@
 +  # rely on this symbol name, it's probably fine to never include it in
 +  # preloaded symbol tables.
 +  extract_expsyms_cmds=
++  # Just being paranoid about ensuring that cc_basename is set.
++  for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 +
 +  case $host_os in
 +  cygwin* | mingw* | pw32*)
@@ -17970,6 +19392,27 @@
 +    # If archive_cmds runs LD, not CC, wlarc should be empty
 +    wlarc='${wl}'
 +
++    # Set some defaults for GNU ld with shared library support. These
++    # are reset later if shared libraries are not supported. Putting them
++    # here allows them to be overridden if necessary.
++    runpath_var=LD_RUN_PATH
++    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
++    export_dynamic_flag_spec='${wl}--export-dynamic'
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	whole_archive_flag_spec=
++    fi
++    supports_anon_versioning=no
++    case `$LD -v 2>/dev/null` in
++      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
++      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++      *\ 2.11.*) ;; # other 2.11 versions
++      *) supports_anon_versioning=yes ;;
++    esac
++
 +    # See if GNU ld supports shared libraries.
 +    case $host_os in
 +    aix3* | aix4* | aix5*)
@@ -18020,7 +19463,7 @@
 +      allow_undefined_flag=unsupported
 +      always_export_symbols=no
 +      enable_shared_with_static_runtimes=yes
-+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
 +
 +      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
 +        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -18038,6 +19481,38 @@
 +      fi
 +      ;;
 +
++    linux*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	tmp_addflag=
++	case $cc_basename,$host_cpu in
++	pgcc*)				# Portland Group C compiler
++	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag'
++	  ;;
++	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
++	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag -Mnomain' ;;
++	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
++	  tmp_addflag=' -i_dynamic' ;;
++	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
++	  tmp_addflag=' -i_dynamic -nofor_main' ;;
++	ifc* | ifort*)			# Intel Fortran compiler
++	  tmp_addflag=' -nofor_main' ;;
++	esac
++	archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++	if test $supports_anon_versioning = yes; then
++	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
++  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++  $echo "local: *; };" >> $output_objdir/$libname.ver~
++	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	fi
++	link_all_deplibs=no
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
 +    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
 +      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 +	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -18076,32 +19551,6 @@
 +      hardcode_shlibpath_var=no
 +      ;;
 +
-+  linux*)
-+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_cmds="$tmp_archive_cmds"
-+      supports_anon_versioning=no
-+      case `$LD -v 2>/dev/null` in
-+        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+        *\ 2.11.*) ;; # other 2.11 versions
-+        *) supports_anon_versioning=yes ;;
-+      esac
-+      if test $supports_anon_versioning = yes; then
-+        archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+$echo "local: *; };" >> $output_objdir/$libname.ver~
-+        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+      else
-+        archive_expsym_cmds="$tmp_archive_cmds"
-+      fi
-+      link_all_deplibs=no
-+    else
-+      ld_shlibs=no
-+    fi
-+    ;;
-+
 +    *)
 +      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 +	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -18112,16 +19561,11 @@
 +      ;;
 +    esac
 +
-+    if test "$ld_shlibs" = yes; then
-+      runpath_var=LD_RUN_PATH
-+      hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-+      export_dynamic_flag_spec='${wl}--export-dynamic'
-+      # ancient GNU ld didn't support --whole-archive et. al.
-+      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-+ 	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      else
-+  	whole_archive_flag_spec=
-+      fi
++    if test "$ld_shlibs" = no; then
++      runpath_var=
++      hardcode_libdir_flag_spec=
++      export_dynamic_flag_spec=
++      whole_archive_flag_spec=
 +    fi
 +  else
 +    # PORTME fill in a description of your system's linker (not GNU ld)
@@ -18185,7 +19629,7 @@
 +      link_all_deplibs=yes
 +
 +      if test "$GCC" = yes; then
-+	case $host_os in aix4.012|aix4.012.*)
++	case $host_os in aix4.[012]|aix4.[012].*)
 +	# We only want to do this on AIX 4.2 and lower, the check
 +	# below for broken collect2 doesn't work under 4.3+
 +	  collect2name=`${CC} -print-prog-name=collect2`
@@ -18206,6 +19650,9 @@
 +	  fi
 +	esac
 +	shared_flag='-shared'
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag="$shared_flag "'${wl}-G'
++	fi
 +      else
 +	# not using gcc
 +	if test "$host_cpu" = ia64; then
@@ -18350,7 +19797,7 @@
 +	  # Exported symbols can be pulled into shared objects from archives
 +	  whole_archive_flag_spec=' '
 +	  archive_cmds_need_lc=yes
-+	  # This is similar to how AIX traditionally builds it's shared libraries.
++	  # This is similar to how AIX traditionally builds its shared libraries.
 +	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 +	fi
 +      fi
@@ -18364,7 +19811,7 @@
 +      ld_shlibs=no
 +      ;;
 +
-+    bsdi4*)
++    bsdi[45]*)
 +      export_dynamic_flag_spec=-rdynamic
 +      ;;
 +
@@ -18390,52 +19837,52 @@
 +      ;;
 +
 +    darwin* | rhapsody*)
-+    if test "$GXX" = yes ; then
-+      archive_cmds_need_lc=no
-+      case "$host_os" in
-+      rhapsody* | darwin1.[012])
-+	allow_undefined_flag='-undefined suppress'
-+	;;
-+      *) # Darwin 1.3 on
-+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+      	allow_undefined_flag='-flat_namespace -undefined suppress'
-+      else
-+        case ${MACOSX_DEPLOYMENT_TARGET} in
-+          10.[012])
-+            allow_undefined_flag='-flat_namespace -undefined suppress'
-+            ;;
-+          10.*)
-+            allow_undefined_flag='-undefined dynamic_lookup'
-+            ;;
-+        esac
-+      fi
-+	;;
++      case $host_os in
++        rhapsody* | darwin1.[012])
++         allow_undefined_flag='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[012])
++               allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
 +      esac
-+    	lt_int_apple_cc_single_mod=no
-+    	output_verbose_link_cmd='echo'
-+    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-+    	  lt_int_apple_cc_single_mod=yes
-+    	fi
-+    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+    	  archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+    	else
-+        archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+      fi
-+      module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-+        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+        else
-+          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+        fi
-+          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      archive_cmds_need_lc=no
 +      hardcode_direct=no
 +      hardcode_automatic=yes
 +      hardcode_shlibpath_var=unsupported
-+      whole_archive_flag_spec='-all_load $convenience'
++      whole_archive_flag_spec=''
 +      link_all_deplibs=yes
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +    else
-+      ld_shlibs=no
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         ld_shlibs=no
++          ;;
++      esac
 +    fi
 +      ;;
 +
@@ -18469,7 +19916,7 @@
 +      ;;
 +
 +    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+    freebsd* | kfreebsd*-gnu)
++    freebsd* | kfreebsd*-gnu | dragonfly*)
 +      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
 +      hardcode_libdir_flag_spec='-R$libdir'
 +      hardcode_direct=yes
@@ -18494,7 +19941,7 @@
 +
 +    hpux10* | hpux11*)
 +      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+	case "$host_cpu" in
++	case $host_cpu in
 +	hppa*64*|ia64*)
 +	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
@@ -18503,7 +19950,7 @@
 +	  ;;
 +	esac
 +      else
-+	case "$host_cpu" in
++	case $host_cpu in
 +	hppa*64*|ia64*)
 +	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
 +	  ;;
@@ -18513,7 +19960,7 @@
 +	esac
 +      fi
 +      if test "$with_gnu_ld" = no; then
-+	case "$host_cpu" in
++	case $host_cpu in
 +	hppa*64*)
 +	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
 +	  hardcode_libdir_flag_spec_ld='+b $libdir'
@@ -18580,6 +20027,7 @@
 +      hardcode_shlibpath_var=no
 +      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 +	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
 +	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
 +	export_dynamic_flag_spec='${wl}-E'
 +      else
@@ -18625,7 +20073,7 @@
 +	allow_undefined_flag=' -expect_unresolved \*'
 +	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 +	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
 +
 +	# Both c and cxx compiler support -rpath directly
 +	hardcode_libdir_flag_spec='-rpath $libdir'
@@ -18644,10 +20092,12 @@
 +    solaris*)
 +      no_undefined_flag=' -z text'
 +      if test "$GCC" = yes; then
++	wlarc='${wl}'
 +	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 +	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
 +      else
++	wlarc=''
 +	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 +  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
@@ -18656,8 +20106,18 @@
 +      hardcode_shlibpath_var=no
 +      case $host_os in
 +      solaris2.[0-5] | solaris2.[0-5].*) ;;
-+      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-+	whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
++      *)
++ 	# The compiler driver will combine linker options so we
++ 	# cannot just pass the convience library names through
++ 	# without $wl, iff we do not link with $LD.
++ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
++ 	case $wlarc in
++ 	'')
++ 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
++ 	*)
++ 	  whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ 	esac ;;
 +      esac
 +      link_all_deplibs=yes
 +      ;;
@@ -18931,7 +20391,7 @@
 +  shlibpath_var=LIBRARY_PATH
 +  ;;
 +
-+bsdi4*)
++bsdi[45]*)
 +  version_type=linux
 +  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -18959,7 +20419,8 @@
 +      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
 +      dldir=$destdir/`dirname \$dlpath`~
 +      test -d \$dldir || mkdir -p \$dldir~
-+      $install_prog $dir/$dlname \$dldir/$dlname'
++      $install_prog $dir/$dlname \$dldir/$dlname~
++      chmod a+x \$dldir/$dlname'
 +    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
 +      dlpath=$dir/\$dldll~
 +       $rm \$dlpath'
@@ -18989,7 +20450,7 @@
 +      ;;
 +    pw32*)
 +      # pw32 DLLs use 'pw' prefix rather than 'lib'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
 +      ;;
 +    esac
 +    ;;
@@ -19012,7 +20473,7 @@
 +  soname_spec='${libname}${release}${major}$shared_ext'
 +  shlibpath_overrides_runpath=yes
 +  shlibpath_var=DYLD_LIBRARY_PATH
-+  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
 +  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
 +  if test "$GCC" = yes; then
 +    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -19047,8 +20508,17 @@
 +  dynamic_linker='GNU ld.so'
 +  ;;
 +
-+freebsd*)
-+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++freebsd* | dragonfly*)
++  # DragonFly does not have aout.  When/if they implement a new
++  # versioning mechanism, adjust this.
++  if test -x /usr/bin/objformat; then
++    objformat=`/usr/bin/objformat`
++  else
++    case $host_os in
++    freebsd[123]*) objformat=aout ;;
++    *) objformat=elf ;;
++    esac
++  fi
 +  version_type=freebsd-$objformat
 +  case $version_type in
 +    freebsd-elf*)
@@ -19066,7 +20536,7 @@
 +  freebsd2*)
 +    shlibpath_overrides_runpath=yes
 +    ;;
-+  freebsd3.01* | freebsdelf3.01*)
++  freebsd3.[01]* | freebsdelf3.[01]*)
 +    shlibpath_overrides_runpath=yes
 +    hardcode_into_libs=yes
 +    ;;
@@ -19093,7 +20563,7 @@
 +  version_type=sunos
 +  need_lib_prefix=no
 +  need_version=no
-+  case "$host_cpu" in
++  case $host_cpu in
 +  ia64*)
 +    shrext_cmds='.so'
 +    hardcode_into_libs=yes
@@ -19192,7 +20662,7 @@
 +
 +  # Append ld.so.conf contents to the search path
 +  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +  fi
 +
@@ -19267,7 +20737,11 @@
 +openbsd*)
 +  version_type=sunos
 +  need_lib_prefix=no
-+  need_version=yes
++  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++  case $host_os in
++    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++    *)                         need_version=no  ;;
++  esac
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
 +  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
 +  shlibpath_var=LD_LIBRARY_PATH
@@ -19389,8 +20863,8 @@
 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 +hardcode_action=
 +if test -n "$hardcode_libdir_flag_spec" || \
-+   test -n "$runpath_var " || \
-+   test "X$hardcode_automatic"="Xyes" ; then
++   test -n "$runpath_var" || \
++   test "X$hardcode_automatic" = "Xyes" ; then
 +
 +  # We can hardcode non-existant directories.
 +  if test "$hardcode_direct" != no &&
@@ -20049,7 +21523,7 @@
 +  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 +  lt_status=$lt_dlunknown
 +  cat > conftest.$ac_ext <<EOF
-+#line 9383 "configure"
++#line 9576 "configure"
 +#include "confdefs.h"
 +
 +#if HAVE_DLFCN_H
@@ -20115,7 +21589,7 @@
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) 2>/dev/null
++    (./conftest; exit; ) >&5 2>/dev/null
 +    lt_status=$?
 +    case x$lt_status in
 +      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
@@ -20147,7 +21621,7 @@
 +  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 +  lt_status=$lt_dlunknown
 +  cat > conftest.$ac_ext <<EOF
-+#line 9481 "configure"
++#line 9674 "configure"
 +#include "confdefs.h"
 +
 +#if HAVE_DLFCN_H
@@ -20213,7 +21687,7 @@
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) 2>/dev/null
++    (./conftest; exit; ) >&5 2>/dev/null
 +    lt_status=$?
 +    case x$lt_status in
 +      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
@@ -20263,7 +21737,7 @@
 +
 +# On AIX, shared libraries and static libraries use the same namespace, and
 +# are all built from PIC.
-+case "$host_os" in
++case $host_os in
 +aix3*)
 +  test "$enable_shared" = yes && enable_static=no
 +  if test -n "$RANLIB"; then
@@ -20276,43 +21750,6 @@
 +  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
 +    test "$enable_shared" = yes && enable_static=no
 +  fi
-+  ;;
-+  darwin* | rhapsody*)
-+  if test "$GCC" = yes; then
-+    archive_cmds_need_lc=no
-+    case "$host_os" in
-+    rhapsody* | darwin1.[012])
-+      allow_undefined_flag='-undefined suppress'
-+      ;;
-+    *) # Darwin 1.3 on
-+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+      	allow_undefined_flag='-flat_namespace -undefined suppress'
-+      else
-+        case ${MACOSX_DEPLOYMENT_TARGET} in
-+          10.[012])
-+            allow_undefined_flag='-flat_namespace -undefined suppress'
-+            ;;
-+          10.*)
-+            allow_undefined_flag='-undefined dynamic_lookup'
-+            ;;
-+        esac
-+      fi
-+      ;;
-+    esac
-+    output_verbose_link_cmd='echo'
-+    archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
-+    module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-+    archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    hardcode_direct=no
-+    hardcode_automatic=yes
-+    hardcode_shlibpath_var=unsupported
-+    whole_archive_flag_spec='-all_load $convenience'
-+    link_all_deplibs=yes
-+  else
-+    ld_shlibs=no
-+  fi
 +    ;;
 +esac
 +echo "$as_me:$LINENO: result: $enable_shared" >&5
@@ -20442,7 +21879,7 @@
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 +#
 +# As a special exception to the GNU General Public License, if you
 +# distribute this file as part of a program that contains a
@@ -20453,11 +21890,11 @@
 +SED=$lt_SED
 +
 +# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-+Xsed="$SED -e s/^X//"
++Xsed="$SED -e 1s/^X//"
 +
 +# The HP-UX ksh and POSIX shell print the target directory to stdout
 +# if CDPATH is set.
-+if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 +
 +# The names of the tagged configurations supported by this script.
 +available_tags=
@@ -20487,7 +21924,13 @@
 +# The host system.
 +host_alias=$host_alias
 +host=$host
++host_os=$host_os
 +
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
++
 +# An echo program that does not interpret backslashes.
 +echo=$lt_echo
 +
@@ -20563,7 +22006,7 @@
 +# Does compiler simultaneously support -c and -o options?
 +compiler_c_o=$lt_lt_cv_prog_compiler_c_o
 +
-+# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
 +need_locks=$lt_need_locks
 +
 +# Do we need the lib prefix for modules?
@@ -20858,7 +22301,9 @@
 +
 +      case $tagname in
 +      CXX)
-+	if test -n "$CXX" && test "X$CXX" != "Xno"; then
++	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++	    (test "X$CXX" != "Xg++"))) ; then
 +	  ac_ext=cc
 +ac_cpp='$CXXCPP $CPPFLAGS'
 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -20895,7 +22340,7 @@
 +compiler_lib_search_path_CXX=
 +
 +# Source file extension for C++ test sources.
-+ac_ext=cc
++ac_ext=cpp
 +
 +# Object file extension for compiled C++ test sources.
 +objext=o
@@ -20916,6 +22361,20 @@
 +compiler=$CC
 +
 +
++# save warnings/boilerplate of simple test code
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++
++
 +# Allow CC to be a program name with arguments.
 +lt_save_CC=$CC
 +lt_save_LD=$LD
@@ -20937,8 +22396,17 @@
 +CC=${CXX-"c++"}
 +compiler=$CC
 +compiler_CXX=$CC
-+cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 +
++
 +# We don't want -fno-exception wen compiling C++ code, so set the
 +# no_builtin_flag separately
 +if test "$GXX" = yes; then
@@ -21008,7 +22476,7 @@
 +    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
 +      lt_cv_path_LD="$ac_dir/$ac_prog"
 +      # Check to see if the program is GNU ld.  I'd rather use --version,
-+      # but apparently some GNU ld's only accept -v.
++      # but apparently some variants of GNU ld only accept -v.
 +      # Break only if it was the GNU/non-GNU ld that we prefer.
 +      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
 +      *GNU* | *'with BFD'*)
@@ -21042,7 +22510,7 @@
 +if test "${lt_cv_prog_gnu_ld+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
 +else
-+  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
++  # I'd rather use --version here, but apparently some GNU lds only accept -v.
 +case `$LD -v 2>&1 </dev/null` in
 +*GNU* | *'with BFD'*)
 +  lt_cv_prog_gnu_ld=yes
@@ -21151,7 +22619,7 @@
 +    link_all_deplibs_CXX=yes
 +
 +    if test "$GXX" = yes; then
-+      case $host_os in aix4.012|aix4.012.*)
++      case $host_os in aix4.[012]|aix4.[012].*)
 +      # We only want to do this on AIX 4.2 and lower, the check
 +      # below for broken collect2 doesn't work under 4.3+
 +	collect2name=`${CC} -print-prog-name=collect2`
@@ -21172,6 +22640,9 @@
 +	fi
 +      esac
 +      shared_flag='-shared'
++      if test "$aix_use_runtimelinking" = yes; then
++	shared_flag="$shared_flag "'${wl}-G'
++      fi
 +    else
 +      # not using gcc
 +      if test "$host_cpu" = ia64; then
@@ -21317,7 +22788,7 @@
 +	# Exported symbols can be pulled into shared objects from archives
 +	whole_archive_flag_spec_CXX=' '
 +	archive_cmds_need_lc_CXX=yes
-+	# This is similar to how AIX traditionally builds it's shared libraries.
++	# This is similar to how AIX traditionally builds its shared libraries.
 +	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 +      fi
 +    fi
@@ -21331,6 +22802,7 @@
 +    esac
 +    ;;
 +
++
 +  cygwin* | mingw* | pw32*)
 +    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
 +    # as there is no search path for DLLs.
@@ -21354,65 +22826,76 @@
 +      ld_shlibs_CXX=no
 +    fi
 +  ;;
++      darwin* | rhapsody*)
++        case $host_os in
++        rhapsody* | darwin1.[012])
++         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[012])
++               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++        esac
++      archive_cmds_need_lc_CXX=no
++      hardcode_direct_CXX=no
++      hardcode_automatic_CXX=yes
++      hardcode_shlibpath_var_CXX=unsupported
++      whole_archive_flag_spec_CXX=''
++      link_all_deplibs_CXX=yes
 +
-+  darwin* | rhapsody*)
-+  if test "$GXX" = yes; then
-+    archive_cmds_need_lc_CXX=no
-+    case "$host_os" in
-+    rhapsody* | darwin1.[012])
-+      allow_undefined_flag_CXX='-undefined suppress'
-+      ;;
-+    *) # Darwin 1.3 on
-+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+      	allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
++    if test "$GXX" = yes ; then
++      lt_int_apple_cc_single_mod=no
++      output_verbose_link_cmd='echo'
++      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
++       lt_int_apple_cc_single_mod=yes
++      fi
++      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
 +      else
-+        case ${MACOSX_DEPLOYMENT_TARGET} in
-+          10.[012])
-+            allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
-+            ;;
-+          10.*)
-+            allow_undefined_flag_CXX='-undefined dynamic_lookup'
-+            ;;
-+        esac
++          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++        fi
++        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          else
++            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          fi
++            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      else
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++          module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         ld_shlibs_CXX=no
++          ;;
++      esac
 +      fi
-+      ;;
-+    esac
-+    lt_int_apple_cc_single_mod=no
-+    output_verbose_link_cmd='echo'
-+    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-+      lt_int_apple_cc_single_mod=yes
-+    fi
-+    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+      archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+    else
-+      archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+    fi
-+    module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++        ;;
 +
-+    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-+    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    else
-+      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    fi
-+    module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    hardcode_direct_CXX=no
-+    hardcode_automatic_CXX=yes
-+    hardcode_shlibpath_var_CXX=unsupported
-+    whole_archive_flag_spec_CXX='-all_load $convenience'
-+    link_all_deplibs_CXX=yes
-+  else
-+    ld_shlibs_CXX=no
-+  fi
-+    ;;
-+
 +  dgux*)
 +    case $cc_basename in
-+      ec++)
++      ec++*)
 +	# FIXME: insert proper C++ library support
 +	ld_shlibs_CXX=no
 +	;;
-+      ghcx)
++      ghcx*)
 +	# Green Hills C++ Compiler
 +	# FIXME: insert proper C++ library support
 +	ld_shlibs_CXX=no
@@ -21423,14 +22906,14 @@
 +	;;
 +    esac
 +    ;;
-+  freebsd12*)
++  freebsd[12]*)
 +    # C++ shared libraries reported to be fairly broken before switch to ELF
 +    ld_shlibs_CXX=no
 +    ;;
 +  freebsd-elf*)
 +    archive_cmds_need_lc_CXX=no
 +    ;;
-+  freebsd* | kfreebsd*-gnu)
++  freebsd* | kfreebsd*-gnu | dragonfly*)
 +    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
 +    # conventions
 +    ld_shlibs_CXX=yes
@@ -21447,11 +22930,11 @@
 +				# location of the library.
 +
 +    case $cc_basename in
-+    CC)
++    CC*)
 +      # FIXME: insert proper C++ library support
 +      ld_shlibs_CXX=no
 +      ;;
-+    aCC)
++    aCC*)
 +      archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
 +      # Commands to make compiler produce verbose output that lists
 +      # what "hidden" libraries, object files and flags are used when
@@ -21461,7 +22944,7 @@
 +      # explicitly linking system object files so we need to strip them
 +      # from the output so that they don't get included in the library
 +      # dependencies.
-+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 +      ;;
 +    *)
 +      if test "$GXX" = yes; then
@@ -21475,7 +22958,7 @@
 +    ;;
 +  hpux10*|hpux11*)
 +    if test $with_gnu_ld = no; then
-+      case "$host_cpu" in
++      case $host_cpu in
 +      hppa*64*)
 +	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
 +	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
@@ -21491,7 +22974,7 @@
 +        ;;
 +      esac
 +    fi
-+    case "$host_cpu" in
++    case $host_cpu in
 +    hppa*64*)
 +      hardcode_direct_CXX=no
 +      hardcode_shlibpath_var_CXX=no
@@ -21512,12 +22995,12 @@
 +    esac
 +
 +    case $cc_basename in
-+      CC)
++      CC*)
 +	# FIXME: insert proper C++ library support
 +	ld_shlibs_CXX=no
 +	;;
-+      aCC)
-+	case "$host_cpu" in
++      aCC*)
++	case $host_cpu in
 +	hppa*64*|ia64*)
 +	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
 +	  ;;
@@ -21538,7 +23021,7 @@
 +      *)
 +	if test "$GXX" = yes; then
 +	  if test $with_gnu_ld = no; then
-+	    case "$host_cpu" in
++	    case $host_cpu in
 +	    ia64*|hppa*64*)
 +	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
 +	      ;;
@@ -21556,9 +23039,9 @@
 +    ;;
 +  irix5* | irix6*)
 +    case $cc_basename in
-+      CC)
++      CC*)
 +	# SGI C++
-+	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 +
 +	# Archives containing C++ object files must be created using
 +	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
@@ -21569,7 +23052,7 @@
 +      *)
 +	if test "$GXX" = yes; then
 +	  if test "$with_gnu_ld" = no; then
-+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 +	  else
 +	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
 +	  fi
@@ -21582,7 +23065,7 @@
 +    ;;
 +  linux*)
 +    case $cc_basename in
-+      KCC)
++      KCC*)
 +	# Kuck and Associates, Inc. (KAI) C++ Compiler
 +
 +	# KCC will only create a shared library if the output file
@@ -21607,17 +23090,41 @@
 +	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
 +	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
 +	;;
-+      icpc)
++      icpc*)
 +	# Intel C++
 +	with_gnu_ld=yes
++	# version 8.0 and above of icpc choke on multiply defined symbols
++	# if we add $predep_objects and $postdep_objects, however 7.1 and
++	# earlier do not add the objects themselves.
++	case `$CC -V 2>&1` in
++	*"Version 7."*)
++  	  archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++  	  archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	*)  # Version 8.0 or newer
++	  tmp_idyn=
++	  case $host_cpu in
++	    ia64*) tmp_idyn=' -i_dynamic';;
++	  esac
++  	  archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	  archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	esac
 +	archive_cmds_need_lc_CXX=no
-+	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
 +	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
 +	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
 +	;;
-+      cxx)
++      pgCC*)
++        # Portland Group C++ compiler
++	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++  	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++
++	hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
++	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
++	whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++        ;;
++      cxx*)
 +	# Compaq C++
 +	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
@@ -21648,7 +23155,7 @@
 +    ;;
 +  mvs*)
 +    case $cc_basename in
-+      cxx)
++      cxx*)
 +	# FIXME: insert proper C++ library support
 +	ld_shlibs_CXX=no
 +	;;
@@ -21669,9 +23176,25 @@
 +    # Workaround some broken pre-1.5 toolchains
 +    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
 +    ;;
++  openbsd2*)
++    # C++ shared libraries are fairly broken
++    ld_shlibs_CXX=no
++    ;;
++  openbsd*)
++    hardcode_direct_CXX=yes
++    hardcode_shlibpath_var_CXX=no
++    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++      export_dynamic_flag_spec_CXX='${wl}-E'
++      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    fi
++    output_verbose_link_cmd='echo'
++    ;;
 +  osf3*)
 +    case $cc_basename in
-+      KCC)
++      KCC*)
 +	# Kuck and Associates, Inc. (KAI) C++ Compiler
 +
 +	# KCC will only create a shared library if the output file
@@ -21687,14 +23210,14 @@
 +	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
 +
 +	;;
-+      RCC)
++      RCC*)
 +	# Rational C++ 2.4.1
 +	# FIXME: insert proper C++ library support
 +	ld_shlibs_CXX=no
 +	;;
-+      cxx)
++      cxx*)
 +	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 +
 +	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
 +	hardcode_libdir_separator_CXX=:
@@ -21712,7 +23235,7 @@
 +      *)
 +	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 +	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-+	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 +
 +	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
 +	  hardcode_libdir_separator_CXX=:
@@ -21731,7 +23254,7 @@
 +    ;;
 +  osf4* | osf5*)
 +    case $cc_basename in
-+      KCC)
++      KCC*)
 +	# Kuck and Associates, Inc. (KAI) C++ Compiler
 +
 +	# KCC will only create a shared library if the output file
@@ -21746,17 +23269,17 @@
 +	# the KAI C++ compiler.
 +	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
 +	;;
-+      RCC)
++      RCC*)
 +	# Rational C++ 2.4.1
 +	# FIXME: insert proper C++ library support
 +	ld_shlibs_CXX=no
 +	;;
-+      cxx)
++      cxx*)
 +	allow_undefined_flag_CXX=' -expect_unresolved \*'
-+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 +	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
 +	  echo "-hidden">> $lib.exp~
-+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
++	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
 +	  $rm $lib.exp'
 +
 +	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
@@ -21775,7 +23298,7 @@
 +      *)
 +	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 +	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-+	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 +
 +	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
 +	  hardcode_libdir_separator_CXX=:
@@ -21799,7 +23322,7 @@
 +  sco*)
 +    archive_cmds_need_lc_CXX=no
 +    case $cc_basename in
-+      CC)
++      CC*)
 +	# FIXME: insert proper C++ library support
 +	ld_shlibs_CXX=no
 +	;;
@@ -21811,12 +23334,12 @@
 +    ;;
 +  sunos4*)
 +    case $cc_basename in
-+      CC)
++      CC*)
 +	# Sun C++ 4.x
 +	# FIXME: insert proper C++ library support
 +	ld_shlibs_CXX=no
 +	;;
-+      lcc)
++      lcc*)
 +	# Lucid
 +	# FIXME: insert proper C++ library support
 +	ld_shlibs_CXX=no
@@ -21829,36 +23352,33 @@
 +    ;;
 +  solaris*)
 +    case $cc_basename in
-+      CC)
++      CC*)
 +	# Sun C++ 4.2, 5.x and Centerline C++
++        archive_cmds_need_lc_CXX=yes
 +	no_undefined_flag_CXX=' -zdefs'
-+	archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
 +
 +	hardcode_libdir_flag_spec_CXX='-R$libdir'
 +	hardcode_shlibpath_var_CXX=no
 +	case $host_os in
-+	  solaris2.0-5 | solaris2.0-5.*) ;;
++	  solaris2.[0-5] | solaris2.[0-5].*) ;;
 +	  *)
 +	    # The C++ compiler is used as linker so we must use $wl
 +	    # flag to pass the commands to the underlying system
-+	    # linker.
++	    # linker. We must also pass each convience library through
++	    # to the system linker between allextract/defaultextract.
++	    # The C++ compiler will combine linker options so we
++	    # cannot just pass the convience library names through
++	    # without $wl.
 +	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-+	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
 +	    ;;
 +	esac
 +	link_all_deplibs_CXX=yes
 +
-+	# Commands to make compiler produce verbose output that lists
-+	# what "hidden" libraries, object files and flags are used when
-+	# linking a shared library.
-+	#
-+	# There doesn't appear to be a way to prevent this compiler from
-+	# explicitly linking system object files so we need to strip them
-+	# from the output so that they don't get included in the library
-+	# dependencies.
-+	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	output_verbose_link_cmd='echo'
 +
 +	# Archives containing C++ object files must be created using
 +	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -21866,7 +23386,7 @@
 +	# in the archive.
 +	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
 +	;;
-+      gcx)
++      gcx*)
 +	# Green Hills C++ Compiler
 +	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 +
@@ -21909,7 +23429,7 @@
 +    ;;
 +  tandem*)
 +    case $cc_basename in
-+      NCC)
++      NCC*)
 +	# NonStop-UX NCC 3.20
 +	# FIXME: insert proper C++ library support
 +	ld_shlibs_CXX=no
@@ -21962,7 +23482,7 @@
 +  # The `*' in the case matches for architectures that use `case' in
 +  # $output_verbose_cmd can trigger glob expansion during the loop
 +  # eval without this substitution.
-+  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
++  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
 +
 +  for p in `eval $output_verbose_link_cmd`; do
 +    case $p in
@@ -22038,6 +23558,20 @@
 +
 +$rm -f confest.$objext
 +
++# PORTME: override above test on systems where it is broken
++case $host_os in
++solaris*)
++  case $cc_basename in
++  CC*)
++    # Adding this requires a known-good setup of shared libraries for
++    # Sun compiler versions before 5.6, else PIC objects from an old
++    # archive will be linked into the output, leading to subtle bugs.
++    postdeps_CXX='-lCstd -lCrun'
++    ;;
++  esac
++esac
++
++
 +case " $postdeps_CXX " in
 +*" -lc "*) archive_cmds_need_lc_CXX=no ;;
 +esac
@@ -22093,7 +23627,7 @@
 +    hpux*)
 +      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
 +      # not for PA HP-UX.
-+      case "$host_cpu" in
++      case $host_cpu in
 +      hppa*64*|ia64*)
 +	;;
 +      *)
@@ -22118,18 +23652,28 @@
 +	;;
 +      chorus*)
 +	case $cc_basename in
-+	cxch68)
++	cxch68*)
 +	  # Green Hills C++ Compiler
 +	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
 +	  ;;
 +	esac
 +	;;
++       darwin*)
++         # PIC is the default on this platform
++         # Common symbols not allowed in MH_DYLIB files
++         case $cc_basename in
++           xlc*)
++           lt_prog_compiler_pic_CXX='-qnocommon'
++           lt_prog_compiler_wl_CXX='-Wl,'
++           ;;
++         esac
++       ;;
 +      dgux*)
 +	case $cc_basename in
-+	  ec++)
++	  ec++*)
 +	    lt_prog_compiler_pic_CXX='-KPIC'
 +	    ;;
-+	  ghcx)
++	  ghcx*)
 +	    # Green Hills C++ Compiler
 +	    lt_prog_compiler_pic_CXX='-pic'
 +	    ;;
@@ -22137,22 +23681,22 @@
 +	    ;;
 +	esac
 +	;;
-+      freebsd* | kfreebsd*-gnu)
++      freebsd* | kfreebsd*-gnu | dragonfly*)
 +	# FreeBSD uses GNU C++
 +	;;
 +      hpux9* | hpux10* | hpux11*)
 +	case $cc_basename in
-+	  CC)
++	  CC*)
 +	    lt_prog_compiler_wl_CXX='-Wl,'
 +	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
 +	    if test "$host_cpu" != ia64; then
 +	      lt_prog_compiler_pic_CXX='+Z'
 +	    fi
 +	    ;;
-+	  aCC)
++	  aCC*)
 +	    lt_prog_compiler_wl_CXX='-Wl,'
 +	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-+	    case "$host_cpu" in
++	    case $host_cpu in
 +	    hppa*64*|ia64*)
 +	      # +Z the default
 +	      ;;
@@ -22167,7 +23711,7 @@
 +	;;
 +      irix5* | irix6* | nonstopux*)
 +	case $cc_basename in
-+	  CC)
++	  CC*)
 +	    lt_prog_compiler_wl_CXX='-Wl,'
 +	    lt_prog_compiler_static_CXX='-non_shared'
 +	    # CC pic flag -KPIC is the default.
@@ -22178,18 +23722,24 @@
 +	;;
 +      linux*)
 +	case $cc_basename in
-+	  KCC)
++	  KCC*)
 +	    # KAI C++ Compiler
 +	    lt_prog_compiler_wl_CXX='--backend -Wl,'
 +	    lt_prog_compiler_pic_CXX='-fPIC'
 +	    ;;
-+	  icpc)
++	  icpc* | ecpc*)
 +	    # Intel C++
 +	    lt_prog_compiler_wl_CXX='-Wl,'
 +	    lt_prog_compiler_pic_CXX='-KPIC'
 +	    lt_prog_compiler_static_CXX='-static'
 +	    ;;
-+	  cxx)
++	  pgCC*)
++	    # Portland Group C++ compiler.
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_pic_CXX='-fpic'
++	    lt_prog_compiler_static_CXX='-Bstatic'
++	    ;;
++	  cxx*)
 +	    # Compaq C++
 +	    # Make sure the PIC flag is empty.  It appears that all Alpha
 +	    # Linux and Compaq Tru64 Unix objects are PIC.
@@ -22206,7 +23756,7 @@
 +	;;
 +      mvs*)
 +	case $cc_basename in
-+	  cxx)
++	  cxx*)
 +	    lt_prog_compiler_pic_CXX='-W c,exportall'
 +	    ;;
 +	  *)
@@ -22217,14 +23767,14 @@
 +	;;
 +      osf3* | osf4* | osf5*)
 +	case $cc_basename in
-+	  KCC)
++	  KCC*)
 +	    lt_prog_compiler_wl_CXX='--backend -Wl,'
 +	    ;;
-+	  RCC)
++	  RCC*)
 +	    # Rational C++ 2.4.1
 +	    lt_prog_compiler_pic_CXX='-pic'
 +	    ;;
-+	  cxx)
++	  cxx*)
 +	    # Digital/Compaq C++
 +	    lt_prog_compiler_wl_CXX='-Wl,'
 +	    # Make sure the PIC flag is empty.  It appears that all Alpha
@@ -22240,7 +23790,7 @@
 +	;;
 +      sco*)
 +	case $cc_basename in
-+	  CC)
++	  CC*)
 +	    lt_prog_compiler_pic_CXX='-fPIC'
 +	    ;;
 +	  *)
@@ -22249,13 +23799,13 @@
 +	;;
 +      solaris*)
 +	case $cc_basename in
-+	  CC)
++	  CC*)
 +	    # Sun C++ 4.2, 5.x and Centerline C++
 +	    lt_prog_compiler_pic_CXX='-KPIC'
 +	    lt_prog_compiler_static_CXX='-Bstatic'
 +	    lt_prog_compiler_wl_CXX='-Qoption ld '
 +	    ;;
-+	  gcx)
++	  gcx*)
 +	    # Green Hills C++ Compiler
 +	    lt_prog_compiler_pic_CXX='-PIC'
 +	    ;;
@@ -22265,12 +23815,12 @@
 +	;;
 +      sunos4*)
 +	case $cc_basename in
-+	  CC)
++	  CC*)
 +	    # Sun C++ 4.x
 +	    lt_prog_compiler_pic_CXX='-pic'
 +	    lt_prog_compiler_static_CXX='-Bstatic'
 +	    ;;
-+	  lcc)
++	  lcc*)
 +	    # Lucid
 +	    lt_prog_compiler_pic_CXX='-pic'
 +	    ;;
@@ -22280,7 +23830,7 @@
 +	;;
 +      tandem*)
 +	case $cc_basename in
-+	  NCC)
++	  NCC*)
 +	    # NonStop-UX NCC 3.20
 +	    lt_prog_compiler_pic_CXX='-KPIC'
 +	    ;;
@@ -22321,18 +23871,20 @@
 +   # with a dollar sign (not a hyphen), so the echo should work correctly.
 +   # The option is referenced via a variable to avoid confusing sed.
 +   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 +   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 +   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:11658: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11927: $lt_compile\"" >&5)
 +   (eval "$lt_compile" 2>conftest.err)
 +   ac_status=$?
 +   cat conftest.err >&5
-+   echo "$as_me:11662: \$? = $ac_status" >&5
++   echo "$as_me:11931: \$? = $ac_status" >&5
 +   if (exit $ac_status) && test -s "$ac_outfile"; then
 +     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     if test ! -s conftest.err; then
++     # So say no if there are warnings other than the usual output.
++     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++     $SED '/^$/d' conftest.err >conftest.er2
++     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
 +       lt_prog_compiler_pic_works_CXX=yes
 +     fi
 +   fi
@@ -22353,7 +23905,7 @@
 +fi
 +
 +fi
-+case "$host_os" in
++case $host_os in
 +  # For platforms which do not support PIC, -DPIC is meaningless:
 +  *djgpp*)
 +    lt_prog_compiler_pic_CXX=
@@ -22381,23 +23933,25 @@
 +   # Note that $ac_compile itself does not contain backslashes and begins
 +   # with a dollar sign (not a hyphen), so the echo should work correctly.
 +   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 +   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 +   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:11718: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11989: $lt_compile\"" >&5)
 +   (eval "$lt_compile" 2>out/conftest.err)
 +   ac_status=$?
 +   cat out/conftest.err >&5
-+   echo "$as_me:11722: \$? = $ac_status" >&5
++   echo "$as_me:11993: \$? = $ac_status" >&5
 +   if (exit $ac_status) && test -s out/conftest2.$ac_objext
 +   then
 +     # The compiler can only warn and ignore the option if not recognized
 +     # So say no if there are warnings
-+     if test ! -s out/conftest.err; then
++     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
++     $SED '/^$/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
 +       lt_cv_prog_compiler_c_o_CXX=yes
 +     fi
 +   fi
-+   chmod u+w .
++   chmod u+w . 2>&5
 +   $rm conftest*
 +   # SGI C++ compiler will create directory out/ii_files/ for
 +   # template instantiation
@@ -22452,7 +24006,7 @@
 +    export_symbols_cmds_CXX="$ltdll_cmds"
 +  ;;
 +  cygwin* | mingw*)
-+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
 +  ;;
 +  linux*)
 +    link_all_deplibs_CXX=no
@@ -22635,7 +24189,7 @@
 +  shlibpath_var=LIBRARY_PATH
 +  ;;
 +
-+bsdi4*)
++bsdi[45]*)
 +  version_type=linux
 +  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -22663,7 +24217,8 @@
 +      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
 +      dldir=$destdir/`dirname \$dlpath`~
 +      test -d \$dldir || mkdir -p \$dldir~
-+      $install_prog $dir/$dlname \$dldir/$dlname'
++      $install_prog $dir/$dlname \$dldir/$dlname~
++      chmod a+x \$dldir/$dlname'
 +    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
 +      dlpath=$dir/\$dldll~
 +       $rm \$dlpath'
@@ -22693,7 +24248,7 @@
 +      ;;
 +    pw32*)
 +      # pw32 DLLs use 'pw' prefix rather than 'lib'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
 +      ;;
 +    esac
 +    ;;
@@ -22716,7 +24271,7 @@
 +  soname_spec='${libname}${release}${major}$shared_ext'
 +  shlibpath_overrides_runpath=yes
 +  shlibpath_var=DYLD_LIBRARY_PATH
-+  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
 +  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
 +  if test "$GCC" = yes; then
 +    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -22751,8 +24306,17 @@
 +  dynamic_linker='GNU ld.so'
 +  ;;
 +
-+freebsd*)
-+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++freebsd* | dragonfly*)
++  # DragonFly does not have aout.  When/if they implement a new
++  # versioning mechanism, adjust this.
++  if test -x /usr/bin/objformat; then
++    objformat=`/usr/bin/objformat`
++  else
++    case $host_os in
++    freebsd[123]*) objformat=aout ;;
++    *) objformat=elf ;;
++    esac
++  fi
 +  version_type=freebsd-$objformat
 +  case $version_type in
 +    freebsd-elf*)
@@ -22770,7 +24334,7 @@
 +  freebsd2*)
 +    shlibpath_overrides_runpath=yes
 +    ;;
-+  freebsd3.01* | freebsdelf3.01*)
++  freebsd3.[01]* | freebsdelf3.[01]*)
 +    shlibpath_overrides_runpath=yes
 +    hardcode_into_libs=yes
 +    ;;
@@ -22797,7 +24361,7 @@
 +  version_type=sunos
 +  need_lib_prefix=no
 +  need_version=no
-+  case "$host_cpu" in
++  case $host_cpu in
 +  ia64*)
 +    shrext_cmds='.so'
 +    hardcode_into_libs=yes
@@ -22896,7 +24460,7 @@
 +
 +  # Append ld.so.conf contents to the search path
 +  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +  fi
 +
@@ -22971,7 +24535,11 @@
 +openbsd*)
 +  version_type=sunos
 +  need_lib_prefix=no
-+  need_version=yes
++  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++  case $host_os in
++    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++    *)                         need_version=no  ;;
++  esac
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
 +  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
 +  shlibpath_var=LD_LIBRARY_PATH
@@ -23093,8 +24661,8 @@
 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 +hardcode_action_CXX=
 +if test -n "$hardcode_libdir_flag_spec_CXX" || \
-+   test -n "$runpath_var CXX" || \
-+   test "X$hardcode_automatic_CXX"="Xyes" ; then
++   test -n "$runpath_var_CXX" || \
++   test "X$hardcode_automatic_CXX" = "Xyes" ; then
 +
 +  # We can hardcode non-existant directories.
 +  if test "$hardcode_direct_CXX" != no &&
@@ -23753,7 +25321,7 @@
 +  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 +  lt_status=$lt_dlunknown
 +  cat > conftest.$ac_ext <<EOF
-+#line 13087 "configure"
++#line 13374 "configure"
 +#include "confdefs.h"
 +
 +#if HAVE_DLFCN_H
@@ -23819,7 +25387,7 @@
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) 2>/dev/null
++    (./conftest; exit; ) >&5 2>/dev/null
 +    lt_status=$?
 +    case x$lt_status in
 +      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
@@ -23851,7 +25419,7 @@
 +  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 +  lt_status=$lt_dlunknown
 +  cat > conftest.$ac_ext <<EOF
-+#line 13185 "configure"
++#line 13472 "configure"
 +#include "confdefs.h"
 +
 +#if HAVE_DLFCN_H
@@ -23917,7 +25485,7 @@
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) 2>/dev/null
++    (./conftest; exit; ) >&5 2>/dev/null
 +    lt_status=$?
 +    case x$lt_status in
 +      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
@@ -24069,7 +25637,13 @@
 +# The host system.
 +host_alias=$host_alias
 +host=$host
++host_os=$host_os
 +
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
++
 +# An echo program that does not interpret backslashes.
 +echo=$lt_echo
 +
@@ -24145,7 +25719,7 @@
 +# Does compiler simultaneously support -c and -o options?
 +compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
 +
-+# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
 +need_locks=$lt_need_locks
 +
 +# Do we need the lib prefix for modules?
@@ -24426,13 +26000,36 @@
 +compiler=$CC
 +
 +
++# save warnings/boilerplate of simple test code
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++
++
 +# Allow CC to be a program name with arguments.
 +lt_save_CC="$CC"
 +CC=${F77-"f77"}
 +compiler=$CC
 +compiler_F77=$CC
-+cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 +
++
 +echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
 +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
 +echo "$as_me:$LINENO: result: $can_build_shared" >&5
@@ -24444,7 +26041,7 @@
 +
 +# On AIX, shared libraries and static libraries use the same namespace, and
 +# are all built from PIC.
-+case "$host_os" in
++case $host_os in
 +aix3*)
 +  test "$enable_shared" = yes && enable_static=no
 +  if test -n "$RANLIB"; then
@@ -24453,7 +26050,9 @@
 +  fi
 +  ;;
 +aix4* | aix5*)
-+  test "$enable_shared" = yes && enable_static=no
++  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++    test "$enable_shared" = yes && enable_static=no
++  fi
 +  ;;
 +esac
 +echo "$as_me:$LINENO: result: $enable_shared" >&5
@@ -24530,7 +26129,7 @@
 +    hpux*)
 +      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
 +      # not for PA HP-UX.
-+      case "$host_cpu" in
++      case $host_cpu in
 +      hppa*64*|ia64*)
 +	# +Z the default
 +	;;
@@ -24556,6 +26155,16 @@
 +	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
 +      fi
 +      ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case $cc_basename in
++         xlc*)
++         lt_prog_compiler_pic_F77='-qnocommon'
++         lt_prog_compiler_wl_F77='-Wl,'
++         ;;
++       esac
++       ;;
 +
 +    mingw* | pw32* | os2*)
 +      # This hack is so that the source file can tell whether it is being
@@ -24567,7 +26176,7 @@
 +      lt_prog_compiler_wl_F77='-Wl,'
 +      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
 +      # not for PA HP-UX.
-+      case "$host_cpu" in
++      case $host_cpu in
 +      hppa*64*|ia64*)
 +	# +Z the default
 +	;;
@@ -24591,12 +26200,19 @@
 +      ;;
 +
 +    linux*)
-+      case $CC in
++      case $cc_basename in
 +      icc* | ecc*)
 +	lt_prog_compiler_wl_F77='-Wl,'
 +	lt_prog_compiler_pic_F77='-KPIC'
 +	lt_prog_compiler_static_F77='-static'
 +        ;;
++      pgcc* | pgf77* | pgf90* | pgf95*)
++        # Portland Group compilers (*not* the Pentium gcc compiler,
++	# which looks to be a dead project)
++	lt_prog_compiler_wl_F77='-Wl,'
++	lt_prog_compiler_pic_F77='-fpic'
++	lt_prog_compiler_static_F77='-Bstatic'
++        ;;
 +      ccc*)
 +        lt_prog_compiler_wl_F77='-Wl,'
 +        # All Alpha code is PIC.
@@ -24617,9 +26233,14 @@
 +      ;;
 +
 +    solaris*)
-+      lt_prog_compiler_wl_F77='-Wl,'
 +      lt_prog_compiler_pic_F77='-KPIC'
 +      lt_prog_compiler_static_F77='-Bstatic'
++      case $cc_basename in
++      f77* | f90* | f95*)
++	lt_prog_compiler_wl_F77='-Qoption ld ';;
++      *)
++	lt_prog_compiler_wl_F77='-Wl,';;
++      esac
 +      ;;
 +
 +    sunos4*)
@@ -24641,6 +26262,11 @@
 +      fi
 +      ;;
 +
++    unicos*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      lt_prog_compiler_can_build_shared_F77=no
++      ;;
++
 +    uts4*)
 +      lt_prog_compiler_pic_F77='-pic'
 +      lt_prog_compiler_static_F77='-Bstatic'
@@ -24675,18 +26301,20 @@
 +   # with a dollar sign (not a hyphen), so the echo should work correctly.
 +   # The option is referenced via a variable to avoid confusing sed.
 +   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 +   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 +   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:14012: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14357: $lt_compile\"" >&5)
 +   (eval "$lt_compile" 2>conftest.err)
 +   ac_status=$?
 +   cat conftest.err >&5
-+   echo "$as_me:14016: \$? = $ac_status" >&5
++   echo "$as_me:14361: \$? = $ac_status" >&5
 +   if (exit $ac_status) && test -s "$ac_outfile"; then
 +     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     if test ! -s conftest.err; then
++     # So say no if there are warnings other than the usual output.
++     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++     $SED '/^$/d' conftest.err >conftest.er2
++     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
 +       lt_prog_compiler_pic_works_F77=yes
 +     fi
 +   fi
@@ -24707,7 +26335,7 @@
 +fi
 +
 +fi
-+case "$host_os" in
++case $host_os in
 +  # For platforms which do not support PIC, -DPIC is meaningless:
 +  *djgpp*)
 +    lt_prog_compiler_pic_F77=
@@ -24735,23 +26363,25 @@
 +   # Note that $ac_compile itself does not contain backslashes and begins
 +   # with a dollar sign (not a hyphen), so the echo should work correctly.
 +   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 +   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 +   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:14072: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14419: $lt_compile\"" >&5)
 +   (eval "$lt_compile" 2>out/conftest.err)
 +   ac_status=$?
 +   cat out/conftest.err >&5
-+   echo "$as_me:14076: \$? = $ac_status" >&5
++   echo "$as_me:14423: \$? = $ac_status" >&5
 +   if (exit $ac_status) && test -s out/conftest2.$ac_objext
 +   then
 +     # The compiler can only warn and ignore the option if not recognized
 +     # So say no if there are warnings
-+     if test ! -s out/conftest.err; then
++     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
++     $SED '/^$/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
 +       lt_cv_prog_compiler_c_o_F77=yes
 +     fi
 +   fi
-+   chmod u+w .
++   chmod u+w . 2>&5
 +   $rm conftest*
 +   # SGI C++ compiler will create directory out/ii_files/ for
 +   # template instantiation
@@ -24827,6 +26457,16 @@
 +  # rely on this symbol name, it's probably fine to never include it in
 +  # preloaded symbol tables.
 +  extract_expsyms_cmds=
++  # Just being paranoid about ensuring that cc_basename is set.
++  for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 +
 +  case $host_os in
 +  cygwin* | mingw* | pw32*)
@@ -24847,6 +26487,27 @@
 +    # If archive_cmds runs LD, not CC, wlarc should be empty
 +    wlarc='${wl}'
 +
++    # Set some defaults for GNU ld with shared library support. These
++    # are reset later if shared libraries are not supported. Putting them
++    # here allows them to be overridden if necessary.
++    runpath_var=LD_RUN_PATH
++    hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
++    export_dynamic_flag_spec_F77='${wl}--export-dynamic'
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	whole_archive_flag_spec_F77=
++    fi
++    supports_anon_versioning=no
++    case `$LD -v 2>/dev/null` in
++      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
++      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++      *\ 2.11.*) ;; # other 2.11 versions
++      *) supports_anon_versioning=yes ;;
++    esac
++
 +    # See if GNU ld supports shared libraries.
 +    case $host_os in
 +    aix3* | aix4* | aix5*)
@@ -24897,7 +26558,7 @@
 +      allow_undefined_flag_F77=unsupported
 +      always_export_symbols_F77=no
 +      enable_shared_with_static_runtimes_F77=yes
-+      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
 +
 +      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
 +        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -24911,10 +26572,42 @@
 +	fi~
 +	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
 +      else
-+	ld_shlibs=no
++	ld_shlibs_F77=no
 +      fi
 +      ;;
 +
++    linux*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	tmp_addflag=
++	case $cc_basename,$host_cpu in
++	pgcc*)				# Portland Group C compiler
++	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag'
++	  ;;
++	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
++	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag -Mnomain' ;;
++	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
++	  tmp_addflag=' -i_dynamic' ;;
++	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
++	  tmp_addflag=' -i_dynamic -nofor_main' ;;
++	ifc* | ifort*)			# Intel Fortran compiler
++	  tmp_addflag=' -nofor_main' ;;
++	esac
++	archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++	if test $supports_anon_versioning = yes; then
++	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
++  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++  $echo "local: *; };" >> $output_objdir/$libname.ver~
++	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	fi
++	link_all_deplibs_F77=no
++      else
++	ld_shlibs_F77=no
++      fi
++      ;;
++
 +    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
 +      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 +	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -24953,32 +26646,6 @@
 +      hardcode_shlibpath_var_F77=no
 +      ;;
 +
-+  linux*)
-+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_cmds_F77="$tmp_archive_cmds"
-+      supports_anon_versioning=no
-+      case `$LD -v 2>/dev/null` in
-+        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+        *\ 2.11.*) ;; # other 2.11 versions
-+        *) supports_anon_versioning=yes ;;
-+      esac
-+      if test $supports_anon_versioning = yes; then
-+        archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
-+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+$echo "local: *; };" >> $output_objdir/$libname.ver~
-+        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+      else
-+        archive_expsym_cmds_F77="$tmp_archive_cmds"
-+      fi
-+      link_all_deplibs_F77=no
-+    else
-+      ld_shlibs_F77=no
-+    fi
-+    ;;
-+
 +    *)
 +      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 +	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -24989,16 +26656,11 @@
 +      ;;
 +    esac
 +
-+    if test "$ld_shlibs_F77" = yes; then
-+      runpath_var=LD_RUN_PATH
-+      hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
-+      export_dynamic_flag_spec_F77='${wl}--export-dynamic'
-+      # ancient GNU ld didn't support --whole-archive et. al.
-+      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-+ 	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      else
-+  	whole_archive_flag_spec_F77=
-+      fi
++    if test "$ld_shlibs_F77" = no; then
++      runpath_var=
++      hardcode_libdir_flag_spec_F77=
++      export_dynamic_flag_spec_F77=
++      whole_archive_flag_spec_F77=
 +    fi
 +  else
 +    # PORTME fill in a description of your system's linker (not GNU ld)
@@ -25062,7 +26724,7 @@
 +      link_all_deplibs_F77=yes
 +
 +      if test "$GCC" = yes; then
-+	case $host_os in aix4.012|aix4.012.*)
++	case $host_os in aix4.[012]|aix4.[012].*)
 +	# We only want to do this on AIX 4.2 and lower, the check
 +	# below for broken collect2 doesn't work under 4.3+
 +	  collect2name=`${CC} -print-prog-name=collect2`
@@ -25083,6 +26745,9 @@
 +	  fi
 +	esac
 +	shared_flag='-shared'
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag="$shared_flag "'${wl}-G'
++	fi
 +      else
 +	# not using gcc
 +	if test "$host_cpu" = ia64; then
@@ -25207,7 +26872,7 @@
 +	  # Exported symbols can be pulled into shared objects from archives
 +	  whole_archive_flag_spec_F77=' '
 +	  archive_cmds_need_lc_F77=yes
-+	  # This is similar to how AIX traditionally builds it's shared libraries.
++	  # This is similar to how AIX traditionally builds its shared libraries.
 +	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 +	fi
 +      fi
@@ -25221,7 +26886,7 @@
 +      ld_shlibs_F77=no
 +      ;;
 +
-+    bsdi4*)
++    bsdi[45]*)
 +      export_dynamic_flag_spec_F77=-rdynamic
 +      ;;
 +
@@ -25242,57 +26907,57 @@
 +      old_archive_From_new_cmds_F77='true'
 +      # FIXME: Should let the user specify the lib program.
 +      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
 +      enable_shared_with_static_runtimes_F77=yes
 +      ;;
 +
 +    darwin* | rhapsody*)
-+    if test "$GXX" = yes ; then
-+      archive_cmds_need_lc_F77=no
-+      case "$host_os" in
-+      rhapsody* | darwin1.[012])
-+	allow_undefined_flag_F77='-undefined suppress'
-+	;;
-+      *) # Darwin 1.3 on
-+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+      	allow_undefined_flag_F77='-flat_namespace -undefined suppress'
-+      else
-+        case ${MACOSX_DEPLOYMENT_TARGET} in
-+          10.[012])
-+            allow_undefined_flag_F77='-flat_namespace -undefined suppress'
-+            ;;
-+          10.*)
-+            allow_undefined_flag_F77='-undefined dynamic_lookup'
-+            ;;
-+        esac
-+      fi
-+	;;
++      case $host_os in
++        rhapsody* | darwin1.[012])
++         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[012])
++               allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
 +      esac
-+    	lt_int_apple_cc_single_mod=no
-+    	output_verbose_link_cmd='echo'
-+    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-+    	  lt_int_apple_cc_single_mod=yes
-+    	fi
-+    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+    	  archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+    	else
-+        archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+      fi
-+      module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-+        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+        else
-+          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+        fi
-+          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      archive_cmds_need_lc_F77=no
 +      hardcode_direct_F77=no
 +      hardcode_automatic_F77=yes
 +      hardcode_shlibpath_var_F77=unsupported
-+      whole_archive_flag_spec_F77='-all_load $convenience'
++      whole_archive_flag_spec_F77=''
 +      link_all_deplibs_F77=yes
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +    else
-+      ld_shlibs_F77=no
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         ld_shlibs_F77=no
++          ;;
++      esac
 +    fi
 +      ;;
 +
@@ -25326,7 +26991,7 @@
 +      ;;
 +
 +    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+    freebsd* | kfreebsd*-gnu)
++    freebsd* | kfreebsd*-gnu | dragonfly*)
 +      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
 +      hardcode_libdir_flag_spec_F77='-R$libdir'
 +      hardcode_direct_F77=yes
@@ -25351,7 +27016,7 @@
 +
 +    hpux10* | hpux11*)
 +      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+	case "$host_cpu" in
++	case $host_cpu in
 +	hppa*64*|ia64*)
 +	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
@@ -25360,7 +27025,7 @@
 +	  ;;
 +	esac
 +      else
-+	case "$host_cpu" in
++	case $host_cpu in
 +	hppa*64*|ia64*)
 +	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
 +	  ;;
@@ -25370,7 +27035,7 @@
 +	esac
 +      fi
 +      if test "$with_gnu_ld" = no; then
-+	case "$host_cpu" in
++	case $host_cpu in
 +	hppa*64*)
 +	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
 +	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
@@ -25437,6 +27102,7 @@
 +      hardcode_shlibpath_var_F77=no
 +      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 +	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
 +	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
 +	export_dynamic_flag_spec_F77='${wl}-E'
 +      else
@@ -25482,7 +27148,7 @@
 +	allow_undefined_flag_F77=' -expect_unresolved \*'
 +	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 +	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
 +
 +	# Both c and cxx compiler support -rpath directly
 +	hardcode_libdir_flag_spec_F77='-rpath $libdir'
@@ -25501,10 +27167,12 @@
 +    solaris*)
 +      no_undefined_flag_F77=' -z text'
 +      if test "$GCC" = yes; then
++	wlarc='${wl}'
 +	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 +	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
 +      else
++	wlarc=''
 +	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 +  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
@@ -25513,8 +27181,18 @@
 +      hardcode_shlibpath_var_F77=no
 +      case $host_os in
 +      solaris2.[0-5] | solaris2.[0-5].*) ;;
-+      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-+	whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
++      *)
++ 	# The compiler driver will combine linker options so we
++ 	# cannot just pass the convience library names through
++ 	# without $wl, iff we do not link with $LD.
++ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
++ 	case $wlarc in
++ 	'')
++ 	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
++ 	*)
++ 	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ 	esac ;;
 +      esac
 +      link_all_deplibs_F77=yes
 +      ;;
@@ -25788,7 +27466,7 @@
 +  shlibpath_var=LIBRARY_PATH
 +  ;;
 +
-+bsdi4*)
++bsdi[45]*)
 +  version_type=linux
 +  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -25816,7 +27494,8 @@
 +      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
 +      dldir=$destdir/`dirname \$dlpath`~
 +      test -d \$dldir || mkdir -p \$dldir~
-+      $install_prog $dir/$dlname \$dldir/$dlname'
++      $install_prog $dir/$dlname \$dldir/$dlname~
++      chmod a+x \$dldir/$dlname'
 +    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
 +      dlpath=$dir/\$dldll~
 +       $rm \$dlpath'
@@ -25846,7 +27525,7 @@
 +      ;;
 +    pw32*)
 +      # pw32 DLLs use 'pw' prefix rather than 'lib'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
 +      ;;
 +    esac
 +    ;;
@@ -25869,7 +27548,7 @@
 +  soname_spec='${libname}${release}${major}$shared_ext'
 +  shlibpath_overrides_runpath=yes
 +  shlibpath_var=DYLD_LIBRARY_PATH
-+  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
 +  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
 +  if test "$GCC" = yes; then
 +    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -25904,8 +27583,17 @@
 +  dynamic_linker='GNU ld.so'
 +  ;;
 +
-+freebsd*)
-+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++freebsd* | dragonfly*)
++  # DragonFly does not have aout.  When/if they implement a new
++  # versioning mechanism, adjust this.
++  if test -x /usr/bin/objformat; then
++    objformat=`/usr/bin/objformat`
++  else
++    case $host_os in
++    freebsd[123]*) objformat=aout ;;
++    *) objformat=elf ;;
++    esac
++  fi
 +  version_type=freebsd-$objformat
 +  case $version_type in
 +    freebsd-elf*)
@@ -25923,7 +27611,7 @@
 +  freebsd2*)
 +    shlibpath_overrides_runpath=yes
 +    ;;
-+  freebsd3.01* | freebsdelf3.01*)
++  freebsd3.[01]* | freebsdelf3.[01]*)
 +    shlibpath_overrides_runpath=yes
 +    hardcode_into_libs=yes
 +    ;;
@@ -25950,7 +27638,7 @@
 +  version_type=sunos
 +  need_lib_prefix=no
 +  need_version=no
-+  case "$host_cpu" in
++  case $host_cpu in
 +  ia64*)
 +    shrext_cmds='.so'
 +    hardcode_into_libs=yes
@@ -26049,7 +27737,7 @@
 +
 +  # Append ld.so.conf contents to the search path
 +  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +  fi
 +
@@ -26124,7 +27812,11 @@
 +openbsd*)
 +  version_type=sunos
 +  need_lib_prefix=no
-+  need_version=yes
++  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++  case $host_os in
++    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++    *)                         need_version=no  ;;
++  esac
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
 +  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
 +  shlibpath_var=LD_LIBRARY_PATH
@@ -26246,8 +27938,8 @@
 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 +hardcode_action_F77=
 +if test -n "$hardcode_libdir_flag_spec_F77" || \
-+   test -n "$runpath_var F77" || \
-+   test "X$hardcode_automatic_F77"="Xyes" ; then
++   test -n "$runpath_var_F77" || \
++   test "X$hardcode_automatic_F77" = "Xyes" ; then
 +
 +  # We can hardcode non-existant directories.
 +  if test "$hardcode_direct_F77" != no &&
@@ -26424,7 +28116,13 @@
 +# The host system.
 +host_alias=$host_alias
 +host=$host
++host_os=$host_os
 +
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
++
 +# An echo program that does not interpret backslashes.
 +echo=$lt_echo
 +
@@ -26500,7 +28198,7 @@
 +# Does compiler simultaneously support -c and -o options?
 +compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
 +
-+# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
 +need_locks=$lt_need_locks
 +
 +# Do we need the lib prefix for modules?
@@ -26738,7 +28436,7 @@
 +lt_simple_compile_test_code="class foo {}\n"
 +
 +# Code to be used in simple link tests
-+lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
 +
 +# ltmain only uses $CC for tagged configurations so make sure $CC is set.
 +
@@ -26749,16 +28447,42 @@
 +compiler=$CC
 +
 +
++# save warnings/boilerplate of simple test code
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++
++
 +# Allow CC to be a program name with arguments.
 +lt_save_CC="$CC"
 +CC=${GCJ-"gcj"}
 +compiler=$CC
 +compiler_GCJ=$CC
++for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 +
++
 +# GCJ did not exist at the time GCC didn't implicitly link libc in.
 +archive_cmds_need_lc_GCJ=no
 +
++old_archive_cmds_GCJ=$old_archive_cmds
 +
++
 +lt_prog_compiler_no_builtin_flag_GCJ=
 +
 +if test "$GCC" = yes; then
@@ -26780,18 +28504,20 @@
 +   # with a dollar sign (not a hyphen), so the echo should work correctly.
 +   # The option is referenced via a variable to avoid confusing sed.
 +   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 +   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 +   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:16117: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16560: $lt_compile\"" >&5)
 +   (eval "$lt_compile" 2>conftest.err)
 +   ac_status=$?
 +   cat conftest.err >&5
-+   echo "$as_me:16121: \$? = $ac_status" >&5
++   echo "$as_me:16564: \$? = $ac_status" >&5
 +   if (exit $ac_status) && test -s "$ac_outfile"; then
 +     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     if test ! -s conftest.err; then
++     # So say no if there are warnings other than the usual output.
++     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++     $SED '/^$/d' conftest.err >conftest.er2
++     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
 +       lt_cv_prog_compiler_rtti_exceptions=yes
 +     fi
 +   fi
@@ -26868,7 +28594,7 @@
 +    hpux*)
 +      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
 +      # not for PA HP-UX.
-+      case "$host_cpu" in
++      case $host_cpu in
 +      hppa*64*|ia64*)
 +	# +Z the default
 +	;;
@@ -26894,6 +28620,16 @@
 +	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
 +      fi
 +      ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case $cc_basename in
++         xlc*)
++         lt_prog_compiler_pic_GCJ='-qnocommon'
++         lt_prog_compiler_wl_GCJ='-Wl,'
++         ;;
++       esac
++       ;;
 +
 +    mingw* | pw32* | os2*)
 +      # This hack is so that the source file can tell whether it is being
@@ -26905,7 +28641,7 @@
 +      lt_prog_compiler_wl_GCJ='-Wl,'
 +      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
 +      # not for PA HP-UX.
-+      case "$host_cpu" in
++      case $host_cpu in
 +      hppa*64*|ia64*)
 +	# +Z the default
 +	;;
@@ -26929,12 +28665,19 @@
 +      ;;
 +
 +    linux*)
-+      case $CC in
++      case $cc_basename in
 +      icc* | ecc*)
 +	lt_prog_compiler_wl_GCJ='-Wl,'
 +	lt_prog_compiler_pic_GCJ='-KPIC'
 +	lt_prog_compiler_static_GCJ='-static'
 +        ;;
++      pgcc* | pgf77* | pgf90* | pgf95*)
++        # Portland Group compilers (*not* the Pentium gcc compiler,
++	# which looks to be a dead project)
++	lt_prog_compiler_wl_GCJ='-Wl,'
++	lt_prog_compiler_pic_GCJ='-fpic'
++	lt_prog_compiler_static_GCJ='-Bstatic'
++        ;;
 +      ccc*)
 +        lt_prog_compiler_wl_GCJ='-Wl,'
 +        # All Alpha code is PIC.
@@ -26955,9 +28698,14 @@
 +      ;;
 +
 +    solaris*)
-+      lt_prog_compiler_wl_GCJ='-Wl,'
 +      lt_prog_compiler_pic_GCJ='-KPIC'
 +      lt_prog_compiler_static_GCJ='-Bstatic'
++      case $cc_basename in
++      f77* | f90* | f95*)
++	lt_prog_compiler_wl_GCJ='-Qoption ld ';;
++      *)
++	lt_prog_compiler_wl_GCJ='-Wl,';;
++      esac
 +      ;;
 +
 +    sunos4*)
@@ -26979,6 +28727,11 @@
 +      fi
 +      ;;
 +
++    unicos*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      lt_prog_compiler_can_build_shared_GCJ=no
++      ;;
++
 +    uts4*)
 +      lt_prog_compiler_pic_GCJ='-pic'
 +      lt_prog_compiler_static_GCJ='-Bstatic'
@@ -27013,18 +28766,20 @@
 +   # with a dollar sign (not a hyphen), so the echo should work correctly.
 +   # The option is referenced via a variable to avoid confusing sed.
 +   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 +   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 +   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:16350: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16822: $lt_compile\"" >&5)
 +   (eval "$lt_compile" 2>conftest.err)
 +   ac_status=$?
 +   cat conftest.err >&5
-+   echo "$as_me:16354: \$? = $ac_status" >&5
++   echo "$as_me:16826: \$? = $ac_status" >&5
 +   if (exit $ac_status) && test -s "$ac_outfile"; then
 +     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     if test ! -s conftest.err; then
++     # So say no if there are warnings other than the usual output.
++     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++     $SED '/^$/d' conftest.err >conftest.er2
++     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
 +       lt_prog_compiler_pic_works_GCJ=yes
 +     fi
 +   fi
@@ -27045,7 +28800,7 @@
 +fi
 +
 +fi
-+case "$host_os" in
++case $host_os in
 +  # For platforms which do not support PIC, -DPIC is meaningless:
 +  *djgpp*)
 +    lt_prog_compiler_pic_GCJ=
@@ -27073,23 +28828,25 @@
 +   # Note that $ac_compile itself does not contain backslashes and begins
 +   # with a dollar sign (not a hyphen), so the echo should work correctly.
 +   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 +   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 +   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:16410: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16884: $lt_compile\"" >&5)
 +   (eval "$lt_compile" 2>out/conftest.err)
 +   ac_status=$?
 +   cat out/conftest.err >&5
-+   echo "$as_me:16414: \$? = $ac_status" >&5
++   echo "$as_me:16888: \$? = $ac_status" >&5
 +   if (exit $ac_status) && test -s out/conftest2.$ac_objext
 +   then
 +     # The compiler can only warn and ignore the option if not recognized
 +     # So say no if there are warnings
-+     if test ! -s out/conftest.err; then
++     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
++     $SED '/^$/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
 +       lt_cv_prog_compiler_c_o_GCJ=yes
 +     fi
 +   fi
-+   chmod u+w .
++   chmod u+w . 2>&5
 +   $rm conftest*
 +   # SGI C++ compiler will create directory out/ii_files/ for
 +   # template instantiation
@@ -27165,6 +28922,16 @@
 +  # rely on this symbol name, it's probably fine to never include it in
 +  # preloaded symbol tables.
 +  extract_expsyms_cmds=
++  # Just being paranoid about ensuring that cc_basename is set.
++  for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 +
 +  case $host_os in
 +  cygwin* | mingw* | pw32*)
@@ -27185,6 +28952,27 @@
 +    # If archive_cmds runs LD, not CC, wlarc should be empty
 +    wlarc='${wl}'
 +
++    # Set some defaults for GNU ld with shared library support. These
++    # are reset later if shared libraries are not supported. Putting them
++    # here allows them to be overridden if necessary.
++    runpath_var=LD_RUN_PATH
++    hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
++    export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	whole_archive_flag_spec_GCJ=
++    fi
++    supports_anon_versioning=no
++    case `$LD -v 2>/dev/null` in
++      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
++      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++      *\ 2.11.*) ;; # other 2.11 versions
++      *) supports_anon_versioning=yes ;;
++    esac
++
 +    # See if GNU ld supports shared libraries.
 +    case $host_os in
 +    aix3* | aix4* | aix5*)
@@ -27235,7 +29023,7 @@
 +      allow_undefined_flag_GCJ=unsupported
 +      always_export_symbols_GCJ=no
 +      enable_shared_with_static_runtimes_GCJ=yes
-+      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
 +
 +      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
 +        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -27249,10 +29037,42 @@
 +	fi~
 +	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
 +      else
-+	ld_shlibs=no
++	ld_shlibs_GCJ=no
 +      fi
 +      ;;
 +
++    linux*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	tmp_addflag=
++	case $cc_basename,$host_cpu in
++	pgcc*)				# Portland Group C compiler
++	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag'
++	  ;;
++	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
++	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag -Mnomain' ;;
++	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
++	  tmp_addflag=' -i_dynamic' ;;
++	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
++	  tmp_addflag=' -i_dynamic -nofor_main' ;;
++	ifc* | ifort*)			# Intel Fortran compiler
++	  tmp_addflag=' -nofor_main' ;;
++	esac
++	archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++	if test $supports_anon_versioning = yes; then
++	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
++  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++  $echo "local: *; };" >> $output_objdir/$libname.ver~
++	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	fi
++	link_all_deplibs_GCJ=no
++      else
++	ld_shlibs_GCJ=no
++      fi
++      ;;
++
 +    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
 +      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 +	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -27291,32 +29111,6 @@
 +      hardcode_shlibpath_var_GCJ=no
 +      ;;
 +
-+  linux*)
-+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_cmds_GCJ="$tmp_archive_cmds"
-+      supports_anon_versioning=no
-+      case `$LD -v 2>/dev/null` in
-+        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+        *\ 2.11.*) ;; # other 2.11 versions
-+        *) supports_anon_versioning=yes ;;
-+      esac
-+      if test $supports_anon_versioning = yes; then
-+        archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
-+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+$echo "local: *; };" >> $output_objdir/$libname.ver~
-+        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+      else
-+        archive_expsym_cmds_GCJ="$tmp_archive_cmds"
-+      fi
-+      link_all_deplibs_GCJ=no
-+    else
-+      ld_shlibs_GCJ=no
-+    fi
-+    ;;
-+
 +    *)
 +      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 +	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -27327,16 +29121,11 @@
 +      ;;
 +    esac
 +
-+    if test "$ld_shlibs_GCJ" = yes; then
-+      runpath_var=LD_RUN_PATH
-+      hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
-+      export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
-+      # ancient GNU ld didn't support --whole-archive et. al.
-+      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-+ 	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      else
-+  	whole_archive_flag_spec_GCJ=
-+      fi
++    if test "$ld_shlibs_GCJ" = no; then
++      runpath_var=
++      hardcode_libdir_flag_spec_GCJ=
++      export_dynamic_flag_spec_GCJ=
++      whole_archive_flag_spec_GCJ=
 +    fi
 +  else
 +    # PORTME fill in a description of your system's linker (not GNU ld)
@@ -27400,7 +29189,7 @@
 +      link_all_deplibs_GCJ=yes
 +
 +      if test "$GCC" = yes; then
-+	case $host_os in aix4.012|aix4.012.*)
++	case $host_os in aix4.[012]|aix4.[012].*)
 +	# We only want to do this on AIX 4.2 and lower, the check
 +	# below for broken collect2 doesn't work under 4.3+
 +	  collect2name=`${CC} -print-prog-name=collect2`
@@ -27421,6 +29210,9 @@
 +	  fi
 +	esac
 +	shared_flag='-shared'
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag="$shared_flag "'${wl}-G'
++	fi
 +      else
 +	# not using gcc
 +	if test "$host_cpu" = ia64; then
@@ -27565,7 +29357,7 @@
 +	  # Exported symbols can be pulled into shared objects from archives
 +	  whole_archive_flag_spec_GCJ=' '
 +	  archive_cmds_need_lc_GCJ=yes
-+	  # This is similar to how AIX traditionally builds it's shared libraries.
++	  # This is similar to how AIX traditionally builds its shared libraries.
 +	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 +	fi
 +      fi
@@ -27579,7 +29371,7 @@
 +      ld_shlibs_GCJ=no
 +      ;;
 +
-+    bsdi4*)
++    bsdi[45]*)
 +      export_dynamic_flag_spec_GCJ=-rdynamic
 +      ;;
 +
@@ -27600,57 +29392,57 @@
 +      old_archive_From_new_cmds_GCJ='true'
 +      # FIXME: Should let the user specify the lib program.
 +      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
 +      enable_shared_with_static_runtimes_GCJ=yes
 +      ;;
 +
 +    darwin* | rhapsody*)
-+    if test "$GXX" = yes ; then
-+      archive_cmds_need_lc_GCJ=no
-+      case "$host_os" in
-+      rhapsody* | darwin1.[012])
-+	allow_undefined_flag_GCJ='-undefined suppress'
-+	;;
-+      *) # Darwin 1.3 on
-+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+      	allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
-+      else
-+        case ${MACOSX_DEPLOYMENT_TARGET} in
-+          10.[012])
-+            allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
-+            ;;
-+          10.*)
-+            allow_undefined_flag_GCJ='-undefined dynamic_lookup'
-+            ;;
-+        esac
-+      fi
-+	;;
++      case $host_os in
++        rhapsody* | darwin1.[012])
++         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[012])
++               allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
 +      esac
-+    	lt_int_apple_cc_single_mod=no
-+    	output_verbose_link_cmd='echo'
-+    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-+    	  lt_int_apple_cc_single_mod=yes
-+    	fi
-+    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+    	  archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+    	else
-+        archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+      fi
-+      module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-+        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+        else
-+          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+        fi
-+          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      archive_cmds_need_lc_GCJ=no
 +      hardcode_direct_GCJ=no
 +      hardcode_automatic_GCJ=yes
 +      hardcode_shlibpath_var_GCJ=unsupported
-+      whole_archive_flag_spec_GCJ='-all_load $convenience'
++      whole_archive_flag_spec_GCJ=''
 +      link_all_deplibs_GCJ=yes
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +    else
-+      ld_shlibs_GCJ=no
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         ld_shlibs_GCJ=no
++          ;;
++      esac
 +    fi
 +      ;;
 +
@@ -27684,7 +29476,7 @@
 +      ;;
 +
 +    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+    freebsd* | kfreebsd*-gnu)
++    freebsd* | kfreebsd*-gnu | dragonfly*)
 +      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
 +      hardcode_libdir_flag_spec_GCJ='-R$libdir'
 +      hardcode_direct_GCJ=yes
@@ -27709,7 +29501,7 @@
 +
 +    hpux10* | hpux11*)
 +      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+	case "$host_cpu" in
++	case $host_cpu in
 +	hppa*64*|ia64*)
 +	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
@@ -27718,7 +29510,7 @@
 +	  ;;
 +	esac
 +      else
-+	case "$host_cpu" in
++	case $host_cpu in
 +	hppa*64*|ia64*)
 +	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
 +	  ;;
@@ -27728,7 +29520,7 @@
 +	esac
 +      fi
 +      if test "$with_gnu_ld" = no; then
-+	case "$host_cpu" in
++	case $host_cpu in
 +	hppa*64*)
 +	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
 +	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
@@ -27795,6 +29587,7 @@
 +      hardcode_shlibpath_var_GCJ=no
 +      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 +	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
 +	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
 +	export_dynamic_flag_spec_GCJ='${wl}-E'
 +      else
@@ -27840,7 +29633,7 @@
 +	allow_undefined_flag_GCJ=' -expect_unresolved \*'
 +	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 +	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
 +
 +	# Both c and cxx compiler support -rpath directly
 +	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
@@ -27859,10 +29652,12 @@
 +    solaris*)
 +      no_undefined_flag_GCJ=' -z text'
 +      if test "$GCC" = yes; then
++	wlarc='${wl}'
 +	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 +	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
 +      else
++	wlarc=''
 +	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 +  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
@@ -27871,8 +29666,18 @@
 +      hardcode_shlibpath_var_GCJ=no
 +      case $host_os in
 +      solaris2.[0-5] | solaris2.[0-5].*) ;;
-+      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-+	whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
++      *)
++ 	# The compiler driver will combine linker options so we
++ 	# cannot just pass the convience library names through
++ 	# without $wl, iff we do not link with $LD.
++ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
++ 	case $wlarc in
++ 	'')
++ 	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
++ 	*)
++ 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ 	esac ;;
 +      esac
 +      link_all_deplibs_GCJ=yes
 +      ;;
@@ -28146,7 +29951,7 @@
 +  shlibpath_var=LIBRARY_PATH
 +  ;;
 +
-+bsdi4*)
++bsdi[45]*)
 +  version_type=linux
 +  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -28174,7 +29979,8 @@
 +      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
 +      dldir=$destdir/`dirname \$dlpath`~
 +      test -d \$dldir || mkdir -p \$dldir~
-+      $install_prog $dir/$dlname \$dldir/$dlname'
++      $install_prog $dir/$dlname \$dldir/$dlname~
++      chmod a+x \$dldir/$dlname'
 +    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
 +      dlpath=$dir/\$dldll~
 +       $rm \$dlpath'
@@ -28204,7 +30010,7 @@
 +      ;;
 +    pw32*)
 +      # pw32 DLLs use 'pw' prefix rather than 'lib'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
 +      ;;
 +    esac
 +    ;;
@@ -28227,7 +30033,7 @@
 +  soname_spec='${libname}${release}${major}$shared_ext'
 +  shlibpath_overrides_runpath=yes
 +  shlibpath_var=DYLD_LIBRARY_PATH
-+  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
 +  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
 +  if test "$GCC" = yes; then
 +    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -28262,8 +30068,17 @@
 +  dynamic_linker='GNU ld.so'
 +  ;;
 +
-+freebsd*)
-+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++freebsd* | dragonfly*)
++  # DragonFly does not have aout.  When/if they implement a new
++  # versioning mechanism, adjust this.
++  if test -x /usr/bin/objformat; then
++    objformat=`/usr/bin/objformat`
++  else
++    case $host_os in
++    freebsd[123]*) objformat=aout ;;
++    *) objformat=elf ;;
++    esac
++  fi
 +  version_type=freebsd-$objformat
 +  case $version_type in
 +    freebsd-elf*)
@@ -28281,7 +30096,7 @@
 +  freebsd2*)
 +    shlibpath_overrides_runpath=yes
 +    ;;
-+  freebsd3.01* | freebsdelf3.01*)
++  freebsd3.[01]* | freebsdelf3.[01]*)
 +    shlibpath_overrides_runpath=yes
 +    hardcode_into_libs=yes
 +    ;;
@@ -28308,7 +30123,7 @@
 +  version_type=sunos
 +  need_lib_prefix=no
 +  need_version=no
-+  case "$host_cpu" in
++  case $host_cpu in
 +  ia64*)
 +    shrext_cmds='.so'
 +    hardcode_into_libs=yes
@@ -28407,7 +30222,7 @@
 +
 +  # Append ld.so.conf contents to the search path
 +  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +  fi
 +
@@ -28482,7 +30297,11 @@
 +openbsd*)
 +  version_type=sunos
 +  need_lib_prefix=no
-+  need_version=yes
++  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++  case $host_os in
++    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++    *)                         need_version=no  ;;
++  esac
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
 +  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
 +  shlibpath_var=LD_LIBRARY_PATH
@@ -28604,8 +30423,8 @@
 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 +hardcode_action_GCJ=
 +if test -n "$hardcode_libdir_flag_spec_GCJ" || \
-+   test -n "$runpath_var GCJ" || \
-+   test "X$hardcode_automatic_GCJ"="Xyes" ; then
++   test -n "$runpath_var_GCJ" || \
++   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
 +
 +  # We can hardcode non-existant directories.
 +  if test "$hardcode_direct_GCJ" != no &&
@@ -29264,7 +31083,7 @@
 +  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 +  lt_status=$lt_dlunknown
 +  cat > conftest.$ac_ext <<EOF
-+#line 18598 "configure"
++#line 19136 "configure"
 +#include "confdefs.h"
 +
 +#if HAVE_DLFCN_H
@@ -29330,7 +31149,7 @@
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) 2>/dev/null
++    (./conftest; exit; ) >&5 2>/dev/null
 +    lt_status=$?
 +    case x$lt_status in
 +      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
@@ -29362,7 +31181,7 @@
 +  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 +  lt_status=$lt_dlunknown
 +  cat > conftest.$ac_ext <<EOF
-+#line 18696 "configure"
++#line 19234 "configure"
 +#include "confdefs.h"
 +
 +#if HAVE_DLFCN_H
@@ -29428,7 +31247,7 @@
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) 2>/dev/null
++    (./conftest; exit; ) >&5 2>/dev/null
 +    lt_status=$?
 +    case x$lt_status in
 +      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
@@ -29580,7 +31399,13 @@
 +# The host system.
 +host_alias=$host_alias
 +host=$host
++host_os=$host_os
 +
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
++
 +# An echo program that does not interpret backslashes.
 +echo=$lt_echo
 +
@@ -29656,7 +31481,7 @@
 +# Does compiler simultaneously support -c and -o options?
 +compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
 +
-+# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
 +need_locks=$lt_need_locks
 +
 +# Do we need the lib prefix for modules?
@@ -29904,11 +31729,35 @@
 +compiler=$CC
 +
 +
++# save warnings/boilerplate of simple test code
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++
++
 +# Allow CC to be a program name with arguments.
 +lt_save_CC="$CC"
 +CC=${RC-"windres"}
 +compiler=$CC
 +compiler_RC=$CC
++for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++
 +lt_cv_prog_compiler_c_o_RC=yes
 +
 +# The else clause should only fire when bootstrapping the
@@ -30025,7 +31874,13 @@
 +# The host system.
 +host_alias=$host_alias
 +host=$host
++host_os=$host_os
 +
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
++
 +# An echo program that does not interpret backslashes.
 +echo=$lt_echo
 +
@@ -30101,7 +31956,7 @@
 +# Does compiler simultaneously support -c and -o options?
 +compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
 +
-+# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
 +need_locks=$lt_need_locks
 +
 +# Do we need the lib prefix for modules?
@@ -32710,8 +34565,642 @@
 +   PORTAUDIO_CFLAGS='-I$(top_srcdir)/lib/portaudio/pa_common'
 +fi
 +
-+if ! test x$OSTYPE = xWIN32; then
++has_wx="no"
 +
++    if test x${WX_CONFIG_NAME+set} != xset ; then
++     WX_CONFIG_NAME=wx-config
++  fi
++
++  if test "x$wx_config_name" != x ; then
++     WX_CONFIG_NAME="$wx_config_name"
++  fi
++
++    if test x$wx_config_exec_prefix != x ; then
++     wx_config_args="$wx_config_args --exec-prefix=$wx_config_exec_prefix"
++     WX_LOOKUP_PATH="$wx_config_exec_prefix/bin"
++  fi
++  if test x$wx_config_prefix != x ; then
++     wx_config_args="$wx_config_args --prefix=$wx_config_prefix"
++     WX_LOOKUP_PATH="$WX_LOOKUP_PATH:$wx_config_prefix/bin"
++  fi
++  if test "$cross_compiling" = "yes"; then
++     wx_config_args="$wx_config_args --host=$host_alias"
++  fi
++
++    if test -x "$WX_CONFIG_NAME" ; then
++     echo "$as_me:$LINENO: checking for wx-config" >&5
++echo $ECHO_N "checking for wx-config... $ECHO_C" >&6
++     WX_CONFIG_PATH="$WX_CONFIG_NAME"
++     echo "$as_me:$LINENO: result: $WX_CONFIG_PATH" >&5
++echo "${ECHO_T}$WX_CONFIG_PATH" >&6
++  else
++     # Extract the first word of "$WX_CONFIG_NAME", so it can be a program name with args.
++set dummy $WX_CONFIG_NAME; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_WX_CONFIG_PATH+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $WX_CONFIG_PATH in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_WX_CONFIG_PATH="$WX_CONFIG_PATH" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++as_dummy=""$WX_LOOKUP_PATH:$PATH""
++for as_dir in $as_dummy
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_WX_CONFIG_PATH="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_path_WX_CONFIG_PATH" && ac_cv_path_WX_CONFIG_PATH="no"
++  ;;
++esac
++fi
++WX_CONFIG_PATH=$ac_cv_path_WX_CONFIG_PATH
++
++if test -n "$WX_CONFIG_PATH"; then
++  echo "$as_me:$LINENO: result: $WX_CONFIG_PATH" >&5
++echo "${ECHO_T}$WX_CONFIG_PATH" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  fi
++
++  if test "$WX_CONFIG_PATH" != "no" ; then
++    WX_VERSION=""
++
++    min_wx_version=2.6.0
++    if test -z "" ; then
++      echo "$as_me:$LINENO: checking for wxWidgets version >= $min_wx_version" >&5
++echo $ECHO_N "checking for wxWidgets version >= $min_wx_version... $ECHO_C" >&6
++    else
++      echo "$as_me:$LINENO: checking for wxWidgets version >= $min_wx_version ()" >&5
++echo $ECHO_N "checking for wxWidgets version >= $min_wx_version ()... $ECHO_C" >&6
++    fi
++
++    WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args  "
++
++    WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
++    wx_config_major_version=`echo $WX_VERSION | \
++           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
++    wx_config_minor_version=`echo $WX_VERSION | \
++           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
++    wx_config_micro_version=`echo $WX_VERSION | \
++           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
++
++    wx_requested_major_version=`echo $min_wx_version | \
++           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
++    wx_requested_minor_version=`echo $min_wx_version | \
++           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
++    wx_requested_micro_version=`echo $min_wx_version | \
++           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
++
++
++    wx_ver_ok=""
++    if test "x$WX_VERSION" != x ; then
++      if test $wx_config_major_version -gt $wx_requested_major_version; then
++        wx_ver_ok=yes
++      else
++        if test $wx_config_major_version -eq $wx_requested_major_version; then
++           if test $wx_config_minor_version -gt $wx_requested_minor_version; then
++              wx_ver_ok=yes
++           else
++              if test $wx_config_minor_version -eq $wx_requested_minor_version; then
++                 if test $wx_config_micro_version -ge $wx_requested_micro_version; then
++                    wx_ver_ok=yes
++                 fi
++              fi
++           fi
++        fi
++      fi
++    fi
++
++
++    if test -n "$wx_ver_ok"; then
++
++      echo "$as_me:$LINENO: result: yes (version $WX_VERSION)" >&5
++echo "${ECHO_T}yes (version $WX_VERSION)" >&6
++      WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`
++
++                              echo "$as_me:$LINENO: checking for wxWidgets static library" >&5
++echo $ECHO_N "checking for wxWidgets static library... $ECHO_C" >&6
++      WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs 2>/dev/null`
++      if test "x$WX_LIBS_STATIC" = "x"; then
++        echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++      else
++        echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++      fi
++
++            wx_has_cppflags=""
++      if test $wx_config_major_version -gt 2; then
++        wx_has_cppflags=yes
++      else
++        if test $wx_config_major_version -eq 2; then
++           if test $wx_config_minor_version -gt 2; then
++              wx_has_cppflags=yes
++           else
++              if test $wx_config_minor_version -eq 2; then
++                 if test $wx_config_micro_version -ge 6; then
++                    wx_has_cppflags=yes
++                 fi
++              fi
++           fi
++        fi
++      fi
++
++      if test "x$wx_has_cppflags" = x ; then
++                  WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
++         WX_CPPFLAGS=$WX_CFLAGS
++         WX_CXXFLAGS=$WX_CFLAGS
++
++         WX_CFLAGS_ONLY=$WX_CFLAGS
++         WX_CXXFLAGS_ONLY=$WX_CFLAGS
++      else
++                  WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags`
++         WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags`
++         WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
++
++         WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
++         WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
++      fi
++
++      has_wx="2.6"
++
++    else
++
++       if test "x$WX_VERSION" = x; then
++                    echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++       else
++          echo "$as_me:$LINENO: result: no (version $WX_VERSION is not new enough)" >&5
++echo "${ECHO_T}no (version $WX_VERSION is not new enough)" >&6
++       fi
++
++       WX_CFLAGS=""
++       WX_CPPFLAGS=""
++       WX_CXXFLAGS=""
++       WX_LIBS=""
++       WX_LIBS_STATIC=""
++
++    if test x${WX_CONFIG_NAME+set} != xset ; then
++     WX_CONFIG_NAME=wx-config
++  fi
++
++  if test "x$wx_config_name" != x ; then
++     WX_CONFIG_NAME="$wx_config_name"
++  fi
++
++    if test x$wx_config_exec_prefix != x ; then
++     wx_config_args="$wx_config_args --exec-prefix=$wx_config_exec_prefix"
++     WX_LOOKUP_PATH="$wx_config_exec_prefix/bin"
++  fi
++  if test x$wx_config_prefix != x ; then
++     wx_config_args="$wx_config_args --prefix=$wx_config_prefix"
++     WX_LOOKUP_PATH="$WX_LOOKUP_PATH:$wx_config_prefix/bin"
++  fi
++  if test "$cross_compiling" = "yes"; then
++     wx_config_args="$wx_config_args --host=$host_alias"
++  fi
++
++    if test -x "$WX_CONFIG_NAME" ; then
++     echo "$as_me:$LINENO: checking for wx-config" >&5
++echo $ECHO_N "checking for wx-config... $ECHO_C" >&6
++     WX_CONFIG_PATH="$WX_CONFIG_NAME"
++     echo "$as_me:$LINENO: result: $WX_CONFIG_PATH" >&5
++echo "${ECHO_T}$WX_CONFIG_PATH" >&6
++  else
++     # Extract the first word of "$WX_CONFIG_NAME", so it can be a program name with args.
++set dummy $WX_CONFIG_NAME; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_WX_CONFIG_PATH+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $WX_CONFIG_PATH in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_WX_CONFIG_PATH="$WX_CONFIG_PATH" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++as_dummy=""$WX_LOOKUP_PATH:$PATH""
++for as_dir in $as_dummy
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_WX_CONFIG_PATH="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_path_WX_CONFIG_PATH" && ac_cv_path_WX_CONFIG_PATH="no"
++  ;;
++esac
++fi
++WX_CONFIG_PATH=$ac_cv_path_WX_CONFIG_PATH
++
++if test -n "$WX_CONFIG_PATH"; then
++  echo "$as_me:$LINENO: result: $WX_CONFIG_PATH" >&5
++echo "${ECHO_T}$WX_CONFIG_PATH" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  fi
++
++  if test "$WX_CONFIG_PATH" != "no" ; then
++    WX_VERSION=""
++
++    min_wx_version=2.4.0
++    if test -z "" ; then
++      echo "$as_me:$LINENO: checking for wxWidgets version >= $min_wx_version" >&5
++echo $ECHO_N "checking for wxWidgets version >= $min_wx_version... $ECHO_C" >&6
++    else
++      echo "$as_me:$LINENO: checking for wxWidgets version >= $min_wx_version ()" >&5
++echo $ECHO_N "checking for wxWidgets version >= $min_wx_version ()... $ECHO_C" >&6
++    fi
++
++    WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args  "
++
++    WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
++    wx_config_major_version=`echo $WX_VERSION | \
++           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
++    wx_config_minor_version=`echo $WX_VERSION | \
++           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
++    wx_config_micro_version=`echo $WX_VERSION | \
++           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
++
++    wx_requested_major_version=`echo $min_wx_version | \
++           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
++    wx_requested_minor_version=`echo $min_wx_version | \
++           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
++    wx_requested_micro_version=`echo $min_wx_version | \
++           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
++
++
++    wx_ver_ok=""
++    if test "x$WX_VERSION" != x ; then
++      if test $wx_config_major_version -gt $wx_requested_major_version; then
++        wx_ver_ok=yes
++      else
++        if test $wx_config_major_version -eq $wx_requested_major_version; then
++           if test $wx_config_minor_version -gt $wx_requested_minor_version; then
++              wx_ver_ok=yes
++           else
++              if test $wx_config_minor_version -eq $wx_requested_minor_version; then
++                 if test $wx_config_micro_version -ge $wx_requested_micro_version; then
++                    wx_ver_ok=yes
++                 fi
++              fi
++           fi
++        fi
++      fi
++    fi
++
++
++    if test -n "$wx_ver_ok"; then
++
++      echo "$as_me:$LINENO: result: yes (version $WX_VERSION)" >&5
++echo "${ECHO_T}yes (version $WX_VERSION)" >&6
++      WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`
++
++                              echo "$as_me:$LINENO: checking for wxWidgets static library" >&5
++echo $ECHO_N "checking for wxWidgets static library... $ECHO_C" >&6
++      WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs 2>/dev/null`
++      if test "x$WX_LIBS_STATIC" = "x"; then
++        echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++      else
++        echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++      fi
++
++            wx_has_cppflags=""
++      if test $wx_config_major_version -gt 2; then
++        wx_has_cppflags=yes
++      else
++        if test $wx_config_major_version -eq 2; then
++           if test $wx_config_minor_version -gt 2; then
++              wx_has_cppflags=yes
++           else
++              if test $wx_config_minor_version -eq 2; then
++                 if test $wx_config_micro_version -ge 6; then
++                    wx_has_cppflags=yes
++                 fi
++              fi
++           fi
++        fi
++      fi
++
++      if test "x$wx_has_cppflags" = x ; then
++                  WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
++         WX_CPPFLAGS=$WX_CFLAGS
++         WX_CXXFLAGS=$WX_CFLAGS
++
++         WX_CFLAGS_ONLY=$WX_CFLAGS
++         WX_CXXFLAGS_ONLY=$WX_CFLAGS
++      else
++                  WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags`
++         WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags`
++         WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
++
++         WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
++         WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
++      fi
++
++      has_wx="2.4"
++
++    else
++
++       if test "x$WX_VERSION" = x; then
++                    echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++       else
++          echo "$as_me:$LINENO: result: no (version $WX_VERSION is not new enough)" >&5
++echo "${ECHO_T}no (version $WX_VERSION is not new enough)" >&6
++       fi
++
++       WX_CFLAGS=""
++       WX_CPPFLAGS=""
++       WX_CXXFLAGS=""
++       WX_LIBS=""
++       WX_LIBS_STATIC=""
++       :
++
++    fi
++  else
++
++    WX_CFLAGS=""
++    WX_CPPFLAGS=""
++    WX_CXXFLAGS=""
++    WX_LIBS=""
++    WX_LIBS_STATIC=""
++    :
++
++  fi
++
++
++
++
++
++
++
++
++
++
++
++    fi
++  else
++
++    WX_CFLAGS=""
++    WX_CPPFLAGS=""
++    WX_CXXFLAGS=""
++    WX_LIBS=""
++    WX_LIBS_STATIC=""
++
++    if test x${WX_CONFIG_NAME+set} != xset ; then
++     WX_CONFIG_NAME=wx-config
++  fi
++
++  if test "x$wx_config_name" != x ; then
++     WX_CONFIG_NAME="$wx_config_name"
++  fi
++
++    if test x$wx_config_exec_prefix != x ; then
++     wx_config_args="$wx_config_args --exec-prefix=$wx_config_exec_prefix"
++     WX_LOOKUP_PATH="$wx_config_exec_prefix/bin"
++  fi
++  if test x$wx_config_prefix != x ; then
++     wx_config_args="$wx_config_args --prefix=$wx_config_prefix"
++     WX_LOOKUP_PATH="$WX_LOOKUP_PATH:$wx_config_prefix/bin"
++  fi
++  if test "$cross_compiling" = "yes"; then
++     wx_config_args="$wx_config_args --host=$host_alias"
++  fi
++
++    if test -x "$WX_CONFIG_NAME" ; then
++     echo "$as_me:$LINENO: checking for wx-config" >&5
++echo $ECHO_N "checking for wx-config... $ECHO_C" >&6
++     WX_CONFIG_PATH="$WX_CONFIG_NAME"
++     echo "$as_me:$LINENO: result: $WX_CONFIG_PATH" >&5
++echo "${ECHO_T}$WX_CONFIG_PATH" >&6
++  else
++     # Extract the first word of "$WX_CONFIG_NAME", so it can be a program name with args.
++set dummy $WX_CONFIG_NAME; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_WX_CONFIG_PATH+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $WX_CONFIG_PATH in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_WX_CONFIG_PATH="$WX_CONFIG_PATH" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++as_dummy=""$WX_LOOKUP_PATH:$PATH""
++for as_dir in $as_dummy
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_WX_CONFIG_PATH="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_path_WX_CONFIG_PATH" && ac_cv_path_WX_CONFIG_PATH="no"
++  ;;
++esac
++fi
++WX_CONFIG_PATH=$ac_cv_path_WX_CONFIG_PATH
++
++if test -n "$WX_CONFIG_PATH"; then
++  echo "$as_me:$LINENO: result: $WX_CONFIG_PATH" >&5
++echo "${ECHO_T}$WX_CONFIG_PATH" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  fi
++
++  if test "$WX_CONFIG_PATH" != "no" ; then
++    WX_VERSION=""
++
++    min_wx_version=2.4.0
++    if test -z "" ; then
++      echo "$as_me:$LINENO: checking for wxWidgets version >= $min_wx_version" >&5
++echo $ECHO_N "checking for wxWidgets version >= $min_wx_version... $ECHO_C" >&6
++    else
++      echo "$as_me:$LINENO: checking for wxWidgets version >= $min_wx_version ()" >&5
++echo $ECHO_N "checking for wxWidgets version >= $min_wx_version ()... $ECHO_C" >&6
++    fi
++
++    WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args  "
++
++    WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
++    wx_config_major_version=`echo $WX_VERSION | \
++           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
++    wx_config_minor_version=`echo $WX_VERSION | \
++           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
++    wx_config_micro_version=`echo $WX_VERSION | \
++           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
++
++    wx_requested_major_version=`echo $min_wx_version | \
++           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
++    wx_requested_minor_version=`echo $min_wx_version | \
++           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
++    wx_requested_micro_version=`echo $min_wx_version | \
++           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
++
++
++    wx_ver_ok=""
++    if test "x$WX_VERSION" != x ; then
++      if test $wx_config_major_version -gt $wx_requested_major_version; then
++        wx_ver_ok=yes
++      else
++        if test $wx_config_major_version -eq $wx_requested_major_version; then
++           if test $wx_config_minor_version -gt $wx_requested_minor_version; then
++              wx_ver_ok=yes
++           else
++              if test $wx_config_minor_version -eq $wx_requested_minor_version; then
++                 if test $wx_config_micro_version -ge $wx_requested_micro_version; then
++                    wx_ver_ok=yes
++                 fi
++              fi
++           fi
++        fi
++      fi
++    fi
++
++
++    if test -n "$wx_ver_ok"; then
++
++      echo "$as_me:$LINENO: result: yes (version $WX_VERSION)" >&5
++echo "${ECHO_T}yes (version $WX_VERSION)" >&6
++      WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`
++
++                              echo "$as_me:$LINENO: checking for wxWidgets static library" >&5
++echo $ECHO_N "checking for wxWidgets static library... $ECHO_C" >&6
++      WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs 2>/dev/null`
++      if test "x$WX_LIBS_STATIC" = "x"; then
++        echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++      else
++        echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++      fi
++
++            wx_has_cppflags=""
++      if test $wx_config_major_version -gt 2; then
++        wx_has_cppflags=yes
++      else
++        if test $wx_config_major_version -eq 2; then
++           if test $wx_config_minor_version -gt 2; then
++              wx_has_cppflags=yes
++           else
++              if test $wx_config_minor_version -eq 2; then
++                 if test $wx_config_micro_version -ge 6; then
++                    wx_has_cppflags=yes
++                 fi
++              fi
++           fi
++        fi
++      fi
++
++      if test "x$wx_has_cppflags" = x ; then
++                  WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
++         WX_CPPFLAGS=$WX_CFLAGS
++         WX_CXXFLAGS=$WX_CFLAGS
++
++         WX_CFLAGS_ONLY=$WX_CFLAGS
++         WX_CXXFLAGS_ONLY=$WX_CFLAGS
++      else
++                  WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags`
++         WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags`
++         WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
++
++         WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
++         WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
++      fi
++
++      has_wx="2.4"
++
++    else
++
++       if test "x$WX_VERSION" = x; then
++                    echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++       else
++          echo "$as_me:$LINENO: result: no (version $WX_VERSION is not new enough)" >&5
++echo "${ECHO_T}no (version $WX_VERSION is not new enough)" >&6
++       fi
++
++       WX_CFLAGS=""
++       WX_CPPFLAGS=""
++       WX_CXXFLAGS=""
++       WX_LIBS=""
++       WX_LIBS_STATIC=""
++       :
++
++    fi
++  else
++
++    WX_CFLAGS=""
++    WX_CPPFLAGS=""
++    WX_CXXFLAGS=""
++    WX_LIBS=""
++    WX_LIBS_STATIC=""
++    :
++
++  fi
++
++
++
++
++
++
++
++
++
++
++
++  fi
++
++
++
++
++
++
++
++
++
++
++
++ if ! test x$OSTYPE = xWIN32; then
++   if test x$has_wx = x2.4; then
++
 +# Check whether --with-gtk-prefix or --without-gtk-prefix was given.
 +if test "${with_gtk_prefix+set}" = set; then
 +  withval="$with_gtk_prefix"
@@ -33024,189 +35513,312 @@
 +
 +  rm -f conf.gtktest
 +
-+fi
++   elif test x$has_wx = x2.6; then
++      # Check whether --enable-gtktest or --disable-gtktest was given.
++if test "${enable_gtktest+set}" = set; then
++  enableval="$enable_gtktest"
 +
++else
++  enable_gtktest=yes
++fi;
 +
-+    if test x${WX_CONFIG_NAME+set} != xset ; then
-+     WX_CONFIG_NAME=wx-config
-+  fi
-+  if test "x$wx_config_name" != x ; then
-+     WX_CONFIG_NAME="$wx_config_name"
-+  fi
++  pkg_config_args=gtk+-2.0
++  for module in .
++  do
++      case "$module" in
++         gthread)
++             pkg_config_args="$pkg_config_args gthread-2.0"
++         ;;
++      esac
++  done
 +
-+    if test x$wx_config_exec_prefix != x ; then
-+     wx_config_args="$wx_config_args --exec-prefix=$wx_config_exec_prefix"
-+     WX_LOOKUP_PATH="$wx_config_exec_prefix/bin"
-+  fi
-+  if test x$wx_config_prefix != x ; then
-+     wx_config_args="$wx_config_args --prefix=$wx_config_prefix"
-+     WX_LOOKUP_PATH="$WX_LOOKUP_PATH:$wx_config_prefix/bin"
-+  fi
++  no_gtk=""
 +
-+    if test -x "$WX_CONFIG_NAME" ; then
-+     echo "$as_me:$LINENO: checking for wx-config" >&5
-+echo $ECHO_N "checking for wx-config... $ECHO_C" >&6
-+     WX_CONFIG_PATH="$WX_CONFIG_NAME"
-+     echo "$as_me:$LINENO: result: $WX_CONFIG_PATH" >&5
-+echo "${ECHO_T}$WX_CONFIG_PATH" >&6
-+  else
-+     # Extract the first word of "$WX_CONFIG_NAME", so it can be a program name with args.
-+set dummy $WX_CONFIG_NAME; ac_word=$2
++  # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
 +echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_WX_CONFIG_PATH+set}" = set; then
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
 +else
-+  case $WX_CONFIG_PATH in
++  case $PKG_CONFIG in
 +  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_WX_CONFIG_PATH="$WX_CONFIG_PATH" # Let the user override the test with a path.
++  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
 +  ;;
 +  *)
 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+as_dummy=""$WX_LOOKUP_PATH:$PATH""
-+for as_dir in $as_dummy
++for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
 +  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_path_WX_CONFIG_PATH="$as_dir/$ac_word$ac_exec_ext"
++    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
 +  fi
 +done
 +done
 +
-+  test -z "$ac_cv_path_WX_CONFIG_PATH" && ac_cv_path_WX_CONFIG_PATH="no"
++  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
 +  ;;
 +esac
 +fi
-+WX_CONFIG_PATH=$ac_cv_path_WX_CONFIG_PATH
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 +
-+if test -n "$WX_CONFIG_PATH"; then
-+  echo "$as_me:$LINENO: result: $WX_CONFIG_PATH" >&5
-+echo "${ECHO_T}$WX_CONFIG_PATH" >&6
++if test -n "$PKG_CONFIG"; then
++  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6
 +else
 +  echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
 +
++
++  if test x$PKG_CONFIG != xno ; then
++    if pkg-config --atleast-pkgconfig-version 0.7 ; then
++      :
++    else
++      echo "*** pkg-config too old; version 0.7 or better required."
++      no_gtk=yes
++      PKG_CONFIG=no
++    fi
++  else
++    no_gtk=yes
 +  fi
 +
-+  if test "$WX_CONFIG_PATH" != "no" ; then
-+    WX_VERSION=""
-+    no_wx=""
++  min_gtk_version=2.0.0
++  echo "$as_me:$LINENO: checking for GTK+ - version >= $min_gtk_version" >&5
++echo $ECHO_N "checking for GTK+ - version >= $min_gtk_version... $ECHO_C" >&6
 +
-+    min_wx_version=2.2.1
-+    echo "$as_me:$LINENO: checking for wxWindows version >= $min_wx_version" >&5
-+echo $ECHO_N "checking for wxWindows version >= $min_wx_version... $ECHO_C" >&6
++  if test x$PKG_CONFIG != xno ; then
++    ## don't try to run the test against uninstalled libtool libs
++    if $PKG_CONFIG --uninstalled $pkg_config_args; then
++	  echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
++	  enable_gtktest=no
++    fi
 +
-+    WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args"
++    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
++	  :
++    else
++	  no_gtk=yes
++    fi
++  fi
 +
-+    WX_VERSION=`$WX_CONFIG_WITH_ARGS --version`
-+    wx_config_major_version=`echo $WX_VERSION | \
++  if test x"$no_gtk" = x ; then
++    GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
++    GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
++    gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
 +           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-+    wx_config_minor_version=`echo $WX_VERSION | \
++    gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
 +           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
-+    wx_config_micro_version=`echo $WX_VERSION | \
++    gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
 +           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
++    if test "x$enable_gtktest" = "xyes" ; then
++      ac_save_CFLAGS="$CFLAGS"
++      ac_save_LIBS="$LIBS"
++      CFLAGS="$CFLAGS $GTK_CFLAGS"
++      LIBS="$GTK_LIBS $LIBS"
++      rm -f conf.gtktest
++      if test "$cross_compiling" = yes; then
++  echo $ac_n "cross compiling; assumed OK... $ac_c"
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
 +
-+    wx_requested_major_version=`echo $min_wx_version | \
-+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-+    wx_requested_minor_version=`echo $min_wx_version | \
-+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
-+    wx_requested_micro_version=`echo $min_wx_version | \
-+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
++#include <gtk/gtk.h>
++#include <stdio.h>
++#include <stdlib.h>
 +
-+    wx_ver_ok=""
-+    if test $wx_config_major_version -gt $wx_requested_major_version; then
-+      wx_ver_ok=yes
-+    else
-+      if test $wx_config_major_version -eq $wx_requested_major_version; then
-+         if test $wx_config_minor_version -gt $wx_requested_minor_version; then
-+            wx_ver_ok=yes
-+         else
-+            if test $wx_config_minor_version -eq $wx_requested_minor_version; then
-+               if test $wx_config_micro_version -ge $wx_requested_micro_version; then
-+                  wx_ver_ok=yes
-+               fi
-+            fi
-+         fi
-+      fi
-+    fi
++int
++main ()
++{
++  int major, minor, micro;
++  char *tmp_version;
 +
-+    if test "x$wx_ver_ok" = x ; then
-+      no_wx=yes
-+    else
-+      WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`
-+      WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs`
++  system ("touch conf.gtktest");
 +
-+            wx_has_cppflags=""
-+      if test $wx_config_major_version -gt 2; then
-+        wx_has_cppflags=yes
-+      else
-+        if test $wx_config_major_version -eq 2; then
-+           if test $wx_config_minor_version -gt 2; then
-+              wx_has_cppflags=yes
-+           else
-+              if test $wx_config_minor_version -eq 2; then
-+                 if test $wx_config_micro_version -ge 6; then
-+                    wx_has_cppflags=yes
-+                 fi
-+              fi
-+           fi
-+        fi
-+      fi
++  /* HP/UX 9 (%@#!) writes to sscanf strings */
++  tmp_version = g_strdup("$min_gtk_version");
++  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
++     printf("%s, bad version string\n", "$min_gtk_version");
++     exit(1);
++   }
 +
-+      if test "x$wx_has_cppflags" = x ; then
-+                  WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
-+         WX_CPPFLAGS=$WX_CFLAGS
-+         WX_CXXFLAGS=$WX_CFLAGS
++  if ((gtk_major_version != $gtk_config_major_version) ||
++      (gtk_minor_version != $gtk_config_minor_version) ||
++      (gtk_micro_version != $gtk_config_micro_version))
++    {
++      printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
++             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
++             gtk_major_version, gtk_minor_version, gtk_micro_version);
++      printf ("*** was found! If pkg-config was correct, then it is best\n");
++      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
++      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
++      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
++      printf("*** required on your system.\n");
++      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
++      printf("*** to point to the correct configuration files\n");
++    }
++  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
++	   (gtk_minor_version != GTK_MINOR_VERSION) ||
++           (gtk_micro_version != GTK_MICRO_VERSION))
++    {
++      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
++	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
++      printf("*** library (version %d.%d.%d)\n",
++	     gtk_major_version, gtk_minor_version, gtk_micro_version);
++    }
++  else
++    {
++      if ((gtk_major_version > major) ||
++        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
++        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
++      {
++        return 0;
++       }
++     else
++      {
++        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
++               gtk_major_version, gtk_minor_version, gtk_micro_version);
++        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
++	       major, minor, micro);
++        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
++        printf("***\n");
++        printf("*** If you have already installed a sufficiently new version, this error\n");
++        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
++        printf("*** being found. The easiest way to fix this is to remove the old version\n");
++        printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
++        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
++        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
++        printf("*** so that the correct libraries are found at run-time))\n");
++      }
++    }
++  return 1;
++}
 +
-+         WX_CFLAGS_ONLY=$WX_CFLAGS
-+         WX_CXXFLAGS_ONLY=$WX_CFLAGS
-+      else
-+                  WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags`
-+         WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags`
-+         WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  :
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
 +
-+         WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
-+         WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
-+      fi
-+    fi
-+
-+    if test "x$no_wx" = x ; then
-+       echo "$as_me:$LINENO: result: yes (version $WX_VERSION)" >&5
-+echo "${ECHO_T}yes (version $WX_VERSION)" >&6
-+       has_wx=yes
-+    else
-+       if test "x$WX_VERSION" = x; then
-+	  	  echo "$as_me:$LINENO: result: no" >&5
++( exit $ac_status )
++no_gtk=yes
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++       CFLAGS="$ac_save_CFLAGS"
++       LIBS="$ac_save_LIBS"
++     fi
++  fi
++  if test "x$no_gtk" = x ; then
++     echo "$as_me:$LINENO: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5
++echo "${ECHO_T}yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6
++     has_gtk=yes
++  else
++     echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6
++     if test "$PKG_CONFIG" = "no" ; then
++       echo "*** A new enough version of pkg-config was not found."
++       echo "*** See http://pkgconfig.sourceforge.net"
++     else
++       if test -f conf.gtktest ; then
++        :
 +       else
-+	  echo "$as_me:$LINENO: result: no (version $WX_VERSION is not new enough)" >&5
-+echo "${ECHO_T}no (version $WX_VERSION is not new enough)" >&6
-+       fi
++          echo "*** Could not run GTK+ test program, checking why..."
++	  ac_save_CFLAGS="$CFLAGS"
++	  ac_save_LIBS="$LIBS"
++          CFLAGS="$CFLAGS $GTK_CFLAGS"
++          LIBS="$LIBS $GTK_LIBS"
++          cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
 +
-+       WX_CFLAGS=""
-+       WX_CPPFLAGS=""
-+       WX_CXXFLAGS=""
-+       WX_LIBS=""
-+       WX_LIBS_STATIC=""
-+       :
-+    fi
-+  fi
++#include <gtk/gtk.h>
++#include <stdio.h>
 +
++int
++main ()
++{
++ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++   echo "*** The test program compiled, but did not run. This usually means"
++          echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
++          echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
++          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
++          echo "*** is required on your system"
++	  echo "***"
++          echo "*** If you have an old version installed, it is best to remove it, although"
++          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
 +
++ echo "*** The test program failed to compile or link. See the file config.log for the"
++          echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++          CFLAGS="$ac_save_CFLAGS"
++          LIBS="$ac_save_LIBS"
++       fi
++     fi
++     GTK_CFLAGS=""
++     GTK_LIBS=""
++     :
++  fi
 +
 +
++  rm -f conf.gtktest
 +
++   fi
++fi
 +
-+
-+
-+
-+
-+
 +save_CPPFLAGS="$CPPFLAGS"
 +save_CXXFLAGS="$CXXFLAGS"
 +save_LIBS="$LIBS"
@@ -33220,7 +35832,7 @@
 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 +
-+if test x$has_wx = xyes; then
++if test ! x$has_wx = xno; then
 +
 +if test "${ac_cv_header_wx_xrc_xmlres_h+set}" = set; then
 +  echo "$as_me:$LINENO: checking for wx/xrc/xmlres.h" >&5
@@ -33604,7 +36216,7 @@
 +if test "x$enable_clients" = "xauto"; then
 +   clients="$clients testcall"
 +
-+   if test x$has_wx = xyes; then
++   if test ! x$has_wx = xno; then
 +      clients="$clients iaxphone wx"
 +
 +      if test x$has_wx_xrc = xyes; then
@@ -34124,7 +36736,7 @@
 +} >&5
 +cat >&5 <<_CSEOF
 +
-+This file was extended by iaxclient $as_me 0.0+cvs20050725, which was
++This file was extended by iaxclient $as_me 0.0+cvs20060520, which was
 +generated by GNU Autoconf 2.59.  Invocation command line was
 +
 +  CONFIG_FILES    = $CONFIG_FILES
@@ -34187,7 +36799,7 @@
 +
 +cat >>$CONFIG_STATUS <<_ACEOF
 +ac_cs_version="\\
-+iaxclient config.status 0.0+cvs20050725
++iaxclient config.status 0.0+cvs20060520
 +configured by $0, generated by GNU Autoconf 2.59,
 +  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 +
@@ -34404,7 +37016,6 @@
 +s, at AUTOMAKE@,$AUTOMAKE,;t t
 +s, at AUTOHEADER@,$AUTOHEADER,;t t
 +s, at MAKEINFO@,$MAKEINFO,;t t
-+s, at AMTAR@,$AMTAR,;t t
 +s, at install_sh@,$install_sh,;t t
 +s, at STRIP@,$STRIP,;t t
 +s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t
@@ -34413,6 +37024,9 @@
 +s, at AWK@,$AWK,;t t
 +s, at SET_MAKE@,$SET_MAKE,;t t
 +s, at am__leading_dot@,$am__leading_dot,;t t
++s, at AMTAR@,$AMTAR,;t t
++s, at am__tar@,$am__tar,;t t
++s, at am__untar@,$am__untar,;t t
 +s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
 +s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
 +s, at MAINT@,$MAINT,;t t
@@ -34482,9 +37096,6 @@
 +s, at IAX2_LIBS@,$IAX2_LIBS,;t t
 +s, at PORTAUDIO_CFLAGS@,$PORTAUDIO_CFLAGS,;t t
 +s, at PORTAUDIO_LIBS@,$PORTAUDIO_LIBS,;t t
-+s, at GTK_CONFIG@,$GTK_CONFIG,;t t
-+s, at GTK_CFLAGS@,$GTK_CFLAGS,;t t
-+s, at GTK_LIBS@,$GTK_LIBS,;t t
 +s, at WX_CONFIG_PATH@,$WX_CONFIG_PATH,;t t
 +s, at WX_CPPFLAGS@,$WX_CPPFLAGS,;t t
 +s, at WX_CFLAGS@,$WX_CFLAGS,;t t
@@ -34494,6 +37105,10 @@
 +s, at WX_LIBS@,$WX_LIBS,;t t
 +s, at WX_LIBS_STATIC@,$WX_LIBS_STATIC,;t t
 +s, at WX_VERSION@,$WX_VERSION,;t t
++s, at GTK_CONFIG@,$GTK_CONFIG,;t t
++s, at GTK_CFLAGS@,$GTK_CFLAGS,;t t
++s, at GTK_LIBS@,$GTK_LIBS,;t t
++s, at PKG_CONFIG@,$PKG_CONFIG,;t t
 +s, at WX_XRC_LIBS@,$WX_XRC_LIBS,;t t
 +s, at SPAN_EC_TRUE@,$SPAN_EC_TRUE,;t t
 +s, at SPAN_EC_FALSE@,$SPAN_EC_FALSE,;t t
@@ -35143,27 +37758,21 @@
 +  else
 +    continue
 +  fi
-+  grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
-+  # Extract the definition of DEP_FILES from the Makefile without
-+  # running `make'.
++  # Extract the definition of DEPDIR, am__include, and am__quote
++  # from the Makefile without running `make'.
 +  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
 +  test -z "$DEPDIR" && continue
++  am__include=`sed -n 's/^am__include = //p' < "$mf"`
++  test -z "am__include" && continue
++  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
 +  # When using ansi2knr, U may be empty or an underscore; expand it
 +  U=`sed -n 's/^U = //p' < "$mf"`
-+  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-+  # We invoke sed twice because it is the simplest approach to
-+  # changing $(DEPDIR) to its actual value in the expansion.
-+  for file in `sed -n '
-+    /^DEP_FILES = .*\\\\$/ {
-+      s/^DEP_FILES = //
-+      :loop
-+	s/\\\\$//
-+	p
-+	n
-+	/\\\\$/ b loop
-+      p
-+    }
-+    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
++  # Find all dependency output files, they are included files with
++  # $(DEPDIR) in their names.  We invoke sed twice because it is the
++  # simplest approach to changing $(DEPDIR) to its actual value in the
++  # expansion.
++  for file in `sed -n "
++    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
 +       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
 +    # Make sure the directory exists.
 +    test -f "$dirpart/$file" && continue
@@ -35245,9 +37854,9 @@
 +
 +{ echo "$as_me:$LINENO: Configured clients: $clients" >&5
 +echo "$as_me: Configured clients: $clients" >&6;}
-diff -urNad iaxclient-0.0+cvs20050725/depcomp /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/depcomp
---- iaxclient-0.0+cvs20050725/depcomp	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/depcomp	2005-08-10 15:15:32.000000000 +0200
+diff -urNad iaxclient-0.0+svn20060520~/depcomp iaxclient-0.0+svn20060520/depcomp
+--- iaxclient-0.0+svn20060520~/depcomp	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/depcomp	2006-05-20 15:47:07.000000000 +0200
 @@ -0,0 +1,526 @@
 +#! /bin/sh
 +# depcomp - compile a program generating dependencies as side-effects
@@ -35775,9 +38384,9 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -urNad iaxclient-0.0+cvs20050725/install-sh /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/install-sh
---- iaxclient-0.0+cvs20050725/install-sh	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/install-sh	2005-08-10 15:15:32.000000000 +0200
+diff -urNad iaxclient-0.0+svn20060520~/install-sh iaxclient-0.0+svn20060520/install-sh
+--- iaxclient-0.0+svn20060520~/install-sh	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/install-sh	2006-05-20 15:47:07.000000000 +0200
 @@ -0,0 +1,325 @@
 +#!/bin/sh
 +# install - install a program, script, or datafile
@@ -36104,15 +38713,15 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -urNad iaxclient-0.0+cvs20050725/lib/Makefile.in /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/lib/Makefile.in
---- iaxclient-0.0+cvs20050725/lib/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/lib/Makefile.in	2005-08-10 15:15:56.000000000 +0200
-@@ -0,0 +1,3866 @@
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+diff -urNad iaxclient-0.0+svn20060520~/lib/Makefile.in iaxclient-0.0+svn20060520/lib/Makefile.in
+--- iaxclient-0.0+svn20060520~/lib/Makefile.in	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/lib/Makefile.in	2006-05-20 15:47:40.000000000 +0200
+@@ -0,0 +1,1520 @@
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
 +# with or without modifications, as long as this notice is preserved.
@@ -36125,8 +38734,6 @@
 + at SET_MAKE@
 +
 +
-+SOURCES = $(libiaxclient_la_SOURCES) $(nodist_libiaxclient_la_SOURCES)
-+
 +srcdir = @srcdir@
 +top_srcdir = @top_srcdir@
 +VPATH = @srcdir@
@@ -36147,6 +38754,7 @@
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
++build_triplet = @build@
 +host_triplet = @host@
 + at WIN32_TRUE@am__append_1 = $(SRCS_WIN32)
 + at WIN32_TRUE@am__append_2 = $(SRCS_PA_WIN32)
@@ -36183,9 +38791,15 @@
 +	$(top_srcdir)/macros/speex.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
-+mkinstalldirs = $(mkdir_p)
++mkinstalldirs = $(install_sh) -d
 +CONFIG_HEADER = $(top_builddir)/config.h
 +CONFIG_CLEAN_FILES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
 +libLTLIBRARIES_INSTALL = $(INSTALL)
 +LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -36340,116 +38954,13 @@
 +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 +depcomp = $(SHELL) $(top_srcdir)/depcomp
 +am__depfiles_maybe = depfiles
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/audio_encode.Plo \
-+ at AMDEP_TRUE@	./$(DEPDIR)/audio_file.Plo \
-+ at AMDEP_TRUE@	./$(DEPDIR)/audio_portaudio.Plo \
-+ at AMDEP_TRUE@	./$(DEPDIR)/codec_alaw.Plo \
-+ at AMDEP_TRUE@	./$(DEPDIR)/codec_gsm.Plo \
-+ at AMDEP_TRUE@	./$(DEPDIR)/codec_ilbc.Plo \
-+ at AMDEP_TRUE@	./$(DEPDIR)/codec_speex.Plo \
-+ at AMDEP_TRUE@	./$(DEPDIR)/codec_ulaw.Plo \
-+ at AMDEP_TRUE@	./$(DEPDIR)/iaxclient_lib.Plo \
-+ at AMDEP_TRUE@	./$(DEPDIR)/jitterbuf.Plo \
-+ at AMDEP_TRUE@	./$(DEPDIR)/unixfuncs.Plo ./$(DEPDIR)/winfuncs.Plo \
-+ at AMDEP_TRUE@	gsm/src/$(DEPDIR)/add.Plo \
-+ at AMDEP_TRUE@	gsm/src/$(DEPDIR)/code.Plo \
-+ at AMDEP_TRUE@	gsm/src/$(DEPDIR)/debug.Plo \
-+ at AMDEP_TRUE@	gsm/src/$(DEPDIR)/decode.Plo \
-+ at AMDEP_TRUE@	gsm/src/$(DEPDIR)/gsm_create.Plo \
-+ at AMDEP_TRUE@	gsm/src/$(DEPDIR)/gsm_decode.Plo \
-+ at AMDEP_TRUE@	gsm/src/$(DEPDIR)/gsm_destroy.Plo \
-+ at AMDEP_TRUE@	gsm/src/$(DEPDIR)/gsm_encode.Plo \
-+ at AMDEP_TRUE@	gsm/src/$(DEPDIR)/gsm_explode.Plo \
-+ at AMDEP_TRUE@	gsm/src/$(DEPDIR)/gsm_implode.Plo \
-+ at AMDEP_TRUE@	gsm/src/$(DEPDIR)/gsm_option.Plo \
-+ at AMDEP_TRUE@	gsm/src/$(DEPDIR)/gsm_print.Plo \
-+ at AMDEP_TRUE@	gsm/src/$(DEPDIR)/long_term.Plo \
-+ at AMDEP_TRUE@	gsm/src/$(DEPDIR)/lpc.Plo \
-+ at AMDEP_TRUE@	gsm/src/$(DEPDIR)/preprocess.Plo \
-+ at AMDEP_TRUE@	gsm/src/$(DEPDIR)/rpe.Plo \
-+ at AMDEP_TRUE@	gsm/src/$(DEPDIR)/short_term.Plo \
-+ at AMDEP_TRUE@	gsm/src/$(DEPDIR)/table.Plo \
-+ at AMDEP_TRUE@	iLBC/$(DEPDIR)/FrameClassify.Plo \
-+ at AMDEP_TRUE@	iLBC/$(DEPDIR)/LPCdecode.Plo \
-+ at AMDEP_TRUE@	iLBC/$(DEPDIR)/LPCencode.Plo \
-+ at AMDEP_TRUE@	iLBC/$(DEPDIR)/StateConstructW.Plo \
-+ at AMDEP_TRUE@	iLBC/$(DEPDIR)/StateSearchW.Plo \
-+ at AMDEP_TRUE@	iLBC/$(DEPDIR)/anaFilter.Plo \
-+ at AMDEP_TRUE@	iLBC/$(DEPDIR)/constants.Plo \
-+ at AMDEP_TRUE@	iLBC/$(DEPDIR)/createCB.Plo \
-+ at AMDEP_TRUE@	iLBC/$(DEPDIR)/doCPLC.Plo \
-+ at AMDEP_TRUE@	iLBC/$(DEPDIR)/enhancer.Plo \
-+ at AMDEP_TRUE@	iLBC/$(DEPDIR)/filter.Plo \
-+ at AMDEP_TRUE@	iLBC/$(DEPDIR)/gainquant.Plo \
-+ at AMDEP_TRUE@	iLBC/$(DEPDIR)/getCBvec.Plo \
-+ at AMDEP_TRUE@	iLBC/$(DEPDIR)/helpfun.Plo \
-+ at AMDEP_TRUE@	iLBC/$(DEPDIR)/hpInput.Plo \
-+ at AMDEP_TRUE@	iLBC/$(DEPDIR)/hpOutput.Plo \
-+ at AMDEP_TRUE@	iLBC/$(DEPDIR)/iCBConstruct.Plo \
-+ at AMDEP_TRUE@	iLBC/$(DEPDIR)/iCBSearch.Plo \
-+ at AMDEP_TRUE@	iLBC/$(DEPDIR)/iLBC_decode.Plo \
-+ at AMDEP_TRUE@	iLBC/$(DEPDIR)/iLBC_encode.Plo \
-+ at AMDEP_TRUE@	iLBC/$(DEPDIR)/lsf.Plo iLBC/$(DEPDIR)/packing.Plo \
-+ at AMDEP_TRUE@	iLBC/$(DEPDIR)/syntFilter.Plo \
-+ at AMDEP_TRUE@	libiax2/src/$(DEPDIR)/iax.Plo \
-+ at AMDEP_TRUE@	libiax2/src/$(DEPDIR)/iax2-parser.Plo \
-+ at AMDEP_TRUE@	libiax2/src/$(DEPDIR)/md5.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/bits.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/cb_search.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/exc_10_16_table.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/exc_10_32_table.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/exc_20_32_table.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/exc_5_256_table.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/exc_5_64_table.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/exc_8_128_table.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/filters.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/gain_table.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/gain_table_lbr.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/hexc_10_32_table.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/hexc_table.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/high_lsp_tables.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/jitter.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/lbr_48k_tables.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/lpc.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/lsp.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/lsp_tables_nb.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/ltp.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/math_approx.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/mdf.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/misc.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/modes.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/nb_celp.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/preprocess.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/quant_lsp.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/sb_celp.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/smallft.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/speex.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/speex_callbacks.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/speex_header.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/stereo.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/vbr.Plo \
-+ at AMDEP_TRUE@	libspeex/$(DEPDIR)/vq.Plo \
-+ at AMDEP_TRUE@	portaudio/pa_common/$(DEPDIR)/pa_convert.Plo \
-+ at AMDEP_TRUE@	portaudio/pa_common/$(DEPDIR)/pa_lib.Plo \
-+ at AMDEP_TRUE@	portaudio/pa_mac_core/$(DEPDIR)/pa_mac_core.Plo \
-+ at AMDEP_TRUE@	portaudio/pa_unix_oss/$(DEPDIR)/pa_unix.Plo \
-+ at AMDEP_TRUE@	portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_oss.Plo \
-+ at AMDEP_TRUE@	portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_solaris.Plo \
-+ at AMDEP_TRUE@	portaudio/pa_win_wmme/$(DEPDIR)/pa_win_wmme.Plo \
-+ at AMDEP_TRUE@	portaudio/pablio/$(DEPDIR)/pablio.Plo \
-+ at AMDEP_TRUE@	portaudio/pablio/$(DEPDIR)/ringbuffer.Plo \
-+ at AMDEP_TRUE@	portmixer/px_mac_core/$(DEPDIR)/px_mac_core.Plo \
-+ at AMDEP_TRUE@	portmixer/px_solaris/$(DEPDIR)/px_solaris.Plo \
-+ at AMDEP_TRUE@	portmixer/px_unix_oss/$(DEPDIR)/px_unix_oss.Plo \
-+ at AMDEP_TRUE@	portmixer/px_win_wmme/$(DEPDIR)/px_win_wmme.Plo \
-+ at AMDEP_TRUE@	spandsp/$(DEPDIR)/plc.Plo
 +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 +	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 +	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 +	$(AM_CFLAGS) $(CFLAGS)
 +CCLD = $(CC)
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 +	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +SOURCES = $(libiaxclient_la_SOURCES) $(nodist_libiaxclient_la_SOURCES)
 +DIST_SOURCES = $(am__libiaxclient_la_SOURCES_DIST)
@@ -36531,6 +39042,7 @@
 +PACKAGE_TARNAME = @PACKAGE_TARNAME@
 +PACKAGE_VERSION = @PACKAGE_VERSION@
 +PATH_SEPARATOR = @PATH_SEPARATOR@
++PKG_CONFIG = @PKG_CONFIG@
 +PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
 +PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
 +RANLIB = @RANLIB@
@@ -36586,6 +39098,8 @@
 +am__include = @am__include@
 +am__leading_dot = @am__leading_dot@
 +am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
 +bindir = @bindir@
 +build = @build@
 +build_alias = @build_alias@
@@ -36622,51 +39136,32 @@
 +lib_LTLIBRARIES = libiaxclient.la
 +libiaxclient_la_SOURCES = $(SRCS)
 +nodist_libiaxclient_la_SOURCES = $(NODIST_SRCS)
-+AM_CFLAGS = -I$(srcdir)/portaudio/pablio			\
-+  -I$(srcdir)/portmixer/px_common				\
-+  $(GSM_CFLAGS) $(SPEEX_CFLAGS) $(IAX_CFLAGS) $(IAX2_CFLAGS)	\
-+  $(PORTAUDIO_CFLAGS)\
-+-Wpointer-arith -DPA_COMPAT18 -DLIBVER='"$(PACKAGE_VERSION)"' $(am__append_7) $(am__append_12)
-+libiaxclient_la_LIBADD = $(GSM_LIBS) $(SPEEX_LIBS) $(IAX_LIBS)	\
-+  $(IAX2_LIBS) $(PORTAUDIO_LIBS)\
-+$(am__append_3) $(am__append_6) $(am__append_11)
-+AM_LDFLAGS = -no-undefined			\
-+  -export-symbols-regex "iaxc_.*"\
-+$(am__append_8)
++AM_CFLAGS = -I$(srcdir)/portaudio/pablio \
++	-I$(srcdir)/portmixer/px_common $(GSM_CFLAGS) $(SPEEX_CFLAGS) \
++	$(IAX_CFLAGS) $(IAX2_CFLAGS) $(PORTAUDIO_CFLAGS) \
++	-Wpointer-arith -DPA_COMPAT18 -DLIBVER='"$(PACKAGE_VERSION)"' \
++	$(am__append_7) $(am__append_12)
++libiaxclient_la_LIBADD = $(GSM_LIBS) $(SPEEX_LIBS) $(IAX_LIBS) \
++	$(IAX2_LIBS) $(PORTAUDIO_LIBS) $(am__append_3) $(am__append_6) \
++	$(am__append_11)
++AM_LDFLAGS = -no-undefined -export-symbols-regex "iaxc_.*" \
++	$(am__append_8)
 +include_HEADERS = iaxclient.h
-+SRCS = $(am__append_1) $(am__append_4) $(am__append_9) $(am__append_13) $(am__append_15) $(am__append_16) $(am__append_17) $(am__append_18) $(am__append_19) $(am__append_21) \
-+	portaudio/pablio/pablio.c		\
-+	portaudio/pablio/ringbuffer.c		\
-+	audio_encode.c				\
-+	audio_portaudio.c			\
-+	audio_file.c				\
-+	codec_gsm.c				\
-+	codec_ulaw.c				\
-+	codec_speex.c				\
-+	codec_alaw.c				\
-+	iaxclient_lib.c				\
-+	spandsp/plc.h				\
-+	spandsp/plc.c				\
-+	audio_encode.h				\
-+	audio_portaudio.h			\
-+	audio_file.h				\
-+	codec_gsm.h				\
-+	codec_ilbc.h				\
-+	codec_speex.h				\
-+	codec_ulaw.h				\
-+	codec_alaw.h				\
-+	iaxclient_lib.h				\
-+	jitterbuf.h				\
-+	portaudio/pablio/pablio.h		\
-+	portaudio/pablio/ringbuffer.h		\
-+	portmixer/px_common/portmixer.h
-+
-+SRCS_LIBPORTAUDIO = $(am__append_2) $(am__append_5) $(am__append_10) $(am__append_14) \
-+	portaudio/pa_common/pa_lib.c		\
-+	portaudio/pa_common/pa_host.h		\
-+	portaudio/pa_common/portaudio.h		\
++SRCS = $(am__append_1) $(am__append_4) $(am__append_9) \
++	$(am__append_13) $(am__append_15) $(am__append_16) \
++	$(am__append_17) $(am__append_18) $(am__append_19) \
++	$(am__append_21) portaudio/pablio/pablio.c \
++	portaudio/pablio/ringbuffer.c audio_encode.c audio_portaudio.c \
++	audio_file.c codec_gsm.c codec_ulaw.c codec_speex.c \
++	codec_alaw.c iaxclient_lib.c spandsp/plc.h spandsp/plc.c \
++	audio_encode.h audio_portaudio.h audio_file.h codec_gsm.h \
++	codec_ilbc.h codec_speex.h codec_ulaw.h codec_alaw.h \
++	iaxclient_lib.h jitterbuf.h portaudio/pablio/pablio.h \
++	portaudio/pablio/ringbuffer.h portmixer/px_common/portmixer.h
++SRCS_LIBPORTAUDIO = $(am__append_2) $(am__append_5) $(am__append_10) \
++	$(am__append_14) portaudio/pa_common/pa_lib.c \
++	portaudio/pa_common/pa_host.h portaudio/pa_common/portaudio.h \
 +	portaudio/pa_common/pa_trace.h
-+
 +NODIST_SRCS = $(am__append_20)
 +SRCS_LIBGSM = \
 +	gsm/src/add.c				\
@@ -36882,7 +39377,7 @@
 +	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
 +	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 +	  if test -f $$p; then \
-+	    f="`echo $$p | sed -e 's|^.*/||'`"; \
++	    f=$(am__strip_dir) \
 +	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
 +	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 +	  else :; fi; \
@@ -36890,8 +39385,8 @@
 +
 +uninstall-libLTLIBRARIES:
 +	@$(NORMAL_UNINSTALL)
-+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+	    p="`echo $$p | sed -e 's|^.*/||'`"; \
++	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	  p=$(am__strip_dir) \
 +	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 +	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 +	done
@@ -37470,2261 +39965,29 @@
 + at AMDEP_TRUE@@am__include@ @am__quote at spandsp/$(DEPDIR)/plc.Plo at am__quote@
 +
 +.c.o:
-+ at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
++ at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
++ at am__fastdepCC_TRUE@	then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
 + at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
 +
 +.c.obj:
-+ at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \
++ at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCC_TRUE@	then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
 + at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 +
 +.c.lo:
-+ at am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
++ at am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
++ at am__fastdepCC_TRUE@	then mv -f "$$depbase.Tpo" "$$depbase.Plo"; else rm -f "$$depbase.Tpo"; exit 1; fi
 + at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 +
-+portmixer/px_win_wmme/px_win_wmme.o: portmixer/px_win_wmme/px_win_wmme.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portmixer/px_win_wmme/px_win_wmme.o -MD -MP -MF "portmixer/px_win_wmme/$(DEPDIR)/px_win_wmme.Tpo" -c -o portmixer/px_win_wmme/px_win_wmme.o `test -f 'portmixer/px_win_wmme/px_win_wmme.c' || echo '$(srcdir)/'`portmixer/px_win_wmme/px_win_wmme.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "portmixer/px_win_wmme/$(DEPDIR)/px_win_wmme.Tpo" "portmixer/px_win_wmme/$(DEPDIR)/px_win_wmme.Po"; else rm -f "portmixer/px_win_wmme/$(DEPDIR)/px_win_wmme.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portmixer/px_win_wmme/px_win_wmme.c' object='portmixer/px_win_wmme/px_win_wmme.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portmixer/px_win_wmme/$(DEPDIR)/px_win_wmme.Po' tmpdepfile='portmixer/px_win_wmme/$(DEPDIR)/px_win_wmme.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portmixer/px_win_wmme/px_win_wmme.o `test -f 'portmixer/px_win_wmme/px_win_wmme.c' || echo '$(srcdir)/'`portmixer/px_win_wmme/px_win_wmme.c
-+
-+portmixer/px_win_wmme/px_win_wmme.obj: portmixer/px_win_wmme/px_win_wmme.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portmixer/px_win_wmme/px_win_wmme.obj -MD -MP -MF "portmixer/px_win_wmme/$(DEPDIR)/px_win_wmme.Tpo" -c -o portmixer/px_win_wmme/px_win_wmme.obj `if test -f 'portmixer/px_win_wmme/px_win_wmme.c'; then $(CYGPATH_W) 'portmixer/px_win_wmme/px_win_wmme.c'; else $(CYGPATH_W) '$(srcdir)/portmixer/px_win_wmme/px_win_wmme.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "portmixer/px_win_wmme/$(DEPDIR)/px_win_wmme.Tpo" "portmixer/px_win_wmme/$(DEPDIR)/px_win_wmme.Po"; else rm -f "portmixer/px_win_wmme/$(DEPDIR)/px_win_wmme.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portmixer/px_win_wmme/px_win_wmme.c' object='portmixer/px_win_wmme/px_win_wmme.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portmixer/px_win_wmme/$(DEPDIR)/px_win_wmme.Po' tmpdepfile='portmixer/px_win_wmme/$(DEPDIR)/px_win_wmme.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portmixer/px_win_wmme/px_win_wmme.obj `if test -f 'portmixer/px_win_wmme/px_win_wmme.c'; then $(CYGPATH_W) 'portmixer/px_win_wmme/px_win_wmme.c'; else $(CYGPATH_W) '$(srcdir)/portmixer/px_win_wmme/px_win_wmme.c'; fi`
-+
-+portmixer/px_win_wmme/px_win_wmme.lo: portmixer/px_win_wmme/px_win_wmme.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portmixer/px_win_wmme/px_win_wmme.lo -MD -MP -MF "portmixer/px_win_wmme/$(DEPDIR)/px_win_wmme.Tpo" -c -o portmixer/px_win_wmme/px_win_wmme.lo `test -f 'portmixer/px_win_wmme/px_win_wmme.c' || echo '$(srcdir)/'`portmixer/px_win_wmme/px_win_wmme.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "portmixer/px_win_wmme/$(DEPDIR)/px_win_wmme.Tpo" "portmixer/px_win_wmme/$(DEPDIR)/px_win_wmme.Plo"; else rm -f "portmixer/px_win_wmme/$(DEPDIR)/px_win_wmme.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portmixer/px_win_wmme/px_win_wmme.c' object='portmixer/px_win_wmme/px_win_wmme.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portmixer/px_win_wmme/$(DEPDIR)/px_win_wmme.Plo' tmpdepfile='portmixer/px_win_wmme/$(DEPDIR)/px_win_wmme.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portmixer/px_win_wmme/px_win_wmme.lo `test -f 'portmixer/px_win_wmme/px_win_wmme.c' || echo '$(srcdir)/'`portmixer/px_win_wmme/px_win_wmme.c
-+
-+portmixer/px_unix_oss/px_unix_oss.o: portmixer/px_unix_oss/px_unix_oss.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portmixer/px_unix_oss/px_unix_oss.o -MD -MP -MF "portmixer/px_unix_oss/$(DEPDIR)/px_unix_oss.Tpo" -c -o portmixer/px_unix_oss/px_unix_oss.o `test -f 'portmixer/px_unix_oss/px_unix_oss.c' || echo '$(srcdir)/'`portmixer/px_unix_oss/px_unix_oss.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "portmixer/px_unix_oss/$(DEPDIR)/px_unix_oss.Tpo" "portmixer/px_unix_oss/$(DEPDIR)/px_unix_oss.Po"; else rm -f "portmixer/px_unix_oss/$(DEPDIR)/px_unix_oss.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portmixer/px_unix_oss/px_unix_oss.c' object='portmixer/px_unix_oss/px_unix_oss.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portmixer/px_unix_oss/$(DEPDIR)/px_unix_oss.Po' tmpdepfile='portmixer/px_unix_oss/$(DEPDIR)/px_unix_oss.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portmixer/px_unix_oss/px_unix_oss.o `test -f 'portmixer/px_unix_oss/px_unix_oss.c' || echo '$(srcdir)/'`portmixer/px_unix_oss/px_unix_oss.c
-+
-+portmixer/px_unix_oss/px_unix_oss.obj: portmixer/px_unix_oss/px_unix_oss.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portmixer/px_unix_oss/px_unix_oss.obj -MD -MP -MF "portmixer/px_unix_oss/$(DEPDIR)/px_unix_oss.Tpo" -c -o portmixer/px_unix_oss/px_unix_oss.obj `if test -f 'portmixer/px_unix_oss/px_unix_oss.c'; then $(CYGPATH_W) 'portmixer/px_unix_oss/px_unix_oss.c'; else $(CYGPATH_W) '$(srcdir)/portmixer/px_unix_oss/px_unix_oss.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "portmixer/px_unix_oss/$(DEPDIR)/px_unix_oss.Tpo" "portmixer/px_unix_oss/$(DEPDIR)/px_unix_oss.Po"; else rm -f "portmixer/px_unix_oss/$(DEPDIR)/px_unix_oss.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portmixer/px_unix_oss/px_unix_oss.c' object='portmixer/px_unix_oss/px_unix_oss.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portmixer/px_unix_oss/$(DEPDIR)/px_unix_oss.Po' tmpdepfile='portmixer/px_unix_oss/$(DEPDIR)/px_unix_oss.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portmixer/px_unix_oss/px_unix_oss.obj `if test -f 'portmixer/px_unix_oss/px_unix_oss.c'; then $(CYGPATH_W) 'portmixer/px_unix_oss/px_unix_oss.c'; else $(CYGPATH_W) '$(srcdir)/portmixer/px_unix_oss/px_unix_oss.c'; fi`
-+
-+portmixer/px_unix_oss/px_unix_oss.lo: portmixer/px_unix_oss/px_unix_oss.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portmixer/px_unix_oss/px_unix_oss.lo -MD -MP -MF "portmixer/px_unix_oss/$(DEPDIR)/px_unix_oss.Tpo" -c -o portmixer/px_unix_oss/px_unix_oss.lo `test -f 'portmixer/px_unix_oss/px_unix_oss.c' || echo '$(srcdir)/'`portmixer/px_unix_oss/px_unix_oss.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "portmixer/px_unix_oss/$(DEPDIR)/px_unix_oss.Tpo" "portmixer/px_unix_oss/$(DEPDIR)/px_unix_oss.Plo"; else rm -f "portmixer/px_unix_oss/$(DEPDIR)/px_unix_oss.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portmixer/px_unix_oss/px_unix_oss.c' object='portmixer/px_unix_oss/px_unix_oss.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portmixer/px_unix_oss/$(DEPDIR)/px_unix_oss.Plo' tmpdepfile='portmixer/px_unix_oss/$(DEPDIR)/px_unix_oss.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portmixer/px_unix_oss/px_unix_oss.lo `test -f 'portmixer/px_unix_oss/px_unix_oss.c' || echo '$(srcdir)/'`portmixer/px_unix_oss/px_unix_oss.c
-+
-+portmixer/px_solaris/px_solaris.o: portmixer/px_solaris/px_solaris.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portmixer/px_solaris/px_solaris.o -MD -MP -MF "portmixer/px_solaris/$(DEPDIR)/px_solaris.Tpo" -c -o portmixer/px_solaris/px_solaris.o `test -f 'portmixer/px_solaris/px_solaris.c' || echo '$(srcdir)/'`portmixer/px_solaris/px_solaris.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "portmixer/px_solaris/$(DEPDIR)/px_solaris.Tpo" "portmixer/px_solaris/$(DEPDIR)/px_solaris.Po"; else rm -f "portmixer/px_solaris/$(DEPDIR)/px_solaris.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portmixer/px_solaris/px_solaris.c' object='portmixer/px_solaris/px_solaris.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portmixer/px_solaris/$(DEPDIR)/px_solaris.Po' tmpdepfile='portmixer/px_solaris/$(DEPDIR)/px_solaris.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portmixer/px_solaris/px_solaris.o `test -f 'portmixer/px_solaris/px_solaris.c' || echo '$(srcdir)/'`portmixer/px_solaris/px_solaris.c
-+
-+portmixer/px_solaris/px_solaris.obj: portmixer/px_solaris/px_solaris.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portmixer/px_solaris/px_solaris.obj -MD -MP -MF "portmixer/px_solaris/$(DEPDIR)/px_solaris.Tpo" -c -o portmixer/px_solaris/px_solaris.obj `if test -f 'portmixer/px_solaris/px_solaris.c'; then $(CYGPATH_W) 'portmixer/px_solaris/px_solaris.c'; else $(CYGPATH_W) '$(srcdir)/portmixer/px_solaris/px_solaris.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "portmixer/px_solaris/$(DEPDIR)/px_solaris.Tpo" "portmixer/px_solaris/$(DEPDIR)/px_solaris.Po"; else rm -f "portmixer/px_solaris/$(DEPDIR)/px_solaris.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portmixer/px_solaris/px_solaris.c' object='portmixer/px_solaris/px_solaris.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portmixer/px_solaris/$(DEPDIR)/px_solaris.Po' tmpdepfile='portmixer/px_solaris/$(DEPDIR)/px_solaris.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portmixer/px_solaris/px_solaris.obj `if test -f 'portmixer/px_solaris/px_solaris.c'; then $(CYGPATH_W) 'portmixer/px_solaris/px_solaris.c'; else $(CYGPATH_W) '$(srcdir)/portmixer/px_solaris/px_solaris.c'; fi`
-+
-+portmixer/px_solaris/px_solaris.lo: portmixer/px_solaris/px_solaris.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portmixer/px_solaris/px_solaris.lo -MD -MP -MF "portmixer/px_solaris/$(DEPDIR)/px_solaris.Tpo" -c -o portmixer/px_solaris/px_solaris.lo `test -f 'portmixer/px_solaris/px_solaris.c' || echo '$(srcdir)/'`portmixer/px_solaris/px_solaris.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "portmixer/px_solaris/$(DEPDIR)/px_solaris.Tpo" "portmixer/px_solaris/$(DEPDIR)/px_solaris.Plo"; else rm -f "portmixer/px_solaris/$(DEPDIR)/px_solaris.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portmixer/px_solaris/px_solaris.c' object='portmixer/px_solaris/px_solaris.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portmixer/px_solaris/$(DEPDIR)/px_solaris.Plo' tmpdepfile='portmixer/px_solaris/$(DEPDIR)/px_solaris.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portmixer/px_solaris/px_solaris.lo `test -f 'portmixer/px_solaris/px_solaris.c' || echo '$(srcdir)/'`portmixer/px_solaris/px_solaris.c
-+
-+portmixer/px_mac_core/px_mac_core.o: portmixer/px_mac_core/px_mac_core.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portmixer/px_mac_core/px_mac_core.o -MD -MP -MF "portmixer/px_mac_core/$(DEPDIR)/px_mac_core.Tpo" -c -o portmixer/px_mac_core/px_mac_core.o `test -f 'portmixer/px_mac_core/px_mac_core.c' || echo '$(srcdir)/'`portmixer/px_mac_core/px_mac_core.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "portmixer/px_mac_core/$(DEPDIR)/px_mac_core.Tpo" "portmixer/px_mac_core/$(DEPDIR)/px_mac_core.Po"; else rm -f "portmixer/px_mac_core/$(DEPDIR)/px_mac_core.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portmixer/px_mac_core/px_mac_core.c' object='portmixer/px_mac_core/px_mac_core.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portmixer/px_mac_core/$(DEPDIR)/px_mac_core.Po' tmpdepfile='portmixer/px_mac_core/$(DEPDIR)/px_mac_core.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portmixer/px_mac_core/px_mac_core.o `test -f 'portmixer/px_mac_core/px_mac_core.c' || echo '$(srcdir)/'`portmixer/px_mac_core/px_mac_core.c
-+
-+portmixer/px_mac_core/px_mac_core.obj: portmixer/px_mac_core/px_mac_core.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portmixer/px_mac_core/px_mac_core.obj -MD -MP -MF "portmixer/px_mac_core/$(DEPDIR)/px_mac_core.Tpo" -c -o portmixer/px_mac_core/px_mac_core.obj `if test -f 'portmixer/px_mac_core/px_mac_core.c'; then $(CYGPATH_W) 'portmixer/px_mac_core/px_mac_core.c'; else $(CYGPATH_W) '$(srcdir)/portmixer/px_mac_core/px_mac_core.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "portmixer/px_mac_core/$(DEPDIR)/px_mac_core.Tpo" "portmixer/px_mac_core/$(DEPDIR)/px_mac_core.Po"; else rm -f "portmixer/px_mac_core/$(DEPDIR)/px_mac_core.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portmixer/px_mac_core/px_mac_core.c' object='portmixer/px_mac_core/px_mac_core.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portmixer/px_mac_core/$(DEPDIR)/px_mac_core.Po' tmpdepfile='portmixer/px_mac_core/$(DEPDIR)/px_mac_core.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portmixer/px_mac_core/px_mac_core.obj `if test -f 'portmixer/px_mac_core/px_mac_core.c'; then $(CYGPATH_W) 'portmixer/px_mac_core/px_mac_core.c'; else $(CYGPATH_W) '$(srcdir)/portmixer/px_mac_core/px_mac_core.c'; fi`
-+
-+portmixer/px_mac_core/px_mac_core.lo: portmixer/px_mac_core/px_mac_core.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portmixer/px_mac_core/px_mac_core.lo -MD -MP -MF "portmixer/px_mac_core/$(DEPDIR)/px_mac_core.Tpo" -c -o portmixer/px_mac_core/px_mac_core.lo `test -f 'portmixer/px_mac_core/px_mac_core.c' || echo '$(srcdir)/'`portmixer/px_mac_core/px_mac_core.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "portmixer/px_mac_core/$(DEPDIR)/px_mac_core.Tpo" "portmixer/px_mac_core/$(DEPDIR)/px_mac_core.Plo"; else rm -f "portmixer/px_mac_core/$(DEPDIR)/px_mac_core.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portmixer/px_mac_core/px_mac_core.c' object='portmixer/px_mac_core/px_mac_core.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portmixer/px_mac_core/$(DEPDIR)/px_mac_core.Plo' tmpdepfile='portmixer/px_mac_core/$(DEPDIR)/px_mac_core.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portmixer/px_mac_core/px_mac_core.lo `test -f 'portmixer/px_mac_core/px_mac_core.c' || echo '$(srcdir)/'`portmixer/px_mac_core/px_mac_core.c
-+
-+gsm/src/add.o: gsm/src/add.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/add.o -MD -MP -MF "gsm/src/$(DEPDIR)/add.Tpo" -c -o gsm/src/add.o `test -f 'gsm/src/add.c' || echo '$(srcdir)/'`gsm/src/add.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/add.Tpo" "gsm/src/$(DEPDIR)/add.Po"; else rm -f "gsm/src/$(DEPDIR)/add.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/add.c' object='gsm/src/add.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/add.Po' tmpdepfile='gsm/src/$(DEPDIR)/add.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/add.o `test -f 'gsm/src/add.c' || echo '$(srcdir)/'`gsm/src/add.c
-+
-+gsm/src/add.obj: gsm/src/add.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/add.obj -MD -MP -MF "gsm/src/$(DEPDIR)/add.Tpo" -c -o gsm/src/add.obj `if test -f 'gsm/src/add.c'; then $(CYGPATH_W) 'gsm/src/add.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/add.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/add.Tpo" "gsm/src/$(DEPDIR)/add.Po"; else rm -f "gsm/src/$(DEPDIR)/add.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/add.c' object='gsm/src/add.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/add.Po' tmpdepfile='gsm/src/$(DEPDIR)/add.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/add.obj `if test -f 'gsm/src/add.c'; then $(CYGPATH_W) 'gsm/src/add.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/add.c'; fi`
-+
-+gsm/src/add.lo: gsm/src/add.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/add.lo -MD -MP -MF "gsm/src/$(DEPDIR)/add.Tpo" -c -o gsm/src/add.lo `test -f 'gsm/src/add.c' || echo '$(srcdir)/'`gsm/src/add.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/add.Tpo" "gsm/src/$(DEPDIR)/add.Plo"; else rm -f "gsm/src/$(DEPDIR)/add.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/add.c' object='gsm/src/add.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/add.Plo' tmpdepfile='gsm/src/$(DEPDIR)/add.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/add.lo `test -f 'gsm/src/add.c' || echo '$(srcdir)/'`gsm/src/add.c
-+
-+gsm/src/code.o: gsm/src/code.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/code.o -MD -MP -MF "gsm/src/$(DEPDIR)/code.Tpo" -c -o gsm/src/code.o `test -f 'gsm/src/code.c' || echo '$(srcdir)/'`gsm/src/code.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/code.Tpo" "gsm/src/$(DEPDIR)/code.Po"; else rm -f "gsm/src/$(DEPDIR)/code.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/code.c' object='gsm/src/code.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/code.Po' tmpdepfile='gsm/src/$(DEPDIR)/code.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/code.o `test -f 'gsm/src/code.c' || echo '$(srcdir)/'`gsm/src/code.c
-+
-+gsm/src/code.obj: gsm/src/code.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/code.obj -MD -MP -MF "gsm/src/$(DEPDIR)/code.Tpo" -c -o gsm/src/code.obj `if test -f 'gsm/src/code.c'; then $(CYGPATH_W) 'gsm/src/code.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/code.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/code.Tpo" "gsm/src/$(DEPDIR)/code.Po"; else rm -f "gsm/src/$(DEPDIR)/code.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/code.c' object='gsm/src/code.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/code.Po' tmpdepfile='gsm/src/$(DEPDIR)/code.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/code.obj `if test -f 'gsm/src/code.c'; then $(CYGPATH_W) 'gsm/src/code.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/code.c'; fi`
-+
-+gsm/src/code.lo: gsm/src/code.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/code.lo -MD -MP -MF "gsm/src/$(DEPDIR)/code.Tpo" -c -o gsm/src/code.lo `test -f 'gsm/src/code.c' || echo '$(srcdir)/'`gsm/src/code.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/code.Tpo" "gsm/src/$(DEPDIR)/code.Plo"; else rm -f "gsm/src/$(DEPDIR)/code.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/code.c' object='gsm/src/code.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/code.Plo' tmpdepfile='gsm/src/$(DEPDIR)/code.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/code.lo `test -f 'gsm/src/code.c' || echo '$(srcdir)/'`gsm/src/code.c
-+
-+gsm/src/debug.o: gsm/src/debug.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/debug.o -MD -MP -MF "gsm/src/$(DEPDIR)/debug.Tpo" -c -o gsm/src/debug.o `test -f 'gsm/src/debug.c' || echo '$(srcdir)/'`gsm/src/debug.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/debug.Tpo" "gsm/src/$(DEPDIR)/debug.Po"; else rm -f "gsm/src/$(DEPDIR)/debug.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/debug.c' object='gsm/src/debug.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/debug.Po' tmpdepfile='gsm/src/$(DEPDIR)/debug.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/debug.o `test -f 'gsm/src/debug.c' || echo '$(srcdir)/'`gsm/src/debug.c
-+
-+gsm/src/debug.obj: gsm/src/debug.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/debug.obj -MD -MP -MF "gsm/src/$(DEPDIR)/debug.Tpo" -c -o gsm/src/debug.obj `if test -f 'gsm/src/debug.c'; then $(CYGPATH_W) 'gsm/src/debug.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/debug.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/debug.Tpo" "gsm/src/$(DEPDIR)/debug.Po"; else rm -f "gsm/src/$(DEPDIR)/debug.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/debug.c' object='gsm/src/debug.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/debug.Po' tmpdepfile='gsm/src/$(DEPDIR)/debug.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/debug.obj `if test -f 'gsm/src/debug.c'; then $(CYGPATH_W) 'gsm/src/debug.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/debug.c'; fi`
-+
-+gsm/src/debug.lo: gsm/src/debug.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/debug.lo -MD -MP -MF "gsm/src/$(DEPDIR)/debug.Tpo" -c -o gsm/src/debug.lo `test -f 'gsm/src/debug.c' || echo '$(srcdir)/'`gsm/src/debug.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/debug.Tpo" "gsm/src/$(DEPDIR)/debug.Plo"; else rm -f "gsm/src/$(DEPDIR)/debug.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/debug.c' object='gsm/src/debug.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/debug.Plo' tmpdepfile='gsm/src/$(DEPDIR)/debug.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/debug.lo `test -f 'gsm/src/debug.c' || echo '$(srcdir)/'`gsm/src/debug.c
-+
-+gsm/src/decode.o: gsm/src/decode.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/decode.o -MD -MP -MF "gsm/src/$(DEPDIR)/decode.Tpo" -c -o gsm/src/decode.o `test -f 'gsm/src/decode.c' || echo '$(srcdir)/'`gsm/src/decode.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/decode.Tpo" "gsm/src/$(DEPDIR)/decode.Po"; else rm -f "gsm/src/$(DEPDIR)/decode.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/decode.c' object='gsm/src/decode.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/decode.Po' tmpdepfile='gsm/src/$(DEPDIR)/decode.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/decode.o `test -f 'gsm/src/decode.c' || echo '$(srcdir)/'`gsm/src/decode.c
-+
-+gsm/src/decode.obj: gsm/src/decode.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/decode.obj -MD -MP -MF "gsm/src/$(DEPDIR)/decode.Tpo" -c -o gsm/src/decode.obj `if test -f 'gsm/src/decode.c'; then $(CYGPATH_W) 'gsm/src/decode.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/decode.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/decode.Tpo" "gsm/src/$(DEPDIR)/decode.Po"; else rm -f "gsm/src/$(DEPDIR)/decode.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/decode.c' object='gsm/src/decode.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/decode.Po' tmpdepfile='gsm/src/$(DEPDIR)/decode.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/decode.obj `if test -f 'gsm/src/decode.c'; then $(CYGPATH_W) 'gsm/src/decode.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/decode.c'; fi`
-+
-+gsm/src/decode.lo: gsm/src/decode.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/decode.lo -MD -MP -MF "gsm/src/$(DEPDIR)/decode.Tpo" -c -o gsm/src/decode.lo `test -f 'gsm/src/decode.c' || echo '$(srcdir)/'`gsm/src/decode.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/decode.Tpo" "gsm/src/$(DEPDIR)/decode.Plo"; else rm -f "gsm/src/$(DEPDIR)/decode.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/decode.c' object='gsm/src/decode.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/decode.Plo' tmpdepfile='gsm/src/$(DEPDIR)/decode.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/decode.lo `test -f 'gsm/src/decode.c' || echo '$(srcdir)/'`gsm/src/decode.c
-+
-+gsm/src/gsm_create.o: gsm/src/gsm_create.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/gsm_create.o -MD -MP -MF "gsm/src/$(DEPDIR)/gsm_create.Tpo" -c -o gsm/src/gsm_create.o `test -f 'gsm/src/gsm_create.c' || echo '$(srcdir)/'`gsm/src/gsm_create.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/gsm_create.Tpo" "gsm/src/$(DEPDIR)/gsm_create.Po"; else rm -f "gsm/src/$(DEPDIR)/gsm_create.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/gsm_create.c' object='gsm/src/gsm_create.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/gsm_create.Po' tmpdepfile='gsm/src/$(DEPDIR)/gsm_create.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/gsm_create.o `test -f 'gsm/src/gsm_create.c' || echo '$(srcdir)/'`gsm/src/gsm_create.c
-+
-+gsm/src/gsm_create.obj: gsm/src/gsm_create.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/gsm_create.obj -MD -MP -MF "gsm/src/$(DEPDIR)/gsm_create.Tpo" -c -o gsm/src/gsm_create.obj `if test -f 'gsm/src/gsm_create.c'; then $(CYGPATH_W) 'gsm/src/gsm_create.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/gsm_create.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/gsm_create.Tpo" "gsm/src/$(DEPDIR)/gsm_create.Po"; else rm -f "gsm/src/$(DEPDIR)/gsm_create.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/gsm_create.c' object='gsm/src/gsm_create.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/gsm_create.Po' tmpdepfile='gsm/src/$(DEPDIR)/gsm_create.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/gsm_create.obj `if test -f 'gsm/src/gsm_create.c'; then $(CYGPATH_W) 'gsm/src/gsm_create.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/gsm_create.c'; fi`
-+
-+gsm/src/gsm_create.lo: gsm/src/gsm_create.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/gsm_create.lo -MD -MP -MF "gsm/src/$(DEPDIR)/gsm_create.Tpo" -c -o gsm/src/gsm_create.lo `test -f 'gsm/src/gsm_create.c' || echo '$(srcdir)/'`gsm/src/gsm_create.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/gsm_create.Tpo" "gsm/src/$(DEPDIR)/gsm_create.Plo"; else rm -f "gsm/src/$(DEPDIR)/gsm_create.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/gsm_create.c' object='gsm/src/gsm_create.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/gsm_create.Plo' tmpdepfile='gsm/src/$(DEPDIR)/gsm_create.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/gsm_create.lo `test -f 'gsm/src/gsm_create.c' || echo '$(srcdir)/'`gsm/src/gsm_create.c
-+
-+gsm/src/gsm_decode.o: gsm/src/gsm_decode.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/gsm_decode.o -MD -MP -MF "gsm/src/$(DEPDIR)/gsm_decode.Tpo" -c -o gsm/src/gsm_decode.o `test -f 'gsm/src/gsm_decode.c' || echo '$(srcdir)/'`gsm/src/gsm_decode.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/gsm_decode.Tpo" "gsm/src/$(DEPDIR)/gsm_decode.Po"; else rm -f "gsm/src/$(DEPDIR)/gsm_decode.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/gsm_decode.c' object='gsm/src/gsm_decode.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/gsm_decode.Po' tmpdepfile='gsm/src/$(DEPDIR)/gsm_decode.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/gsm_decode.o `test -f 'gsm/src/gsm_decode.c' || echo '$(srcdir)/'`gsm/src/gsm_decode.c
-+
-+gsm/src/gsm_decode.obj: gsm/src/gsm_decode.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/gsm_decode.obj -MD -MP -MF "gsm/src/$(DEPDIR)/gsm_decode.Tpo" -c -o gsm/src/gsm_decode.obj `if test -f 'gsm/src/gsm_decode.c'; then $(CYGPATH_W) 'gsm/src/gsm_decode.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/gsm_decode.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/gsm_decode.Tpo" "gsm/src/$(DEPDIR)/gsm_decode.Po"; else rm -f "gsm/src/$(DEPDIR)/gsm_decode.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/gsm_decode.c' object='gsm/src/gsm_decode.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/gsm_decode.Po' tmpdepfile='gsm/src/$(DEPDIR)/gsm_decode.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/gsm_decode.obj `if test -f 'gsm/src/gsm_decode.c'; then $(CYGPATH_W) 'gsm/src/gsm_decode.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/gsm_decode.c'; fi`
-+
-+gsm/src/gsm_decode.lo: gsm/src/gsm_decode.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/gsm_decode.lo -MD -MP -MF "gsm/src/$(DEPDIR)/gsm_decode.Tpo" -c -o gsm/src/gsm_decode.lo `test -f 'gsm/src/gsm_decode.c' || echo '$(srcdir)/'`gsm/src/gsm_decode.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/gsm_decode.Tpo" "gsm/src/$(DEPDIR)/gsm_decode.Plo"; else rm -f "gsm/src/$(DEPDIR)/gsm_decode.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/gsm_decode.c' object='gsm/src/gsm_decode.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/gsm_decode.Plo' tmpdepfile='gsm/src/$(DEPDIR)/gsm_decode.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/gsm_decode.lo `test -f 'gsm/src/gsm_decode.c' || echo '$(srcdir)/'`gsm/src/gsm_decode.c
-+
-+gsm/src/gsm_destroy.o: gsm/src/gsm_destroy.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/gsm_destroy.o -MD -MP -MF "gsm/src/$(DEPDIR)/gsm_destroy.Tpo" -c -o gsm/src/gsm_destroy.o `test -f 'gsm/src/gsm_destroy.c' || echo '$(srcdir)/'`gsm/src/gsm_destroy.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/gsm_destroy.Tpo" "gsm/src/$(DEPDIR)/gsm_destroy.Po"; else rm -f "gsm/src/$(DEPDIR)/gsm_destroy.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/gsm_destroy.c' object='gsm/src/gsm_destroy.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/gsm_destroy.Po' tmpdepfile='gsm/src/$(DEPDIR)/gsm_destroy.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/gsm_destroy.o `test -f 'gsm/src/gsm_destroy.c' || echo '$(srcdir)/'`gsm/src/gsm_destroy.c
-+
-+gsm/src/gsm_destroy.obj: gsm/src/gsm_destroy.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/gsm_destroy.obj -MD -MP -MF "gsm/src/$(DEPDIR)/gsm_destroy.Tpo" -c -o gsm/src/gsm_destroy.obj `if test -f 'gsm/src/gsm_destroy.c'; then $(CYGPATH_W) 'gsm/src/gsm_destroy.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/gsm_destroy.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/gsm_destroy.Tpo" "gsm/src/$(DEPDIR)/gsm_destroy.Po"; else rm -f "gsm/src/$(DEPDIR)/gsm_destroy.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/gsm_destroy.c' object='gsm/src/gsm_destroy.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/gsm_destroy.Po' tmpdepfile='gsm/src/$(DEPDIR)/gsm_destroy.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/gsm_destroy.obj `if test -f 'gsm/src/gsm_destroy.c'; then $(CYGPATH_W) 'gsm/src/gsm_destroy.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/gsm_destroy.c'; fi`
-+
-+gsm/src/gsm_destroy.lo: gsm/src/gsm_destroy.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/gsm_destroy.lo -MD -MP -MF "gsm/src/$(DEPDIR)/gsm_destroy.Tpo" -c -o gsm/src/gsm_destroy.lo `test -f 'gsm/src/gsm_destroy.c' || echo '$(srcdir)/'`gsm/src/gsm_destroy.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/gsm_destroy.Tpo" "gsm/src/$(DEPDIR)/gsm_destroy.Plo"; else rm -f "gsm/src/$(DEPDIR)/gsm_destroy.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/gsm_destroy.c' object='gsm/src/gsm_destroy.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/gsm_destroy.Plo' tmpdepfile='gsm/src/$(DEPDIR)/gsm_destroy.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/gsm_destroy.lo `test -f 'gsm/src/gsm_destroy.c' || echo '$(srcdir)/'`gsm/src/gsm_destroy.c
-+
-+gsm/src/gsm_encode.o: gsm/src/gsm_encode.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/gsm_encode.o -MD -MP -MF "gsm/src/$(DEPDIR)/gsm_encode.Tpo" -c -o gsm/src/gsm_encode.o `test -f 'gsm/src/gsm_encode.c' || echo '$(srcdir)/'`gsm/src/gsm_encode.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/gsm_encode.Tpo" "gsm/src/$(DEPDIR)/gsm_encode.Po"; else rm -f "gsm/src/$(DEPDIR)/gsm_encode.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/gsm_encode.c' object='gsm/src/gsm_encode.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/gsm_encode.Po' tmpdepfile='gsm/src/$(DEPDIR)/gsm_encode.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/gsm_encode.o `test -f 'gsm/src/gsm_encode.c' || echo '$(srcdir)/'`gsm/src/gsm_encode.c
-+
-+gsm/src/gsm_encode.obj: gsm/src/gsm_encode.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/gsm_encode.obj -MD -MP -MF "gsm/src/$(DEPDIR)/gsm_encode.Tpo" -c -o gsm/src/gsm_encode.obj `if test -f 'gsm/src/gsm_encode.c'; then $(CYGPATH_W) 'gsm/src/gsm_encode.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/gsm_encode.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/gsm_encode.Tpo" "gsm/src/$(DEPDIR)/gsm_encode.Po"; else rm -f "gsm/src/$(DEPDIR)/gsm_encode.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/gsm_encode.c' object='gsm/src/gsm_encode.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/gsm_encode.Po' tmpdepfile='gsm/src/$(DEPDIR)/gsm_encode.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/gsm_encode.obj `if test -f 'gsm/src/gsm_encode.c'; then $(CYGPATH_W) 'gsm/src/gsm_encode.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/gsm_encode.c'; fi`
-+
-+gsm/src/gsm_encode.lo: gsm/src/gsm_encode.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/gsm_encode.lo -MD -MP -MF "gsm/src/$(DEPDIR)/gsm_encode.Tpo" -c -o gsm/src/gsm_encode.lo `test -f 'gsm/src/gsm_encode.c' || echo '$(srcdir)/'`gsm/src/gsm_encode.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/gsm_encode.Tpo" "gsm/src/$(DEPDIR)/gsm_encode.Plo"; else rm -f "gsm/src/$(DEPDIR)/gsm_encode.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/gsm_encode.c' object='gsm/src/gsm_encode.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/gsm_encode.Plo' tmpdepfile='gsm/src/$(DEPDIR)/gsm_encode.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/gsm_encode.lo `test -f 'gsm/src/gsm_encode.c' || echo '$(srcdir)/'`gsm/src/gsm_encode.c
-+
-+gsm/src/gsm_explode.o: gsm/src/gsm_explode.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/gsm_explode.o -MD -MP -MF "gsm/src/$(DEPDIR)/gsm_explode.Tpo" -c -o gsm/src/gsm_explode.o `test -f 'gsm/src/gsm_explode.c' || echo '$(srcdir)/'`gsm/src/gsm_explode.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/gsm_explode.Tpo" "gsm/src/$(DEPDIR)/gsm_explode.Po"; else rm -f "gsm/src/$(DEPDIR)/gsm_explode.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/gsm_explode.c' object='gsm/src/gsm_explode.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/gsm_explode.Po' tmpdepfile='gsm/src/$(DEPDIR)/gsm_explode.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/gsm_explode.o `test -f 'gsm/src/gsm_explode.c' || echo '$(srcdir)/'`gsm/src/gsm_explode.c
-+
-+gsm/src/gsm_explode.obj: gsm/src/gsm_explode.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/gsm_explode.obj -MD -MP -MF "gsm/src/$(DEPDIR)/gsm_explode.Tpo" -c -o gsm/src/gsm_explode.obj `if test -f 'gsm/src/gsm_explode.c'; then $(CYGPATH_W) 'gsm/src/gsm_explode.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/gsm_explode.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/gsm_explode.Tpo" "gsm/src/$(DEPDIR)/gsm_explode.Po"; else rm -f "gsm/src/$(DEPDIR)/gsm_explode.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/gsm_explode.c' object='gsm/src/gsm_explode.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/gsm_explode.Po' tmpdepfile='gsm/src/$(DEPDIR)/gsm_explode.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/gsm_explode.obj `if test -f 'gsm/src/gsm_explode.c'; then $(CYGPATH_W) 'gsm/src/gsm_explode.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/gsm_explode.c'; fi`
-+
-+gsm/src/gsm_explode.lo: gsm/src/gsm_explode.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/gsm_explode.lo -MD -MP -MF "gsm/src/$(DEPDIR)/gsm_explode.Tpo" -c -o gsm/src/gsm_explode.lo `test -f 'gsm/src/gsm_explode.c' || echo '$(srcdir)/'`gsm/src/gsm_explode.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/gsm_explode.Tpo" "gsm/src/$(DEPDIR)/gsm_explode.Plo"; else rm -f "gsm/src/$(DEPDIR)/gsm_explode.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/gsm_explode.c' object='gsm/src/gsm_explode.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/gsm_explode.Plo' tmpdepfile='gsm/src/$(DEPDIR)/gsm_explode.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/gsm_explode.lo `test -f 'gsm/src/gsm_explode.c' || echo '$(srcdir)/'`gsm/src/gsm_explode.c
-+
-+gsm/src/gsm_implode.o: gsm/src/gsm_implode.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/gsm_implode.o -MD -MP -MF "gsm/src/$(DEPDIR)/gsm_implode.Tpo" -c -o gsm/src/gsm_implode.o `test -f 'gsm/src/gsm_implode.c' || echo '$(srcdir)/'`gsm/src/gsm_implode.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/gsm_implode.Tpo" "gsm/src/$(DEPDIR)/gsm_implode.Po"; else rm -f "gsm/src/$(DEPDIR)/gsm_implode.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/gsm_implode.c' object='gsm/src/gsm_implode.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/gsm_implode.Po' tmpdepfile='gsm/src/$(DEPDIR)/gsm_implode.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/gsm_implode.o `test -f 'gsm/src/gsm_implode.c' || echo '$(srcdir)/'`gsm/src/gsm_implode.c
-+
-+gsm/src/gsm_implode.obj: gsm/src/gsm_implode.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/gsm_implode.obj -MD -MP -MF "gsm/src/$(DEPDIR)/gsm_implode.Tpo" -c -o gsm/src/gsm_implode.obj `if test -f 'gsm/src/gsm_implode.c'; then $(CYGPATH_W) 'gsm/src/gsm_implode.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/gsm_implode.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/gsm_implode.Tpo" "gsm/src/$(DEPDIR)/gsm_implode.Po"; else rm -f "gsm/src/$(DEPDIR)/gsm_implode.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/gsm_implode.c' object='gsm/src/gsm_implode.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/gsm_implode.Po' tmpdepfile='gsm/src/$(DEPDIR)/gsm_implode.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/gsm_implode.obj `if test -f 'gsm/src/gsm_implode.c'; then $(CYGPATH_W) 'gsm/src/gsm_implode.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/gsm_implode.c'; fi`
-+
-+gsm/src/gsm_implode.lo: gsm/src/gsm_implode.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/gsm_implode.lo -MD -MP -MF "gsm/src/$(DEPDIR)/gsm_implode.Tpo" -c -o gsm/src/gsm_implode.lo `test -f 'gsm/src/gsm_implode.c' || echo '$(srcdir)/'`gsm/src/gsm_implode.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/gsm_implode.Tpo" "gsm/src/$(DEPDIR)/gsm_implode.Plo"; else rm -f "gsm/src/$(DEPDIR)/gsm_implode.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/gsm_implode.c' object='gsm/src/gsm_implode.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/gsm_implode.Plo' tmpdepfile='gsm/src/$(DEPDIR)/gsm_implode.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/gsm_implode.lo `test -f 'gsm/src/gsm_implode.c' || echo '$(srcdir)/'`gsm/src/gsm_implode.c
-+
-+gsm/src/gsm_option.o: gsm/src/gsm_option.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/gsm_option.o -MD -MP -MF "gsm/src/$(DEPDIR)/gsm_option.Tpo" -c -o gsm/src/gsm_option.o `test -f 'gsm/src/gsm_option.c' || echo '$(srcdir)/'`gsm/src/gsm_option.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/gsm_option.Tpo" "gsm/src/$(DEPDIR)/gsm_option.Po"; else rm -f "gsm/src/$(DEPDIR)/gsm_option.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/gsm_option.c' object='gsm/src/gsm_option.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/gsm_option.Po' tmpdepfile='gsm/src/$(DEPDIR)/gsm_option.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/gsm_option.o `test -f 'gsm/src/gsm_option.c' || echo '$(srcdir)/'`gsm/src/gsm_option.c
-+
-+gsm/src/gsm_option.obj: gsm/src/gsm_option.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/gsm_option.obj -MD -MP -MF "gsm/src/$(DEPDIR)/gsm_option.Tpo" -c -o gsm/src/gsm_option.obj `if test -f 'gsm/src/gsm_option.c'; then $(CYGPATH_W) 'gsm/src/gsm_option.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/gsm_option.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/gsm_option.Tpo" "gsm/src/$(DEPDIR)/gsm_option.Po"; else rm -f "gsm/src/$(DEPDIR)/gsm_option.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/gsm_option.c' object='gsm/src/gsm_option.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/gsm_option.Po' tmpdepfile='gsm/src/$(DEPDIR)/gsm_option.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/gsm_option.obj `if test -f 'gsm/src/gsm_option.c'; then $(CYGPATH_W) 'gsm/src/gsm_option.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/gsm_option.c'; fi`
-+
-+gsm/src/gsm_option.lo: gsm/src/gsm_option.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/gsm_option.lo -MD -MP -MF "gsm/src/$(DEPDIR)/gsm_option.Tpo" -c -o gsm/src/gsm_option.lo `test -f 'gsm/src/gsm_option.c' || echo '$(srcdir)/'`gsm/src/gsm_option.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/gsm_option.Tpo" "gsm/src/$(DEPDIR)/gsm_option.Plo"; else rm -f "gsm/src/$(DEPDIR)/gsm_option.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/gsm_option.c' object='gsm/src/gsm_option.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/gsm_option.Plo' tmpdepfile='gsm/src/$(DEPDIR)/gsm_option.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/gsm_option.lo `test -f 'gsm/src/gsm_option.c' || echo '$(srcdir)/'`gsm/src/gsm_option.c
-+
-+gsm/src/gsm_print.o: gsm/src/gsm_print.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/gsm_print.o -MD -MP -MF "gsm/src/$(DEPDIR)/gsm_print.Tpo" -c -o gsm/src/gsm_print.o `test -f 'gsm/src/gsm_print.c' || echo '$(srcdir)/'`gsm/src/gsm_print.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/gsm_print.Tpo" "gsm/src/$(DEPDIR)/gsm_print.Po"; else rm -f "gsm/src/$(DEPDIR)/gsm_print.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/gsm_print.c' object='gsm/src/gsm_print.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/gsm_print.Po' tmpdepfile='gsm/src/$(DEPDIR)/gsm_print.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/gsm_print.o `test -f 'gsm/src/gsm_print.c' || echo '$(srcdir)/'`gsm/src/gsm_print.c
-+
-+gsm/src/gsm_print.obj: gsm/src/gsm_print.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/gsm_print.obj -MD -MP -MF "gsm/src/$(DEPDIR)/gsm_print.Tpo" -c -o gsm/src/gsm_print.obj `if test -f 'gsm/src/gsm_print.c'; then $(CYGPATH_W) 'gsm/src/gsm_print.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/gsm_print.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/gsm_print.Tpo" "gsm/src/$(DEPDIR)/gsm_print.Po"; else rm -f "gsm/src/$(DEPDIR)/gsm_print.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/gsm_print.c' object='gsm/src/gsm_print.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/gsm_print.Po' tmpdepfile='gsm/src/$(DEPDIR)/gsm_print.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/gsm_print.obj `if test -f 'gsm/src/gsm_print.c'; then $(CYGPATH_W) 'gsm/src/gsm_print.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/gsm_print.c'; fi`
-+
-+gsm/src/gsm_print.lo: gsm/src/gsm_print.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/gsm_print.lo -MD -MP -MF "gsm/src/$(DEPDIR)/gsm_print.Tpo" -c -o gsm/src/gsm_print.lo `test -f 'gsm/src/gsm_print.c' || echo '$(srcdir)/'`gsm/src/gsm_print.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/gsm_print.Tpo" "gsm/src/$(DEPDIR)/gsm_print.Plo"; else rm -f "gsm/src/$(DEPDIR)/gsm_print.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/gsm_print.c' object='gsm/src/gsm_print.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/gsm_print.Plo' tmpdepfile='gsm/src/$(DEPDIR)/gsm_print.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/gsm_print.lo `test -f 'gsm/src/gsm_print.c' || echo '$(srcdir)/'`gsm/src/gsm_print.c
-+
-+gsm/src/long_term.o: gsm/src/long_term.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/long_term.o -MD -MP -MF "gsm/src/$(DEPDIR)/long_term.Tpo" -c -o gsm/src/long_term.o `test -f 'gsm/src/long_term.c' || echo '$(srcdir)/'`gsm/src/long_term.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/long_term.Tpo" "gsm/src/$(DEPDIR)/long_term.Po"; else rm -f "gsm/src/$(DEPDIR)/long_term.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/long_term.c' object='gsm/src/long_term.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/long_term.Po' tmpdepfile='gsm/src/$(DEPDIR)/long_term.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/long_term.o `test -f 'gsm/src/long_term.c' || echo '$(srcdir)/'`gsm/src/long_term.c
-+
-+gsm/src/long_term.obj: gsm/src/long_term.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/long_term.obj -MD -MP -MF "gsm/src/$(DEPDIR)/long_term.Tpo" -c -o gsm/src/long_term.obj `if test -f 'gsm/src/long_term.c'; then $(CYGPATH_W) 'gsm/src/long_term.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/long_term.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/long_term.Tpo" "gsm/src/$(DEPDIR)/long_term.Po"; else rm -f "gsm/src/$(DEPDIR)/long_term.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/long_term.c' object='gsm/src/long_term.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/long_term.Po' tmpdepfile='gsm/src/$(DEPDIR)/long_term.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/long_term.obj `if test -f 'gsm/src/long_term.c'; then $(CYGPATH_W) 'gsm/src/long_term.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/long_term.c'; fi`
-+
-+gsm/src/long_term.lo: gsm/src/long_term.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/long_term.lo -MD -MP -MF "gsm/src/$(DEPDIR)/long_term.Tpo" -c -o gsm/src/long_term.lo `test -f 'gsm/src/long_term.c' || echo '$(srcdir)/'`gsm/src/long_term.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/long_term.Tpo" "gsm/src/$(DEPDIR)/long_term.Plo"; else rm -f "gsm/src/$(DEPDIR)/long_term.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/long_term.c' object='gsm/src/long_term.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/long_term.Plo' tmpdepfile='gsm/src/$(DEPDIR)/long_term.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/long_term.lo `test -f 'gsm/src/long_term.c' || echo '$(srcdir)/'`gsm/src/long_term.c
-+
-+gsm/src/lpc.o: gsm/src/lpc.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/lpc.o -MD -MP -MF "gsm/src/$(DEPDIR)/lpc.Tpo" -c -o gsm/src/lpc.o `test -f 'gsm/src/lpc.c' || echo '$(srcdir)/'`gsm/src/lpc.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/lpc.Tpo" "gsm/src/$(DEPDIR)/lpc.Po"; else rm -f "gsm/src/$(DEPDIR)/lpc.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/lpc.c' object='gsm/src/lpc.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/lpc.Po' tmpdepfile='gsm/src/$(DEPDIR)/lpc.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/lpc.o `test -f 'gsm/src/lpc.c' || echo '$(srcdir)/'`gsm/src/lpc.c
-+
-+gsm/src/lpc.obj: gsm/src/lpc.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/lpc.obj -MD -MP -MF "gsm/src/$(DEPDIR)/lpc.Tpo" -c -o gsm/src/lpc.obj `if test -f 'gsm/src/lpc.c'; then $(CYGPATH_W) 'gsm/src/lpc.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/lpc.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/lpc.Tpo" "gsm/src/$(DEPDIR)/lpc.Po"; else rm -f "gsm/src/$(DEPDIR)/lpc.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/lpc.c' object='gsm/src/lpc.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/lpc.Po' tmpdepfile='gsm/src/$(DEPDIR)/lpc.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/lpc.obj `if test -f 'gsm/src/lpc.c'; then $(CYGPATH_W) 'gsm/src/lpc.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/lpc.c'; fi`
-+
-+gsm/src/lpc.lo: gsm/src/lpc.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/lpc.lo -MD -MP -MF "gsm/src/$(DEPDIR)/lpc.Tpo" -c -o gsm/src/lpc.lo `test -f 'gsm/src/lpc.c' || echo '$(srcdir)/'`gsm/src/lpc.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/lpc.Tpo" "gsm/src/$(DEPDIR)/lpc.Plo"; else rm -f "gsm/src/$(DEPDIR)/lpc.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/lpc.c' object='gsm/src/lpc.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/lpc.Plo' tmpdepfile='gsm/src/$(DEPDIR)/lpc.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/lpc.lo `test -f 'gsm/src/lpc.c' || echo '$(srcdir)/'`gsm/src/lpc.c
-+
-+gsm/src/preprocess.o: gsm/src/preprocess.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/preprocess.o -MD -MP -MF "gsm/src/$(DEPDIR)/preprocess.Tpo" -c -o gsm/src/preprocess.o `test -f 'gsm/src/preprocess.c' || echo '$(srcdir)/'`gsm/src/preprocess.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/preprocess.Tpo" "gsm/src/$(DEPDIR)/preprocess.Po"; else rm -f "gsm/src/$(DEPDIR)/preprocess.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/preprocess.c' object='gsm/src/preprocess.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/preprocess.Po' tmpdepfile='gsm/src/$(DEPDIR)/preprocess.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/preprocess.o `test -f 'gsm/src/preprocess.c' || echo '$(srcdir)/'`gsm/src/preprocess.c
-+
-+gsm/src/preprocess.obj: gsm/src/preprocess.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/preprocess.obj -MD -MP -MF "gsm/src/$(DEPDIR)/preprocess.Tpo" -c -o gsm/src/preprocess.obj `if test -f 'gsm/src/preprocess.c'; then $(CYGPATH_W) 'gsm/src/preprocess.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/preprocess.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/preprocess.Tpo" "gsm/src/$(DEPDIR)/preprocess.Po"; else rm -f "gsm/src/$(DEPDIR)/preprocess.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/preprocess.c' object='gsm/src/preprocess.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/preprocess.Po' tmpdepfile='gsm/src/$(DEPDIR)/preprocess.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/preprocess.obj `if test -f 'gsm/src/preprocess.c'; then $(CYGPATH_W) 'gsm/src/preprocess.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/preprocess.c'; fi`
-+
-+gsm/src/preprocess.lo: gsm/src/preprocess.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/preprocess.lo -MD -MP -MF "gsm/src/$(DEPDIR)/preprocess.Tpo" -c -o gsm/src/preprocess.lo `test -f 'gsm/src/preprocess.c' || echo '$(srcdir)/'`gsm/src/preprocess.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/preprocess.Tpo" "gsm/src/$(DEPDIR)/preprocess.Plo"; else rm -f "gsm/src/$(DEPDIR)/preprocess.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/preprocess.c' object='gsm/src/preprocess.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/preprocess.Plo' tmpdepfile='gsm/src/$(DEPDIR)/preprocess.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/preprocess.lo `test -f 'gsm/src/preprocess.c' || echo '$(srcdir)/'`gsm/src/preprocess.c
-+
-+gsm/src/rpe.o: gsm/src/rpe.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/rpe.o -MD -MP -MF "gsm/src/$(DEPDIR)/rpe.Tpo" -c -o gsm/src/rpe.o `test -f 'gsm/src/rpe.c' || echo '$(srcdir)/'`gsm/src/rpe.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/rpe.Tpo" "gsm/src/$(DEPDIR)/rpe.Po"; else rm -f "gsm/src/$(DEPDIR)/rpe.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/rpe.c' object='gsm/src/rpe.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/rpe.Po' tmpdepfile='gsm/src/$(DEPDIR)/rpe.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/rpe.o `test -f 'gsm/src/rpe.c' || echo '$(srcdir)/'`gsm/src/rpe.c
-+
-+gsm/src/rpe.obj: gsm/src/rpe.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/rpe.obj -MD -MP -MF "gsm/src/$(DEPDIR)/rpe.Tpo" -c -o gsm/src/rpe.obj `if test -f 'gsm/src/rpe.c'; then $(CYGPATH_W) 'gsm/src/rpe.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/rpe.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/rpe.Tpo" "gsm/src/$(DEPDIR)/rpe.Po"; else rm -f "gsm/src/$(DEPDIR)/rpe.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/rpe.c' object='gsm/src/rpe.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/rpe.Po' tmpdepfile='gsm/src/$(DEPDIR)/rpe.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/rpe.obj `if test -f 'gsm/src/rpe.c'; then $(CYGPATH_W) 'gsm/src/rpe.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/rpe.c'; fi`
-+
-+gsm/src/rpe.lo: gsm/src/rpe.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/rpe.lo -MD -MP -MF "gsm/src/$(DEPDIR)/rpe.Tpo" -c -o gsm/src/rpe.lo `test -f 'gsm/src/rpe.c' || echo '$(srcdir)/'`gsm/src/rpe.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/rpe.Tpo" "gsm/src/$(DEPDIR)/rpe.Plo"; else rm -f "gsm/src/$(DEPDIR)/rpe.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/rpe.c' object='gsm/src/rpe.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/rpe.Plo' tmpdepfile='gsm/src/$(DEPDIR)/rpe.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/rpe.lo `test -f 'gsm/src/rpe.c' || echo '$(srcdir)/'`gsm/src/rpe.c
-+
-+gsm/src/short_term.o: gsm/src/short_term.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/short_term.o -MD -MP -MF "gsm/src/$(DEPDIR)/short_term.Tpo" -c -o gsm/src/short_term.o `test -f 'gsm/src/short_term.c' || echo '$(srcdir)/'`gsm/src/short_term.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/short_term.Tpo" "gsm/src/$(DEPDIR)/short_term.Po"; else rm -f "gsm/src/$(DEPDIR)/short_term.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/short_term.c' object='gsm/src/short_term.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/short_term.Po' tmpdepfile='gsm/src/$(DEPDIR)/short_term.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/short_term.o `test -f 'gsm/src/short_term.c' || echo '$(srcdir)/'`gsm/src/short_term.c
-+
-+gsm/src/short_term.obj: gsm/src/short_term.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/short_term.obj -MD -MP -MF "gsm/src/$(DEPDIR)/short_term.Tpo" -c -o gsm/src/short_term.obj `if test -f 'gsm/src/short_term.c'; then $(CYGPATH_W) 'gsm/src/short_term.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/short_term.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/short_term.Tpo" "gsm/src/$(DEPDIR)/short_term.Po"; else rm -f "gsm/src/$(DEPDIR)/short_term.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/short_term.c' object='gsm/src/short_term.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/short_term.Po' tmpdepfile='gsm/src/$(DEPDIR)/short_term.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/short_term.obj `if test -f 'gsm/src/short_term.c'; then $(CYGPATH_W) 'gsm/src/short_term.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/short_term.c'; fi`
-+
-+gsm/src/short_term.lo: gsm/src/short_term.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/short_term.lo -MD -MP -MF "gsm/src/$(DEPDIR)/short_term.Tpo" -c -o gsm/src/short_term.lo `test -f 'gsm/src/short_term.c' || echo '$(srcdir)/'`gsm/src/short_term.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/short_term.Tpo" "gsm/src/$(DEPDIR)/short_term.Plo"; else rm -f "gsm/src/$(DEPDIR)/short_term.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/short_term.c' object='gsm/src/short_term.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/short_term.Plo' tmpdepfile='gsm/src/$(DEPDIR)/short_term.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/short_term.lo `test -f 'gsm/src/short_term.c' || echo '$(srcdir)/'`gsm/src/short_term.c
-+
-+gsm/src/table.o: gsm/src/table.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/table.o -MD -MP -MF "gsm/src/$(DEPDIR)/table.Tpo" -c -o gsm/src/table.o `test -f 'gsm/src/table.c' || echo '$(srcdir)/'`gsm/src/table.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/table.Tpo" "gsm/src/$(DEPDIR)/table.Po"; else rm -f "gsm/src/$(DEPDIR)/table.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/table.c' object='gsm/src/table.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/table.Po' tmpdepfile='gsm/src/$(DEPDIR)/table.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/table.o `test -f 'gsm/src/table.c' || echo '$(srcdir)/'`gsm/src/table.c
-+
-+gsm/src/table.obj: gsm/src/table.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/table.obj -MD -MP -MF "gsm/src/$(DEPDIR)/table.Tpo" -c -o gsm/src/table.obj `if test -f 'gsm/src/table.c'; then $(CYGPATH_W) 'gsm/src/table.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/table.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/table.Tpo" "gsm/src/$(DEPDIR)/table.Po"; else rm -f "gsm/src/$(DEPDIR)/table.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/table.c' object='gsm/src/table.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/table.Po' tmpdepfile='gsm/src/$(DEPDIR)/table.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/table.obj `if test -f 'gsm/src/table.c'; then $(CYGPATH_W) 'gsm/src/table.c'; else $(CYGPATH_W) '$(srcdir)/gsm/src/table.c'; fi`
-+
-+gsm/src/table.lo: gsm/src/table.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gsm/src/table.lo -MD -MP -MF "gsm/src/$(DEPDIR)/table.Tpo" -c -o gsm/src/table.lo `test -f 'gsm/src/table.c' || echo '$(srcdir)/'`gsm/src/table.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "gsm/src/$(DEPDIR)/table.Tpo" "gsm/src/$(DEPDIR)/table.Plo"; else rm -f "gsm/src/$(DEPDIR)/table.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsm/src/table.c' object='gsm/src/table.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='gsm/src/$(DEPDIR)/table.Plo' tmpdepfile='gsm/src/$(DEPDIR)/table.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gsm/src/table.lo `test -f 'gsm/src/table.c' || echo '$(srcdir)/'`gsm/src/table.c
-+
-+libiax2/src/md5.o: libiax2/src/md5.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libiax2/src/md5.o -MD -MP -MF "libiax2/src/$(DEPDIR)/md5.Tpo" -c -o libiax2/src/md5.o `test -f 'libiax2/src/md5.c' || echo '$(srcdir)/'`libiax2/src/md5.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libiax2/src/$(DEPDIR)/md5.Tpo" "libiax2/src/$(DEPDIR)/md5.Po"; else rm -f "libiax2/src/$(DEPDIR)/md5.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libiax2/src/md5.c' object='libiax2/src/md5.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libiax2/src/$(DEPDIR)/md5.Po' tmpdepfile='libiax2/src/$(DEPDIR)/md5.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libiax2/src/md5.o `test -f 'libiax2/src/md5.c' || echo '$(srcdir)/'`libiax2/src/md5.c
-+
-+libiax2/src/md5.obj: libiax2/src/md5.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libiax2/src/md5.obj -MD -MP -MF "libiax2/src/$(DEPDIR)/md5.Tpo" -c -o libiax2/src/md5.obj `if test -f 'libiax2/src/md5.c'; then $(CYGPATH_W) 'libiax2/src/md5.c'; else $(CYGPATH_W) '$(srcdir)/libiax2/src/md5.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libiax2/src/$(DEPDIR)/md5.Tpo" "libiax2/src/$(DEPDIR)/md5.Po"; else rm -f "libiax2/src/$(DEPDIR)/md5.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libiax2/src/md5.c' object='libiax2/src/md5.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libiax2/src/$(DEPDIR)/md5.Po' tmpdepfile='libiax2/src/$(DEPDIR)/md5.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libiax2/src/md5.obj `if test -f 'libiax2/src/md5.c'; then $(CYGPATH_W) 'libiax2/src/md5.c'; else $(CYGPATH_W) '$(srcdir)/libiax2/src/md5.c'; fi`
-+
-+libiax2/src/md5.lo: libiax2/src/md5.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libiax2/src/md5.lo -MD -MP -MF "libiax2/src/$(DEPDIR)/md5.Tpo" -c -o libiax2/src/md5.lo `test -f 'libiax2/src/md5.c' || echo '$(srcdir)/'`libiax2/src/md5.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libiax2/src/$(DEPDIR)/md5.Tpo" "libiax2/src/$(DEPDIR)/md5.Plo"; else rm -f "libiax2/src/$(DEPDIR)/md5.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libiax2/src/md5.c' object='libiax2/src/md5.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libiax2/src/$(DEPDIR)/md5.Plo' tmpdepfile='libiax2/src/$(DEPDIR)/md5.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libiax2/src/md5.lo `test -f 'libiax2/src/md5.c' || echo '$(srcdir)/'`libiax2/src/md5.c
-+
-+libiax2/src/iax.o: libiax2/src/iax.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libiax2/src/iax.o -MD -MP -MF "libiax2/src/$(DEPDIR)/iax.Tpo" -c -o libiax2/src/iax.o `test -f 'libiax2/src/iax.c' || echo '$(srcdir)/'`libiax2/src/iax.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libiax2/src/$(DEPDIR)/iax.Tpo" "libiax2/src/$(DEPDIR)/iax.Po"; else rm -f "libiax2/src/$(DEPDIR)/iax.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libiax2/src/iax.c' object='libiax2/src/iax.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libiax2/src/$(DEPDIR)/iax.Po' tmpdepfile='libiax2/src/$(DEPDIR)/iax.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libiax2/src/iax.o `test -f 'libiax2/src/iax.c' || echo '$(srcdir)/'`libiax2/src/iax.c
-+
-+libiax2/src/iax.obj: libiax2/src/iax.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libiax2/src/iax.obj -MD -MP -MF "libiax2/src/$(DEPDIR)/iax.Tpo" -c -o libiax2/src/iax.obj `if test -f 'libiax2/src/iax.c'; then $(CYGPATH_W) 'libiax2/src/iax.c'; else $(CYGPATH_W) '$(srcdir)/libiax2/src/iax.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libiax2/src/$(DEPDIR)/iax.Tpo" "libiax2/src/$(DEPDIR)/iax.Po"; else rm -f "libiax2/src/$(DEPDIR)/iax.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libiax2/src/iax.c' object='libiax2/src/iax.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libiax2/src/$(DEPDIR)/iax.Po' tmpdepfile='libiax2/src/$(DEPDIR)/iax.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libiax2/src/iax.obj `if test -f 'libiax2/src/iax.c'; then $(CYGPATH_W) 'libiax2/src/iax.c'; else $(CYGPATH_W) '$(srcdir)/libiax2/src/iax.c'; fi`
-+
-+libiax2/src/iax.lo: libiax2/src/iax.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libiax2/src/iax.lo -MD -MP -MF "libiax2/src/$(DEPDIR)/iax.Tpo" -c -o libiax2/src/iax.lo `test -f 'libiax2/src/iax.c' || echo '$(srcdir)/'`libiax2/src/iax.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libiax2/src/$(DEPDIR)/iax.Tpo" "libiax2/src/$(DEPDIR)/iax.Plo"; else rm -f "libiax2/src/$(DEPDIR)/iax.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libiax2/src/iax.c' object='libiax2/src/iax.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libiax2/src/$(DEPDIR)/iax.Plo' tmpdepfile='libiax2/src/$(DEPDIR)/iax.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libiax2/src/iax.lo `test -f 'libiax2/src/iax.c' || echo '$(srcdir)/'`libiax2/src/iax.c
-+
-+libiax2/src/iax2-parser.o: libiax2/src/iax2-parser.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libiax2/src/iax2-parser.o -MD -MP -MF "libiax2/src/$(DEPDIR)/iax2-parser.Tpo" -c -o libiax2/src/iax2-parser.o `test -f 'libiax2/src/iax2-parser.c' || echo '$(srcdir)/'`libiax2/src/iax2-parser.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libiax2/src/$(DEPDIR)/iax2-parser.Tpo" "libiax2/src/$(DEPDIR)/iax2-parser.Po"; else rm -f "libiax2/src/$(DEPDIR)/iax2-parser.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libiax2/src/iax2-parser.c' object='libiax2/src/iax2-parser.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libiax2/src/$(DEPDIR)/iax2-parser.Po' tmpdepfile='libiax2/src/$(DEPDIR)/iax2-parser.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libiax2/src/iax2-parser.o `test -f 'libiax2/src/iax2-parser.c' || echo '$(srcdir)/'`libiax2/src/iax2-parser.c
-+
-+libiax2/src/iax2-parser.obj: libiax2/src/iax2-parser.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libiax2/src/iax2-parser.obj -MD -MP -MF "libiax2/src/$(DEPDIR)/iax2-parser.Tpo" -c -o libiax2/src/iax2-parser.obj `if test -f 'libiax2/src/iax2-parser.c'; then $(CYGPATH_W) 'libiax2/src/iax2-parser.c'; else $(CYGPATH_W) '$(srcdir)/libiax2/src/iax2-parser.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libiax2/src/$(DEPDIR)/iax2-parser.Tpo" "libiax2/src/$(DEPDIR)/iax2-parser.Po"; else rm -f "libiax2/src/$(DEPDIR)/iax2-parser.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libiax2/src/iax2-parser.c' object='libiax2/src/iax2-parser.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libiax2/src/$(DEPDIR)/iax2-parser.Po' tmpdepfile='libiax2/src/$(DEPDIR)/iax2-parser.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libiax2/src/iax2-parser.obj `if test -f 'libiax2/src/iax2-parser.c'; then $(CYGPATH_W) 'libiax2/src/iax2-parser.c'; else $(CYGPATH_W) '$(srcdir)/libiax2/src/iax2-parser.c'; fi`
-+
-+libiax2/src/iax2-parser.lo: libiax2/src/iax2-parser.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libiax2/src/iax2-parser.lo -MD -MP -MF "libiax2/src/$(DEPDIR)/iax2-parser.Tpo" -c -o libiax2/src/iax2-parser.lo `test -f 'libiax2/src/iax2-parser.c' || echo '$(srcdir)/'`libiax2/src/iax2-parser.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libiax2/src/$(DEPDIR)/iax2-parser.Tpo" "libiax2/src/$(DEPDIR)/iax2-parser.Plo"; else rm -f "libiax2/src/$(DEPDIR)/iax2-parser.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libiax2/src/iax2-parser.c' object='libiax2/src/iax2-parser.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libiax2/src/$(DEPDIR)/iax2-parser.Plo' tmpdepfile='libiax2/src/$(DEPDIR)/iax2-parser.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libiax2/src/iax2-parser.lo `test -f 'libiax2/src/iax2-parser.c' || echo '$(srcdir)/'`libiax2/src/iax2-parser.c
-+
-+libspeex/nb_celp.o: libspeex/nb_celp.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/nb_celp.o -MD -MP -MF "libspeex/$(DEPDIR)/nb_celp.Tpo" -c -o libspeex/nb_celp.o `test -f 'libspeex/nb_celp.c' || echo '$(srcdir)/'`libspeex/nb_celp.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/nb_celp.Tpo" "libspeex/$(DEPDIR)/nb_celp.Po"; else rm -f "libspeex/$(DEPDIR)/nb_celp.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/nb_celp.c' object='libspeex/nb_celp.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/nb_celp.Po' tmpdepfile='libspeex/$(DEPDIR)/nb_celp.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/nb_celp.o `test -f 'libspeex/nb_celp.c' || echo '$(srcdir)/'`libspeex/nb_celp.c
-+
-+libspeex/nb_celp.obj: libspeex/nb_celp.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/nb_celp.obj -MD -MP -MF "libspeex/$(DEPDIR)/nb_celp.Tpo" -c -o libspeex/nb_celp.obj `if test -f 'libspeex/nb_celp.c'; then $(CYGPATH_W) 'libspeex/nb_celp.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/nb_celp.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/nb_celp.Tpo" "libspeex/$(DEPDIR)/nb_celp.Po"; else rm -f "libspeex/$(DEPDIR)/nb_celp.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/nb_celp.c' object='libspeex/nb_celp.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/nb_celp.Po' tmpdepfile='libspeex/$(DEPDIR)/nb_celp.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/nb_celp.obj `if test -f 'libspeex/nb_celp.c'; then $(CYGPATH_W) 'libspeex/nb_celp.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/nb_celp.c'; fi`
-+
-+libspeex/nb_celp.lo: libspeex/nb_celp.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/nb_celp.lo -MD -MP -MF "libspeex/$(DEPDIR)/nb_celp.Tpo" -c -o libspeex/nb_celp.lo `test -f 'libspeex/nb_celp.c' || echo '$(srcdir)/'`libspeex/nb_celp.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/nb_celp.Tpo" "libspeex/$(DEPDIR)/nb_celp.Plo"; else rm -f "libspeex/$(DEPDIR)/nb_celp.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/nb_celp.c' object='libspeex/nb_celp.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/nb_celp.Plo' tmpdepfile='libspeex/$(DEPDIR)/nb_celp.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/nb_celp.lo `test -f 'libspeex/nb_celp.c' || echo '$(srcdir)/'`libspeex/nb_celp.c
-+
-+libspeex/sb_celp.o: libspeex/sb_celp.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/sb_celp.o -MD -MP -MF "libspeex/$(DEPDIR)/sb_celp.Tpo" -c -o libspeex/sb_celp.o `test -f 'libspeex/sb_celp.c' || echo '$(srcdir)/'`libspeex/sb_celp.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/sb_celp.Tpo" "libspeex/$(DEPDIR)/sb_celp.Po"; else rm -f "libspeex/$(DEPDIR)/sb_celp.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/sb_celp.c' object='libspeex/sb_celp.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/sb_celp.Po' tmpdepfile='libspeex/$(DEPDIR)/sb_celp.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/sb_celp.o `test -f 'libspeex/sb_celp.c' || echo '$(srcdir)/'`libspeex/sb_celp.c
-+
-+libspeex/sb_celp.obj: libspeex/sb_celp.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/sb_celp.obj -MD -MP -MF "libspeex/$(DEPDIR)/sb_celp.Tpo" -c -o libspeex/sb_celp.obj `if test -f 'libspeex/sb_celp.c'; then $(CYGPATH_W) 'libspeex/sb_celp.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/sb_celp.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/sb_celp.Tpo" "libspeex/$(DEPDIR)/sb_celp.Po"; else rm -f "libspeex/$(DEPDIR)/sb_celp.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/sb_celp.c' object='libspeex/sb_celp.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/sb_celp.Po' tmpdepfile='libspeex/$(DEPDIR)/sb_celp.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/sb_celp.obj `if test -f 'libspeex/sb_celp.c'; then $(CYGPATH_W) 'libspeex/sb_celp.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/sb_celp.c'; fi`
-+
-+libspeex/sb_celp.lo: libspeex/sb_celp.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/sb_celp.lo -MD -MP -MF "libspeex/$(DEPDIR)/sb_celp.Tpo" -c -o libspeex/sb_celp.lo `test -f 'libspeex/sb_celp.c' || echo '$(srcdir)/'`libspeex/sb_celp.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/sb_celp.Tpo" "libspeex/$(DEPDIR)/sb_celp.Plo"; else rm -f "libspeex/$(DEPDIR)/sb_celp.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/sb_celp.c' object='libspeex/sb_celp.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/sb_celp.Plo' tmpdepfile='libspeex/$(DEPDIR)/sb_celp.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/sb_celp.lo `test -f 'libspeex/sb_celp.c' || echo '$(srcdir)/'`libspeex/sb_celp.c
-+
-+libspeex/lpc.o: libspeex/lpc.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/lpc.o -MD -MP -MF "libspeex/$(DEPDIR)/lpc.Tpo" -c -o libspeex/lpc.o `test -f 'libspeex/lpc.c' || echo '$(srcdir)/'`libspeex/lpc.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/lpc.Tpo" "libspeex/$(DEPDIR)/lpc.Po"; else rm -f "libspeex/$(DEPDIR)/lpc.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/lpc.c' object='libspeex/lpc.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/lpc.Po' tmpdepfile='libspeex/$(DEPDIR)/lpc.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/lpc.o `test -f 'libspeex/lpc.c' || echo '$(srcdir)/'`libspeex/lpc.c
-+
-+libspeex/lpc.obj: libspeex/lpc.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/lpc.obj -MD -MP -MF "libspeex/$(DEPDIR)/lpc.Tpo" -c -o libspeex/lpc.obj `if test -f 'libspeex/lpc.c'; then $(CYGPATH_W) 'libspeex/lpc.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/lpc.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/lpc.Tpo" "libspeex/$(DEPDIR)/lpc.Po"; else rm -f "libspeex/$(DEPDIR)/lpc.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/lpc.c' object='libspeex/lpc.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/lpc.Po' tmpdepfile='libspeex/$(DEPDIR)/lpc.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/lpc.obj `if test -f 'libspeex/lpc.c'; then $(CYGPATH_W) 'libspeex/lpc.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/lpc.c'; fi`
-+
-+libspeex/lpc.lo: libspeex/lpc.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/lpc.lo -MD -MP -MF "libspeex/$(DEPDIR)/lpc.Tpo" -c -o libspeex/lpc.lo `test -f 'libspeex/lpc.c' || echo '$(srcdir)/'`libspeex/lpc.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/lpc.Tpo" "libspeex/$(DEPDIR)/lpc.Plo"; else rm -f "libspeex/$(DEPDIR)/lpc.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/lpc.c' object='libspeex/lpc.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/lpc.Plo' tmpdepfile='libspeex/$(DEPDIR)/lpc.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/lpc.lo `test -f 'libspeex/lpc.c' || echo '$(srcdir)/'`libspeex/lpc.c
-+
-+libspeex/ltp.o: libspeex/ltp.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/ltp.o -MD -MP -MF "libspeex/$(DEPDIR)/ltp.Tpo" -c -o libspeex/ltp.o `test -f 'libspeex/ltp.c' || echo '$(srcdir)/'`libspeex/ltp.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/ltp.Tpo" "libspeex/$(DEPDIR)/ltp.Po"; else rm -f "libspeex/$(DEPDIR)/ltp.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/ltp.c' object='libspeex/ltp.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/ltp.Po' tmpdepfile='libspeex/$(DEPDIR)/ltp.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/ltp.o `test -f 'libspeex/ltp.c' || echo '$(srcdir)/'`libspeex/ltp.c
-+
-+libspeex/ltp.obj: libspeex/ltp.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/ltp.obj -MD -MP -MF "libspeex/$(DEPDIR)/ltp.Tpo" -c -o libspeex/ltp.obj `if test -f 'libspeex/ltp.c'; then $(CYGPATH_W) 'libspeex/ltp.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/ltp.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/ltp.Tpo" "libspeex/$(DEPDIR)/ltp.Po"; else rm -f "libspeex/$(DEPDIR)/ltp.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/ltp.c' object='libspeex/ltp.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/ltp.Po' tmpdepfile='libspeex/$(DEPDIR)/ltp.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/ltp.obj `if test -f 'libspeex/ltp.c'; then $(CYGPATH_W) 'libspeex/ltp.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/ltp.c'; fi`
-+
-+libspeex/ltp.lo: libspeex/ltp.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/ltp.lo -MD -MP -MF "libspeex/$(DEPDIR)/ltp.Tpo" -c -o libspeex/ltp.lo `test -f 'libspeex/ltp.c' || echo '$(srcdir)/'`libspeex/ltp.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/ltp.Tpo" "libspeex/$(DEPDIR)/ltp.Plo"; else rm -f "libspeex/$(DEPDIR)/ltp.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/ltp.c' object='libspeex/ltp.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/ltp.Plo' tmpdepfile='libspeex/$(DEPDIR)/ltp.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/ltp.lo `test -f 'libspeex/ltp.c' || echo '$(srcdir)/'`libspeex/ltp.c
-+
-+libspeex/lsp.o: libspeex/lsp.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/lsp.o -MD -MP -MF "libspeex/$(DEPDIR)/lsp.Tpo" -c -o libspeex/lsp.o `test -f 'libspeex/lsp.c' || echo '$(srcdir)/'`libspeex/lsp.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/lsp.Tpo" "libspeex/$(DEPDIR)/lsp.Po"; else rm -f "libspeex/$(DEPDIR)/lsp.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/lsp.c' object='libspeex/lsp.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/lsp.Po' tmpdepfile='libspeex/$(DEPDIR)/lsp.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/lsp.o `test -f 'libspeex/lsp.c' || echo '$(srcdir)/'`libspeex/lsp.c
-+
-+libspeex/lsp.obj: libspeex/lsp.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/lsp.obj -MD -MP -MF "libspeex/$(DEPDIR)/lsp.Tpo" -c -o libspeex/lsp.obj `if test -f 'libspeex/lsp.c'; then $(CYGPATH_W) 'libspeex/lsp.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/lsp.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/lsp.Tpo" "libspeex/$(DEPDIR)/lsp.Po"; else rm -f "libspeex/$(DEPDIR)/lsp.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/lsp.c' object='libspeex/lsp.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/lsp.Po' tmpdepfile='libspeex/$(DEPDIR)/lsp.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/lsp.obj `if test -f 'libspeex/lsp.c'; then $(CYGPATH_W) 'libspeex/lsp.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/lsp.c'; fi`
-+
-+libspeex/lsp.lo: libspeex/lsp.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/lsp.lo -MD -MP -MF "libspeex/$(DEPDIR)/lsp.Tpo" -c -o libspeex/lsp.lo `test -f 'libspeex/lsp.c' || echo '$(srcdir)/'`libspeex/lsp.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/lsp.Tpo" "libspeex/$(DEPDIR)/lsp.Plo"; else rm -f "libspeex/$(DEPDIR)/lsp.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/lsp.c' object='libspeex/lsp.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/lsp.Plo' tmpdepfile='libspeex/$(DEPDIR)/lsp.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/lsp.lo `test -f 'libspeex/lsp.c' || echo '$(srcdir)/'`libspeex/lsp.c
-+
-+libspeex/quant_lsp.o: libspeex/quant_lsp.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/quant_lsp.o -MD -MP -MF "libspeex/$(DEPDIR)/quant_lsp.Tpo" -c -o libspeex/quant_lsp.o `test -f 'libspeex/quant_lsp.c' || echo '$(srcdir)/'`libspeex/quant_lsp.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/quant_lsp.Tpo" "libspeex/$(DEPDIR)/quant_lsp.Po"; else rm -f "libspeex/$(DEPDIR)/quant_lsp.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/quant_lsp.c' object='libspeex/quant_lsp.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/quant_lsp.Po' tmpdepfile='libspeex/$(DEPDIR)/quant_lsp.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/quant_lsp.o `test -f 'libspeex/quant_lsp.c' || echo '$(srcdir)/'`libspeex/quant_lsp.c
-+
-+libspeex/quant_lsp.obj: libspeex/quant_lsp.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/quant_lsp.obj -MD -MP -MF "libspeex/$(DEPDIR)/quant_lsp.Tpo" -c -o libspeex/quant_lsp.obj `if test -f 'libspeex/quant_lsp.c'; then $(CYGPATH_W) 'libspeex/quant_lsp.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/quant_lsp.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/quant_lsp.Tpo" "libspeex/$(DEPDIR)/quant_lsp.Po"; else rm -f "libspeex/$(DEPDIR)/quant_lsp.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/quant_lsp.c' object='libspeex/quant_lsp.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/quant_lsp.Po' tmpdepfile='libspeex/$(DEPDIR)/quant_lsp.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/quant_lsp.obj `if test -f 'libspeex/quant_lsp.c'; then $(CYGPATH_W) 'libspeex/quant_lsp.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/quant_lsp.c'; fi`
-+
-+libspeex/quant_lsp.lo: libspeex/quant_lsp.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/quant_lsp.lo -MD -MP -MF "libspeex/$(DEPDIR)/quant_lsp.Tpo" -c -o libspeex/quant_lsp.lo `test -f 'libspeex/quant_lsp.c' || echo '$(srcdir)/'`libspeex/quant_lsp.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/quant_lsp.Tpo" "libspeex/$(DEPDIR)/quant_lsp.Plo"; else rm -f "libspeex/$(DEPDIR)/quant_lsp.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/quant_lsp.c' object='libspeex/quant_lsp.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/quant_lsp.Plo' tmpdepfile='libspeex/$(DEPDIR)/quant_lsp.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/quant_lsp.lo `test -f 'libspeex/quant_lsp.c' || echo '$(srcdir)/'`libspeex/quant_lsp.c
-+
-+libspeex/lsp_tables_nb.o: libspeex/lsp_tables_nb.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/lsp_tables_nb.o -MD -MP -MF "libspeex/$(DEPDIR)/lsp_tables_nb.Tpo" -c -o libspeex/lsp_tables_nb.o `test -f 'libspeex/lsp_tables_nb.c' || echo '$(srcdir)/'`libspeex/lsp_tables_nb.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/lsp_tables_nb.Tpo" "libspeex/$(DEPDIR)/lsp_tables_nb.Po"; else rm -f "libspeex/$(DEPDIR)/lsp_tables_nb.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/lsp_tables_nb.c' object='libspeex/lsp_tables_nb.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/lsp_tables_nb.Po' tmpdepfile='libspeex/$(DEPDIR)/lsp_tables_nb.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/lsp_tables_nb.o `test -f 'libspeex/lsp_tables_nb.c' || echo '$(srcdir)/'`libspeex/lsp_tables_nb.c
-+
-+libspeex/lsp_tables_nb.obj: libspeex/lsp_tables_nb.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/lsp_tables_nb.obj -MD -MP -MF "libspeex/$(DEPDIR)/lsp_tables_nb.Tpo" -c -o libspeex/lsp_tables_nb.obj `if test -f 'libspeex/lsp_tables_nb.c'; then $(CYGPATH_W) 'libspeex/lsp_tables_nb.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/lsp_tables_nb.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/lsp_tables_nb.Tpo" "libspeex/$(DEPDIR)/lsp_tables_nb.Po"; else rm -f "libspeex/$(DEPDIR)/lsp_tables_nb.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/lsp_tables_nb.c' object='libspeex/lsp_tables_nb.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/lsp_tables_nb.Po' tmpdepfile='libspeex/$(DEPDIR)/lsp_tables_nb.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/lsp_tables_nb.obj `if test -f 'libspeex/lsp_tables_nb.c'; then $(CYGPATH_W) 'libspeex/lsp_tables_nb.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/lsp_tables_nb.c'; fi`
-+
-+libspeex/lsp_tables_nb.lo: libspeex/lsp_tables_nb.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/lsp_tables_nb.lo -MD -MP -MF "libspeex/$(DEPDIR)/lsp_tables_nb.Tpo" -c -o libspeex/lsp_tables_nb.lo `test -f 'libspeex/lsp_tables_nb.c' || echo '$(srcdir)/'`libspeex/lsp_tables_nb.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/lsp_tables_nb.Tpo" "libspeex/$(DEPDIR)/lsp_tables_nb.Plo"; else rm -f "libspeex/$(DEPDIR)/lsp_tables_nb.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/lsp_tables_nb.c' object='libspeex/lsp_tables_nb.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/lsp_tables_nb.Plo' tmpdepfile='libspeex/$(DEPDIR)/lsp_tables_nb.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/lsp_tables_nb.lo `test -f 'libspeex/lsp_tables_nb.c' || echo '$(srcdir)/'`libspeex/lsp_tables_nb.c
-+
-+libspeex/gain_table.o: libspeex/gain_table.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/gain_table.o -MD -MP -MF "libspeex/$(DEPDIR)/gain_table.Tpo" -c -o libspeex/gain_table.o `test -f 'libspeex/gain_table.c' || echo '$(srcdir)/'`libspeex/gain_table.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/gain_table.Tpo" "libspeex/$(DEPDIR)/gain_table.Po"; else rm -f "libspeex/$(DEPDIR)/gain_table.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/gain_table.c' object='libspeex/gain_table.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/gain_table.Po' tmpdepfile='libspeex/$(DEPDIR)/gain_table.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/gain_table.o `test -f 'libspeex/gain_table.c' || echo '$(srcdir)/'`libspeex/gain_table.c
-+
-+libspeex/gain_table.obj: libspeex/gain_table.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/gain_table.obj -MD -MP -MF "libspeex/$(DEPDIR)/gain_table.Tpo" -c -o libspeex/gain_table.obj `if test -f 'libspeex/gain_table.c'; then $(CYGPATH_W) 'libspeex/gain_table.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/gain_table.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/gain_table.Tpo" "libspeex/$(DEPDIR)/gain_table.Po"; else rm -f "libspeex/$(DEPDIR)/gain_table.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/gain_table.c' object='libspeex/gain_table.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/gain_table.Po' tmpdepfile='libspeex/$(DEPDIR)/gain_table.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/gain_table.obj `if test -f 'libspeex/gain_table.c'; then $(CYGPATH_W) 'libspeex/gain_table.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/gain_table.c'; fi`
-+
-+libspeex/gain_table.lo: libspeex/gain_table.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/gain_table.lo -MD -MP -MF "libspeex/$(DEPDIR)/gain_table.Tpo" -c -o libspeex/gain_table.lo `test -f 'libspeex/gain_table.c' || echo '$(srcdir)/'`libspeex/gain_table.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/gain_table.Tpo" "libspeex/$(DEPDIR)/gain_table.Plo"; else rm -f "libspeex/$(DEPDIR)/gain_table.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/gain_table.c' object='libspeex/gain_table.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/gain_table.Plo' tmpdepfile='libspeex/$(DEPDIR)/gain_table.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/gain_table.lo `test -f 'libspeex/gain_table.c' || echo '$(srcdir)/'`libspeex/gain_table.c
-+
-+libspeex/gain_table_lbr.o: libspeex/gain_table_lbr.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/gain_table_lbr.o -MD -MP -MF "libspeex/$(DEPDIR)/gain_table_lbr.Tpo" -c -o libspeex/gain_table_lbr.o `test -f 'libspeex/gain_table_lbr.c' || echo '$(srcdir)/'`libspeex/gain_table_lbr.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/gain_table_lbr.Tpo" "libspeex/$(DEPDIR)/gain_table_lbr.Po"; else rm -f "libspeex/$(DEPDIR)/gain_table_lbr.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/gain_table_lbr.c' object='libspeex/gain_table_lbr.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/gain_table_lbr.Po' tmpdepfile='libspeex/$(DEPDIR)/gain_table_lbr.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/gain_table_lbr.o `test -f 'libspeex/gain_table_lbr.c' || echo '$(srcdir)/'`libspeex/gain_table_lbr.c
-+
-+libspeex/gain_table_lbr.obj: libspeex/gain_table_lbr.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/gain_table_lbr.obj -MD -MP -MF "libspeex/$(DEPDIR)/gain_table_lbr.Tpo" -c -o libspeex/gain_table_lbr.obj `if test -f 'libspeex/gain_table_lbr.c'; then $(CYGPATH_W) 'libspeex/gain_table_lbr.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/gain_table_lbr.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/gain_table_lbr.Tpo" "libspeex/$(DEPDIR)/gain_table_lbr.Po"; else rm -f "libspeex/$(DEPDIR)/gain_table_lbr.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/gain_table_lbr.c' object='libspeex/gain_table_lbr.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/gain_table_lbr.Po' tmpdepfile='libspeex/$(DEPDIR)/gain_table_lbr.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/gain_table_lbr.obj `if test -f 'libspeex/gain_table_lbr.c'; then $(CYGPATH_W) 'libspeex/gain_table_lbr.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/gain_table_lbr.c'; fi`
-+
-+libspeex/gain_table_lbr.lo: libspeex/gain_table_lbr.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/gain_table_lbr.lo -MD -MP -MF "libspeex/$(DEPDIR)/gain_table_lbr.Tpo" -c -o libspeex/gain_table_lbr.lo `test -f 'libspeex/gain_table_lbr.c' || echo '$(srcdir)/'`libspeex/gain_table_lbr.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/gain_table_lbr.Tpo" "libspeex/$(DEPDIR)/gain_table_lbr.Plo"; else rm -f "libspeex/$(DEPDIR)/gain_table_lbr.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/gain_table_lbr.c' object='libspeex/gain_table_lbr.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/gain_table_lbr.Plo' tmpdepfile='libspeex/$(DEPDIR)/gain_table_lbr.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/gain_table_lbr.lo `test -f 'libspeex/gain_table_lbr.c' || echo '$(srcdir)/'`libspeex/gain_table_lbr.c
-+
-+libspeex/cb_search.o: libspeex/cb_search.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/cb_search.o -MD -MP -MF "libspeex/$(DEPDIR)/cb_search.Tpo" -c -o libspeex/cb_search.o `test -f 'libspeex/cb_search.c' || echo '$(srcdir)/'`libspeex/cb_search.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/cb_search.Tpo" "libspeex/$(DEPDIR)/cb_search.Po"; else rm -f "libspeex/$(DEPDIR)/cb_search.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/cb_search.c' object='libspeex/cb_search.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/cb_search.Po' tmpdepfile='libspeex/$(DEPDIR)/cb_search.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/cb_search.o `test -f 'libspeex/cb_search.c' || echo '$(srcdir)/'`libspeex/cb_search.c
-+
-+libspeex/cb_search.obj: libspeex/cb_search.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/cb_search.obj -MD -MP -MF "libspeex/$(DEPDIR)/cb_search.Tpo" -c -o libspeex/cb_search.obj `if test -f 'libspeex/cb_search.c'; then $(CYGPATH_W) 'libspeex/cb_search.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/cb_search.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/cb_search.Tpo" "libspeex/$(DEPDIR)/cb_search.Po"; else rm -f "libspeex/$(DEPDIR)/cb_search.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/cb_search.c' object='libspeex/cb_search.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/cb_search.Po' tmpdepfile='libspeex/$(DEPDIR)/cb_search.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/cb_search.obj `if test -f 'libspeex/cb_search.c'; then $(CYGPATH_W) 'libspeex/cb_search.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/cb_search.c'; fi`
-+
-+libspeex/cb_search.lo: libspeex/cb_search.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/cb_search.lo -MD -MP -MF "libspeex/$(DEPDIR)/cb_search.Tpo" -c -o libspeex/cb_search.lo `test -f 'libspeex/cb_search.c' || echo '$(srcdir)/'`libspeex/cb_search.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/cb_search.Tpo" "libspeex/$(DEPDIR)/cb_search.Plo"; else rm -f "libspeex/$(DEPDIR)/cb_search.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/cb_search.c' object='libspeex/cb_search.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/cb_search.Plo' tmpdepfile='libspeex/$(DEPDIR)/cb_search.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/cb_search.lo `test -f 'libspeex/cb_search.c' || echo '$(srcdir)/'`libspeex/cb_search.c
-+
-+libspeex/filters.o: libspeex/filters.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/filters.o -MD -MP -MF "libspeex/$(DEPDIR)/filters.Tpo" -c -o libspeex/filters.o `test -f 'libspeex/filters.c' || echo '$(srcdir)/'`libspeex/filters.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/filters.Tpo" "libspeex/$(DEPDIR)/filters.Po"; else rm -f "libspeex/$(DEPDIR)/filters.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/filters.c' object='libspeex/filters.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/filters.Po' tmpdepfile='libspeex/$(DEPDIR)/filters.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/filters.o `test -f 'libspeex/filters.c' || echo '$(srcdir)/'`libspeex/filters.c
-+
-+libspeex/filters.obj: libspeex/filters.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/filters.obj -MD -MP -MF "libspeex/$(DEPDIR)/filters.Tpo" -c -o libspeex/filters.obj `if test -f 'libspeex/filters.c'; then $(CYGPATH_W) 'libspeex/filters.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/filters.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/filters.Tpo" "libspeex/$(DEPDIR)/filters.Po"; else rm -f "libspeex/$(DEPDIR)/filters.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/filters.c' object='libspeex/filters.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/filters.Po' tmpdepfile='libspeex/$(DEPDIR)/filters.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/filters.obj `if test -f 'libspeex/filters.c'; then $(CYGPATH_W) 'libspeex/filters.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/filters.c'; fi`
-+
-+libspeex/filters.lo: libspeex/filters.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/filters.lo -MD -MP -MF "libspeex/$(DEPDIR)/filters.Tpo" -c -o libspeex/filters.lo `test -f 'libspeex/filters.c' || echo '$(srcdir)/'`libspeex/filters.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/filters.Tpo" "libspeex/$(DEPDIR)/filters.Plo"; else rm -f "libspeex/$(DEPDIR)/filters.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/filters.c' object='libspeex/filters.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/filters.Plo' tmpdepfile='libspeex/$(DEPDIR)/filters.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/filters.lo `test -f 'libspeex/filters.c' || echo '$(srcdir)/'`libspeex/filters.c
-+
-+libspeex/bits.o: libspeex/bits.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/bits.o -MD -MP -MF "libspeex/$(DEPDIR)/bits.Tpo" -c -o libspeex/bits.o `test -f 'libspeex/bits.c' || echo '$(srcdir)/'`libspeex/bits.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/bits.Tpo" "libspeex/$(DEPDIR)/bits.Po"; else rm -f "libspeex/$(DEPDIR)/bits.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/bits.c' object='libspeex/bits.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/bits.Po' tmpdepfile='libspeex/$(DEPDIR)/bits.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/bits.o `test -f 'libspeex/bits.c' || echo '$(srcdir)/'`libspeex/bits.c
-+
-+libspeex/bits.obj: libspeex/bits.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/bits.obj -MD -MP -MF "libspeex/$(DEPDIR)/bits.Tpo" -c -o libspeex/bits.obj `if test -f 'libspeex/bits.c'; then $(CYGPATH_W) 'libspeex/bits.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/bits.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/bits.Tpo" "libspeex/$(DEPDIR)/bits.Po"; else rm -f "libspeex/$(DEPDIR)/bits.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/bits.c' object='libspeex/bits.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/bits.Po' tmpdepfile='libspeex/$(DEPDIR)/bits.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/bits.obj `if test -f 'libspeex/bits.c'; then $(CYGPATH_W) 'libspeex/bits.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/bits.c'; fi`
-+
-+libspeex/bits.lo: libspeex/bits.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/bits.lo -MD -MP -MF "libspeex/$(DEPDIR)/bits.Tpo" -c -o libspeex/bits.lo `test -f 'libspeex/bits.c' || echo '$(srcdir)/'`libspeex/bits.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/bits.Tpo" "libspeex/$(DEPDIR)/bits.Plo"; else rm -f "libspeex/$(DEPDIR)/bits.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/bits.c' object='libspeex/bits.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/bits.Plo' tmpdepfile='libspeex/$(DEPDIR)/bits.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/bits.lo `test -f 'libspeex/bits.c' || echo '$(srcdir)/'`libspeex/bits.c
-+
-+libspeex/modes.o: libspeex/modes.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/modes.o -MD -MP -MF "libspeex/$(DEPDIR)/modes.Tpo" -c -o libspeex/modes.o `test -f 'libspeex/modes.c' || echo '$(srcdir)/'`libspeex/modes.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/modes.Tpo" "libspeex/$(DEPDIR)/modes.Po"; else rm -f "libspeex/$(DEPDIR)/modes.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/modes.c' object='libspeex/modes.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/modes.Po' tmpdepfile='libspeex/$(DEPDIR)/modes.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/modes.o `test -f 'libspeex/modes.c' || echo '$(srcdir)/'`libspeex/modes.c
-+
-+libspeex/modes.obj: libspeex/modes.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/modes.obj -MD -MP -MF "libspeex/$(DEPDIR)/modes.Tpo" -c -o libspeex/modes.obj `if test -f 'libspeex/modes.c'; then $(CYGPATH_W) 'libspeex/modes.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/modes.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/modes.Tpo" "libspeex/$(DEPDIR)/modes.Po"; else rm -f "libspeex/$(DEPDIR)/modes.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/modes.c' object='libspeex/modes.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/modes.Po' tmpdepfile='libspeex/$(DEPDIR)/modes.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/modes.obj `if test -f 'libspeex/modes.c'; then $(CYGPATH_W) 'libspeex/modes.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/modes.c'; fi`
-+
-+libspeex/modes.lo: libspeex/modes.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/modes.lo -MD -MP -MF "libspeex/$(DEPDIR)/modes.Tpo" -c -o libspeex/modes.lo `test -f 'libspeex/modes.c' || echo '$(srcdir)/'`libspeex/modes.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/modes.Tpo" "libspeex/$(DEPDIR)/modes.Plo"; else rm -f "libspeex/$(DEPDIR)/modes.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/modes.c' object='libspeex/modes.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/modes.Plo' tmpdepfile='libspeex/$(DEPDIR)/modes.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/modes.lo `test -f 'libspeex/modes.c' || echo '$(srcdir)/'`libspeex/modes.c
-+
-+libspeex/speex.o: libspeex/speex.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/speex.o -MD -MP -MF "libspeex/$(DEPDIR)/speex.Tpo" -c -o libspeex/speex.o `test -f 'libspeex/speex.c' || echo '$(srcdir)/'`libspeex/speex.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/speex.Tpo" "libspeex/$(DEPDIR)/speex.Po"; else rm -f "libspeex/$(DEPDIR)/speex.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/speex.c' object='libspeex/speex.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/speex.Po' tmpdepfile='libspeex/$(DEPDIR)/speex.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/speex.o `test -f 'libspeex/speex.c' || echo '$(srcdir)/'`libspeex/speex.c
-+
-+libspeex/speex.obj: libspeex/speex.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/speex.obj -MD -MP -MF "libspeex/$(DEPDIR)/speex.Tpo" -c -o libspeex/speex.obj `if test -f 'libspeex/speex.c'; then $(CYGPATH_W) 'libspeex/speex.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/speex.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/speex.Tpo" "libspeex/$(DEPDIR)/speex.Po"; else rm -f "libspeex/$(DEPDIR)/speex.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/speex.c' object='libspeex/speex.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/speex.Po' tmpdepfile='libspeex/$(DEPDIR)/speex.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/speex.obj `if test -f 'libspeex/speex.c'; then $(CYGPATH_W) 'libspeex/speex.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/speex.c'; fi`
-+
-+libspeex/speex.lo: libspeex/speex.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/speex.lo -MD -MP -MF "libspeex/$(DEPDIR)/speex.Tpo" -c -o libspeex/speex.lo `test -f 'libspeex/speex.c' || echo '$(srcdir)/'`libspeex/speex.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/speex.Tpo" "libspeex/$(DEPDIR)/speex.Plo"; else rm -f "libspeex/$(DEPDIR)/speex.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/speex.c' object='libspeex/speex.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/speex.Plo' tmpdepfile='libspeex/$(DEPDIR)/speex.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/speex.lo `test -f 'libspeex/speex.c' || echo '$(srcdir)/'`libspeex/speex.c
-+
-+libspeex/vq.o: libspeex/vq.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/vq.o -MD -MP -MF "libspeex/$(DEPDIR)/vq.Tpo" -c -o libspeex/vq.o `test -f 'libspeex/vq.c' || echo '$(srcdir)/'`libspeex/vq.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/vq.Tpo" "libspeex/$(DEPDIR)/vq.Po"; else rm -f "libspeex/$(DEPDIR)/vq.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/vq.c' object='libspeex/vq.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/vq.Po' tmpdepfile='libspeex/$(DEPDIR)/vq.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/vq.o `test -f 'libspeex/vq.c' || echo '$(srcdir)/'`libspeex/vq.c
-+
-+libspeex/vq.obj: libspeex/vq.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/vq.obj -MD -MP -MF "libspeex/$(DEPDIR)/vq.Tpo" -c -o libspeex/vq.obj `if test -f 'libspeex/vq.c'; then $(CYGPATH_W) 'libspeex/vq.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/vq.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/vq.Tpo" "libspeex/$(DEPDIR)/vq.Po"; else rm -f "libspeex/$(DEPDIR)/vq.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/vq.c' object='libspeex/vq.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/vq.Po' tmpdepfile='libspeex/$(DEPDIR)/vq.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/vq.obj `if test -f 'libspeex/vq.c'; then $(CYGPATH_W) 'libspeex/vq.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/vq.c'; fi`
-+
-+libspeex/vq.lo: libspeex/vq.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/vq.lo -MD -MP -MF "libspeex/$(DEPDIR)/vq.Tpo" -c -o libspeex/vq.lo `test -f 'libspeex/vq.c' || echo '$(srcdir)/'`libspeex/vq.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/vq.Tpo" "libspeex/$(DEPDIR)/vq.Plo"; else rm -f "libspeex/$(DEPDIR)/vq.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/vq.c' object='libspeex/vq.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/vq.Plo' tmpdepfile='libspeex/$(DEPDIR)/vq.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/vq.lo `test -f 'libspeex/vq.c' || echo '$(srcdir)/'`libspeex/vq.c
-+
-+libspeex/high_lsp_tables.o: libspeex/high_lsp_tables.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/high_lsp_tables.o -MD -MP -MF "libspeex/$(DEPDIR)/high_lsp_tables.Tpo" -c -o libspeex/high_lsp_tables.o `test -f 'libspeex/high_lsp_tables.c' || echo '$(srcdir)/'`libspeex/high_lsp_tables.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/high_lsp_tables.Tpo" "libspeex/$(DEPDIR)/high_lsp_tables.Po"; else rm -f "libspeex/$(DEPDIR)/high_lsp_tables.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/high_lsp_tables.c' object='libspeex/high_lsp_tables.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/high_lsp_tables.Po' tmpdepfile='libspeex/$(DEPDIR)/high_lsp_tables.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/high_lsp_tables.o `test -f 'libspeex/high_lsp_tables.c' || echo '$(srcdir)/'`libspeex/high_lsp_tables.c
-+
-+libspeex/high_lsp_tables.obj: libspeex/high_lsp_tables.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/high_lsp_tables.obj -MD -MP -MF "libspeex/$(DEPDIR)/high_lsp_tables.Tpo" -c -o libspeex/high_lsp_tables.obj `if test -f 'libspeex/high_lsp_tables.c'; then $(CYGPATH_W) 'libspeex/high_lsp_tables.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/high_lsp_tables.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/high_lsp_tables.Tpo" "libspeex/$(DEPDIR)/high_lsp_tables.Po"; else rm -f "libspeex/$(DEPDIR)/high_lsp_tables.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/high_lsp_tables.c' object='libspeex/high_lsp_tables.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/high_lsp_tables.Po' tmpdepfile='libspeex/$(DEPDIR)/high_lsp_tables.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/high_lsp_tables.obj `if test -f 'libspeex/high_lsp_tables.c'; then $(CYGPATH_W) 'libspeex/high_lsp_tables.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/high_lsp_tables.c'; fi`
-+
-+libspeex/high_lsp_tables.lo: libspeex/high_lsp_tables.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/high_lsp_tables.lo -MD -MP -MF "libspeex/$(DEPDIR)/high_lsp_tables.Tpo" -c -o libspeex/high_lsp_tables.lo `test -f 'libspeex/high_lsp_tables.c' || echo '$(srcdir)/'`libspeex/high_lsp_tables.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/high_lsp_tables.Tpo" "libspeex/$(DEPDIR)/high_lsp_tables.Plo"; else rm -f "libspeex/$(DEPDIR)/high_lsp_tables.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/high_lsp_tables.c' object='libspeex/high_lsp_tables.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/high_lsp_tables.Plo' tmpdepfile='libspeex/$(DEPDIR)/high_lsp_tables.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/high_lsp_tables.lo `test -f 'libspeex/high_lsp_tables.c' || echo '$(srcdir)/'`libspeex/high_lsp_tables.c
-+
-+libspeex/vbr.o: libspeex/vbr.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/vbr.o -MD -MP -MF "libspeex/$(DEPDIR)/vbr.Tpo" -c -o libspeex/vbr.o `test -f 'libspeex/vbr.c' || echo '$(srcdir)/'`libspeex/vbr.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/vbr.Tpo" "libspeex/$(DEPDIR)/vbr.Po"; else rm -f "libspeex/$(DEPDIR)/vbr.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/vbr.c' object='libspeex/vbr.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/vbr.Po' tmpdepfile='libspeex/$(DEPDIR)/vbr.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/vbr.o `test -f 'libspeex/vbr.c' || echo '$(srcdir)/'`libspeex/vbr.c
-+
-+libspeex/vbr.obj: libspeex/vbr.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/vbr.obj -MD -MP -MF "libspeex/$(DEPDIR)/vbr.Tpo" -c -o libspeex/vbr.obj `if test -f 'libspeex/vbr.c'; then $(CYGPATH_W) 'libspeex/vbr.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/vbr.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/vbr.Tpo" "libspeex/$(DEPDIR)/vbr.Po"; else rm -f "libspeex/$(DEPDIR)/vbr.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/vbr.c' object='libspeex/vbr.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/vbr.Po' tmpdepfile='libspeex/$(DEPDIR)/vbr.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/vbr.obj `if test -f 'libspeex/vbr.c'; then $(CYGPATH_W) 'libspeex/vbr.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/vbr.c'; fi`
-+
-+libspeex/vbr.lo: libspeex/vbr.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/vbr.lo -MD -MP -MF "libspeex/$(DEPDIR)/vbr.Tpo" -c -o libspeex/vbr.lo `test -f 'libspeex/vbr.c' || echo '$(srcdir)/'`libspeex/vbr.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/vbr.Tpo" "libspeex/$(DEPDIR)/vbr.Plo"; else rm -f "libspeex/$(DEPDIR)/vbr.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/vbr.c' object='libspeex/vbr.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/vbr.Plo' tmpdepfile='libspeex/$(DEPDIR)/vbr.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/vbr.lo `test -f 'libspeex/vbr.c' || echo '$(srcdir)/'`libspeex/vbr.c
-+
-+libspeex/hexc_table.o: libspeex/hexc_table.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/hexc_table.o -MD -MP -MF "libspeex/$(DEPDIR)/hexc_table.Tpo" -c -o libspeex/hexc_table.o `test -f 'libspeex/hexc_table.c' || echo '$(srcdir)/'`libspeex/hexc_table.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/hexc_table.Tpo" "libspeex/$(DEPDIR)/hexc_table.Po"; else rm -f "libspeex/$(DEPDIR)/hexc_table.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/hexc_table.c' object='libspeex/hexc_table.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/hexc_table.Po' tmpdepfile='libspeex/$(DEPDIR)/hexc_table.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/hexc_table.o `test -f 'libspeex/hexc_table.c' || echo '$(srcdir)/'`libspeex/hexc_table.c
-+
-+libspeex/hexc_table.obj: libspeex/hexc_table.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/hexc_table.obj -MD -MP -MF "libspeex/$(DEPDIR)/hexc_table.Tpo" -c -o libspeex/hexc_table.obj `if test -f 'libspeex/hexc_table.c'; then $(CYGPATH_W) 'libspeex/hexc_table.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/hexc_table.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/hexc_table.Tpo" "libspeex/$(DEPDIR)/hexc_table.Po"; else rm -f "libspeex/$(DEPDIR)/hexc_table.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/hexc_table.c' object='libspeex/hexc_table.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/hexc_table.Po' tmpdepfile='libspeex/$(DEPDIR)/hexc_table.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/hexc_table.obj `if test -f 'libspeex/hexc_table.c'; then $(CYGPATH_W) 'libspeex/hexc_table.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/hexc_table.c'; fi`
-+
-+libspeex/hexc_table.lo: libspeex/hexc_table.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/hexc_table.lo -MD -MP -MF "libspeex/$(DEPDIR)/hexc_table.Tpo" -c -o libspeex/hexc_table.lo `test -f 'libspeex/hexc_table.c' || echo '$(srcdir)/'`libspeex/hexc_table.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/hexc_table.Tpo" "libspeex/$(DEPDIR)/hexc_table.Plo"; else rm -f "libspeex/$(DEPDIR)/hexc_table.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/hexc_table.c' object='libspeex/hexc_table.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/hexc_table.Plo' tmpdepfile='libspeex/$(DEPDIR)/hexc_table.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/hexc_table.lo `test -f 'libspeex/hexc_table.c' || echo '$(srcdir)/'`libspeex/hexc_table.c
-+
-+libspeex/exc_5_256_table.o: libspeex/exc_5_256_table.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/exc_5_256_table.o -MD -MP -MF "libspeex/$(DEPDIR)/exc_5_256_table.Tpo" -c -o libspeex/exc_5_256_table.o `test -f 'libspeex/exc_5_256_table.c' || echo '$(srcdir)/'`libspeex/exc_5_256_table.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/exc_5_256_table.Tpo" "libspeex/$(DEPDIR)/exc_5_256_table.Po"; else rm -f "libspeex/$(DEPDIR)/exc_5_256_table.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/exc_5_256_table.c' object='libspeex/exc_5_256_table.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/exc_5_256_table.Po' tmpdepfile='libspeex/$(DEPDIR)/exc_5_256_table.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/exc_5_256_table.o `test -f 'libspeex/exc_5_256_table.c' || echo '$(srcdir)/'`libspeex/exc_5_256_table.c
-+
-+libspeex/exc_5_256_table.obj: libspeex/exc_5_256_table.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/exc_5_256_table.obj -MD -MP -MF "libspeex/$(DEPDIR)/exc_5_256_table.Tpo" -c -o libspeex/exc_5_256_table.obj `if test -f 'libspeex/exc_5_256_table.c'; then $(CYGPATH_W) 'libspeex/exc_5_256_table.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/exc_5_256_table.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/exc_5_256_table.Tpo" "libspeex/$(DEPDIR)/exc_5_256_table.Po"; else rm -f "libspeex/$(DEPDIR)/exc_5_256_table.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/exc_5_256_table.c' object='libspeex/exc_5_256_table.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/exc_5_256_table.Po' tmpdepfile='libspeex/$(DEPDIR)/exc_5_256_table.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/exc_5_256_table.obj `if test -f 'libspeex/exc_5_256_table.c'; then $(CYGPATH_W) 'libspeex/exc_5_256_table.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/exc_5_256_table.c'; fi`
-+
-+libspeex/exc_5_256_table.lo: libspeex/exc_5_256_table.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/exc_5_256_table.lo -MD -MP -MF "libspeex/$(DEPDIR)/exc_5_256_table.Tpo" -c -o libspeex/exc_5_256_table.lo `test -f 'libspeex/exc_5_256_table.c' || echo '$(srcdir)/'`libspeex/exc_5_256_table.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/exc_5_256_table.Tpo" "libspeex/$(DEPDIR)/exc_5_256_table.Plo"; else rm -f "libspeex/$(DEPDIR)/exc_5_256_table.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/exc_5_256_table.c' object='libspeex/exc_5_256_table.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/exc_5_256_table.Plo' tmpdepfile='libspeex/$(DEPDIR)/exc_5_256_table.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/exc_5_256_table.lo `test -f 'libspeex/exc_5_256_table.c' || echo '$(srcdir)/'`libspeex/exc_5_256_table.c
-+
-+libspeex/exc_5_64_table.o: libspeex/exc_5_64_table.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/exc_5_64_table.o -MD -MP -MF "libspeex/$(DEPDIR)/exc_5_64_table.Tpo" -c -o libspeex/exc_5_64_table.o `test -f 'libspeex/exc_5_64_table.c' || echo '$(srcdir)/'`libspeex/exc_5_64_table.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/exc_5_64_table.Tpo" "libspeex/$(DEPDIR)/exc_5_64_table.Po"; else rm -f "libspeex/$(DEPDIR)/exc_5_64_table.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/exc_5_64_table.c' object='libspeex/exc_5_64_table.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/exc_5_64_table.Po' tmpdepfile='libspeex/$(DEPDIR)/exc_5_64_table.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/exc_5_64_table.o `test -f 'libspeex/exc_5_64_table.c' || echo '$(srcdir)/'`libspeex/exc_5_64_table.c
-+
-+libspeex/exc_5_64_table.obj: libspeex/exc_5_64_table.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/exc_5_64_table.obj -MD -MP -MF "libspeex/$(DEPDIR)/exc_5_64_table.Tpo" -c -o libspeex/exc_5_64_table.obj `if test -f 'libspeex/exc_5_64_table.c'; then $(CYGPATH_W) 'libspeex/exc_5_64_table.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/exc_5_64_table.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/exc_5_64_table.Tpo" "libspeex/$(DEPDIR)/exc_5_64_table.Po"; else rm -f "libspeex/$(DEPDIR)/exc_5_64_table.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/exc_5_64_table.c' object='libspeex/exc_5_64_table.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/exc_5_64_table.Po' tmpdepfile='libspeex/$(DEPDIR)/exc_5_64_table.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/exc_5_64_table.obj `if test -f 'libspeex/exc_5_64_table.c'; then $(CYGPATH_W) 'libspeex/exc_5_64_table.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/exc_5_64_table.c'; fi`
-+
-+libspeex/exc_5_64_table.lo: libspeex/exc_5_64_table.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/exc_5_64_table.lo -MD -MP -MF "libspeex/$(DEPDIR)/exc_5_64_table.Tpo" -c -o libspeex/exc_5_64_table.lo `test -f 'libspeex/exc_5_64_table.c' || echo '$(srcdir)/'`libspeex/exc_5_64_table.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/exc_5_64_table.Tpo" "libspeex/$(DEPDIR)/exc_5_64_table.Plo"; else rm -f "libspeex/$(DEPDIR)/exc_5_64_table.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/exc_5_64_table.c' object='libspeex/exc_5_64_table.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/exc_5_64_table.Plo' tmpdepfile='libspeex/$(DEPDIR)/exc_5_64_table.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/exc_5_64_table.lo `test -f 'libspeex/exc_5_64_table.c' || echo '$(srcdir)/'`libspeex/exc_5_64_table.c
-+
-+libspeex/exc_8_128_table.o: libspeex/exc_8_128_table.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/exc_8_128_table.o -MD -MP -MF "libspeex/$(DEPDIR)/exc_8_128_table.Tpo" -c -o libspeex/exc_8_128_table.o `test -f 'libspeex/exc_8_128_table.c' || echo '$(srcdir)/'`libspeex/exc_8_128_table.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/exc_8_128_table.Tpo" "libspeex/$(DEPDIR)/exc_8_128_table.Po"; else rm -f "libspeex/$(DEPDIR)/exc_8_128_table.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/exc_8_128_table.c' object='libspeex/exc_8_128_table.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/exc_8_128_table.Po' tmpdepfile='libspeex/$(DEPDIR)/exc_8_128_table.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/exc_8_128_table.o `test -f 'libspeex/exc_8_128_table.c' || echo '$(srcdir)/'`libspeex/exc_8_128_table.c
-+
-+libspeex/exc_8_128_table.obj: libspeex/exc_8_128_table.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/exc_8_128_table.obj -MD -MP -MF "libspeex/$(DEPDIR)/exc_8_128_table.Tpo" -c -o libspeex/exc_8_128_table.obj `if test -f 'libspeex/exc_8_128_table.c'; then $(CYGPATH_W) 'libspeex/exc_8_128_table.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/exc_8_128_table.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/exc_8_128_table.Tpo" "libspeex/$(DEPDIR)/exc_8_128_table.Po"; else rm -f "libspeex/$(DEPDIR)/exc_8_128_table.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/exc_8_128_table.c' object='libspeex/exc_8_128_table.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/exc_8_128_table.Po' tmpdepfile='libspeex/$(DEPDIR)/exc_8_128_table.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/exc_8_128_table.obj `if test -f 'libspeex/exc_8_128_table.c'; then $(CYGPATH_W) 'libspeex/exc_8_128_table.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/exc_8_128_table.c'; fi`
-+
-+libspeex/exc_8_128_table.lo: libspeex/exc_8_128_table.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/exc_8_128_table.lo -MD -MP -MF "libspeex/$(DEPDIR)/exc_8_128_table.Tpo" -c -o libspeex/exc_8_128_table.lo `test -f 'libspeex/exc_8_128_table.c' || echo '$(srcdir)/'`libspeex/exc_8_128_table.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/exc_8_128_table.Tpo" "libspeex/$(DEPDIR)/exc_8_128_table.Plo"; else rm -f "libspeex/$(DEPDIR)/exc_8_128_table.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/exc_8_128_table.c' object='libspeex/exc_8_128_table.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/exc_8_128_table.Plo' tmpdepfile='libspeex/$(DEPDIR)/exc_8_128_table.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/exc_8_128_table.lo `test -f 'libspeex/exc_8_128_table.c' || echo '$(srcdir)/'`libspeex/exc_8_128_table.c
-+
-+libspeex/exc_10_32_table.o: libspeex/exc_10_32_table.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/exc_10_32_table.o -MD -MP -MF "libspeex/$(DEPDIR)/exc_10_32_table.Tpo" -c -o libspeex/exc_10_32_table.o `test -f 'libspeex/exc_10_32_table.c' || echo '$(srcdir)/'`libspeex/exc_10_32_table.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/exc_10_32_table.Tpo" "libspeex/$(DEPDIR)/exc_10_32_table.Po"; else rm -f "libspeex/$(DEPDIR)/exc_10_32_table.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/exc_10_32_table.c' object='libspeex/exc_10_32_table.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/exc_10_32_table.Po' tmpdepfile='libspeex/$(DEPDIR)/exc_10_32_table.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/exc_10_32_table.o `test -f 'libspeex/exc_10_32_table.c' || echo '$(srcdir)/'`libspeex/exc_10_32_table.c
-+
-+libspeex/exc_10_32_table.obj: libspeex/exc_10_32_table.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/exc_10_32_table.obj -MD -MP -MF "libspeex/$(DEPDIR)/exc_10_32_table.Tpo" -c -o libspeex/exc_10_32_table.obj `if test -f 'libspeex/exc_10_32_table.c'; then $(CYGPATH_W) 'libspeex/exc_10_32_table.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/exc_10_32_table.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/exc_10_32_table.Tpo" "libspeex/$(DEPDIR)/exc_10_32_table.Po"; else rm -f "libspeex/$(DEPDIR)/exc_10_32_table.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/exc_10_32_table.c' object='libspeex/exc_10_32_table.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/exc_10_32_table.Po' tmpdepfile='libspeex/$(DEPDIR)/exc_10_32_table.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/exc_10_32_table.obj `if test -f 'libspeex/exc_10_32_table.c'; then $(CYGPATH_W) 'libspeex/exc_10_32_table.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/exc_10_32_table.c'; fi`
-+
-+libspeex/exc_10_32_table.lo: libspeex/exc_10_32_table.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/exc_10_32_table.lo -MD -MP -MF "libspeex/$(DEPDIR)/exc_10_32_table.Tpo" -c -o libspeex/exc_10_32_table.lo `test -f 'libspeex/exc_10_32_table.c' || echo '$(srcdir)/'`libspeex/exc_10_32_table.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/exc_10_32_table.Tpo" "libspeex/$(DEPDIR)/exc_10_32_table.Plo"; else rm -f "libspeex/$(DEPDIR)/exc_10_32_table.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/exc_10_32_table.c' object='libspeex/exc_10_32_table.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/exc_10_32_table.Plo' tmpdepfile='libspeex/$(DEPDIR)/exc_10_32_table.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/exc_10_32_table.lo `test -f 'libspeex/exc_10_32_table.c' || echo '$(srcdir)/'`libspeex/exc_10_32_table.c
-+
-+libspeex/exc_10_16_table.o: libspeex/exc_10_16_table.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/exc_10_16_table.o -MD -MP -MF "libspeex/$(DEPDIR)/exc_10_16_table.Tpo" -c -o libspeex/exc_10_16_table.o `test -f 'libspeex/exc_10_16_table.c' || echo '$(srcdir)/'`libspeex/exc_10_16_table.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/exc_10_16_table.Tpo" "libspeex/$(DEPDIR)/exc_10_16_table.Po"; else rm -f "libspeex/$(DEPDIR)/exc_10_16_table.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/exc_10_16_table.c' object='libspeex/exc_10_16_table.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/exc_10_16_table.Po' tmpdepfile='libspeex/$(DEPDIR)/exc_10_16_table.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/exc_10_16_table.o `test -f 'libspeex/exc_10_16_table.c' || echo '$(srcdir)/'`libspeex/exc_10_16_table.c
-+
-+libspeex/exc_10_16_table.obj: libspeex/exc_10_16_table.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/exc_10_16_table.obj -MD -MP -MF "libspeex/$(DEPDIR)/exc_10_16_table.Tpo" -c -o libspeex/exc_10_16_table.obj `if test -f 'libspeex/exc_10_16_table.c'; then $(CYGPATH_W) 'libspeex/exc_10_16_table.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/exc_10_16_table.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/exc_10_16_table.Tpo" "libspeex/$(DEPDIR)/exc_10_16_table.Po"; else rm -f "libspeex/$(DEPDIR)/exc_10_16_table.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/exc_10_16_table.c' object='libspeex/exc_10_16_table.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/exc_10_16_table.Po' tmpdepfile='libspeex/$(DEPDIR)/exc_10_16_table.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/exc_10_16_table.obj `if test -f 'libspeex/exc_10_16_table.c'; then $(CYGPATH_W) 'libspeex/exc_10_16_table.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/exc_10_16_table.c'; fi`
-+
-+libspeex/exc_10_16_table.lo: libspeex/exc_10_16_table.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/exc_10_16_table.lo -MD -MP -MF "libspeex/$(DEPDIR)/exc_10_16_table.Tpo" -c -o libspeex/exc_10_16_table.lo `test -f 'libspeex/exc_10_16_table.c' || echo '$(srcdir)/'`libspeex/exc_10_16_table.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/exc_10_16_table.Tpo" "libspeex/$(DEPDIR)/exc_10_16_table.Plo"; else rm -f "libspeex/$(DEPDIR)/exc_10_16_table.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/exc_10_16_table.c' object='libspeex/exc_10_16_table.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/exc_10_16_table.Plo' tmpdepfile='libspeex/$(DEPDIR)/exc_10_16_table.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/exc_10_16_table.lo `test -f 'libspeex/exc_10_16_table.c' || echo '$(srcdir)/'`libspeex/exc_10_16_table.c
-+
-+libspeex/exc_20_32_table.o: libspeex/exc_20_32_table.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/exc_20_32_table.o -MD -MP -MF "libspeex/$(DEPDIR)/exc_20_32_table.Tpo" -c -o libspeex/exc_20_32_table.o `test -f 'libspeex/exc_20_32_table.c' || echo '$(srcdir)/'`libspeex/exc_20_32_table.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/exc_20_32_table.Tpo" "libspeex/$(DEPDIR)/exc_20_32_table.Po"; else rm -f "libspeex/$(DEPDIR)/exc_20_32_table.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/exc_20_32_table.c' object='libspeex/exc_20_32_table.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/exc_20_32_table.Po' tmpdepfile='libspeex/$(DEPDIR)/exc_20_32_table.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/exc_20_32_table.o `test -f 'libspeex/exc_20_32_table.c' || echo '$(srcdir)/'`libspeex/exc_20_32_table.c
-+
-+libspeex/exc_20_32_table.obj: libspeex/exc_20_32_table.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/exc_20_32_table.obj -MD -MP -MF "libspeex/$(DEPDIR)/exc_20_32_table.Tpo" -c -o libspeex/exc_20_32_table.obj `if test -f 'libspeex/exc_20_32_table.c'; then $(CYGPATH_W) 'libspeex/exc_20_32_table.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/exc_20_32_table.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/exc_20_32_table.Tpo" "libspeex/$(DEPDIR)/exc_20_32_table.Po"; else rm -f "libspeex/$(DEPDIR)/exc_20_32_table.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/exc_20_32_table.c' object='libspeex/exc_20_32_table.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/exc_20_32_table.Po' tmpdepfile='libspeex/$(DEPDIR)/exc_20_32_table.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/exc_20_32_table.obj `if test -f 'libspeex/exc_20_32_table.c'; then $(CYGPATH_W) 'libspeex/exc_20_32_table.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/exc_20_32_table.c'; fi`
-+
-+libspeex/exc_20_32_table.lo: libspeex/exc_20_32_table.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/exc_20_32_table.lo -MD -MP -MF "libspeex/$(DEPDIR)/exc_20_32_table.Tpo" -c -o libspeex/exc_20_32_table.lo `test -f 'libspeex/exc_20_32_table.c' || echo '$(srcdir)/'`libspeex/exc_20_32_table.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/exc_20_32_table.Tpo" "libspeex/$(DEPDIR)/exc_20_32_table.Plo"; else rm -f "libspeex/$(DEPDIR)/exc_20_32_table.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/exc_20_32_table.c' object='libspeex/exc_20_32_table.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/exc_20_32_table.Plo' tmpdepfile='libspeex/$(DEPDIR)/exc_20_32_table.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/exc_20_32_table.lo `test -f 'libspeex/exc_20_32_table.c' || echo '$(srcdir)/'`libspeex/exc_20_32_table.c
-+
-+libspeex/hexc_10_32_table.o: libspeex/hexc_10_32_table.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/hexc_10_32_table.o -MD -MP -MF "libspeex/$(DEPDIR)/hexc_10_32_table.Tpo" -c -o libspeex/hexc_10_32_table.o `test -f 'libspeex/hexc_10_32_table.c' || echo '$(srcdir)/'`libspeex/hexc_10_32_table.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/hexc_10_32_table.Tpo" "libspeex/$(DEPDIR)/hexc_10_32_table.Po"; else rm -f "libspeex/$(DEPDIR)/hexc_10_32_table.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/hexc_10_32_table.c' object='libspeex/hexc_10_32_table.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/hexc_10_32_table.Po' tmpdepfile='libspeex/$(DEPDIR)/hexc_10_32_table.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/hexc_10_32_table.o `test -f 'libspeex/hexc_10_32_table.c' || echo '$(srcdir)/'`libspeex/hexc_10_32_table.c
-+
-+libspeex/hexc_10_32_table.obj: libspeex/hexc_10_32_table.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/hexc_10_32_table.obj -MD -MP -MF "libspeex/$(DEPDIR)/hexc_10_32_table.Tpo" -c -o libspeex/hexc_10_32_table.obj `if test -f 'libspeex/hexc_10_32_table.c'; then $(CYGPATH_W) 'libspeex/hexc_10_32_table.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/hexc_10_32_table.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/hexc_10_32_table.Tpo" "libspeex/$(DEPDIR)/hexc_10_32_table.Po"; else rm -f "libspeex/$(DEPDIR)/hexc_10_32_table.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/hexc_10_32_table.c' object='libspeex/hexc_10_32_table.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/hexc_10_32_table.Po' tmpdepfile='libspeex/$(DEPDIR)/hexc_10_32_table.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/hexc_10_32_table.obj `if test -f 'libspeex/hexc_10_32_table.c'; then $(CYGPATH_W) 'libspeex/hexc_10_32_table.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/hexc_10_32_table.c'; fi`
-+
-+libspeex/hexc_10_32_table.lo: libspeex/hexc_10_32_table.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/hexc_10_32_table.lo -MD -MP -MF "libspeex/$(DEPDIR)/hexc_10_32_table.Tpo" -c -o libspeex/hexc_10_32_table.lo `test -f 'libspeex/hexc_10_32_table.c' || echo '$(srcdir)/'`libspeex/hexc_10_32_table.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/hexc_10_32_table.Tpo" "libspeex/$(DEPDIR)/hexc_10_32_table.Plo"; else rm -f "libspeex/$(DEPDIR)/hexc_10_32_table.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/hexc_10_32_table.c' object='libspeex/hexc_10_32_table.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/hexc_10_32_table.Plo' tmpdepfile='libspeex/$(DEPDIR)/hexc_10_32_table.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/hexc_10_32_table.lo `test -f 'libspeex/hexc_10_32_table.c' || echo '$(srcdir)/'`libspeex/hexc_10_32_table.c
-+
-+libspeex/misc.o: libspeex/misc.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/misc.o -MD -MP -MF "libspeex/$(DEPDIR)/misc.Tpo" -c -o libspeex/misc.o `test -f 'libspeex/misc.c' || echo '$(srcdir)/'`libspeex/misc.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/misc.Tpo" "libspeex/$(DEPDIR)/misc.Po"; else rm -f "libspeex/$(DEPDIR)/misc.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/misc.c' object='libspeex/misc.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/misc.Po' tmpdepfile='libspeex/$(DEPDIR)/misc.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/misc.o `test -f 'libspeex/misc.c' || echo '$(srcdir)/'`libspeex/misc.c
-+
-+libspeex/misc.obj: libspeex/misc.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/misc.obj -MD -MP -MF "libspeex/$(DEPDIR)/misc.Tpo" -c -o libspeex/misc.obj `if test -f 'libspeex/misc.c'; then $(CYGPATH_W) 'libspeex/misc.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/misc.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/misc.Tpo" "libspeex/$(DEPDIR)/misc.Po"; else rm -f "libspeex/$(DEPDIR)/misc.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/misc.c' object='libspeex/misc.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/misc.Po' tmpdepfile='libspeex/$(DEPDIR)/misc.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/misc.obj `if test -f 'libspeex/misc.c'; then $(CYGPATH_W) 'libspeex/misc.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/misc.c'; fi`
-+
-+libspeex/misc.lo: libspeex/misc.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/misc.lo -MD -MP -MF "libspeex/$(DEPDIR)/misc.Tpo" -c -o libspeex/misc.lo `test -f 'libspeex/misc.c' || echo '$(srcdir)/'`libspeex/misc.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/misc.Tpo" "libspeex/$(DEPDIR)/misc.Plo"; else rm -f "libspeex/$(DEPDIR)/misc.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/misc.c' object='libspeex/misc.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/misc.Plo' tmpdepfile='libspeex/$(DEPDIR)/misc.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/misc.lo `test -f 'libspeex/misc.c' || echo '$(srcdir)/'`libspeex/misc.c
-+
-+libspeex/speex_header.o: libspeex/speex_header.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/speex_header.o -MD -MP -MF "libspeex/$(DEPDIR)/speex_header.Tpo" -c -o libspeex/speex_header.o `test -f 'libspeex/speex_header.c' || echo '$(srcdir)/'`libspeex/speex_header.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/speex_header.Tpo" "libspeex/$(DEPDIR)/speex_header.Po"; else rm -f "libspeex/$(DEPDIR)/speex_header.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/speex_header.c' object='libspeex/speex_header.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/speex_header.Po' tmpdepfile='libspeex/$(DEPDIR)/speex_header.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/speex_header.o `test -f 'libspeex/speex_header.c' || echo '$(srcdir)/'`libspeex/speex_header.c
-+
-+libspeex/speex_header.obj: libspeex/speex_header.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/speex_header.obj -MD -MP -MF "libspeex/$(DEPDIR)/speex_header.Tpo" -c -o libspeex/speex_header.obj `if test -f 'libspeex/speex_header.c'; then $(CYGPATH_W) 'libspeex/speex_header.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/speex_header.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/speex_header.Tpo" "libspeex/$(DEPDIR)/speex_header.Po"; else rm -f "libspeex/$(DEPDIR)/speex_header.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/speex_header.c' object='libspeex/speex_header.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/speex_header.Po' tmpdepfile='libspeex/$(DEPDIR)/speex_header.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/speex_header.obj `if test -f 'libspeex/speex_header.c'; then $(CYGPATH_W) 'libspeex/speex_header.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/speex_header.c'; fi`
-+
-+libspeex/speex_header.lo: libspeex/speex_header.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/speex_header.lo -MD -MP -MF "libspeex/$(DEPDIR)/speex_header.Tpo" -c -o libspeex/speex_header.lo `test -f 'libspeex/speex_header.c' || echo '$(srcdir)/'`libspeex/speex_header.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/speex_header.Tpo" "libspeex/$(DEPDIR)/speex_header.Plo"; else rm -f "libspeex/$(DEPDIR)/speex_header.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/speex_header.c' object='libspeex/speex_header.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/speex_header.Plo' tmpdepfile='libspeex/$(DEPDIR)/speex_header.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/speex_header.lo `test -f 'libspeex/speex_header.c' || echo '$(srcdir)/'`libspeex/speex_header.c
-+
-+libspeex/speex_callbacks.o: libspeex/speex_callbacks.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/speex_callbacks.o -MD -MP -MF "libspeex/$(DEPDIR)/speex_callbacks.Tpo" -c -o libspeex/speex_callbacks.o `test -f 'libspeex/speex_callbacks.c' || echo '$(srcdir)/'`libspeex/speex_callbacks.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/speex_callbacks.Tpo" "libspeex/$(DEPDIR)/speex_callbacks.Po"; else rm -f "libspeex/$(DEPDIR)/speex_callbacks.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/speex_callbacks.c' object='libspeex/speex_callbacks.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/speex_callbacks.Po' tmpdepfile='libspeex/$(DEPDIR)/speex_callbacks.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/speex_callbacks.o `test -f 'libspeex/speex_callbacks.c' || echo '$(srcdir)/'`libspeex/speex_callbacks.c
-+
-+libspeex/speex_callbacks.obj: libspeex/speex_callbacks.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/speex_callbacks.obj -MD -MP -MF "libspeex/$(DEPDIR)/speex_callbacks.Tpo" -c -o libspeex/speex_callbacks.obj `if test -f 'libspeex/speex_callbacks.c'; then $(CYGPATH_W) 'libspeex/speex_callbacks.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/speex_callbacks.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/speex_callbacks.Tpo" "libspeex/$(DEPDIR)/speex_callbacks.Po"; else rm -f "libspeex/$(DEPDIR)/speex_callbacks.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/speex_callbacks.c' object='libspeex/speex_callbacks.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/speex_callbacks.Po' tmpdepfile='libspeex/$(DEPDIR)/speex_callbacks.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/speex_callbacks.obj `if test -f 'libspeex/speex_callbacks.c'; then $(CYGPATH_W) 'libspeex/speex_callbacks.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/speex_callbacks.c'; fi`
-+
-+libspeex/speex_callbacks.lo: libspeex/speex_callbacks.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/speex_callbacks.lo -MD -MP -MF "libspeex/$(DEPDIR)/speex_callbacks.Tpo" -c -o libspeex/speex_callbacks.lo `test -f 'libspeex/speex_callbacks.c' || echo '$(srcdir)/'`libspeex/speex_callbacks.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/speex_callbacks.Tpo" "libspeex/$(DEPDIR)/speex_callbacks.Plo"; else rm -f "libspeex/$(DEPDIR)/speex_callbacks.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/speex_callbacks.c' object='libspeex/speex_callbacks.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/speex_callbacks.Plo' tmpdepfile='libspeex/$(DEPDIR)/speex_callbacks.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/speex_callbacks.lo `test -f 'libspeex/speex_callbacks.c' || echo '$(srcdir)/'`libspeex/speex_callbacks.c
-+
-+libspeex/math_approx.o: libspeex/math_approx.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/math_approx.o -MD -MP -MF "libspeex/$(DEPDIR)/math_approx.Tpo" -c -o libspeex/math_approx.o `test -f 'libspeex/math_approx.c' || echo '$(srcdir)/'`libspeex/math_approx.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/math_approx.Tpo" "libspeex/$(DEPDIR)/math_approx.Po"; else rm -f "libspeex/$(DEPDIR)/math_approx.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/math_approx.c' object='libspeex/math_approx.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/math_approx.Po' tmpdepfile='libspeex/$(DEPDIR)/math_approx.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/math_approx.o `test -f 'libspeex/math_approx.c' || echo '$(srcdir)/'`libspeex/math_approx.c
-+
-+libspeex/math_approx.obj: libspeex/math_approx.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/math_approx.obj -MD -MP -MF "libspeex/$(DEPDIR)/math_approx.Tpo" -c -o libspeex/math_approx.obj `if test -f 'libspeex/math_approx.c'; then $(CYGPATH_W) 'libspeex/math_approx.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/math_approx.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/math_approx.Tpo" "libspeex/$(DEPDIR)/math_approx.Po"; else rm -f "libspeex/$(DEPDIR)/math_approx.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/math_approx.c' object='libspeex/math_approx.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/math_approx.Po' tmpdepfile='libspeex/$(DEPDIR)/math_approx.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/math_approx.obj `if test -f 'libspeex/math_approx.c'; then $(CYGPATH_W) 'libspeex/math_approx.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/math_approx.c'; fi`
-+
-+libspeex/math_approx.lo: libspeex/math_approx.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/math_approx.lo -MD -MP -MF "libspeex/$(DEPDIR)/math_approx.Tpo" -c -o libspeex/math_approx.lo `test -f 'libspeex/math_approx.c' || echo '$(srcdir)/'`libspeex/math_approx.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/math_approx.Tpo" "libspeex/$(DEPDIR)/math_approx.Plo"; else rm -f "libspeex/$(DEPDIR)/math_approx.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/math_approx.c' object='libspeex/math_approx.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/math_approx.Plo' tmpdepfile='libspeex/$(DEPDIR)/math_approx.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/math_approx.lo `test -f 'libspeex/math_approx.c' || echo '$(srcdir)/'`libspeex/math_approx.c
-+
-+libspeex/stereo.o: libspeex/stereo.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/stereo.o -MD -MP -MF "libspeex/$(DEPDIR)/stereo.Tpo" -c -o libspeex/stereo.o `test -f 'libspeex/stereo.c' || echo '$(srcdir)/'`libspeex/stereo.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/stereo.Tpo" "libspeex/$(DEPDIR)/stereo.Po"; else rm -f "libspeex/$(DEPDIR)/stereo.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/stereo.c' object='libspeex/stereo.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/stereo.Po' tmpdepfile='libspeex/$(DEPDIR)/stereo.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/stereo.o `test -f 'libspeex/stereo.c' || echo '$(srcdir)/'`libspeex/stereo.c
-+
-+libspeex/stereo.obj: libspeex/stereo.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/stereo.obj -MD -MP -MF "libspeex/$(DEPDIR)/stereo.Tpo" -c -o libspeex/stereo.obj `if test -f 'libspeex/stereo.c'; then $(CYGPATH_W) 'libspeex/stereo.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/stereo.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/stereo.Tpo" "libspeex/$(DEPDIR)/stereo.Po"; else rm -f "libspeex/$(DEPDIR)/stereo.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/stereo.c' object='libspeex/stereo.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/stereo.Po' tmpdepfile='libspeex/$(DEPDIR)/stereo.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/stereo.obj `if test -f 'libspeex/stereo.c'; then $(CYGPATH_W) 'libspeex/stereo.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/stereo.c'; fi`
-+
-+libspeex/stereo.lo: libspeex/stereo.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/stereo.lo -MD -MP -MF "libspeex/$(DEPDIR)/stereo.Tpo" -c -o libspeex/stereo.lo `test -f 'libspeex/stereo.c' || echo '$(srcdir)/'`libspeex/stereo.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/stereo.Tpo" "libspeex/$(DEPDIR)/stereo.Plo"; else rm -f "libspeex/$(DEPDIR)/stereo.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/stereo.c' object='libspeex/stereo.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/stereo.Plo' tmpdepfile='libspeex/$(DEPDIR)/stereo.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/stereo.lo `test -f 'libspeex/stereo.c' || echo '$(srcdir)/'`libspeex/stereo.c
-+
-+libspeex/preprocess.o: libspeex/preprocess.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/preprocess.o -MD -MP -MF "libspeex/$(DEPDIR)/preprocess.Tpo" -c -o libspeex/preprocess.o `test -f 'libspeex/preprocess.c' || echo '$(srcdir)/'`libspeex/preprocess.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/preprocess.Tpo" "libspeex/$(DEPDIR)/preprocess.Po"; else rm -f "libspeex/$(DEPDIR)/preprocess.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/preprocess.c' object='libspeex/preprocess.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/preprocess.Po' tmpdepfile='libspeex/$(DEPDIR)/preprocess.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/preprocess.o `test -f 'libspeex/preprocess.c' || echo '$(srcdir)/'`libspeex/preprocess.c
-+
-+libspeex/preprocess.obj: libspeex/preprocess.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/preprocess.obj -MD -MP -MF "libspeex/$(DEPDIR)/preprocess.Tpo" -c -o libspeex/preprocess.obj `if test -f 'libspeex/preprocess.c'; then $(CYGPATH_W) 'libspeex/preprocess.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/preprocess.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/preprocess.Tpo" "libspeex/$(DEPDIR)/preprocess.Po"; else rm -f "libspeex/$(DEPDIR)/preprocess.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/preprocess.c' object='libspeex/preprocess.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/preprocess.Po' tmpdepfile='libspeex/$(DEPDIR)/preprocess.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/preprocess.obj `if test -f 'libspeex/preprocess.c'; then $(CYGPATH_W) 'libspeex/preprocess.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/preprocess.c'; fi`
-+
-+libspeex/preprocess.lo: libspeex/preprocess.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/preprocess.lo -MD -MP -MF "libspeex/$(DEPDIR)/preprocess.Tpo" -c -o libspeex/preprocess.lo `test -f 'libspeex/preprocess.c' || echo '$(srcdir)/'`libspeex/preprocess.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/preprocess.Tpo" "libspeex/$(DEPDIR)/preprocess.Plo"; else rm -f "libspeex/$(DEPDIR)/preprocess.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/preprocess.c' object='libspeex/preprocess.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/preprocess.Plo' tmpdepfile='libspeex/$(DEPDIR)/preprocess.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/preprocess.lo `test -f 'libspeex/preprocess.c' || echo '$(srcdir)/'`libspeex/preprocess.c
-+
-+libspeex/smallft.o: libspeex/smallft.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/smallft.o -MD -MP -MF "libspeex/$(DEPDIR)/smallft.Tpo" -c -o libspeex/smallft.o `test -f 'libspeex/smallft.c' || echo '$(srcdir)/'`libspeex/smallft.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/smallft.Tpo" "libspeex/$(DEPDIR)/smallft.Po"; else rm -f "libspeex/$(DEPDIR)/smallft.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/smallft.c' object='libspeex/smallft.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/smallft.Po' tmpdepfile='libspeex/$(DEPDIR)/smallft.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/smallft.o `test -f 'libspeex/smallft.c' || echo '$(srcdir)/'`libspeex/smallft.c
-+
-+libspeex/smallft.obj: libspeex/smallft.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/smallft.obj -MD -MP -MF "libspeex/$(DEPDIR)/smallft.Tpo" -c -o libspeex/smallft.obj `if test -f 'libspeex/smallft.c'; then $(CYGPATH_W) 'libspeex/smallft.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/smallft.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/smallft.Tpo" "libspeex/$(DEPDIR)/smallft.Po"; else rm -f "libspeex/$(DEPDIR)/smallft.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/smallft.c' object='libspeex/smallft.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/smallft.Po' tmpdepfile='libspeex/$(DEPDIR)/smallft.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/smallft.obj `if test -f 'libspeex/smallft.c'; then $(CYGPATH_W) 'libspeex/smallft.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/smallft.c'; fi`
-+
-+libspeex/smallft.lo: libspeex/smallft.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/smallft.lo -MD -MP -MF "libspeex/$(DEPDIR)/smallft.Tpo" -c -o libspeex/smallft.lo `test -f 'libspeex/smallft.c' || echo '$(srcdir)/'`libspeex/smallft.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/smallft.Tpo" "libspeex/$(DEPDIR)/smallft.Plo"; else rm -f "libspeex/$(DEPDIR)/smallft.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/smallft.c' object='libspeex/smallft.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/smallft.Plo' tmpdepfile='libspeex/$(DEPDIR)/smallft.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/smallft.lo `test -f 'libspeex/smallft.c' || echo '$(srcdir)/'`libspeex/smallft.c
-+
-+libspeex/lbr_48k_tables.o: libspeex/lbr_48k_tables.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/lbr_48k_tables.o -MD -MP -MF "libspeex/$(DEPDIR)/lbr_48k_tables.Tpo" -c -o libspeex/lbr_48k_tables.o `test -f 'libspeex/lbr_48k_tables.c' || echo '$(srcdir)/'`libspeex/lbr_48k_tables.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/lbr_48k_tables.Tpo" "libspeex/$(DEPDIR)/lbr_48k_tables.Po"; else rm -f "libspeex/$(DEPDIR)/lbr_48k_tables.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/lbr_48k_tables.c' object='libspeex/lbr_48k_tables.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/lbr_48k_tables.Po' tmpdepfile='libspeex/$(DEPDIR)/lbr_48k_tables.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/lbr_48k_tables.o `test -f 'libspeex/lbr_48k_tables.c' || echo '$(srcdir)/'`libspeex/lbr_48k_tables.c
-+
-+libspeex/lbr_48k_tables.obj: libspeex/lbr_48k_tables.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/lbr_48k_tables.obj -MD -MP -MF "libspeex/$(DEPDIR)/lbr_48k_tables.Tpo" -c -o libspeex/lbr_48k_tables.obj `if test -f 'libspeex/lbr_48k_tables.c'; then $(CYGPATH_W) 'libspeex/lbr_48k_tables.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/lbr_48k_tables.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/lbr_48k_tables.Tpo" "libspeex/$(DEPDIR)/lbr_48k_tables.Po"; else rm -f "libspeex/$(DEPDIR)/lbr_48k_tables.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/lbr_48k_tables.c' object='libspeex/lbr_48k_tables.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/lbr_48k_tables.Po' tmpdepfile='libspeex/$(DEPDIR)/lbr_48k_tables.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/lbr_48k_tables.obj `if test -f 'libspeex/lbr_48k_tables.c'; then $(CYGPATH_W) 'libspeex/lbr_48k_tables.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/lbr_48k_tables.c'; fi`
-+
-+libspeex/lbr_48k_tables.lo: libspeex/lbr_48k_tables.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/lbr_48k_tables.lo -MD -MP -MF "libspeex/$(DEPDIR)/lbr_48k_tables.Tpo" -c -o libspeex/lbr_48k_tables.lo `test -f 'libspeex/lbr_48k_tables.c' || echo '$(srcdir)/'`libspeex/lbr_48k_tables.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/lbr_48k_tables.Tpo" "libspeex/$(DEPDIR)/lbr_48k_tables.Plo"; else rm -f "libspeex/$(DEPDIR)/lbr_48k_tables.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/lbr_48k_tables.c' object='libspeex/lbr_48k_tables.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/lbr_48k_tables.Plo' tmpdepfile='libspeex/$(DEPDIR)/lbr_48k_tables.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/lbr_48k_tables.lo `test -f 'libspeex/lbr_48k_tables.c' || echo '$(srcdir)/'`libspeex/lbr_48k_tables.c
-+
-+libspeex/jitter.o: libspeex/jitter.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/jitter.o -MD -MP -MF "libspeex/$(DEPDIR)/jitter.Tpo" -c -o libspeex/jitter.o `test -f 'libspeex/jitter.c' || echo '$(srcdir)/'`libspeex/jitter.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/jitter.Tpo" "libspeex/$(DEPDIR)/jitter.Po"; else rm -f "libspeex/$(DEPDIR)/jitter.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/jitter.c' object='libspeex/jitter.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/jitter.Po' tmpdepfile='libspeex/$(DEPDIR)/jitter.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/jitter.o `test -f 'libspeex/jitter.c' || echo '$(srcdir)/'`libspeex/jitter.c
-+
-+libspeex/jitter.obj: libspeex/jitter.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/jitter.obj -MD -MP -MF "libspeex/$(DEPDIR)/jitter.Tpo" -c -o libspeex/jitter.obj `if test -f 'libspeex/jitter.c'; then $(CYGPATH_W) 'libspeex/jitter.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/jitter.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/jitter.Tpo" "libspeex/$(DEPDIR)/jitter.Po"; else rm -f "libspeex/$(DEPDIR)/jitter.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/jitter.c' object='libspeex/jitter.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/jitter.Po' tmpdepfile='libspeex/$(DEPDIR)/jitter.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/jitter.obj `if test -f 'libspeex/jitter.c'; then $(CYGPATH_W) 'libspeex/jitter.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/jitter.c'; fi`
-+
-+libspeex/jitter.lo: libspeex/jitter.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/jitter.lo -MD -MP -MF "libspeex/$(DEPDIR)/jitter.Tpo" -c -o libspeex/jitter.lo `test -f 'libspeex/jitter.c' || echo '$(srcdir)/'`libspeex/jitter.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/jitter.Tpo" "libspeex/$(DEPDIR)/jitter.Plo"; else rm -f "libspeex/$(DEPDIR)/jitter.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/jitter.c' object='libspeex/jitter.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/jitter.Plo' tmpdepfile='libspeex/$(DEPDIR)/jitter.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/jitter.lo `test -f 'libspeex/jitter.c' || echo '$(srcdir)/'`libspeex/jitter.c
-+
-+libspeex/mdf.o: libspeex/mdf.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/mdf.o -MD -MP -MF "libspeex/$(DEPDIR)/mdf.Tpo" -c -o libspeex/mdf.o `test -f 'libspeex/mdf.c' || echo '$(srcdir)/'`libspeex/mdf.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/mdf.Tpo" "libspeex/$(DEPDIR)/mdf.Po"; else rm -f "libspeex/$(DEPDIR)/mdf.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/mdf.c' object='libspeex/mdf.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/mdf.Po' tmpdepfile='libspeex/$(DEPDIR)/mdf.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/mdf.o `test -f 'libspeex/mdf.c' || echo '$(srcdir)/'`libspeex/mdf.c
-+
-+libspeex/mdf.obj: libspeex/mdf.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/mdf.obj -MD -MP -MF "libspeex/$(DEPDIR)/mdf.Tpo" -c -o libspeex/mdf.obj `if test -f 'libspeex/mdf.c'; then $(CYGPATH_W) 'libspeex/mdf.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/mdf.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/mdf.Tpo" "libspeex/$(DEPDIR)/mdf.Po"; else rm -f "libspeex/$(DEPDIR)/mdf.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/mdf.c' object='libspeex/mdf.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/mdf.Po' tmpdepfile='libspeex/$(DEPDIR)/mdf.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/mdf.obj `if test -f 'libspeex/mdf.c'; then $(CYGPATH_W) 'libspeex/mdf.c'; else $(CYGPATH_W) '$(srcdir)/libspeex/mdf.c'; fi`
-+
-+libspeex/mdf.lo: libspeex/mdf.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspeex/mdf.lo -MD -MP -MF "libspeex/$(DEPDIR)/mdf.Tpo" -c -o libspeex/mdf.lo `test -f 'libspeex/mdf.c' || echo '$(srcdir)/'`libspeex/mdf.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "libspeex/$(DEPDIR)/mdf.Tpo" "libspeex/$(DEPDIR)/mdf.Plo"; else rm -f "libspeex/$(DEPDIR)/mdf.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libspeex/mdf.c' object='libspeex/mdf.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='libspeex/$(DEPDIR)/mdf.Plo' tmpdepfile='libspeex/$(DEPDIR)/mdf.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspeex/mdf.lo `test -f 'libspeex/mdf.c' || echo '$(srcdir)/'`libspeex/mdf.c
-+
-+portaudio/pa_win_wmme/pa_win_wmme.o: portaudio/pa_win_wmme/pa_win_wmme.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portaudio/pa_win_wmme/pa_win_wmme.o -MD -MP -MF "portaudio/pa_win_wmme/$(DEPDIR)/pa_win_wmme.Tpo" -c -o portaudio/pa_win_wmme/pa_win_wmme.o `test -f 'portaudio/pa_win_wmme/pa_win_wmme.c' || echo '$(srcdir)/'`portaudio/pa_win_wmme/pa_win_wmme.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "portaudio/pa_win_wmme/$(DEPDIR)/pa_win_wmme.Tpo" "portaudio/pa_win_wmme/$(DEPDIR)/pa_win_wmme.Po"; else rm -f "portaudio/pa_win_wmme/$(DEPDIR)/pa_win_wmme.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portaudio/pa_win_wmme/pa_win_wmme.c' object='portaudio/pa_win_wmme/pa_win_wmme.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portaudio/pa_win_wmme/$(DEPDIR)/pa_win_wmme.Po' tmpdepfile='portaudio/pa_win_wmme/$(DEPDIR)/pa_win_wmme.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portaudio/pa_win_wmme/pa_win_wmme.o `test -f 'portaudio/pa_win_wmme/pa_win_wmme.c' || echo '$(srcdir)/'`portaudio/pa_win_wmme/pa_win_wmme.c
-+
-+portaudio/pa_win_wmme/pa_win_wmme.obj: portaudio/pa_win_wmme/pa_win_wmme.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portaudio/pa_win_wmme/pa_win_wmme.obj -MD -MP -MF "portaudio/pa_win_wmme/$(DEPDIR)/pa_win_wmme.Tpo" -c -o portaudio/pa_win_wmme/pa_win_wmme.obj `if test -f 'portaudio/pa_win_wmme/pa_win_wmme.c'; then $(CYGPATH_W) 'portaudio/pa_win_wmme/pa_win_wmme.c'; else $(CYGPATH_W) '$(srcdir)/portaudio/pa_win_wmme/pa_win_wmme.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "portaudio/pa_win_wmme/$(DEPDIR)/pa_win_wmme.Tpo" "portaudio/pa_win_wmme/$(DEPDIR)/pa_win_wmme.Po"; else rm -f "portaudio/pa_win_wmme/$(DEPDIR)/pa_win_wmme.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portaudio/pa_win_wmme/pa_win_wmme.c' object='portaudio/pa_win_wmme/pa_win_wmme.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portaudio/pa_win_wmme/$(DEPDIR)/pa_win_wmme.Po' tmpdepfile='portaudio/pa_win_wmme/$(DEPDIR)/pa_win_wmme.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portaudio/pa_win_wmme/pa_win_wmme.obj `if test -f 'portaudio/pa_win_wmme/pa_win_wmme.c'; then $(CYGPATH_W) 'portaudio/pa_win_wmme/pa_win_wmme.c'; else $(CYGPATH_W) '$(srcdir)/portaudio/pa_win_wmme/pa_win_wmme.c'; fi`
-+
-+portaudio/pa_win_wmme/pa_win_wmme.lo: portaudio/pa_win_wmme/pa_win_wmme.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portaudio/pa_win_wmme/pa_win_wmme.lo -MD -MP -MF "portaudio/pa_win_wmme/$(DEPDIR)/pa_win_wmme.Tpo" -c -o portaudio/pa_win_wmme/pa_win_wmme.lo `test -f 'portaudio/pa_win_wmme/pa_win_wmme.c' || echo '$(srcdir)/'`portaudio/pa_win_wmme/pa_win_wmme.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "portaudio/pa_win_wmme/$(DEPDIR)/pa_win_wmme.Tpo" "portaudio/pa_win_wmme/$(DEPDIR)/pa_win_wmme.Plo"; else rm -f "portaudio/pa_win_wmme/$(DEPDIR)/pa_win_wmme.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portaudio/pa_win_wmme/pa_win_wmme.c' object='portaudio/pa_win_wmme/pa_win_wmme.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portaudio/pa_win_wmme/$(DEPDIR)/pa_win_wmme.Plo' tmpdepfile='portaudio/pa_win_wmme/$(DEPDIR)/pa_win_wmme.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portaudio/pa_win_wmme/pa_win_wmme.lo `test -f 'portaudio/pa_win_wmme/pa_win_wmme.c' || echo '$(srcdir)/'`portaudio/pa_win_wmme/pa_win_wmme.c
-+
-+portaudio/pa_unix_oss/pa_unix_oss.o: portaudio/pa_unix_oss/pa_unix_oss.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portaudio/pa_unix_oss/pa_unix_oss.o -MD -MP -MF "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_oss.Tpo" -c -o portaudio/pa_unix_oss/pa_unix_oss.o `test -f 'portaudio/pa_unix_oss/pa_unix_oss.c' || echo '$(srcdir)/'`portaudio/pa_unix_oss/pa_unix_oss.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_oss.Tpo" "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_oss.Po"; else rm -f "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_oss.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portaudio/pa_unix_oss/pa_unix_oss.c' object='portaudio/pa_unix_oss/pa_unix_oss.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_oss.Po' tmpdepfile='portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_oss.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portaudio/pa_unix_oss/pa_unix_oss.o `test -f 'portaudio/pa_unix_oss/pa_unix_oss.c' || echo '$(srcdir)/'`portaudio/pa_unix_oss/pa_unix_oss.c
-+
-+portaudio/pa_unix_oss/pa_unix_oss.obj: portaudio/pa_unix_oss/pa_unix_oss.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portaudio/pa_unix_oss/pa_unix_oss.obj -MD -MP -MF "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_oss.Tpo" -c -o portaudio/pa_unix_oss/pa_unix_oss.obj `if test -f 'portaudio/pa_unix_oss/pa_unix_oss.c'; then $(CYGPATH_W) 'portaudio/pa_unix_oss/pa_unix_oss.c'; else $(CYGPATH_W) '$(srcdir)/portaudio/pa_unix_oss/pa_unix_oss.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_oss.Tpo" "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_oss.Po"; else rm -f "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_oss.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portaudio/pa_unix_oss/pa_unix_oss.c' object='portaudio/pa_unix_oss/pa_unix_oss.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_oss.Po' tmpdepfile='portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_oss.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portaudio/pa_unix_oss/pa_unix_oss.obj `if test -f 'portaudio/pa_unix_oss/pa_unix_oss.c'; then $(CYGPATH_W) 'portaudio/pa_unix_oss/pa_unix_oss.c'; else $(CYGPATH_W) '$(srcdir)/portaudio/pa_unix_oss/pa_unix_oss.c'; fi`
-+
-+portaudio/pa_unix_oss/pa_unix_oss.lo: portaudio/pa_unix_oss/pa_unix_oss.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portaudio/pa_unix_oss/pa_unix_oss.lo -MD -MP -MF "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_oss.Tpo" -c -o portaudio/pa_unix_oss/pa_unix_oss.lo `test -f 'portaudio/pa_unix_oss/pa_unix_oss.c' || echo '$(srcdir)/'`portaudio/pa_unix_oss/pa_unix_oss.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_oss.Tpo" "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_oss.Plo"; else rm -f "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_oss.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portaudio/pa_unix_oss/pa_unix_oss.c' object='portaudio/pa_unix_oss/pa_unix_oss.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_oss.Plo' tmpdepfile='portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_oss.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portaudio/pa_unix_oss/pa_unix_oss.lo `test -f 'portaudio/pa_unix_oss/pa_unix_oss.c' || echo '$(srcdir)/'`portaudio/pa_unix_oss/pa_unix_oss.c
-+
-+portaudio/pa_unix_oss/pa_unix.o: portaudio/pa_unix_oss/pa_unix.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portaudio/pa_unix_oss/pa_unix.o -MD -MP -MF "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix.Tpo" -c -o portaudio/pa_unix_oss/pa_unix.o `test -f 'portaudio/pa_unix_oss/pa_unix.c' || echo '$(srcdir)/'`portaudio/pa_unix_oss/pa_unix.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix.Tpo" "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix.Po"; else rm -f "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portaudio/pa_unix_oss/pa_unix.c' object='portaudio/pa_unix_oss/pa_unix.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portaudio/pa_unix_oss/$(DEPDIR)/pa_unix.Po' tmpdepfile='portaudio/pa_unix_oss/$(DEPDIR)/pa_unix.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portaudio/pa_unix_oss/pa_unix.o `test -f 'portaudio/pa_unix_oss/pa_unix.c' || echo '$(srcdir)/'`portaudio/pa_unix_oss/pa_unix.c
-+
-+portaudio/pa_unix_oss/pa_unix.obj: portaudio/pa_unix_oss/pa_unix.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portaudio/pa_unix_oss/pa_unix.obj -MD -MP -MF "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix.Tpo" -c -o portaudio/pa_unix_oss/pa_unix.obj `if test -f 'portaudio/pa_unix_oss/pa_unix.c'; then $(CYGPATH_W) 'portaudio/pa_unix_oss/pa_unix.c'; else $(CYGPATH_W) '$(srcdir)/portaudio/pa_unix_oss/pa_unix.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix.Tpo" "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix.Po"; else rm -f "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portaudio/pa_unix_oss/pa_unix.c' object='portaudio/pa_unix_oss/pa_unix.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portaudio/pa_unix_oss/$(DEPDIR)/pa_unix.Po' tmpdepfile='portaudio/pa_unix_oss/$(DEPDIR)/pa_unix.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portaudio/pa_unix_oss/pa_unix.obj `if test -f 'portaudio/pa_unix_oss/pa_unix.c'; then $(CYGPATH_W) 'portaudio/pa_unix_oss/pa_unix.c'; else $(CYGPATH_W) '$(srcdir)/portaudio/pa_unix_oss/pa_unix.c'; fi`
-+
-+portaudio/pa_unix_oss/pa_unix.lo: portaudio/pa_unix_oss/pa_unix.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portaudio/pa_unix_oss/pa_unix.lo -MD -MP -MF "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix.Tpo" -c -o portaudio/pa_unix_oss/pa_unix.lo `test -f 'portaudio/pa_unix_oss/pa_unix.c' || echo '$(srcdir)/'`portaudio/pa_unix_oss/pa_unix.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix.Tpo" "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix.Plo"; else rm -f "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portaudio/pa_unix_oss/pa_unix.c' object='portaudio/pa_unix_oss/pa_unix.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portaudio/pa_unix_oss/$(DEPDIR)/pa_unix.Plo' tmpdepfile='portaudio/pa_unix_oss/$(DEPDIR)/pa_unix.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portaudio/pa_unix_oss/pa_unix.lo `test -f 'portaudio/pa_unix_oss/pa_unix.c' || echo '$(srcdir)/'`portaudio/pa_unix_oss/pa_unix.c
-+
-+portaudio/pa_unix_oss/pa_unix_solaris.o: portaudio/pa_unix_oss/pa_unix_solaris.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portaudio/pa_unix_oss/pa_unix_solaris.o -MD -MP -MF "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_solaris.Tpo" -c -o portaudio/pa_unix_oss/pa_unix_solaris.o `test -f 'portaudio/pa_unix_oss/pa_unix_solaris.c' || echo '$(srcdir)/'`portaudio/pa_unix_oss/pa_unix_solaris.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_solaris.Tpo" "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_solaris.Po"; else rm -f "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_solaris.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portaudio/pa_unix_oss/pa_unix_solaris.c' object='portaudio/pa_unix_oss/pa_unix_solaris.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_solaris.Po' tmpdepfile='portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_solaris.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portaudio/pa_unix_oss/pa_unix_solaris.o `test -f 'portaudio/pa_unix_oss/pa_unix_solaris.c' || echo '$(srcdir)/'`portaudio/pa_unix_oss/pa_unix_solaris.c
-+
-+portaudio/pa_unix_oss/pa_unix_solaris.obj: portaudio/pa_unix_oss/pa_unix_solaris.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portaudio/pa_unix_oss/pa_unix_solaris.obj -MD -MP -MF "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_solaris.Tpo" -c -o portaudio/pa_unix_oss/pa_unix_solaris.obj `if test -f 'portaudio/pa_unix_oss/pa_unix_solaris.c'; then $(CYGPATH_W) 'portaudio/pa_unix_oss/pa_unix_solaris.c'; else $(CYGPATH_W) '$(srcdir)/portaudio/pa_unix_oss/pa_unix_solaris.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_solaris.Tpo" "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_solaris.Po"; else rm -f "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_solaris.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portaudio/pa_unix_oss/pa_unix_solaris.c' object='portaudio/pa_unix_oss/pa_unix_solaris.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_solaris.Po' tmpdepfile='portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_solaris.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portaudio/pa_unix_oss/pa_unix_solaris.obj `if test -f 'portaudio/pa_unix_oss/pa_unix_solaris.c'; then $(CYGPATH_W) 'portaudio/pa_unix_oss/pa_unix_solaris.c'; else $(CYGPATH_W) '$(srcdir)/portaudio/pa_unix_oss/pa_unix_solaris.c'; fi`
-+
-+portaudio/pa_unix_oss/pa_unix_solaris.lo: portaudio/pa_unix_oss/pa_unix_solaris.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portaudio/pa_unix_oss/pa_unix_solaris.lo -MD -MP -MF "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_solaris.Tpo" -c -o portaudio/pa_unix_oss/pa_unix_solaris.lo `test -f 'portaudio/pa_unix_oss/pa_unix_solaris.c' || echo '$(srcdir)/'`portaudio/pa_unix_oss/pa_unix_solaris.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_solaris.Tpo" "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_solaris.Plo"; else rm -f "portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_solaris.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portaudio/pa_unix_oss/pa_unix_solaris.c' object='portaudio/pa_unix_oss/pa_unix_solaris.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_solaris.Plo' tmpdepfile='portaudio/pa_unix_oss/$(DEPDIR)/pa_unix_solaris.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portaudio/pa_unix_oss/pa_unix_solaris.lo `test -f 'portaudio/pa_unix_oss/pa_unix_solaris.c' || echo '$(srcdir)/'`portaudio/pa_unix_oss/pa_unix_solaris.c
-+
-+portaudio/pa_common/pa_convert.o: portaudio/pa_common/pa_convert.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portaudio/pa_common/pa_convert.o -MD -MP -MF "portaudio/pa_common/$(DEPDIR)/pa_convert.Tpo" -c -o portaudio/pa_common/pa_convert.o `test -f 'portaudio/pa_common/pa_convert.c' || echo '$(srcdir)/'`portaudio/pa_common/pa_convert.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "portaudio/pa_common/$(DEPDIR)/pa_convert.Tpo" "portaudio/pa_common/$(DEPDIR)/pa_convert.Po"; else rm -f "portaudio/pa_common/$(DEPDIR)/pa_convert.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portaudio/pa_common/pa_convert.c' object='portaudio/pa_common/pa_convert.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portaudio/pa_common/$(DEPDIR)/pa_convert.Po' tmpdepfile='portaudio/pa_common/$(DEPDIR)/pa_convert.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portaudio/pa_common/pa_convert.o `test -f 'portaudio/pa_common/pa_convert.c' || echo '$(srcdir)/'`portaudio/pa_common/pa_convert.c
-+
-+portaudio/pa_common/pa_convert.obj: portaudio/pa_common/pa_convert.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portaudio/pa_common/pa_convert.obj -MD -MP -MF "portaudio/pa_common/$(DEPDIR)/pa_convert.Tpo" -c -o portaudio/pa_common/pa_convert.obj `if test -f 'portaudio/pa_common/pa_convert.c'; then $(CYGPATH_W) 'portaudio/pa_common/pa_convert.c'; else $(CYGPATH_W) '$(srcdir)/portaudio/pa_common/pa_convert.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "portaudio/pa_common/$(DEPDIR)/pa_convert.Tpo" "portaudio/pa_common/$(DEPDIR)/pa_convert.Po"; else rm -f "portaudio/pa_common/$(DEPDIR)/pa_convert.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portaudio/pa_common/pa_convert.c' object='portaudio/pa_common/pa_convert.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portaudio/pa_common/$(DEPDIR)/pa_convert.Po' tmpdepfile='portaudio/pa_common/$(DEPDIR)/pa_convert.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portaudio/pa_common/pa_convert.obj `if test -f 'portaudio/pa_common/pa_convert.c'; then $(CYGPATH_W) 'portaudio/pa_common/pa_convert.c'; else $(CYGPATH_W) '$(srcdir)/portaudio/pa_common/pa_convert.c'; fi`
-+
-+portaudio/pa_common/pa_convert.lo: portaudio/pa_common/pa_convert.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portaudio/pa_common/pa_convert.lo -MD -MP -MF "portaudio/pa_common/$(DEPDIR)/pa_convert.Tpo" -c -o portaudio/pa_common/pa_convert.lo `test -f 'portaudio/pa_common/pa_convert.c' || echo '$(srcdir)/'`portaudio/pa_common/pa_convert.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "portaudio/pa_common/$(DEPDIR)/pa_convert.Tpo" "portaudio/pa_common/$(DEPDIR)/pa_convert.Plo"; else rm -f "portaudio/pa_common/$(DEPDIR)/pa_convert.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portaudio/pa_common/pa_convert.c' object='portaudio/pa_common/pa_convert.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portaudio/pa_common/$(DEPDIR)/pa_convert.Plo' tmpdepfile='portaudio/pa_common/$(DEPDIR)/pa_convert.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portaudio/pa_common/pa_convert.lo `test -f 'portaudio/pa_common/pa_convert.c' || echo '$(srcdir)/'`portaudio/pa_common/pa_convert.c
-+
-+portaudio/pa_mac_core/pa_mac_core.o: portaudio/pa_mac_core/pa_mac_core.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portaudio/pa_mac_core/pa_mac_core.o -MD -MP -MF "portaudio/pa_mac_core/$(DEPDIR)/pa_mac_core.Tpo" -c -o portaudio/pa_mac_core/pa_mac_core.o `test -f 'portaudio/pa_mac_core/pa_mac_core.c' || echo '$(srcdir)/'`portaudio/pa_mac_core/pa_mac_core.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "portaudio/pa_mac_core/$(DEPDIR)/pa_mac_core.Tpo" "portaudio/pa_mac_core/$(DEPDIR)/pa_mac_core.Po"; else rm -f "portaudio/pa_mac_core/$(DEPDIR)/pa_mac_core.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portaudio/pa_mac_core/pa_mac_core.c' object='portaudio/pa_mac_core/pa_mac_core.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portaudio/pa_mac_core/$(DEPDIR)/pa_mac_core.Po' tmpdepfile='portaudio/pa_mac_core/$(DEPDIR)/pa_mac_core.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portaudio/pa_mac_core/pa_mac_core.o `test -f 'portaudio/pa_mac_core/pa_mac_core.c' || echo '$(srcdir)/'`portaudio/pa_mac_core/pa_mac_core.c
-+
-+portaudio/pa_mac_core/pa_mac_core.obj: portaudio/pa_mac_core/pa_mac_core.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portaudio/pa_mac_core/pa_mac_core.obj -MD -MP -MF "portaudio/pa_mac_core/$(DEPDIR)/pa_mac_core.Tpo" -c -o portaudio/pa_mac_core/pa_mac_core.obj `if test -f 'portaudio/pa_mac_core/pa_mac_core.c'; then $(CYGPATH_W) 'portaudio/pa_mac_core/pa_mac_core.c'; else $(CYGPATH_W) '$(srcdir)/portaudio/pa_mac_core/pa_mac_core.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "portaudio/pa_mac_core/$(DEPDIR)/pa_mac_core.Tpo" "portaudio/pa_mac_core/$(DEPDIR)/pa_mac_core.Po"; else rm -f "portaudio/pa_mac_core/$(DEPDIR)/pa_mac_core.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portaudio/pa_mac_core/pa_mac_core.c' object='portaudio/pa_mac_core/pa_mac_core.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portaudio/pa_mac_core/$(DEPDIR)/pa_mac_core.Po' tmpdepfile='portaudio/pa_mac_core/$(DEPDIR)/pa_mac_core.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portaudio/pa_mac_core/pa_mac_core.obj `if test -f 'portaudio/pa_mac_core/pa_mac_core.c'; then $(CYGPATH_W) 'portaudio/pa_mac_core/pa_mac_core.c'; else $(CYGPATH_W) '$(srcdir)/portaudio/pa_mac_core/pa_mac_core.c'; fi`
-+
-+portaudio/pa_mac_core/pa_mac_core.lo: portaudio/pa_mac_core/pa_mac_core.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portaudio/pa_mac_core/pa_mac_core.lo -MD -MP -MF "portaudio/pa_mac_core/$(DEPDIR)/pa_mac_core.Tpo" -c -o portaudio/pa_mac_core/pa_mac_core.lo `test -f 'portaudio/pa_mac_core/pa_mac_core.c' || echo '$(srcdir)/'`portaudio/pa_mac_core/pa_mac_core.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "portaudio/pa_mac_core/$(DEPDIR)/pa_mac_core.Tpo" "portaudio/pa_mac_core/$(DEPDIR)/pa_mac_core.Plo"; else rm -f "portaudio/pa_mac_core/$(DEPDIR)/pa_mac_core.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portaudio/pa_mac_core/pa_mac_core.c' object='portaudio/pa_mac_core/pa_mac_core.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portaudio/pa_mac_core/$(DEPDIR)/pa_mac_core.Plo' tmpdepfile='portaudio/pa_mac_core/$(DEPDIR)/pa_mac_core.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portaudio/pa_mac_core/pa_mac_core.lo `test -f 'portaudio/pa_mac_core/pa_mac_core.c' || echo '$(srcdir)/'`portaudio/pa_mac_core/pa_mac_core.c
-+
-+portaudio/pa_common/pa_lib.o: portaudio/pa_common/pa_lib.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portaudio/pa_common/pa_lib.o -MD -MP -MF "portaudio/pa_common/$(DEPDIR)/pa_lib.Tpo" -c -o portaudio/pa_common/pa_lib.o `test -f 'portaudio/pa_common/pa_lib.c' || echo '$(srcdir)/'`portaudio/pa_common/pa_lib.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "portaudio/pa_common/$(DEPDIR)/pa_lib.Tpo" "portaudio/pa_common/$(DEPDIR)/pa_lib.Po"; else rm -f "portaudio/pa_common/$(DEPDIR)/pa_lib.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portaudio/pa_common/pa_lib.c' object='portaudio/pa_common/pa_lib.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portaudio/pa_common/$(DEPDIR)/pa_lib.Po' tmpdepfile='portaudio/pa_common/$(DEPDIR)/pa_lib.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portaudio/pa_common/pa_lib.o `test -f 'portaudio/pa_common/pa_lib.c' || echo '$(srcdir)/'`portaudio/pa_common/pa_lib.c
-+
-+portaudio/pa_common/pa_lib.obj: portaudio/pa_common/pa_lib.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portaudio/pa_common/pa_lib.obj -MD -MP -MF "portaudio/pa_common/$(DEPDIR)/pa_lib.Tpo" -c -o portaudio/pa_common/pa_lib.obj `if test -f 'portaudio/pa_common/pa_lib.c'; then $(CYGPATH_W) 'portaudio/pa_common/pa_lib.c'; else $(CYGPATH_W) '$(srcdir)/portaudio/pa_common/pa_lib.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "portaudio/pa_common/$(DEPDIR)/pa_lib.Tpo" "portaudio/pa_common/$(DEPDIR)/pa_lib.Po"; else rm -f "portaudio/pa_common/$(DEPDIR)/pa_lib.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portaudio/pa_common/pa_lib.c' object='portaudio/pa_common/pa_lib.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portaudio/pa_common/$(DEPDIR)/pa_lib.Po' tmpdepfile='portaudio/pa_common/$(DEPDIR)/pa_lib.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portaudio/pa_common/pa_lib.obj `if test -f 'portaudio/pa_common/pa_lib.c'; then $(CYGPATH_W) 'portaudio/pa_common/pa_lib.c'; else $(CYGPATH_W) '$(srcdir)/portaudio/pa_common/pa_lib.c'; fi`
-+
-+portaudio/pa_common/pa_lib.lo: portaudio/pa_common/pa_lib.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portaudio/pa_common/pa_lib.lo -MD -MP -MF "portaudio/pa_common/$(DEPDIR)/pa_lib.Tpo" -c -o portaudio/pa_common/pa_lib.lo `test -f 'portaudio/pa_common/pa_lib.c' || echo '$(srcdir)/'`portaudio/pa_common/pa_lib.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "portaudio/pa_common/$(DEPDIR)/pa_lib.Tpo" "portaudio/pa_common/$(DEPDIR)/pa_lib.Plo"; else rm -f "portaudio/pa_common/$(DEPDIR)/pa_lib.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portaudio/pa_common/pa_lib.c' object='portaudio/pa_common/pa_lib.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portaudio/pa_common/$(DEPDIR)/pa_lib.Plo' tmpdepfile='portaudio/pa_common/$(DEPDIR)/pa_lib.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portaudio/pa_common/pa_lib.lo `test -f 'portaudio/pa_common/pa_lib.c' || echo '$(srcdir)/'`portaudio/pa_common/pa_lib.c
-+
-+portaudio/pablio/pablio.o: portaudio/pablio/pablio.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portaudio/pablio/pablio.o -MD -MP -MF "portaudio/pablio/$(DEPDIR)/pablio.Tpo" -c -o portaudio/pablio/pablio.o `test -f 'portaudio/pablio/pablio.c' || echo '$(srcdir)/'`portaudio/pablio/pablio.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "portaudio/pablio/$(DEPDIR)/pablio.Tpo" "portaudio/pablio/$(DEPDIR)/pablio.Po"; else rm -f "portaudio/pablio/$(DEPDIR)/pablio.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portaudio/pablio/pablio.c' object='portaudio/pablio/pablio.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portaudio/pablio/$(DEPDIR)/pablio.Po' tmpdepfile='portaudio/pablio/$(DEPDIR)/pablio.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portaudio/pablio/pablio.o `test -f 'portaudio/pablio/pablio.c' || echo '$(srcdir)/'`portaudio/pablio/pablio.c
-+
-+portaudio/pablio/pablio.obj: portaudio/pablio/pablio.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portaudio/pablio/pablio.obj -MD -MP -MF "portaudio/pablio/$(DEPDIR)/pablio.Tpo" -c -o portaudio/pablio/pablio.obj `if test -f 'portaudio/pablio/pablio.c'; then $(CYGPATH_W) 'portaudio/pablio/pablio.c'; else $(CYGPATH_W) '$(srcdir)/portaudio/pablio/pablio.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "portaudio/pablio/$(DEPDIR)/pablio.Tpo" "portaudio/pablio/$(DEPDIR)/pablio.Po"; else rm -f "portaudio/pablio/$(DEPDIR)/pablio.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portaudio/pablio/pablio.c' object='portaudio/pablio/pablio.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portaudio/pablio/$(DEPDIR)/pablio.Po' tmpdepfile='portaudio/pablio/$(DEPDIR)/pablio.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portaudio/pablio/pablio.obj `if test -f 'portaudio/pablio/pablio.c'; then $(CYGPATH_W) 'portaudio/pablio/pablio.c'; else $(CYGPATH_W) '$(srcdir)/portaudio/pablio/pablio.c'; fi`
-+
-+portaudio/pablio/pablio.lo: portaudio/pablio/pablio.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portaudio/pablio/pablio.lo -MD -MP -MF "portaudio/pablio/$(DEPDIR)/pablio.Tpo" -c -o portaudio/pablio/pablio.lo `test -f 'portaudio/pablio/pablio.c' || echo '$(srcdir)/'`portaudio/pablio/pablio.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "portaudio/pablio/$(DEPDIR)/pablio.Tpo" "portaudio/pablio/$(DEPDIR)/pablio.Plo"; else rm -f "portaudio/pablio/$(DEPDIR)/pablio.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portaudio/pablio/pablio.c' object='portaudio/pablio/pablio.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portaudio/pablio/$(DEPDIR)/pablio.Plo' tmpdepfile='portaudio/pablio/$(DEPDIR)/pablio.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portaudio/pablio/pablio.lo `test -f 'portaudio/pablio/pablio.c' || echo '$(srcdir)/'`portaudio/pablio/pablio.c
-+
-+portaudio/pablio/ringbuffer.o: portaudio/pablio/ringbuffer.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portaudio/pablio/ringbuffer.o -MD -MP -MF "portaudio/pablio/$(DEPDIR)/ringbuffer.Tpo" -c -o portaudio/pablio/ringbuffer.o `test -f 'portaudio/pablio/ringbuffer.c' || echo '$(srcdir)/'`portaudio/pablio/ringbuffer.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "portaudio/pablio/$(DEPDIR)/ringbuffer.Tpo" "portaudio/pablio/$(DEPDIR)/ringbuffer.Po"; else rm -f "portaudio/pablio/$(DEPDIR)/ringbuffer.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portaudio/pablio/ringbuffer.c' object='portaudio/pablio/ringbuffer.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portaudio/pablio/$(DEPDIR)/ringbuffer.Po' tmpdepfile='portaudio/pablio/$(DEPDIR)/ringbuffer.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portaudio/pablio/ringbuffer.o `test -f 'portaudio/pablio/ringbuffer.c' || echo '$(srcdir)/'`portaudio/pablio/ringbuffer.c
-+
-+portaudio/pablio/ringbuffer.obj: portaudio/pablio/ringbuffer.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portaudio/pablio/ringbuffer.obj -MD -MP -MF "portaudio/pablio/$(DEPDIR)/ringbuffer.Tpo" -c -o portaudio/pablio/ringbuffer.obj `if test -f 'portaudio/pablio/ringbuffer.c'; then $(CYGPATH_W) 'portaudio/pablio/ringbuffer.c'; else $(CYGPATH_W) '$(srcdir)/portaudio/pablio/ringbuffer.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "portaudio/pablio/$(DEPDIR)/ringbuffer.Tpo" "portaudio/pablio/$(DEPDIR)/ringbuffer.Po"; else rm -f "portaudio/pablio/$(DEPDIR)/ringbuffer.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portaudio/pablio/ringbuffer.c' object='portaudio/pablio/ringbuffer.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portaudio/pablio/$(DEPDIR)/ringbuffer.Po' tmpdepfile='portaudio/pablio/$(DEPDIR)/ringbuffer.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portaudio/pablio/ringbuffer.obj `if test -f 'portaudio/pablio/ringbuffer.c'; then $(CYGPATH_W) 'portaudio/pablio/ringbuffer.c'; else $(CYGPATH_W) '$(srcdir)/portaudio/pablio/ringbuffer.c'; fi`
-+
-+portaudio/pablio/ringbuffer.lo: portaudio/pablio/ringbuffer.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portaudio/pablio/ringbuffer.lo -MD -MP -MF "portaudio/pablio/$(DEPDIR)/ringbuffer.Tpo" -c -o portaudio/pablio/ringbuffer.lo `test -f 'portaudio/pablio/ringbuffer.c' || echo '$(srcdir)/'`portaudio/pablio/ringbuffer.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "portaudio/pablio/$(DEPDIR)/ringbuffer.Tpo" "portaudio/pablio/$(DEPDIR)/ringbuffer.Plo"; else rm -f "portaudio/pablio/$(DEPDIR)/ringbuffer.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='portaudio/pablio/ringbuffer.c' object='portaudio/pablio/ringbuffer.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='portaudio/pablio/$(DEPDIR)/ringbuffer.Plo' tmpdepfile='portaudio/pablio/$(DEPDIR)/ringbuffer.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portaudio/pablio/ringbuffer.lo `test -f 'portaudio/pablio/ringbuffer.c' || echo '$(srcdir)/'`portaudio/pablio/ringbuffer.c
-+
-+spandsp/plc.o: spandsp/plc.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT spandsp/plc.o -MD -MP -MF "spandsp/$(DEPDIR)/plc.Tpo" -c -o spandsp/plc.o `test -f 'spandsp/plc.c' || echo '$(srcdir)/'`spandsp/plc.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "spandsp/$(DEPDIR)/plc.Tpo" "spandsp/$(DEPDIR)/plc.Po"; else rm -f "spandsp/$(DEPDIR)/plc.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='spandsp/plc.c' object='spandsp/plc.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='spandsp/$(DEPDIR)/plc.Po' tmpdepfile='spandsp/$(DEPDIR)/plc.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o spandsp/plc.o `test -f 'spandsp/plc.c' || echo '$(srcdir)/'`spandsp/plc.c
-+
-+spandsp/plc.obj: spandsp/plc.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT spandsp/plc.obj -MD -MP -MF "spandsp/$(DEPDIR)/plc.Tpo" -c -o spandsp/plc.obj `if test -f 'spandsp/plc.c'; then $(CYGPATH_W) 'spandsp/plc.c'; else $(CYGPATH_W) '$(srcdir)/spandsp/plc.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "spandsp/$(DEPDIR)/plc.Tpo" "spandsp/$(DEPDIR)/plc.Po"; else rm -f "spandsp/$(DEPDIR)/plc.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='spandsp/plc.c' object='spandsp/plc.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='spandsp/$(DEPDIR)/plc.Po' tmpdepfile='spandsp/$(DEPDIR)/plc.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o spandsp/plc.obj `if test -f 'spandsp/plc.c'; then $(CYGPATH_W) 'spandsp/plc.c'; else $(CYGPATH_W) '$(srcdir)/spandsp/plc.c'; fi`
-+
-+spandsp/plc.lo: spandsp/plc.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT spandsp/plc.lo -MD -MP -MF "spandsp/$(DEPDIR)/plc.Tpo" -c -o spandsp/plc.lo `test -f 'spandsp/plc.c' || echo '$(srcdir)/'`spandsp/plc.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "spandsp/$(DEPDIR)/plc.Tpo" "spandsp/$(DEPDIR)/plc.Plo"; else rm -f "spandsp/$(DEPDIR)/plc.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='spandsp/plc.c' object='spandsp/plc.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='spandsp/$(DEPDIR)/plc.Plo' tmpdepfile='spandsp/$(DEPDIR)/plc.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o spandsp/plc.lo `test -f 'spandsp/plc.c' || echo '$(srcdir)/'`spandsp/plc.c
-+
-+iLBC/anaFilter.o: iLBC/anaFilter.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/anaFilter.o -MD -MP -MF "iLBC/$(DEPDIR)/anaFilter.Tpo" -c -o iLBC/anaFilter.o `test -f 'iLBC/anaFilter.c' || echo '$(srcdir)/'`iLBC/anaFilter.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/anaFilter.Tpo" "iLBC/$(DEPDIR)/anaFilter.Po"; else rm -f "iLBC/$(DEPDIR)/anaFilter.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/anaFilter.c' object='iLBC/anaFilter.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/anaFilter.Po' tmpdepfile='iLBC/$(DEPDIR)/anaFilter.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/anaFilter.o `test -f 'iLBC/anaFilter.c' || echo '$(srcdir)/'`iLBC/anaFilter.c
-+
-+iLBC/anaFilter.obj: iLBC/anaFilter.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/anaFilter.obj -MD -MP -MF "iLBC/$(DEPDIR)/anaFilter.Tpo" -c -o iLBC/anaFilter.obj `if test -f 'iLBC/anaFilter.c'; then $(CYGPATH_W) 'iLBC/anaFilter.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/anaFilter.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/anaFilter.Tpo" "iLBC/$(DEPDIR)/anaFilter.Po"; else rm -f "iLBC/$(DEPDIR)/anaFilter.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/anaFilter.c' object='iLBC/anaFilter.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/anaFilter.Po' tmpdepfile='iLBC/$(DEPDIR)/anaFilter.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/anaFilter.obj `if test -f 'iLBC/anaFilter.c'; then $(CYGPATH_W) 'iLBC/anaFilter.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/anaFilter.c'; fi`
-+
-+iLBC/anaFilter.lo: iLBC/anaFilter.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/anaFilter.lo -MD -MP -MF "iLBC/$(DEPDIR)/anaFilter.Tpo" -c -o iLBC/anaFilter.lo `test -f 'iLBC/anaFilter.c' || echo '$(srcdir)/'`iLBC/anaFilter.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/anaFilter.Tpo" "iLBC/$(DEPDIR)/anaFilter.Plo"; else rm -f "iLBC/$(DEPDIR)/anaFilter.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/anaFilter.c' object='iLBC/anaFilter.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/anaFilter.Plo' tmpdepfile='iLBC/$(DEPDIR)/anaFilter.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/anaFilter.lo `test -f 'iLBC/anaFilter.c' || echo '$(srcdir)/'`iLBC/anaFilter.c
-+
-+iLBC/iCBSearch.o: iLBC/iCBSearch.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/iCBSearch.o -MD -MP -MF "iLBC/$(DEPDIR)/iCBSearch.Tpo" -c -o iLBC/iCBSearch.o `test -f 'iLBC/iCBSearch.c' || echo '$(srcdir)/'`iLBC/iCBSearch.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/iCBSearch.Tpo" "iLBC/$(DEPDIR)/iCBSearch.Po"; else rm -f "iLBC/$(DEPDIR)/iCBSearch.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/iCBSearch.c' object='iLBC/iCBSearch.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/iCBSearch.Po' tmpdepfile='iLBC/$(DEPDIR)/iCBSearch.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/iCBSearch.o `test -f 'iLBC/iCBSearch.c' || echo '$(srcdir)/'`iLBC/iCBSearch.c
-+
-+iLBC/iCBSearch.obj: iLBC/iCBSearch.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/iCBSearch.obj -MD -MP -MF "iLBC/$(DEPDIR)/iCBSearch.Tpo" -c -o iLBC/iCBSearch.obj `if test -f 'iLBC/iCBSearch.c'; then $(CYGPATH_W) 'iLBC/iCBSearch.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/iCBSearch.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/iCBSearch.Tpo" "iLBC/$(DEPDIR)/iCBSearch.Po"; else rm -f "iLBC/$(DEPDIR)/iCBSearch.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/iCBSearch.c' object='iLBC/iCBSearch.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/iCBSearch.Po' tmpdepfile='iLBC/$(DEPDIR)/iCBSearch.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/iCBSearch.obj `if test -f 'iLBC/iCBSearch.c'; then $(CYGPATH_W) 'iLBC/iCBSearch.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/iCBSearch.c'; fi`
-+
-+iLBC/iCBSearch.lo: iLBC/iCBSearch.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/iCBSearch.lo -MD -MP -MF "iLBC/$(DEPDIR)/iCBSearch.Tpo" -c -o iLBC/iCBSearch.lo `test -f 'iLBC/iCBSearch.c' || echo '$(srcdir)/'`iLBC/iCBSearch.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/iCBSearch.Tpo" "iLBC/$(DEPDIR)/iCBSearch.Plo"; else rm -f "iLBC/$(DEPDIR)/iCBSearch.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/iCBSearch.c' object='iLBC/iCBSearch.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/iCBSearch.Plo' tmpdepfile='iLBC/$(DEPDIR)/iCBSearch.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/iCBSearch.lo `test -f 'iLBC/iCBSearch.c' || echo '$(srcdir)/'`iLBC/iCBSearch.c
-+
-+iLBC/packing.o: iLBC/packing.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/packing.o -MD -MP -MF "iLBC/$(DEPDIR)/packing.Tpo" -c -o iLBC/packing.o `test -f 'iLBC/packing.c' || echo '$(srcdir)/'`iLBC/packing.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/packing.Tpo" "iLBC/$(DEPDIR)/packing.Po"; else rm -f "iLBC/$(DEPDIR)/packing.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/packing.c' object='iLBC/packing.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/packing.Po' tmpdepfile='iLBC/$(DEPDIR)/packing.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/packing.o `test -f 'iLBC/packing.c' || echo '$(srcdir)/'`iLBC/packing.c
-+
-+iLBC/packing.obj: iLBC/packing.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/packing.obj -MD -MP -MF "iLBC/$(DEPDIR)/packing.Tpo" -c -o iLBC/packing.obj `if test -f 'iLBC/packing.c'; then $(CYGPATH_W) 'iLBC/packing.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/packing.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/packing.Tpo" "iLBC/$(DEPDIR)/packing.Po"; else rm -f "iLBC/$(DEPDIR)/packing.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/packing.c' object='iLBC/packing.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/packing.Po' tmpdepfile='iLBC/$(DEPDIR)/packing.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/packing.obj `if test -f 'iLBC/packing.c'; then $(CYGPATH_W) 'iLBC/packing.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/packing.c'; fi`
-+
-+iLBC/packing.lo: iLBC/packing.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/packing.lo -MD -MP -MF "iLBC/$(DEPDIR)/packing.Tpo" -c -o iLBC/packing.lo `test -f 'iLBC/packing.c' || echo '$(srcdir)/'`iLBC/packing.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/packing.Tpo" "iLBC/$(DEPDIR)/packing.Plo"; else rm -f "iLBC/$(DEPDIR)/packing.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/packing.c' object='iLBC/packing.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/packing.Plo' tmpdepfile='iLBC/$(DEPDIR)/packing.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/packing.lo `test -f 'iLBC/packing.c' || echo '$(srcdir)/'`iLBC/packing.c
-+
-+iLBC/constants.o: iLBC/constants.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/constants.o -MD -MP -MF "iLBC/$(DEPDIR)/constants.Tpo" -c -o iLBC/constants.o `test -f 'iLBC/constants.c' || echo '$(srcdir)/'`iLBC/constants.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/constants.Tpo" "iLBC/$(DEPDIR)/constants.Po"; else rm -f "iLBC/$(DEPDIR)/constants.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/constants.c' object='iLBC/constants.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/constants.Po' tmpdepfile='iLBC/$(DEPDIR)/constants.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/constants.o `test -f 'iLBC/constants.c' || echo '$(srcdir)/'`iLBC/constants.c
-+
-+iLBC/constants.obj: iLBC/constants.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/constants.obj -MD -MP -MF "iLBC/$(DEPDIR)/constants.Tpo" -c -o iLBC/constants.obj `if test -f 'iLBC/constants.c'; then $(CYGPATH_W) 'iLBC/constants.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/constants.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/constants.Tpo" "iLBC/$(DEPDIR)/constants.Po"; else rm -f "iLBC/$(DEPDIR)/constants.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/constants.c' object='iLBC/constants.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/constants.Po' tmpdepfile='iLBC/$(DEPDIR)/constants.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/constants.obj `if test -f 'iLBC/constants.c'; then $(CYGPATH_W) 'iLBC/constants.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/constants.c'; fi`
-+
-+iLBC/constants.lo: iLBC/constants.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/constants.lo -MD -MP -MF "iLBC/$(DEPDIR)/constants.Tpo" -c -o iLBC/constants.lo `test -f 'iLBC/constants.c' || echo '$(srcdir)/'`iLBC/constants.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/constants.Tpo" "iLBC/$(DEPDIR)/constants.Plo"; else rm -f "iLBC/$(DEPDIR)/constants.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/constants.c' object='iLBC/constants.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/constants.Plo' tmpdepfile='iLBC/$(DEPDIR)/constants.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/constants.lo `test -f 'iLBC/constants.c' || echo '$(srcdir)/'`iLBC/constants.c
-+
-+iLBC/gainquant.o: iLBC/gainquant.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/gainquant.o -MD -MP -MF "iLBC/$(DEPDIR)/gainquant.Tpo" -c -o iLBC/gainquant.o `test -f 'iLBC/gainquant.c' || echo '$(srcdir)/'`iLBC/gainquant.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/gainquant.Tpo" "iLBC/$(DEPDIR)/gainquant.Po"; else rm -f "iLBC/$(DEPDIR)/gainquant.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/gainquant.c' object='iLBC/gainquant.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/gainquant.Po' tmpdepfile='iLBC/$(DEPDIR)/gainquant.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/gainquant.o `test -f 'iLBC/gainquant.c' || echo '$(srcdir)/'`iLBC/gainquant.c
-+
-+iLBC/gainquant.obj: iLBC/gainquant.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/gainquant.obj -MD -MP -MF "iLBC/$(DEPDIR)/gainquant.Tpo" -c -o iLBC/gainquant.obj `if test -f 'iLBC/gainquant.c'; then $(CYGPATH_W) 'iLBC/gainquant.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/gainquant.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/gainquant.Tpo" "iLBC/$(DEPDIR)/gainquant.Po"; else rm -f "iLBC/$(DEPDIR)/gainquant.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/gainquant.c' object='iLBC/gainquant.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/gainquant.Po' tmpdepfile='iLBC/$(DEPDIR)/gainquant.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/gainquant.obj `if test -f 'iLBC/gainquant.c'; then $(CYGPATH_W) 'iLBC/gainquant.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/gainquant.c'; fi`
-+
-+iLBC/gainquant.lo: iLBC/gainquant.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/gainquant.lo -MD -MP -MF "iLBC/$(DEPDIR)/gainquant.Tpo" -c -o iLBC/gainquant.lo `test -f 'iLBC/gainquant.c' || echo '$(srcdir)/'`iLBC/gainquant.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/gainquant.Tpo" "iLBC/$(DEPDIR)/gainquant.Plo"; else rm -f "iLBC/$(DEPDIR)/gainquant.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/gainquant.c' object='iLBC/gainquant.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/gainquant.Plo' tmpdepfile='iLBC/$(DEPDIR)/gainquant.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/gainquant.lo `test -f 'iLBC/gainquant.c' || echo '$(srcdir)/'`iLBC/gainquant.c
-+
-+iLBC/iLBC_decode.o: iLBC/iLBC_decode.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/iLBC_decode.o -MD -MP -MF "iLBC/$(DEPDIR)/iLBC_decode.Tpo" -c -o iLBC/iLBC_decode.o `test -f 'iLBC/iLBC_decode.c' || echo '$(srcdir)/'`iLBC/iLBC_decode.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/iLBC_decode.Tpo" "iLBC/$(DEPDIR)/iLBC_decode.Po"; else rm -f "iLBC/$(DEPDIR)/iLBC_decode.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/iLBC_decode.c' object='iLBC/iLBC_decode.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/iLBC_decode.Po' tmpdepfile='iLBC/$(DEPDIR)/iLBC_decode.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/iLBC_decode.o `test -f 'iLBC/iLBC_decode.c' || echo '$(srcdir)/'`iLBC/iLBC_decode.c
-+
-+iLBC/iLBC_decode.obj: iLBC/iLBC_decode.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/iLBC_decode.obj -MD -MP -MF "iLBC/$(DEPDIR)/iLBC_decode.Tpo" -c -o iLBC/iLBC_decode.obj `if test -f 'iLBC/iLBC_decode.c'; then $(CYGPATH_W) 'iLBC/iLBC_decode.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/iLBC_decode.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/iLBC_decode.Tpo" "iLBC/$(DEPDIR)/iLBC_decode.Po"; else rm -f "iLBC/$(DEPDIR)/iLBC_decode.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/iLBC_decode.c' object='iLBC/iLBC_decode.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/iLBC_decode.Po' tmpdepfile='iLBC/$(DEPDIR)/iLBC_decode.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/iLBC_decode.obj `if test -f 'iLBC/iLBC_decode.c'; then $(CYGPATH_W) 'iLBC/iLBC_decode.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/iLBC_decode.c'; fi`
-+
-+iLBC/iLBC_decode.lo: iLBC/iLBC_decode.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/iLBC_decode.lo -MD -MP -MF "iLBC/$(DEPDIR)/iLBC_decode.Tpo" -c -o iLBC/iLBC_decode.lo `test -f 'iLBC/iLBC_decode.c' || echo '$(srcdir)/'`iLBC/iLBC_decode.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/iLBC_decode.Tpo" "iLBC/$(DEPDIR)/iLBC_decode.Plo"; else rm -f "iLBC/$(DEPDIR)/iLBC_decode.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/iLBC_decode.c' object='iLBC/iLBC_decode.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/iLBC_decode.Plo' tmpdepfile='iLBC/$(DEPDIR)/iLBC_decode.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/iLBC_decode.lo `test -f 'iLBC/iLBC_decode.c' || echo '$(srcdir)/'`iLBC/iLBC_decode.c
-+
-+iLBC/StateConstructW.o: iLBC/StateConstructW.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/StateConstructW.o -MD -MP -MF "iLBC/$(DEPDIR)/StateConstructW.Tpo" -c -o iLBC/StateConstructW.o `test -f 'iLBC/StateConstructW.c' || echo '$(srcdir)/'`iLBC/StateConstructW.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/StateConstructW.Tpo" "iLBC/$(DEPDIR)/StateConstructW.Po"; else rm -f "iLBC/$(DEPDIR)/StateConstructW.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/StateConstructW.c' object='iLBC/StateConstructW.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/StateConstructW.Po' tmpdepfile='iLBC/$(DEPDIR)/StateConstructW.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/StateConstructW.o `test -f 'iLBC/StateConstructW.c' || echo '$(srcdir)/'`iLBC/StateConstructW.c
-+
-+iLBC/StateConstructW.obj: iLBC/StateConstructW.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/StateConstructW.obj -MD -MP -MF "iLBC/$(DEPDIR)/StateConstructW.Tpo" -c -o iLBC/StateConstructW.obj `if test -f 'iLBC/StateConstructW.c'; then $(CYGPATH_W) 'iLBC/StateConstructW.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/StateConstructW.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/StateConstructW.Tpo" "iLBC/$(DEPDIR)/StateConstructW.Po"; else rm -f "iLBC/$(DEPDIR)/StateConstructW.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/StateConstructW.c' object='iLBC/StateConstructW.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/StateConstructW.Po' tmpdepfile='iLBC/$(DEPDIR)/StateConstructW.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/StateConstructW.obj `if test -f 'iLBC/StateConstructW.c'; then $(CYGPATH_W) 'iLBC/StateConstructW.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/StateConstructW.c'; fi`
-+
-+iLBC/StateConstructW.lo: iLBC/StateConstructW.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/StateConstructW.lo -MD -MP -MF "iLBC/$(DEPDIR)/StateConstructW.Tpo" -c -o iLBC/StateConstructW.lo `test -f 'iLBC/StateConstructW.c' || echo '$(srcdir)/'`iLBC/StateConstructW.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/StateConstructW.Tpo" "iLBC/$(DEPDIR)/StateConstructW.Plo"; else rm -f "iLBC/$(DEPDIR)/StateConstructW.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/StateConstructW.c' object='iLBC/StateConstructW.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/StateConstructW.Plo' tmpdepfile='iLBC/$(DEPDIR)/StateConstructW.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/StateConstructW.lo `test -f 'iLBC/StateConstructW.c' || echo '$(srcdir)/'`iLBC/StateConstructW.c
-+
-+iLBC/createCB.o: iLBC/createCB.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/createCB.o -MD -MP -MF "iLBC/$(DEPDIR)/createCB.Tpo" -c -o iLBC/createCB.o `test -f 'iLBC/createCB.c' || echo '$(srcdir)/'`iLBC/createCB.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/createCB.Tpo" "iLBC/$(DEPDIR)/createCB.Po"; else rm -f "iLBC/$(DEPDIR)/createCB.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/createCB.c' object='iLBC/createCB.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/createCB.Po' tmpdepfile='iLBC/$(DEPDIR)/createCB.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/createCB.o `test -f 'iLBC/createCB.c' || echo '$(srcdir)/'`iLBC/createCB.c
-+
-+iLBC/createCB.obj: iLBC/createCB.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/createCB.obj -MD -MP -MF "iLBC/$(DEPDIR)/createCB.Tpo" -c -o iLBC/createCB.obj `if test -f 'iLBC/createCB.c'; then $(CYGPATH_W) 'iLBC/createCB.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/createCB.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/createCB.Tpo" "iLBC/$(DEPDIR)/createCB.Po"; else rm -f "iLBC/$(DEPDIR)/createCB.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/createCB.c' object='iLBC/createCB.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/createCB.Po' tmpdepfile='iLBC/$(DEPDIR)/createCB.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/createCB.obj `if test -f 'iLBC/createCB.c'; then $(CYGPATH_W) 'iLBC/createCB.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/createCB.c'; fi`
-+
-+iLBC/createCB.lo: iLBC/createCB.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/createCB.lo -MD -MP -MF "iLBC/$(DEPDIR)/createCB.Tpo" -c -o iLBC/createCB.lo `test -f 'iLBC/createCB.c' || echo '$(srcdir)/'`iLBC/createCB.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/createCB.Tpo" "iLBC/$(DEPDIR)/createCB.Plo"; else rm -f "iLBC/$(DEPDIR)/createCB.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/createCB.c' object='iLBC/createCB.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/createCB.Plo' tmpdepfile='iLBC/$(DEPDIR)/createCB.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/createCB.lo `test -f 'iLBC/createCB.c' || echo '$(srcdir)/'`iLBC/createCB.c
-+
-+iLBC/getCBvec.o: iLBC/getCBvec.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/getCBvec.o -MD -MP -MF "iLBC/$(DEPDIR)/getCBvec.Tpo" -c -o iLBC/getCBvec.o `test -f 'iLBC/getCBvec.c' || echo '$(srcdir)/'`iLBC/getCBvec.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/getCBvec.Tpo" "iLBC/$(DEPDIR)/getCBvec.Po"; else rm -f "iLBC/$(DEPDIR)/getCBvec.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/getCBvec.c' object='iLBC/getCBvec.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/getCBvec.Po' tmpdepfile='iLBC/$(DEPDIR)/getCBvec.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/getCBvec.o `test -f 'iLBC/getCBvec.c' || echo '$(srcdir)/'`iLBC/getCBvec.c
-+
-+iLBC/getCBvec.obj: iLBC/getCBvec.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/getCBvec.obj -MD -MP -MF "iLBC/$(DEPDIR)/getCBvec.Tpo" -c -o iLBC/getCBvec.obj `if test -f 'iLBC/getCBvec.c'; then $(CYGPATH_W) 'iLBC/getCBvec.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/getCBvec.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/getCBvec.Tpo" "iLBC/$(DEPDIR)/getCBvec.Po"; else rm -f "iLBC/$(DEPDIR)/getCBvec.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/getCBvec.c' object='iLBC/getCBvec.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/getCBvec.Po' tmpdepfile='iLBC/$(DEPDIR)/getCBvec.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/getCBvec.obj `if test -f 'iLBC/getCBvec.c'; then $(CYGPATH_W) 'iLBC/getCBvec.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/getCBvec.c'; fi`
-+
-+iLBC/getCBvec.lo: iLBC/getCBvec.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/getCBvec.lo -MD -MP -MF "iLBC/$(DEPDIR)/getCBvec.Tpo" -c -o iLBC/getCBvec.lo `test -f 'iLBC/getCBvec.c' || echo '$(srcdir)/'`iLBC/getCBvec.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/getCBvec.Tpo" "iLBC/$(DEPDIR)/getCBvec.Plo"; else rm -f "iLBC/$(DEPDIR)/getCBvec.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/getCBvec.c' object='iLBC/getCBvec.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/getCBvec.Plo' tmpdepfile='iLBC/$(DEPDIR)/getCBvec.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/getCBvec.lo `test -f 'iLBC/getCBvec.c' || echo '$(srcdir)/'`iLBC/getCBvec.c
-+
-+iLBC/iLBC_encode.o: iLBC/iLBC_encode.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/iLBC_encode.o -MD -MP -MF "iLBC/$(DEPDIR)/iLBC_encode.Tpo" -c -o iLBC/iLBC_encode.o `test -f 'iLBC/iLBC_encode.c' || echo '$(srcdir)/'`iLBC/iLBC_encode.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/iLBC_encode.Tpo" "iLBC/$(DEPDIR)/iLBC_encode.Po"; else rm -f "iLBC/$(DEPDIR)/iLBC_encode.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/iLBC_encode.c' object='iLBC/iLBC_encode.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/iLBC_encode.Po' tmpdepfile='iLBC/$(DEPDIR)/iLBC_encode.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/iLBC_encode.o `test -f 'iLBC/iLBC_encode.c' || echo '$(srcdir)/'`iLBC/iLBC_encode.c
-+
-+iLBC/iLBC_encode.obj: iLBC/iLBC_encode.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/iLBC_encode.obj -MD -MP -MF "iLBC/$(DEPDIR)/iLBC_encode.Tpo" -c -o iLBC/iLBC_encode.obj `if test -f 'iLBC/iLBC_encode.c'; then $(CYGPATH_W) 'iLBC/iLBC_encode.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/iLBC_encode.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/iLBC_encode.Tpo" "iLBC/$(DEPDIR)/iLBC_encode.Po"; else rm -f "iLBC/$(DEPDIR)/iLBC_encode.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/iLBC_encode.c' object='iLBC/iLBC_encode.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/iLBC_encode.Po' tmpdepfile='iLBC/$(DEPDIR)/iLBC_encode.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/iLBC_encode.obj `if test -f 'iLBC/iLBC_encode.c'; then $(CYGPATH_W) 'iLBC/iLBC_encode.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/iLBC_encode.c'; fi`
-+
-+iLBC/iLBC_encode.lo: iLBC/iLBC_encode.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/iLBC_encode.lo -MD -MP -MF "iLBC/$(DEPDIR)/iLBC_encode.Tpo" -c -o iLBC/iLBC_encode.lo `test -f 'iLBC/iLBC_encode.c' || echo '$(srcdir)/'`iLBC/iLBC_encode.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/iLBC_encode.Tpo" "iLBC/$(DEPDIR)/iLBC_encode.Plo"; else rm -f "iLBC/$(DEPDIR)/iLBC_encode.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/iLBC_encode.c' object='iLBC/iLBC_encode.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/iLBC_encode.Plo' tmpdepfile='iLBC/$(DEPDIR)/iLBC_encode.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/iLBC_encode.lo `test -f 'iLBC/iLBC_encode.c' || echo '$(srcdir)/'`iLBC/iLBC_encode.c
-+
-+iLBC/StateSearchW.o: iLBC/StateSearchW.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/StateSearchW.o -MD -MP -MF "iLBC/$(DEPDIR)/StateSearchW.Tpo" -c -o iLBC/StateSearchW.o `test -f 'iLBC/StateSearchW.c' || echo '$(srcdir)/'`iLBC/StateSearchW.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/StateSearchW.Tpo" "iLBC/$(DEPDIR)/StateSearchW.Po"; else rm -f "iLBC/$(DEPDIR)/StateSearchW.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/StateSearchW.c' object='iLBC/StateSearchW.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/StateSearchW.Po' tmpdepfile='iLBC/$(DEPDIR)/StateSearchW.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/StateSearchW.o `test -f 'iLBC/StateSearchW.c' || echo '$(srcdir)/'`iLBC/StateSearchW.c
-+
-+iLBC/StateSearchW.obj: iLBC/StateSearchW.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/StateSearchW.obj -MD -MP -MF "iLBC/$(DEPDIR)/StateSearchW.Tpo" -c -o iLBC/StateSearchW.obj `if test -f 'iLBC/StateSearchW.c'; then $(CYGPATH_W) 'iLBC/StateSearchW.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/StateSearchW.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/StateSearchW.Tpo" "iLBC/$(DEPDIR)/StateSearchW.Po"; else rm -f "iLBC/$(DEPDIR)/StateSearchW.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/StateSearchW.c' object='iLBC/StateSearchW.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/StateSearchW.Po' tmpdepfile='iLBC/$(DEPDIR)/StateSearchW.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/StateSearchW.obj `if test -f 'iLBC/StateSearchW.c'; then $(CYGPATH_W) 'iLBC/StateSearchW.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/StateSearchW.c'; fi`
-+
-+iLBC/StateSearchW.lo: iLBC/StateSearchW.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/StateSearchW.lo -MD -MP -MF "iLBC/$(DEPDIR)/StateSearchW.Tpo" -c -o iLBC/StateSearchW.lo `test -f 'iLBC/StateSearchW.c' || echo '$(srcdir)/'`iLBC/StateSearchW.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/StateSearchW.Tpo" "iLBC/$(DEPDIR)/StateSearchW.Plo"; else rm -f "iLBC/$(DEPDIR)/StateSearchW.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/StateSearchW.c' object='iLBC/StateSearchW.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/StateSearchW.Plo' tmpdepfile='iLBC/$(DEPDIR)/StateSearchW.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/StateSearchW.lo `test -f 'iLBC/StateSearchW.c' || echo '$(srcdir)/'`iLBC/StateSearchW.c
-+
-+iLBC/doCPLC.o: iLBC/doCPLC.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/doCPLC.o -MD -MP -MF "iLBC/$(DEPDIR)/doCPLC.Tpo" -c -o iLBC/doCPLC.o `test -f 'iLBC/doCPLC.c' || echo '$(srcdir)/'`iLBC/doCPLC.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/doCPLC.Tpo" "iLBC/$(DEPDIR)/doCPLC.Po"; else rm -f "iLBC/$(DEPDIR)/doCPLC.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/doCPLC.c' object='iLBC/doCPLC.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/doCPLC.Po' tmpdepfile='iLBC/$(DEPDIR)/doCPLC.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/doCPLC.o `test -f 'iLBC/doCPLC.c' || echo '$(srcdir)/'`iLBC/doCPLC.c
-+
-+iLBC/doCPLC.obj: iLBC/doCPLC.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/doCPLC.obj -MD -MP -MF "iLBC/$(DEPDIR)/doCPLC.Tpo" -c -o iLBC/doCPLC.obj `if test -f 'iLBC/doCPLC.c'; then $(CYGPATH_W) 'iLBC/doCPLC.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/doCPLC.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/doCPLC.Tpo" "iLBC/$(DEPDIR)/doCPLC.Po"; else rm -f "iLBC/$(DEPDIR)/doCPLC.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/doCPLC.c' object='iLBC/doCPLC.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/doCPLC.Po' tmpdepfile='iLBC/$(DEPDIR)/doCPLC.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/doCPLC.obj `if test -f 'iLBC/doCPLC.c'; then $(CYGPATH_W) 'iLBC/doCPLC.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/doCPLC.c'; fi`
-+
-+iLBC/doCPLC.lo: iLBC/doCPLC.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/doCPLC.lo -MD -MP -MF "iLBC/$(DEPDIR)/doCPLC.Tpo" -c -o iLBC/doCPLC.lo `test -f 'iLBC/doCPLC.c' || echo '$(srcdir)/'`iLBC/doCPLC.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/doCPLC.Tpo" "iLBC/$(DEPDIR)/doCPLC.Plo"; else rm -f "iLBC/$(DEPDIR)/doCPLC.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/doCPLC.c' object='iLBC/doCPLC.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/doCPLC.Plo' tmpdepfile='iLBC/$(DEPDIR)/doCPLC.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/doCPLC.lo `test -f 'iLBC/doCPLC.c' || echo '$(srcdir)/'`iLBC/doCPLC.c
-+
-+iLBC/helpfun.o: iLBC/helpfun.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/helpfun.o -MD -MP -MF "iLBC/$(DEPDIR)/helpfun.Tpo" -c -o iLBC/helpfun.o `test -f 'iLBC/helpfun.c' || echo '$(srcdir)/'`iLBC/helpfun.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/helpfun.Tpo" "iLBC/$(DEPDIR)/helpfun.Po"; else rm -f "iLBC/$(DEPDIR)/helpfun.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/helpfun.c' object='iLBC/helpfun.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/helpfun.Po' tmpdepfile='iLBC/$(DEPDIR)/helpfun.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/helpfun.o `test -f 'iLBC/helpfun.c' || echo '$(srcdir)/'`iLBC/helpfun.c
-+
-+iLBC/helpfun.obj: iLBC/helpfun.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/helpfun.obj -MD -MP -MF "iLBC/$(DEPDIR)/helpfun.Tpo" -c -o iLBC/helpfun.obj `if test -f 'iLBC/helpfun.c'; then $(CYGPATH_W) 'iLBC/helpfun.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/helpfun.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/helpfun.Tpo" "iLBC/$(DEPDIR)/helpfun.Po"; else rm -f "iLBC/$(DEPDIR)/helpfun.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/helpfun.c' object='iLBC/helpfun.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/helpfun.Po' tmpdepfile='iLBC/$(DEPDIR)/helpfun.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/helpfun.obj `if test -f 'iLBC/helpfun.c'; then $(CYGPATH_W) 'iLBC/helpfun.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/helpfun.c'; fi`
-+
-+iLBC/helpfun.lo: iLBC/helpfun.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/helpfun.lo -MD -MP -MF "iLBC/$(DEPDIR)/helpfun.Tpo" -c -o iLBC/helpfun.lo `test -f 'iLBC/helpfun.c' || echo '$(srcdir)/'`iLBC/helpfun.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/helpfun.Tpo" "iLBC/$(DEPDIR)/helpfun.Plo"; else rm -f "iLBC/$(DEPDIR)/helpfun.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/helpfun.c' object='iLBC/helpfun.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/helpfun.Plo' tmpdepfile='iLBC/$(DEPDIR)/helpfun.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/helpfun.lo `test -f 'iLBC/helpfun.c' || echo '$(srcdir)/'`iLBC/helpfun.c
-+
-+iLBC/syntFilter.o: iLBC/syntFilter.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/syntFilter.o -MD -MP -MF "iLBC/$(DEPDIR)/syntFilter.Tpo" -c -o iLBC/syntFilter.o `test -f 'iLBC/syntFilter.c' || echo '$(srcdir)/'`iLBC/syntFilter.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/syntFilter.Tpo" "iLBC/$(DEPDIR)/syntFilter.Po"; else rm -f "iLBC/$(DEPDIR)/syntFilter.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/syntFilter.c' object='iLBC/syntFilter.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/syntFilter.Po' tmpdepfile='iLBC/$(DEPDIR)/syntFilter.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/syntFilter.o `test -f 'iLBC/syntFilter.c' || echo '$(srcdir)/'`iLBC/syntFilter.c
-+
-+iLBC/syntFilter.obj: iLBC/syntFilter.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/syntFilter.obj -MD -MP -MF "iLBC/$(DEPDIR)/syntFilter.Tpo" -c -o iLBC/syntFilter.obj `if test -f 'iLBC/syntFilter.c'; then $(CYGPATH_W) 'iLBC/syntFilter.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/syntFilter.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/syntFilter.Tpo" "iLBC/$(DEPDIR)/syntFilter.Po"; else rm -f "iLBC/$(DEPDIR)/syntFilter.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/syntFilter.c' object='iLBC/syntFilter.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/syntFilter.Po' tmpdepfile='iLBC/$(DEPDIR)/syntFilter.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/syntFilter.obj `if test -f 'iLBC/syntFilter.c'; then $(CYGPATH_W) 'iLBC/syntFilter.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/syntFilter.c'; fi`
-+
-+iLBC/syntFilter.lo: iLBC/syntFilter.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/syntFilter.lo -MD -MP -MF "iLBC/$(DEPDIR)/syntFilter.Tpo" -c -o iLBC/syntFilter.lo `test -f 'iLBC/syntFilter.c' || echo '$(srcdir)/'`iLBC/syntFilter.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/syntFilter.Tpo" "iLBC/$(DEPDIR)/syntFilter.Plo"; else rm -f "iLBC/$(DEPDIR)/syntFilter.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/syntFilter.c' object='iLBC/syntFilter.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/syntFilter.Plo' tmpdepfile='iLBC/$(DEPDIR)/syntFilter.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/syntFilter.lo `test -f 'iLBC/syntFilter.c' || echo '$(srcdir)/'`iLBC/syntFilter.c
-+
-+iLBC/enhancer.o: iLBC/enhancer.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/enhancer.o -MD -MP -MF "iLBC/$(DEPDIR)/enhancer.Tpo" -c -o iLBC/enhancer.o `test -f 'iLBC/enhancer.c' || echo '$(srcdir)/'`iLBC/enhancer.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/enhancer.Tpo" "iLBC/$(DEPDIR)/enhancer.Po"; else rm -f "iLBC/$(DEPDIR)/enhancer.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/enhancer.c' object='iLBC/enhancer.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/enhancer.Po' tmpdepfile='iLBC/$(DEPDIR)/enhancer.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/enhancer.o `test -f 'iLBC/enhancer.c' || echo '$(srcdir)/'`iLBC/enhancer.c
-+
-+iLBC/enhancer.obj: iLBC/enhancer.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/enhancer.obj -MD -MP -MF "iLBC/$(DEPDIR)/enhancer.Tpo" -c -o iLBC/enhancer.obj `if test -f 'iLBC/enhancer.c'; then $(CYGPATH_W) 'iLBC/enhancer.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/enhancer.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/enhancer.Tpo" "iLBC/$(DEPDIR)/enhancer.Po"; else rm -f "iLBC/$(DEPDIR)/enhancer.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/enhancer.c' object='iLBC/enhancer.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/enhancer.Po' tmpdepfile='iLBC/$(DEPDIR)/enhancer.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/enhancer.obj `if test -f 'iLBC/enhancer.c'; then $(CYGPATH_W) 'iLBC/enhancer.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/enhancer.c'; fi`
-+
-+iLBC/enhancer.lo: iLBC/enhancer.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/enhancer.lo -MD -MP -MF "iLBC/$(DEPDIR)/enhancer.Tpo" -c -o iLBC/enhancer.lo `test -f 'iLBC/enhancer.c' || echo '$(srcdir)/'`iLBC/enhancer.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/enhancer.Tpo" "iLBC/$(DEPDIR)/enhancer.Plo"; else rm -f "iLBC/$(DEPDIR)/enhancer.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/enhancer.c' object='iLBC/enhancer.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/enhancer.Plo' tmpdepfile='iLBC/$(DEPDIR)/enhancer.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/enhancer.lo `test -f 'iLBC/enhancer.c' || echo '$(srcdir)/'`iLBC/enhancer.c
-+
-+iLBC/hpInput.o: iLBC/hpInput.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/hpInput.o -MD -MP -MF "iLBC/$(DEPDIR)/hpInput.Tpo" -c -o iLBC/hpInput.o `test -f 'iLBC/hpInput.c' || echo '$(srcdir)/'`iLBC/hpInput.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/hpInput.Tpo" "iLBC/$(DEPDIR)/hpInput.Po"; else rm -f "iLBC/$(DEPDIR)/hpInput.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/hpInput.c' object='iLBC/hpInput.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/hpInput.Po' tmpdepfile='iLBC/$(DEPDIR)/hpInput.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/hpInput.o `test -f 'iLBC/hpInput.c' || echo '$(srcdir)/'`iLBC/hpInput.c
-+
-+iLBC/hpInput.obj: iLBC/hpInput.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/hpInput.obj -MD -MP -MF "iLBC/$(DEPDIR)/hpInput.Tpo" -c -o iLBC/hpInput.obj `if test -f 'iLBC/hpInput.c'; then $(CYGPATH_W) 'iLBC/hpInput.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/hpInput.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/hpInput.Tpo" "iLBC/$(DEPDIR)/hpInput.Po"; else rm -f "iLBC/$(DEPDIR)/hpInput.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/hpInput.c' object='iLBC/hpInput.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/hpInput.Po' tmpdepfile='iLBC/$(DEPDIR)/hpInput.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/hpInput.obj `if test -f 'iLBC/hpInput.c'; then $(CYGPATH_W) 'iLBC/hpInput.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/hpInput.c'; fi`
-+
-+iLBC/hpInput.lo: iLBC/hpInput.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/hpInput.lo -MD -MP -MF "iLBC/$(DEPDIR)/hpInput.Tpo" -c -o iLBC/hpInput.lo `test -f 'iLBC/hpInput.c' || echo '$(srcdir)/'`iLBC/hpInput.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/hpInput.Tpo" "iLBC/$(DEPDIR)/hpInput.Plo"; else rm -f "iLBC/$(DEPDIR)/hpInput.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/hpInput.c' object='iLBC/hpInput.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/hpInput.Plo' tmpdepfile='iLBC/$(DEPDIR)/hpInput.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/hpInput.lo `test -f 'iLBC/hpInput.c' || echo '$(srcdir)/'`iLBC/hpInput.c
-+
-+iLBC/LPCdecode.o: iLBC/LPCdecode.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/LPCdecode.o -MD -MP -MF "iLBC/$(DEPDIR)/LPCdecode.Tpo" -c -o iLBC/LPCdecode.o `test -f 'iLBC/LPCdecode.c' || echo '$(srcdir)/'`iLBC/LPCdecode.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/LPCdecode.Tpo" "iLBC/$(DEPDIR)/LPCdecode.Po"; else rm -f "iLBC/$(DEPDIR)/LPCdecode.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/LPCdecode.c' object='iLBC/LPCdecode.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/LPCdecode.Po' tmpdepfile='iLBC/$(DEPDIR)/LPCdecode.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/LPCdecode.o `test -f 'iLBC/LPCdecode.c' || echo '$(srcdir)/'`iLBC/LPCdecode.c
-+
-+iLBC/LPCdecode.obj: iLBC/LPCdecode.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/LPCdecode.obj -MD -MP -MF "iLBC/$(DEPDIR)/LPCdecode.Tpo" -c -o iLBC/LPCdecode.obj `if test -f 'iLBC/LPCdecode.c'; then $(CYGPATH_W) 'iLBC/LPCdecode.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/LPCdecode.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/LPCdecode.Tpo" "iLBC/$(DEPDIR)/LPCdecode.Po"; else rm -f "iLBC/$(DEPDIR)/LPCdecode.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/LPCdecode.c' object='iLBC/LPCdecode.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/LPCdecode.Po' tmpdepfile='iLBC/$(DEPDIR)/LPCdecode.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/LPCdecode.obj `if test -f 'iLBC/LPCdecode.c'; then $(CYGPATH_W) 'iLBC/LPCdecode.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/LPCdecode.c'; fi`
-+
-+iLBC/LPCdecode.lo: iLBC/LPCdecode.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/LPCdecode.lo -MD -MP -MF "iLBC/$(DEPDIR)/LPCdecode.Tpo" -c -o iLBC/LPCdecode.lo `test -f 'iLBC/LPCdecode.c' || echo '$(srcdir)/'`iLBC/LPCdecode.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/LPCdecode.Tpo" "iLBC/$(DEPDIR)/LPCdecode.Plo"; else rm -f "iLBC/$(DEPDIR)/LPCdecode.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/LPCdecode.c' object='iLBC/LPCdecode.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/LPCdecode.Plo' tmpdepfile='iLBC/$(DEPDIR)/LPCdecode.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/LPCdecode.lo `test -f 'iLBC/LPCdecode.c' || echo '$(srcdir)/'`iLBC/LPCdecode.c
-+
-+iLBC/filter.o: iLBC/filter.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/filter.o -MD -MP -MF "iLBC/$(DEPDIR)/filter.Tpo" -c -o iLBC/filter.o `test -f 'iLBC/filter.c' || echo '$(srcdir)/'`iLBC/filter.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/filter.Tpo" "iLBC/$(DEPDIR)/filter.Po"; else rm -f "iLBC/$(DEPDIR)/filter.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/filter.c' object='iLBC/filter.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/filter.Po' tmpdepfile='iLBC/$(DEPDIR)/filter.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/filter.o `test -f 'iLBC/filter.c' || echo '$(srcdir)/'`iLBC/filter.c
-+
-+iLBC/filter.obj: iLBC/filter.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/filter.obj -MD -MP -MF "iLBC/$(DEPDIR)/filter.Tpo" -c -o iLBC/filter.obj `if test -f 'iLBC/filter.c'; then $(CYGPATH_W) 'iLBC/filter.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/filter.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/filter.Tpo" "iLBC/$(DEPDIR)/filter.Po"; else rm -f "iLBC/$(DEPDIR)/filter.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/filter.c' object='iLBC/filter.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/filter.Po' tmpdepfile='iLBC/$(DEPDIR)/filter.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/filter.obj `if test -f 'iLBC/filter.c'; then $(CYGPATH_W) 'iLBC/filter.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/filter.c'; fi`
-+
-+iLBC/filter.lo: iLBC/filter.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/filter.lo -MD -MP -MF "iLBC/$(DEPDIR)/filter.Tpo" -c -o iLBC/filter.lo `test -f 'iLBC/filter.c' || echo '$(srcdir)/'`iLBC/filter.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/filter.Tpo" "iLBC/$(DEPDIR)/filter.Plo"; else rm -f "iLBC/$(DEPDIR)/filter.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/filter.c' object='iLBC/filter.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/filter.Plo' tmpdepfile='iLBC/$(DEPDIR)/filter.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/filter.lo `test -f 'iLBC/filter.c' || echo '$(srcdir)/'`iLBC/filter.c
-+
-+iLBC/hpOutput.o: iLBC/hpOutput.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/hpOutput.o -MD -MP -MF "iLBC/$(DEPDIR)/hpOutput.Tpo" -c -o iLBC/hpOutput.o `test -f 'iLBC/hpOutput.c' || echo '$(srcdir)/'`iLBC/hpOutput.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/hpOutput.Tpo" "iLBC/$(DEPDIR)/hpOutput.Po"; else rm -f "iLBC/$(DEPDIR)/hpOutput.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/hpOutput.c' object='iLBC/hpOutput.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/hpOutput.Po' tmpdepfile='iLBC/$(DEPDIR)/hpOutput.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/hpOutput.o `test -f 'iLBC/hpOutput.c' || echo '$(srcdir)/'`iLBC/hpOutput.c
-+
-+iLBC/hpOutput.obj: iLBC/hpOutput.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/hpOutput.obj -MD -MP -MF "iLBC/$(DEPDIR)/hpOutput.Tpo" -c -o iLBC/hpOutput.obj `if test -f 'iLBC/hpOutput.c'; then $(CYGPATH_W) 'iLBC/hpOutput.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/hpOutput.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/hpOutput.Tpo" "iLBC/$(DEPDIR)/hpOutput.Po"; else rm -f "iLBC/$(DEPDIR)/hpOutput.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/hpOutput.c' object='iLBC/hpOutput.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/hpOutput.Po' tmpdepfile='iLBC/$(DEPDIR)/hpOutput.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/hpOutput.obj `if test -f 'iLBC/hpOutput.c'; then $(CYGPATH_W) 'iLBC/hpOutput.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/hpOutput.c'; fi`
-+
-+iLBC/hpOutput.lo: iLBC/hpOutput.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/hpOutput.lo -MD -MP -MF "iLBC/$(DEPDIR)/hpOutput.Tpo" -c -o iLBC/hpOutput.lo `test -f 'iLBC/hpOutput.c' || echo '$(srcdir)/'`iLBC/hpOutput.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/hpOutput.Tpo" "iLBC/$(DEPDIR)/hpOutput.Plo"; else rm -f "iLBC/$(DEPDIR)/hpOutput.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/hpOutput.c' object='iLBC/hpOutput.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/hpOutput.Plo' tmpdepfile='iLBC/$(DEPDIR)/hpOutput.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/hpOutput.lo `test -f 'iLBC/hpOutput.c' || echo '$(srcdir)/'`iLBC/hpOutput.c
-+
-+iLBC/LPCencode.o: iLBC/LPCencode.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/LPCencode.o -MD -MP -MF "iLBC/$(DEPDIR)/LPCencode.Tpo" -c -o iLBC/LPCencode.o `test -f 'iLBC/LPCencode.c' || echo '$(srcdir)/'`iLBC/LPCencode.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/LPCencode.Tpo" "iLBC/$(DEPDIR)/LPCencode.Po"; else rm -f "iLBC/$(DEPDIR)/LPCencode.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/LPCencode.c' object='iLBC/LPCencode.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/LPCencode.Po' tmpdepfile='iLBC/$(DEPDIR)/LPCencode.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/LPCencode.o `test -f 'iLBC/LPCencode.c' || echo '$(srcdir)/'`iLBC/LPCencode.c
-+
-+iLBC/LPCencode.obj: iLBC/LPCencode.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/LPCencode.obj -MD -MP -MF "iLBC/$(DEPDIR)/LPCencode.Tpo" -c -o iLBC/LPCencode.obj `if test -f 'iLBC/LPCencode.c'; then $(CYGPATH_W) 'iLBC/LPCencode.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/LPCencode.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/LPCencode.Tpo" "iLBC/$(DEPDIR)/LPCencode.Po"; else rm -f "iLBC/$(DEPDIR)/LPCencode.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/LPCencode.c' object='iLBC/LPCencode.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/LPCencode.Po' tmpdepfile='iLBC/$(DEPDIR)/LPCencode.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/LPCencode.obj `if test -f 'iLBC/LPCencode.c'; then $(CYGPATH_W) 'iLBC/LPCencode.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/LPCencode.c'; fi`
-+
-+iLBC/LPCencode.lo: iLBC/LPCencode.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/LPCencode.lo -MD -MP -MF "iLBC/$(DEPDIR)/LPCencode.Tpo" -c -o iLBC/LPCencode.lo `test -f 'iLBC/LPCencode.c' || echo '$(srcdir)/'`iLBC/LPCencode.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/LPCencode.Tpo" "iLBC/$(DEPDIR)/LPCencode.Plo"; else rm -f "iLBC/$(DEPDIR)/LPCencode.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/LPCencode.c' object='iLBC/LPCencode.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/LPCencode.Plo' tmpdepfile='iLBC/$(DEPDIR)/LPCencode.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/LPCencode.lo `test -f 'iLBC/LPCencode.c' || echo '$(srcdir)/'`iLBC/LPCencode.c
-+
-+iLBC/FrameClassify.o: iLBC/FrameClassify.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/FrameClassify.o -MD -MP -MF "iLBC/$(DEPDIR)/FrameClassify.Tpo" -c -o iLBC/FrameClassify.o `test -f 'iLBC/FrameClassify.c' || echo '$(srcdir)/'`iLBC/FrameClassify.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/FrameClassify.Tpo" "iLBC/$(DEPDIR)/FrameClassify.Po"; else rm -f "iLBC/$(DEPDIR)/FrameClassify.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/FrameClassify.c' object='iLBC/FrameClassify.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/FrameClassify.Po' tmpdepfile='iLBC/$(DEPDIR)/FrameClassify.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/FrameClassify.o `test -f 'iLBC/FrameClassify.c' || echo '$(srcdir)/'`iLBC/FrameClassify.c
-+
-+iLBC/FrameClassify.obj: iLBC/FrameClassify.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/FrameClassify.obj -MD -MP -MF "iLBC/$(DEPDIR)/FrameClassify.Tpo" -c -o iLBC/FrameClassify.obj `if test -f 'iLBC/FrameClassify.c'; then $(CYGPATH_W) 'iLBC/FrameClassify.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/FrameClassify.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/FrameClassify.Tpo" "iLBC/$(DEPDIR)/FrameClassify.Po"; else rm -f "iLBC/$(DEPDIR)/FrameClassify.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/FrameClassify.c' object='iLBC/FrameClassify.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/FrameClassify.Po' tmpdepfile='iLBC/$(DEPDIR)/FrameClassify.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/FrameClassify.obj `if test -f 'iLBC/FrameClassify.c'; then $(CYGPATH_W) 'iLBC/FrameClassify.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/FrameClassify.c'; fi`
-+
-+iLBC/FrameClassify.lo: iLBC/FrameClassify.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/FrameClassify.lo -MD -MP -MF "iLBC/$(DEPDIR)/FrameClassify.Tpo" -c -o iLBC/FrameClassify.lo `test -f 'iLBC/FrameClassify.c' || echo '$(srcdir)/'`iLBC/FrameClassify.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/FrameClassify.Tpo" "iLBC/$(DEPDIR)/FrameClassify.Plo"; else rm -f "iLBC/$(DEPDIR)/FrameClassify.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/FrameClassify.c' object='iLBC/FrameClassify.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/FrameClassify.Plo' tmpdepfile='iLBC/$(DEPDIR)/FrameClassify.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/FrameClassify.lo `test -f 'iLBC/FrameClassify.c' || echo '$(srcdir)/'`iLBC/FrameClassify.c
-+
-+iLBC/iCBConstruct.o: iLBC/iCBConstruct.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/iCBConstruct.o -MD -MP -MF "iLBC/$(DEPDIR)/iCBConstruct.Tpo" -c -o iLBC/iCBConstruct.o `test -f 'iLBC/iCBConstruct.c' || echo '$(srcdir)/'`iLBC/iCBConstruct.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/iCBConstruct.Tpo" "iLBC/$(DEPDIR)/iCBConstruct.Po"; else rm -f "iLBC/$(DEPDIR)/iCBConstruct.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/iCBConstruct.c' object='iLBC/iCBConstruct.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/iCBConstruct.Po' tmpdepfile='iLBC/$(DEPDIR)/iCBConstruct.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/iCBConstruct.o `test -f 'iLBC/iCBConstruct.c' || echo '$(srcdir)/'`iLBC/iCBConstruct.c
-+
-+iLBC/iCBConstruct.obj: iLBC/iCBConstruct.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/iCBConstruct.obj -MD -MP -MF "iLBC/$(DEPDIR)/iCBConstruct.Tpo" -c -o iLBC/iCBConstruct.obj `if test -f 'iLBC/iCBConstruct.c'; then $(CYGPATH_W) 'iLBC/iCBConstruct.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/iCBConstruct.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/iCBConstruct.Tpo" "iLBC/$(DEPDIR)/iCBConstruct.Po"; else rm -f "iLBC/$(DEPDIR)/iCBConstruct.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/iCBConstruct.c' object='iLBC/iCBConstruct.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/iCBConstruct.Po' tmpdepfile='iLBC/$(DEPDIR)/iCBConstruct.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/iCBConstruct.obj `if test -f 'iLBC/iCBConstruct.c'; then $(CYGPATH_W) 'iLBC/iCBConstruct.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/iCBConstruct.c'; fi`
-+
-+iLBC/iCBConstruct.lo: iLBC/iCBConstruct.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/iCBConstruct.lo -MD -MP -MF "iLBC/$(DEPDIR)/iCBConstruct.Tpo" -c -o iLBC/iCBConstruct.lo `test -f 'iLBC/iCBConstruct.c' || echo '$(srcdir)/'`iLBC/iCBConstruct.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/iCBConstruct.Tpo" "iLBC/$(DEPDIR)/iCBConstruct.Plo"; else rm -f "iLBC/$(DEPDIR)/iCBConstruct.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/iCBConstruct.c' object='iLBC/iCBConstruct.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/iCBConstruct.Plo' tmpdepfile='iLBC/$(DEPDIR)/iCBConstruct.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/iCBConstruct.lo `test -f 'iLBC/iCBConstruct.c' || echo '$(srcdir)/'`iLBC/iCBConstruct.c
-+
-+iLBC/lsf.o: iLBC/lsf.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/lsf.o -MD -MP -MF "iLBC/$(DEPDIR)/lsf.Tpo" -c -o iLBC/lsf.o `test -f 'iLBC/lsf.c' || echo '$(srcdir)/'`iLBC/lsf.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/lsf.Tpo" "iLBC/$(DEPDIR)/lsf.Po"; else rm -f "iLBC/$(DEPDIR)/lsf.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/lsf.c' object='iLBC/lsf.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/lsf.Po' tmpdepfile='iLBC/$(DEPDIR)/lsf.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/lsf.o `test -f 'iLBC/lsf.c' || echo '$(srcdir)/'`iLBC/lsf.c
-+
-+iLBC/lsf.obj: iLBC/lsf.c
-+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/lsf.obj -MD -MP -MF "iLBC/$(DEPDIR)/lsf.Tpo" -c -o iLBC/lsf.obj `if test -f 'iLBC/lsf.c'; then $(CYGPATH_W) 'iLBC/lsf.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/lsf.c'; fi`; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/lsf.Tpo" "iLBC/$(DEPDIR)/lsf.Po"; else rm -f "iLBC/$(DEPDIR)/lsf.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/lsf.c' object='iLBC/lsf.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/lsf.Po' tmpdepfile='iLBC/$(DEPDIR)/lsf.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/lsf.obj `if test -f 'iLBC/lsf.c'; then $(CYGPATH_W) 'iLBC/lsf.c'; else $(CYGPATH_W) '$(srcdir)/iLBC/lsf.c'; fi`
-+
-+iLBC/lsf.lo: iLBC/lsf.c
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iLBC/lsf.lo -MD -MP -MF "iLBC/$(DEPDIR)/lsf.Tpo" -c -o iLBC/lsf.lo `test -f 'iLBC/lsf.c' || echo '$(srcdir)/'`iLBC/lsf.c; \
-+ at am__fastdepCC_TRUE@	then mv -f "iLBC/$(DEPDIR)/lsf.Tpo" "iLBC/$(DEPDIR)/lsf.Plo"; else rm -f "iLBC/$(DEPDIR)/lsf.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iLBC/lsf.c' object='iLBC/lsf.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='iLBC/$(DEPDIR)/lsf.Plo' tmpdepfile='iLBC/$(DEPDIR)/lsf.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iLBC/lsf.lo `test -f 'iLBC/lsf.c' || echo '$(srcdir)/'`iLBC/lsf.c
-+
 +mostlyclean-libtool:
 +	-rm -f *.lo
 +
@@ -39753,7 +40016,7 @@
 +	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
 +	@list='$(include_HEADERS)'; for p in $$list; do \
 +	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
++	  f=$(am__strip_dir) \
 +	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
 +	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
 +	done
@@ -39761,7 +40024,7 @@
 +uninstall-includeHEADERS:
 +	@$(NORMAL_UNINSTALL)
 +	@list='$(include_HEADERS)'; for p in $$list; do \
-+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
++	  f=$(am__strip_dir) \
 +	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
 +	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
 +	done
@@ -39868,35 +40131,35 @@
 +clean-generic:
 +
 +distclean-generic:
-+	-rm -f $(CONFIG_CLEAN_FILES)
-+	-rm -f portmixer/px_mac_core/$(am__dirstamp)
-+	-rm -f portmixer/px_unix_oss/$(DEPDIR)/$(am__dirstamp)
-+	-rm -f spandsp/$(am__dirstamp)
-+	-rm -f libspeex/$(DEPDIR)/$(am__dirstamp)
-+	-rm -f portmixer/px_win_wmme/$(am__dirstamp)
-+	-rm -f libiax2/src/$(am__dirstamp)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++	-rm -f gsm/src/$(DEPDIR)/$(am__dirstamp)
++	-rm -f gsm/src/$(am__dirstamp)
 +	-rm -f iLBC/$(DEPDIR)/$(am__dirstamp)
-+	-rm -f portmixer/px_mac_core/$(DEPDIR)/$(am__dirstamp)
-+	-rm -f portaudio/pa_mac_core/$(DEPDIR)/$(am__dirstamp)
-+	-rm -f portaudio/pa_unix_oss/$(am__dirstamp)
++	-rm -f iLBC/$(am__dirstamp)
++	-rm -f libiax2/src/$(DEPDIR)/$(am__dirstamp)
++	-rm -f libiax2/src/$(am__dirstamp)
++	-rm -f libspeex/$(DEPDIR)/$(am__dirstamp)
 +	-rm -f libspeex/$(am__dirstamp)
-+	-rm -f portaudio/pablio/$(am__dirstamp)
 +	-rm -f portaudio/pa_common/$(DEPDIR)/$(am__dirstamp)
++	-rm -f portaudio/pa_common/$(am__dirstamp)
++	-rm -f portaudio/pa_mac_core/$(DEPDIR)/$(am__dirstamp)
++	-rm -f portaudio/pa_mac_core/$(am__dirstamp)
 +	-rm -f portaudio/pa_unix_oss/$(DEPDIR)/$(am__dirstamp)
++	-rm -f portaudio/pa_unix_oss/$(am__dirstamp)
 +	-rm -f portaudio/pa_win_wmme/$(DEPDIR)/$(am__dirstamp)
-+	-rm -f libiax2/src/$(DEPDIR)/$(am__dirstamp)
-+	-rm -f iLBC/$(am__dirstamp)
-+	-rm -f gsm/src/$(DEPDIR)/$(am__dirstamp)
-+	-rm -f portaudio/pa_mac_core/$(am__dirstamp)
-+	-rm -f portmixer/px_solaris/$(DEPDIR)/$(am__dirstamp)
++	-rm -f portaudio/pa_win_wmme/$(am__dirstamp)
 +	-rm -f portaudio/pablio/$(DEPDIR)/$(am__dirstamp)
-+	-rm -f gsm/src/$(am__dirstamp)
-+	-rm -f portaudio/pa_common/$(am__dirstamp)
++	-rm -f portaudio/pablio/$(am__dirstamp)
++	-rm -f portmixer/px_mac_core/$(DEPDIR)/$(am__dirstamp)
++	-rm -f portmixer/px_mac_core/$(am__dirstamp)
++	-rm -f portmixer/px_solaris/$(DEPDIR)/$(am__dirstamp)
 +	-rm -f portmixer/px_solaris/$(am__dirstamp)
++	-rm -f portmixer/px_unix_oss/$(DEPDIR)/$(am__dirstamp)
 +	-rm -f portmixer/px_unix_oss/$(am__dirstamp)
 +	-rm -f portmixer/px_win_wmme/$(DEPDIR)/$(am__dirstamp)
++	-rm -f portmixer/px_win_wmme/$(am__dirstamp)
 +	-rm -f spandsp/$(DEPDIR)/$(am__dirstamp)
-+	-rm -f portaudio/pa_win_wmme/$(am__dirstamp)
++	-rm -f spandsp/$(am__dirstamp)
 +
 +maintainer-clean-generic:
 +	@echo "This command is intended for maintainers to use"
@@ -39974,14 +40237,14 @@
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -urNad iaxclient-0.0+cvs20050725/ltmain.sh /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/ltmain.sh
---- iaxclient-0.0+cvs20050725/ltmain.sh	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/ltmain.sh	2005-08-10 15:15:50.000000000 +0200
-@@ -0,0 +1,6426 @@
+diff -urNad iaxclient-0.0+svn20060520~/ltmain.sh iaxclient-0.0+svn20060520/ltmain.sh
+--- iaxclient-0.0+svn20060520~/ltmain.sh	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/ltmain.sh	2005-09-25 16:53:57.000000000 +0200
+@@ -0,0 +1,6538 @@
 +# ltmain.sh - Provide generalized library-building support services.
 +# NOTE: Changing this file will not affect anything until you rerun configure.
 +#
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
 +# Free Software Foundation, Inc.
 +# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
 +#
@@ -39997,7 +40260,7 @@
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 +#
 +# As a special exception to the GNU General Public License, if you
 +# distribute this file as part of a program that contains a
@@ -40023,9 +40286,14 @@
 +
 +PROGRAM=ltmain.sh
 +PACKAGE=libtool
-+VERSION=1.5.6
-+TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 224 $"
++VERSION="1.5.20 Debian 1.5.20-2"
++TIMESTAMP=" (1.1220.2.287 2005/08/31 18:54:15)"
 +
++# See if we are running on zsh, and set the options which allow our
++# commands through without removal of \ escapes.
++if test -n "${ZSH_VERSION+set}" ; then
++  setopt NO_GLOB_SUBST
++fi
 +
 +# Check that we have a working $echo.
 +if test "X$1" = X--no-reexec; then
@@ -40063,14 +40331,15 @@
 +Xsed="${SED}"' -e 1s/^X//'
 +sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
 +# test EBCDIC or ASCII
-+case `echo A|tr A '\301'` in
-+ A) # EBCDIC based system
-+  SP2NL="tr '\100' '\n'"
-+  NL2SP="tr '\r\n' '\100\100'"
++case `echo X|tr X '\101'` in
++ A) # ASCII based system
++    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
++  SP2NL='tr \040 \012'
++  NL2SP='tr \015\012 \040\040'
 +  ;;
-+ *) # Assume ASCII based system
-+  SP2NL="tr '\040' '\012'"
-+  NL2SP="tr '\015\012' '\040\040'"
++ *) # EBCDIC based system
++  SP2NL='tr \100 \n'
++  NL2SP='tr \r\n \100\100'
 +  ;;
 +esac
 +
@@ -40087,8 +40356,9 @@
 +fi
 +
 +# Make sure IFS has a sensible default
-+: ${IFS=" 	
-+"}
++lt_nl='
++'
++IFS=" 	$lt_nl"
 +
 +if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
 +  $echo "$modename: not configured to build any kind of library" 1>&2
@@ -40118,7 +40388,8 @@
 +# Need a lot of goo to handle *both* DLLs and import libs
 +# Has to be a shell function in order to 'eat' the argument
 +# that is supplied when $file_magic_command is called.
-+func_win32_libid () {
++func_win32_libid ()
++{
 +  win32_libid_type="unknown"
 +  win32_fileres=`file -L $1 2>/dev/null`
 +  case $win32_fileres in
@@ -40158,7 +40429,8 @@
 +# Only attempt this if the compiler in the base compile
 +# command doesn't match the default compiler.
 +# arg is usually of the form 'gcc ...'
-+func_infer_tag () {
++func_infer_tag ()
++{
 +    if test -n "$available_tags" && test -z "$tagname"; then
 +      CC_quoted=
 +      for arg in $CC; do
@@ -40215,6 +40487,108 @@
 +      esac
 +    fi
 +}
++
++
++# func_extract_an_archive dir oldlib
++func_extract_an_archive ()
++{
++    f_ex_an_ar_dir="$1"; shift
++    f_ex_an_ar_oldlib="$1"
++
++    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
++    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
++    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
++     :
++    else
++      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
++      exit $EXIT_FAILURE
++    fi
++}
++
++# func_extract_archives gentop oldlib ...
++func_extract_archives ()
++{
++    my_gentop="$1"; shift
++    my_oldlibs=${1+"$@"}
++    my_oldobjs=""
++    my_xlib=""
++    my_xabs=""
++    my_xdir=""
++    my_status=""
++
++    $show "${rm}r $my_gentop"
++    $run ${rm}r "$my_gentop"
++    $show "$mkdir $my_gentop"
++    $run $mkdir "$my_gentop"
++    my_status=$?
++    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
++      exit $my_status
++    fi
++
++    for my_xlib in $my_oldlibs; do
++      # Extract the objects.
++      case $my_xlib in
++	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
++	*) my_xabs=`pwd`"/$my_xlib" ;;
++      esac
++      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
++      my_xdir="$my_gentop/$my_xlib"
++
++      $show "${rm}r $my_xdir"
++      $run ${rm}r "$my_xdir"
++      $show "$mkdir $my_xdir"
++      $run $mkdir "$my_xdir"
++      status=$?
++      if test "$status" -ne 0 && test ! -d "$my_xdir"; then
++	exit $status
++      fi
++      case $host in
++      *-darwin*)
++	$show "Extracting $my_xabs"
++	# Do not bother doing anything if just a dry run
++	if test -z "$run"; then
++	  darwin_orig_dir=`pwd`
++	  cd $my_xdir || exit $?
++	  darwin_archive=$my_xabs
++	  darwin_curdir=`pwd`
++	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
++	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
++	  if test -n "$darwin_arches"; then 
++	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
++	    darwin_arch=
++	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
++	    for darwin_arch in  $darwin_arches ; do
++	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
++	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
++	      cd "$darwin_curdir"
++	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
++	    done # $darwin_arches
++      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
++	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
++	    darwin_file=
++	    darwin_files=
++	    for darwin_file in $darwin_filelist; do
++	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
++	      lipo -create -output "$darwin_file" $darwin_files
++	    done # $darwin_filelist
++	    ${rm}r unfat-$$
++	    cd "$darwin_orig_dir"
++	  else
++	    cd "$darwin_orig_dir"
++ 	    func_extract_an_archive "$my_xdir" "$my_xabs"
++	  fi # $darwin_arches
++	fi # $run
++	;;
++      *)
++        func_extract_an_archive "$my_xdir" "$my_xabs"
++        ;;
++      esac
++      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
++    done
++    func_extract_archives_result="$my_oldobjs"
++}
 +# End of Shell function definitions
 +#####################################
 +
@@ -40285,10 +40659,10 @@
 +  --version)
 +    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
 +    $echo
-+    $echo "Copyright (C) 2003  Free Software Foundation, Inc."
++    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
 +    $echo "This is free software; see the source for copying conditions.  There is NO"
 +    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+    exit $EXIT_SUCCESS
++    exit $?
 +    ;;
 +
 +  --config)
@@ -40297,7 +40671,7 @@
 +    for tagname in $taglist; do
 +      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
 +    done
-+    exit $EXIT_SUCCESS
++    exit $?
 +    ;;
 +
 +  --debug)
@@ -40322,7 +40696,7 @@
 +    else
 +      $echo "disable static libraries"
 +    fi
-+    exit $EXIT_SUCCESS
++    exit $?
 +    ;;
 +
 +  --finish) mode="finish" ;;
@@ -40379,7 +40753,7 @@
 +  # Infer the operation mode.
 +  if test -z "$mode"; then
 +    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
-+    $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
++    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
 +    case $nonopt in
 +    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
 +      mode=link
@@ -40445,7 +40819,7 @@
 +
 +    for arg
 +    do
-+      case "$arg_mode" in
++      case $arg_mode in
 +      arg  )
 +	# do not "continue".  Instead, add this to base_compile
 +	lastarg="$arg"
@@ -40527,7 +40901,10 @@
 +      case $lastarg in
 +      # Double-quote args containing other shell metacharacters.
 +      # Many Bourne shells cannot handle close brackets correctly
-+      # in scan sets, so we specify it separately.
++      # in scan sets, and some SunOS ksh mistreat backslash-escaping
++      # in scan sets (worked around with variable expansion),
++      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
++      # at all, so we specify them separately.
 +      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
 +	lastarg="\"$lastarg\""
 +	;;
@@ -40601,6 +40978,14 @@
 +      esac
 +    done
 +
++    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
++    case $qlibobj in
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	qlibobj="\"$qlibobj\"" ;;
++    esac
++    test "X$libobj" != "X$qlibobj" \
++	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
++	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
 +    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
 +    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
 +    if test "X$xdir" = "X$obj"; then
@@ -40673,12 +41058,17 @@
 +	$run $rm $removelist
 +	exit $EXIT_FAILURE
 +      fi
-+      $echo $srcfile > "$lockfile"
++      $echo "$srcfile" > "$lockfile"
 +    fi
 +
 +    if test -n "$fix_srcfile_path"; then
 +      eval srcfile=\"$fix_srcfile_path\"
 +    fi
++    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
++    case $qsrcfile in
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++      qsrcfile="\"$qsrcfile\"" ;;
++    esac
 +
 +    $run $rm "$libobj" "${libobj}T"
 +
@@ -40700,10 +41090,10 @@
 +      fbsd_hideous_sh_bug=$base_compile
 +
 +      if test "$pic_mode" != no; then
-+	command="$base_compile $srcfile $pic_flag"
++	command="$base_compile $qsrcfile $pic_flag"
 +      else
 +	# Don't build PIC code
-+	command="$base_compile $srcfile"
++	command="$base_compile $qsrcfile"
 +      fi
 +
 +      if test ! -d "${xdir}$objdir"; then
@@ -40783,9 +41173,9 @@
 +    if test "$build_old_libs" = yes; then
 +      if test "$pic_mode" != yes; then
 +	# Don't build PIC code
-+	command="$base_compile $srcfile"
++	command="$base_compile $qsrcfile"
 +      else
-+	command="$base_compile $srcfile $pic_flag"
++	command="$base_compile $qsrcfile $pic_flag"
 +      fi
 +      if test "$compiler_c_o" = yes; then
 +	command="$command -o $obj"
@@ -41207,6 +41597,13 @@
 +	  prev=
 +	  continue
 +	  ;;
++        darwin_framework)
++	  compiler_flags="$compiler_flags $arg"
++	  compile_command="$compile_command $arg"
++	  finalize_command="$finalize_command $arg"
++	  prev=
++	  continue
++	  ;;
 +	*)
 +	  eval "$prev=\"\$arg\""
 +	  prev=
@@ -41265,6 +41662,14 @@
 +	continue
 +	;;
 +
++      -framework|-arch)
++        prev=darwin_framework
++        compiler_flags="$compiler_flags $arg"
++	compile_command="$compile_command $arg"
++	finalize_command="$finalize_command $arg"
++        continue
++        ;;
++
 +      -inst-prefix-dir)
 +	prev=inst_prefix
 +	continue
@@ -41325,7 +41730,7 @@
 +	    # These systems don't actually have a C library (as such)
 +	    test "X$arg" = "X-lc" && continue
 +	    ;;
-+	  *-*-openbsd* | *-*-freebsd*)
++	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
 +	    # Do not include libc due to us having libc/libc_r.
 +	    test "X$arg" = "X-lc" && continue
 +	    ;;
@@ -41336,7 +41741,7 @@
 +	  esac
 +	elif test "X$arg" = "X-lc_r"; then
 +	 case $host in
-+	 *-*-openbsd* | *-*-freebsd*)
++	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
 +	   # Do not include libc_r directly, use -pthread flag.
 +	   continue
 +	   ;;
@@ -41346,8 +41751,20 @@
 +	continue
 +	;;
 +
++      # Tru64 UNIX uses -model [arg] to determine the layout of C++
++      # classes, name mangling, and exception handling.
++      -model)
++	compile_command="$compile_command $arg"
++	compiler_flags="$compiler_flags $arg"
++	finalize_command="$finalize_command $arg"
++	prev=xcompiler
++	continue
++	;;
++
 +     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-+	deplibs="$deplibs $arg"
++	compiler_flags="$compiler_flags $arg"
++	compile_command="$compile_command $arg"
++	finalize_command="$finalize_command $arg"
 +	continue
 +	;;
 +
@@ -41356,13 +41773,14 @@
 +	continue
 +	;;
 +
-+      # gcc -m* arguments should be passed to the linker via $compiler_flags
-+      # in order to pass architecture information to the linker
-+      # (e.g. 32 vs 64-bit).  This may also be accomplished via -Wl,-mfoo
-+      # but this is not reliable with gcc because gcc may use -mfoo to
-+      # select a different linker, different libraries, etc, while
-+      # -Wl,-mfoo simply passes -mfoo to the linker.
-+      -m*)
++      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
++      # -r[0-9][0-9]* specifies the processor on the SGI compiler
++      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
++      # +DA*, +DD* enable 64-bit mode on the HP compiler
++      # -q* pass through compiler args for the IBM compiler
++      # -m* pass through architecture-specific compiler args for GCC
++      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*)
++
 +	# Unknown arguments in both finalize_command and compile_command need
 +	# to be aesthetically quoted because they are evaled later.
 +	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
@@ -41838,7 +42256,7 @@
 +	    compile_deplibs="$deplib $compile_deplibs"
 +	    finalize_deplibs="$deplib $finalize_deplibs"
 +	  else
-+	    deplibs="$deplib $deplibs"
++	    compiler_flags="$compiler_flags $deplib"
 +	  fi
 +	  continue
 +	  ;;
@@ -41957,7 +42375,22 @@
 +	  fi
 +	  case $linkmode in
 +	  lib)
-+	    if test "$deplibs_check_method" != pass_all; then
++	    valid_a_lib=no
++	    case $deplibs_check_method in
++	      match_pattern*)
++		set dummy $deplibs_check_method
++	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
++		if eval $echo \"$deplib\" 2>/dev/null \
++		    | $SED 10q \
++		    | $EGREP "$match_pattern_regex" > /dev/null; then
++		  valid_a_lib=yes
++		fi
++		;;
++	      pass_all)
++		valid_a_lib=yes
++		;;
++            esac
++	    if test "$valid_a_lib" != yes; then
 +	      $echo
 +	      $echo "*** Warning: Trying to link with static lib archive $deplib."
 +	      $echo "*** I have the capability to make that library automatically link in when"
@@ -42031,7 +42464,9 @@
 +	# it will not redefine variables installed, or shouldnotlink
 +	installed=yes
 +	shouldnotlink=no
++	avoidtemprpath=
 +
++
 +	# Read the .la file
 +	case $lib in
 +	*/* | *\\*) . $lib ;;
@@ -42129,11 +42564,19 @@
 +	    dir="$libdir"
 +	    absdir="$libdir"
 +	  fi
++	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
 +	else
-+	  dir="$ladir/$objdir"
-+	  absdir="$abs_ladir/$objdir"
-+	  # Remove this search path later
-+	  notinst_path="$notinst_path $abs_ladir"
++	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
++	    dir="$ladir"
++	    absdir="$abs_ladir"
++	    # Remove this search path later
++	    notinst_path="$notinst_path $abs_ladir"
++	  else
++	    dir="$ladir/$objdir"
++	    absdir="$abs_ladir/$objdir"
++	    # Remove this search path later
++	    notinst_path="$notinst_path $abs_ladir"
++	  fi
 +	fi # $installed = yes
 +	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
 +
@@ -42206,12 +42649,12 @@
 +	  if test -n "$library_names" &&
 +	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
 +	    # We need to hardcode the library path
-+	    if test -n "$shlibpath_var"; then
++	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
 +	      # Make sure the rpath contains only unique directories.
 +	      case "$temp_rpath " in
 +	      *" $dir "*) ;;
 +	      *" $absdir "*) ;;
-+	      *) temp_rpath="$temp_rpath $dir" ;;
++	      *) temp_rpath="$temp_rpath $absdir" ;;
 +	      esac
 +	    fi
 +
@@ -42397,7 +42840,7 @@
 +		add_dir="-L$dir"
 +		# Try looking first in the location we're being installed to.
 +		if test -n "$inst_prefix_dir"; then
-+		  case "$libdir" in
++		  case $libdir in
 +		    [\\/]*)
 +		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
 +		      ;;
@@ -42470,7 +42913,7 @@
 +	      add_dir="-L$libdir"
 +	      # Try looking first in the location we're being installed to.
 +	      if test -n "$inst_prefix_dir"; then
-+		case "$libdir" in
++		case $libdir in
 +		  [\\/]*)
 +		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
 +		    ;;
@@ -42531,8 +42974,6 @@
 +	      fi
 +	    fi
 +	  else
-+	    convenience="$convenience $dir/$old_library"
-+	    old_convenience="$old_convenience $dir/$old_library"
 +	    deplibs="$dir/$old_library $deplibs"
 +	    link_static=yes
 +	  fi
@@ -42650,13 +43091,13 @@
 +	      *) continue ;;
 +	      esac
 +	      case " $deplibs " in
++	      *" $path "*) ;;
++	      *) deplibs="$path $deplibs" ;;
++	      esac
++	      case " $deplibs " in
 +	      *" $depdepl "*) ;;
 +	      *) deplibs="$depdepl $deplibs" ;;
 +	      esac
-+	      case " $deplibs " in
-+	      *" $path "*) ;;
-+	      *) deplibs="$deplibs $path" ;;
-+	      esac
 +	    done
 +	  fi # link_all_deplibs != no
 +	fi # linkmode = lib
@@ -42927,7 +43368,7 @@
 +	case $current in
 +	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 +	*)
-+	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
++	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
 +	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
 +	  exit $EXIT_FAILURE
 +	  ;;
@@ -42936,7 +43377,7 @@
 +	case $revision in
 +	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 +	*)
-+	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
++	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
 +	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
 +	  exit $EXIT_FAILURE
 +	  ;;
@@ -42945,7 +43386,7 @@
 +	case $age in
 +	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 +	*)
-+	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
++	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
 +	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
 +	  exit $EXIT_FAILURE
 +	  ;;
@@ -42971,7 +43412,7 @@
 +	  versuffix="$major.$age.$revision"
 +	  # Darwin ld doesn't like 0 for these options...
 +	  minor_current=`expr $current + 1`
-+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
++	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
 +	  ;;
 +
 +	freebsd-aout)
@@ -43177,7 +43618,7 @@
 +	  *-*-netbsd*)
 +	    # Don't link with libc until the a.out ld.so is fixed.
 +	    ;;
-+	  *-*-openbsd* | *-*-freebsd*)
++	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
 +	    # Do not include libc due to us having libc/libc_r.
 +	    test "X$arg" = "X-lc" && continue
 +	    ;;
@@ -43227,7 +43668,7 @@
 +	  if test "$?" -eq 0 ; then
 +	    ldd_output=`ldd conftest`
 +	    for i in $deplibs; do
-+	      name="`expr $i : '-l\(.*\)'`"
++	      name=`expr $i : '-l\(.*\)'`
 +	      # If $name is empty we are operating on a -L argument.
 +              if test "$name" != "" && test "$name" -ne "0"; then
 +		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
@@ -43264,7 +43705,7 @@
 +	    # Error occurred in the first compile.  Let's try to salvage
 +	    # the situation: Compile a separate program for each library.
 +	    for i in $deplibs; do
-+	      name="`expr $i : '-l\(.*\)'`"
++	      name=`expr $i : '-l\(.*\)'`
 +	      # If $name is empty we are operating on a -L argument.
 +              if test "$name" != "" && test "$name" != "0"; then
 +		$rm conftest
@@ -43316,7 +43757,7 @@
 +	  set dummy $deplibs_check_method
 +	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
 +	  for a_deplib in $deplibs; do
-+	    name="`expr $a_deplib : '-l\(.*\)'`"
++	    name=`expr $a_deplib : '-l\(.*\)'`
 +	    # If $name is empty we are operating on a -L argument.
 +            if test "$name" != "" && test  "$name" != "0"; then
 +	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
@@ -43385,7 +43826,7 @@
 +	  set dummy $deplibs_check_method
 +	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
 +	  for a_deplib in $deplibs; do
-+	    name="`expr $a_deplib : '-l\(.*\)'`"
++	    name=`expr $a_deplib : '-l\(.*\)'`
 +	    # If $name is empty we are operating on a -L argument.
 +	    if test -n "$name" && test "$name" != "0"; then
 +	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
@@ -43626,6 +44067,9 @@
 +	        # The command line is too long to execute in one step.
 +	        $show "using reloadable object file for export list..."
 +	        skipped_export=:
++		# Break out early, otherwise skipped_export may be
++		# set to false by a later but shorter cmd.
++		break
 +	      fi
 +	    done
 +	    IFS="$save_ifs"
@@ -43659,67 +44103,13 @@
 +	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
 +	  else
 +	    gentop="$output_objdir/${outputname}x"
-+	    $show "${rm}r $gentop"
-+	    $run ${rm}r "$gentop"
-+	    $show "$mkdir $gentop"
-+	    $run $mkdir "$gentop"
-+	    status=$?
-+	    if test "$status" -ne 0 && test ! -d "$gentop"; then
-+	      exit $status
-+	    fi
 +	    generated="$generated $gentop"
 +
-+	    for xlib in $convenience; do
-+	      # Extract the objects.
-+	      case $xlib in
-+	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-+	      *) xabs=`pwd`"/$xlib" ;;
-+	      esac
-+	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-+	      xdir="$gentop/$xlib"
-+
-+	      $show "${rm}r $xdir"
-+	      $run ${rm}r "$xdir"
-+	      $show "$mkdir $xdir"
-+	      $run $mkdir "$xdir"
-+	      status=$?
-+	      if test "$status" -ne 0 && test ! -d "$xdir"; then
-+		exit $status
-+	      fi
-+	      # We will extract separately just the conflicting names and we will no
-+	      # longer touch any unique names. It is faster to leave these extract
-+	      # automatically by $AR in one run.
-+	      $show "(cd $xdir && $AR x $xabs)"
-+	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-+	      if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-+		:
-+	      else
-+		$echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-+		$echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-+		$AR t "$xabs" | sort | uniq -cd | while read -r count name
-+		do
-+		  i=1
-+		  while test "$i" -le "$count"
-+		  do
-+		   # Put our $i before any first dot (extension)
-+		   # Never overwrite any file
-+		   name_to="$name"
-+		   while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-+		   do
-+		     name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-+		   done
-+		   $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-+		   $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-+		   i=`expr $i + 1`
-+		  done
-+		done
-+	      fi
-+
-+	      libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-+	    done
++	    func_extract_archives $gentop $convenience
++	    libobjs="$libobjs $func_extract_archives_result"
 +	  fi
 +	fi
-+
++	
 +	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
 +	  eval flag=\"$thread_safe_flag_spec\"
 +	  linker_flags="$linker_flags $flag"
@@ -43749,7 +44139,8 @@
 +	  fi
 +	fi
 +
-+	if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
++	if test "X$skipped_export" != "X:" &&
++	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
 +	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
 +	  :
 +	else
@@ -43768,6 +44159,7 @@
 +	    save_libobjs=$libobjs
 +	  fi
 +	  save_output=$output
++	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
 +
 +	  # Clear the reloadable object creation command queue and
 +	  # initialize k to one.
@@ -43777,13 +44169,13 @@
 +	  delfiles=
 +	  last_robj=
 +	  k=1
-+	  output=$output_objdir/$save_output-${k}.$objext
++	  output=$output_objdir/$output_la-${k}.$objext
 +	  # Loop over the list of objects to be linked.
 +	  for obj in $save_libobjs
 +	  do
 +	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
 +	    if test "X$objlist" = X ||
-+	       { len=`expr "X$test_cmds" : ".*"` &&
++	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
 +		 test "$len" -le "$max_cmd_len"; }; then
 +	      objlist="$objlist $obj"
 +	    else
@@ -43797,9 +44189,9 @@
 +		# the last one created.
 +		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
 +	      fi
-+	      last_robj=$output_objdir/$save_output-${k}.$objext
++	      last_robj=$output_objdir/$output_la-${k}.$objext
 +	      k=`expr $k + 1`
-+	      output=$output_objdir/$save_output-${k}.$objext
++	      output=$output_objdir/$output_la-${k}.$objext
 +	      objlist=$obj
 +	      len=1
 +	    fi
@@ -43819,13 +44211,13 @@
 +	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
 +          fi
 +
-+	  # Set up a command to remove the reloadale object files
++	  # Set up a command to remove the reloadable object files
 +	  # after they are used.
 +	  i=0
 +	  while test "$i" -lt "$k"
 +	  do
 +	    i=`expr $i + 1`
-+	    delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
++	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
 +	  done
 +
 +	  $echo "creating a temporary reloadable object file: $output"
@@ -43873,13 +44265,30 @@
 +	  IFS="$save_ifs"
 +	  eval cmd=\"$cmd\"
 +	  $show "$cmd"
-+	  $run eval "$cmd" || exit $?
++	  $run eval "$cmd" || {
++	    lt_exit=$?
++
++	    # Restore the uninstalled library and exit
++	    if test "$mode" = relink; then
++	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
++	    fi
++
++	    exit $lt_exit
++	  }
 +	done
 +	IFS="$save_ifs"
 +
 +	# Restore the uninstalled library and exit
 +	if test "$mode" = relink; then
 +	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
++
++	  if test -n "$convenience"; then
++	    if test -z "$whole_archive_flag_spec"; then
++	      $show "${rm}r $gentop"
++	      $run ${rm}r "$gentop"
++	    fi
++	  fi
++
 +	  exit $EXIT_SUCCESS
 +	fi
 +
@@ -43957,64 +44366,10 @@
 +	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
 +	else
 +	  gentop="$output_objdir/${obj}x"
-+	  $show "${rm}r $gentop"
-+	  $run ${rm}r "$gentop"
-+	  $show "$mkdir $gentop"
-+	  $run $mkdir "$gentop"
-+	  status=$?
-+	  if test "$status" -ne 0 && test ! -d "$gentop"; then
-+	    exit $status
-+	  fi
 +	  generated="$generated $gentop"
 +
-+	  for xlib in $convenience; do
-+	    # Extract the objects.
-+	    case $xlib in
-+	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-+	    *) xabs=`pwd`"/$xlib" ;;
-+	    esac
-+	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-+	    xdir="$gentop/$xlib"
-+
-+	    $show "${rm}r $xdir"
-+	    $run ${rm}r "$xdir"
-+	    $show "$mkdir $xdir"
-+	    $run $mkdir "$xdir"
-+	    status=$?
-+	    if test "$status" -ne 0 && test ! -d "$xdir"; then
-+	      exit $status
-+	    fi
-+	    # We will extract separately just the conflicting names and we will no
-+	    # longer touch any unique names. It is faster to leave these extract
-+	    # automatically by $AR in one run.
-+	    $show "(cd $xdir && $AR x $xabs)"
-+	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-+	    if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-+	      :
-+	    else
-+	      $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-+	      $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-+	      $AR t "$xabs" | sort | uniq -cd | while read -r count name
-+	      do
-+		i=1
-+		while test "$i" -le "$count"
-+		do
-+		 # Put our $i before any first dot (extension)
-+		 # Never overwrite any file
-+		 name_to="$name"
-+		 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-+		 do
-+		   name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-+		 done
-+		 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-+		 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-+		 i=`expr $i + 1`
-+		done
-+	      done
-+	    fi
-+
-+	    reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-+	  done
++	  func_extract_archives $gentop $convenience
++	  reload_conv_objs="$reload_objs $func_extract_archives_result"
 +	fi
 +      fi
 +
@@ -44276,12 +44631,12 @@
 +
 +	    # Prepare the list of exported symbols
 +	    if test -z "$export_symbols"; then
-+	      export_symbols="$output_objdir/$output.exp"
++	      export_symbols="$output_objdir/$outputname.exp"
 +	      $run $rm $export_symbols
-+	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
++	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
 +	    else
-+	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
-+	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
++	      $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
++	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
 +	      $run eval 'mv "$nlist"T "$nlist"'
 +	    fi
 +	  fi
@@ -44333,7 +44688,26 @@
 +#endif
 +
 +/* The mapping between symbol names and symbols. */
++"
++
++	    case $host in
++	    *cygwin* | *mingw* )
++	  $echo >> "$output_objdir/$dlsyms" "\
++/* DATA imports from DLLs on WIN32 can't be const, because
++   runtime relocations are performed -- see ld's documentation
++   on pseudo-relocs */
++struct {
++"
++	      ;;
++	    * )
++	  $echo >> "$output_objdir/$dlsyms" "\
 +const struct {
++"
++	      ;;
++	    esac
++
++
++	  $echo >> "$output_objdir/$dlsyms" "\
 +  const char *name;
 +  lt_ptr address;
 +}
@@ -44562,7 +44936,7 @@
 +	esac
 +	case $host in
 +	  *cygwin* | *mingw* )
-+	    cwrappersource=`$echo ${objdir}/lt-${output}.c`
++	    cwrappersource=`$echo ${objdir}/lt-${outputname}.c`
 +	    cwrapper=`$echo ${output}.exe`
 +	    $rm $cwrappersource $cwrapper
 +	    trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
@@ -44661,6 +45035,7 @@
 +EOF
 +
 +	    cat >> $cwrappersource <<"EOF"
++  return 127;
 +}
 +
 +void *
@@ -44795,7 +45170,7 @@
 +
 +# The HP-UX ksh and POSIX shell print the target directory to stdout
 +# if CDPATH is set.
-+if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 +
 +relink_command=\"$relink_command\"
 +
@@ -44924,13 +45299,13 @@
 +	# Backslashes separate directories on plain windows
 +	*-*-mingw | *-*-os2*)
 +	  $echo >> $output "\
-+      exec \$progdir\\\\\$program \${1+\"\$@\"}
++      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
 +"
 +	  ;;
 +
 +	*)
 +	  $echo >> $output "\
-+      exec \$progdir/\$program \${1+\"\$@\"}
++      exec \"\$progdir/\$program\" \${1+\"\$@\"}
 +"
 +	  ;;
 +	esac
@@ -44940,7 +45315,7 @@
 +    fi
 +  else
 +    # The program doesn't exist.
-+    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
++    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
 +    \$echo \"This script is just a wrapper for \$program.\" 1>&2
 +    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
 +    exit $EXIT_FAILURE
@@ -44972,71 +45347,73 @@
 +
 +      if test -n "$addlibs"; then
 +	gentop="$output_objdir/${outputname}x"
-+	$show "${rm}r $gentop"
-+	$run ${rm}r "$gentop"
-+	$show "$mkdir $gentop"
-+	$run $mkdir "$gentop"
-+	status=$?
-+	if test "$status" -ne 0 && test ! -d "$gentop"; then
-+	  exit $status
-+	fi
 +	generated="$generated $gentop"
 +
-+	# Add in members from convenience archives.
-+	for xlib in $addlibs; do
-+	  # Extract the objects.
-+	  case $xlib in
-+	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-+	  *) xabs=`pwd`"/$xlib" ;;
-+	  esac
-+	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-+	  xdir="$gentop/$xlib"
-+
-+	  $show "${rm}r $xdir"
-+	  $run ${rm}r "$xdir"
-+	  $show "$mkdir $xdir"
-+	  $run $mkdir "$xdir"
-+	  status=$?
-+	  if test "$status" -ne 0 && test ! -d "$xdir"; then
-+	    exit $status
-+	  fi
-+	  # We will extract separately just the conflicting names and we will no
-+	  # longer touch any unique names. It is faster to leave these extract
-+	  # automatically by $AR in one run.
-+	  $show "(cd $xdir && $AR x $xabs)"
-+	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-+	  if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-+	    :
-+	  else
-+	    $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-+	    $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-+	    $AR t "$xabs" | sort | uniq -cd | while read -r count name
-+	    do
-+	      i=1
-+	      while test "$i" -le "$count"
-+	      do
-+	       # Put our $i before any first dot (extension)
-+	       # Never overwrite any file
-+	       name_to="$name"
-+	       while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-+	       do
-+		 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-+	       done
-+	       $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-+	       $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-+	       i=`expr $i + 1`
-+	      done
-+	    done
-+	  fi
-+
-+	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
-+	done
++	func_extract_archives $gentop $addlibs
++	oldobjs="$oldobjs $func_extract_archives_result"
 +      fi
 +
 +      # Do each command in the archive commands.
 +      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
 +       cmds=$old_archive_from_new_cmds
 +      else
++	# POSIX demands no paths to be encoded in archives.  We have
++	# to avoid creating archives with duplicate basenames if we
++	# might have to extract them afterwards, e.g., when creating a
++	# static archive out of a convenience library, or when linking
++	# the entirety of a libtool archive into another (currently
++	# not supported by libtool).
++	if (for obj in $oldobjs
++	    do
++	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
++	    done | sort | sort -uc >/dev/null 2>&1); then
++	  :
++	else
++	  $echo "copying selected object files to avoid basename conflicts..."
++
++	  if test -z "$gentop"; then
++	    gentop="$output_objdir/${outputname}x"
++	    generated="$generated $gentop"
++
++	    $show "${rm}r $gentop"
++	    $run ${rm}r "$gentop"
++	    $show "$mkdir $gentop"
++	    $run $mkdir "$gentop"
++	    status=$?
++	    if test "$status" -ne 0 && test ! -d "$gentop"; then
++	      exit $status
++	    fi
++	  fi
++
++	  save_oldobjs=$oldobjs
++	  oldobjs=
++	  counter=1
++	  for obj in $save_oldobjs
++	  do
++	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
++	    case " $oldobjs " in
++	    " ") oldobjs=$obj ;;
++	    *[\ /]"$objbase "*)
++	      while :; do
++		# Make sure we don't pick an alternate name that also
++		# overlaps.
++		newobj=lt$counter-$objbase
++		counter=`expr $counter + 1`
++		case " $oldobjs " in
++		*[\ /]"$newobj "*) ;;
++		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
++		esac
++	      done
++	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
++	      $run ln "$obj" "$gentop/$newobj" ||
++	      $run cp "$obj" "$gentop/$newobj"
++	      oldobjs="$oldobjs $gentop/$newobj"
++	      ;;
++	    *) oldobjs="$oldobjs $obj" ;;
++	    esac
++	  done
++	fi
++
 +	eval cmds=\"$old_archive_cmds\"
 +
 +	if len=`expr "X$cmds" : ".*"` &&
@@ -45050,20 +45427,7 @@
 +	  objlist=
 +	  concat_cmds=
 +	  save_oldobjs=$oldobjs
-+	  # GNU ar 2.10+ was changed to match POSIX; thus no paths are
-+	  # encoded into archives.  This makes 'ar r' malfunction in
-+	  # this piecewise linking case whenever conflicting object
-+	  # names appear in distinct ar calls; check, warn and compensate.
-+	    if (for obj in $save_oldobjs
-+	    do
-+	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
-+	    done | sort | sort -uc >/dev/null 2>&1); then
-+	    :
-+	  else
-+	    $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
-+	    $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
-+	    AR_FLAGS=cq
-+	  fi
++
 +	  # Is there a better way of finding the last object in the list?
 +	  for obj in $save_oldobjs
 +	  do
@@ -45074,7 +45438,7 @@
 +	    oldobjs="$objlist $obj"
 +	    objlist="$objlist $obj"
 +	    eval test_cmds=\"$old_archive_cmds\"
-+	    if len=`expr "X$test_cmds" : ".*"` &&
++	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
 +	       test "$len" -le "$max_cmd_len"; then
 +	      :
 +	    else
@@ -45271,11 +45635,11 @@
 +    # install_prog (especially on Windows NT).
 +    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
 +       # Allow the use of GNU shtool's install command.
-+       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
++       $echo "X$nonopt" | grep shtool > /dev/null; then
 +      # Aesthetically quote it.
 +      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
 +      case $arg in
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
 +	arg="\"$arg\""
 +	;;
 +      esac
@@ -45284,14 +45648,14 @@
 +      shift
 +    else
 +      install_prog=
-+      arg="$nonopt"
++      arg=$nonopt
 +    fi
 +
 +    # The real first argument should be the name of the installation program.
 +    # Aesthetically quote it.
 +    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
 +    case $arg in
-+    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
++    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
 +      arg="\"$arg\""
 +      ;;
 +    esac
@@ -45309,28 +45673,31 @@
 +    do
 +      if test -n "$dest"; then
 +	files="$files $dest"
-+	dest="$arg"
++	dest=$arg
 +	continue
 +      fi
 +
 +      case $arg in
 +      -d) isdir=yes ;;
-+      -f) prev="-f" ;;
-+      -g) prev="-g" ;;
-+      -m) prev="-m" ;;
-+      -o) prev="-o" ;;
++      -f) 
++      	case " $install_prog " in
++	*[\\\ /]cp\ *) ;;
++	*) prev=$arg ;;
++	esac
++	;;
++      -g | -m | -o) prev=$arg ;;
 +      -s)
 +	stripme=" -s"
 +	continue
 +	;;
-+      -*) ;;
-+
++      -*)
++	;;
 +      *)
 +	# If the previous option needed an argument, then skip it.
 +	if test -n "$prev"; then
 +	  prev=
 +	else
-+	  dest="$arg"
++	  dest=$arg
 +	  continue
 +	fi
 +	;;
@@ -45339,7 +45706,7 @@
 +      # Aesthetically quote the argument.
 +      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
 +      case $arg in
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
 +	arg="\"$arg\""
 +	;;
 +      esac
@@ -45508,11 +45875,14 @@
 +
 +	  if test "$#" -gt 0; then
 +	    # Delete the old symlinks, and create new ones.
++	    # Try `ln -sf' first, because the `ln' binary might depend on
++	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
++	    # so we also need to try rm && ln -s.
 +	    for linkname
 +	    do
 +	      if test "$linkname" != "$realname"; then
-+		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-+		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
++                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
++                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
 +	      fi
 +	    done
 +	  fi
@@ -45525,7 +45895,16 @@
 +	    IFS="$save_ifs"
 +	    eval cmd=\"$cmd\"
 +	    $show "$cmd"
-+	    $run eval "$cmd" || exit $?
++	    $run eval "$cmd" || {
++	      lt_exit=$?
++
++	      # Restore the uninstalled library and exit
++	      if test "$mode" = relink; then
++		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
++	      fi
++
++	      exit $lt_exit
++	    }
 +	  done
 +	  IFS="$save_ifs"
 +	fi
@@ -45619,17 +45998,15 @@
 +	  notinst_deplibs=
 +	  relink_command=
 +
-+	  # To insure that "foo" is sourced, and not "foo.exe",
-+	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
-+	  # which disallows the automatic-append-.exe behavior.
-+	  case $build in
-+	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
-+	  *) wrapperdot=${wrapper} ;;
-+	  esac
++	  # Note that it is not necessary on cygwin/mingw to append a dot to
++	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
++	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
++	  # `FILE.' does not work on cygwin managed mounts.
++	  #
 +	  # If there is no directory component, then add one.
-+	  case $file in
-+	  */* | *\\*) . ${wrapperdot} ;;
-+	  *) . ./${wrapperdot} ;;
++	  case $wrapper in
++	  */* | *\\*) . ${wrapper} ;;
++	  *) . ./${wrapper} ;;
 +	  esac
 +
 +	  # Check the variables that should have been set.
@@ -45657,17 +46034,15 @@
 +	  done
 +
 +	  relink_command=
-+	  # To insure that "foo" is sourced, and not "foo.exe",
-+	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
-+	  # which disallows the automatic-append-.exe behavior.
-+	  case $build in
-+	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
-+	  *) wrapperdot=${wrapper} ;;
-+	  esac
++	  # Note that it is not necessary on cygwin/mingw to append a dot to
++	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
++	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
++	  # `FILE.' does not work on cygwin managed mounts.
++	  #
 +	  # If there is no directory component, then add one.
-+	  case $file in
-+	  */* | *\\*) . ${wrapperdot} ;;
-+	  *) . ./${wrapperdot} ;;
++	  case $wrapper in
++	  */* | *\\*) . ${wrapper} ;;
++	  *) . ./${wrapper} ;;
 +	  esac
 +
 +	  outputname=
@@ -45708,7 +46083,7 @@
 +	fi
 +
 +	# remove .exe since cygwin /usr/bin/install will append another
-+	# one anyways
++	# one anyway 
 +	case $install_prog,$host in
 +	*/usr/bin/install*,*cygwin*)
 +	  case $file:$destfile in
@@ -46378,7 +46753,7 @@
 +$echo
 +$echo "Try \`$modename --help' for more information about other modes."
 +
-+exit $EXIT_SUCCESS
++exit $?
 +
 +# The TAGs below are defined such that we never get into a situation
 +# in which we disable both kinds of libraries.  Given conflicting
@@ -46404,15 +46779,379 @@
 +# mode:shell-script
 +# sh-indentation:2
 +# End:
-diff -urNad iaxclient-0.0+cvs20050725/Makefile.in /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/Makefile.in
---- iaxclient-0.0+cvs20050725/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/Makefile.in	2005-08-10 15:15:54.000000000 +0200
-@@ -0,0 +1,659 @@
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+diff -urNad iaxclient-0.0+svn20060520~/missing iaxclient-0.0+svn20060520/missing
+--- iaxclient-0.0+svn20060520~/missing	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/missing	2006-05-20 15:47:07.000000000 +0200
+@@ -0,0 +1,360 @@
++#! /bin/sh
++# Common stub for a few missing GNU programs while installing.
++
++scriptversion=2003-09-02.23
++
++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 
++#   Free Software Foundation, Inc.
++# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++if test $# -eq 0; then
++  echo 1>&2 "Try \`$0 --help' for more information"
++  exit 1
++fi
++
++run=:
++
++# In the cases where this matters, `missing' is being run in the
++# srcdir already.
++if test -f configure.ac; then
++  configure_ac=configure.ac
++else
++  configure_ac=configure.in
++fi
++
++msg="missing on your system"
++
++case "$1" in
++--run)
++  # Try to run requested program, and just exit if it succeeds.
++  run=
++  shift
++  "$@" && exit 0
++  # Exit code 63 means version mismatch.  This often happens
++  # when the user try to use an ancient version of a tool on
++  # a file that requires a minimum version.  In this case we
++  # we should proceed has if the program had been absent, or
++  # if --run hadn't been passed.
++  if test $? = 63; then
++    run=:
++    msg="probably too old"
++  fi
++  ;;
++esac
++
++# If it does not exist, or fails to run (possibly an outdated version),
++# try to emulate it.
++case "$1" in
++
++  -h|--h|--he|--hel|--help)
++    echo "\
++$0 [OPTION]... PROGRAM [ARGUMENT]...
++
++Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
++error status if there is no known handling for PROGRAM.
++
++Options:
++  -h, --help      display this help and exit
++  -v, --version   output version information and exit
++  --run           try to run the given command, and emulate it if it fails
++
++Supported PROGRAM values:
++  aclocal      touch file \`aclocal.m4'
++  autoconf     touch file \`configure'
++  autoheader   touch file \`config.h.in'
++  automake     touch all \`Makefile.in' files
++  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
++  flex         create \`lex.yy.c', if possible, from existing .c
++  help2man     touch the output file
++  lex          create \`lex.yy.c', if possible, from existing .c
++  makeinfo     touch the output file
++  tar          try tar, gnutar, gtar, then tar without non-portable flags
++  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
++
++Send bug reports to <bug-automake at gnu.org>."
++    ;;
++
++  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
++    echo "missing $scriptversion (GNU Automake)"
++    ;;
++
++  -*)
++    echo 1>&2 "$0: Unknown \`$1' option"
++    echo 1>&2 "Try \`$0 --help' for more information"
++    exit 1
++    ;;
++
++  aclocal*)
++    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
++       # We have it, but it failed.
++       exit 1
++    fi
++
++    echo 1>&2 "\
++WARNING: \`$1' is $msg.  You should only need it if
++         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
++         to install the \`Automake' and \`Perl' packages.  Grab them from
++         any GNU archive site."
++    touch aclocal.m4
++    ;;
++
++  autoconf)
++    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
++       # We have it, but it failed.
++       exit 1
++    fi
++
++    echo 1>&2 "\
++WARNING: \`$1' is $msg.  You should only need it if
++         you modified \`${configure_ac}'.  You might want to install the
++         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
++         archive site."
++    touch configure
++    ;;
++
++  autoheader)
++    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
++       # We have it, but it failed.
++       exit 1
++    fi
++
++    echo 1>&2 "\
++WARNING: \`$1' is $msg.  You should only need it if
++         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
++         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
++         from any GNU archive site."
++    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
++    test -z "$files" && files="config.h"
++    touch_files=
++    for f in $files; do
++      case "$f" in
++      *:*) touch_files="$touch_files "`echo "$f" |
++				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
++      *) touch_files="$touch_files $f.in";;
++      esac
++    done
++    touch $touch_files
++    ;;
++
++  automake*)
++    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
++       # We have it, but it failed.
++       exit 1
++    fi
++
++    echo 1>&2 "\
++WARNING: \`$1' is $msg.  You should only need it if
++         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
++         You might want to install the \`Automake' and \`Perl' packages.
++         Grab them from any GNU archive site."
++    find . -type f -name Makefile.am -print |
++	   sed 's/\.am$/.in/' |
++	   while read f; do touch "$f"; done
++    ;;
++
++  autom4te)
++    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
++       # We have it, but it failed.
++       exit 1
++    fi
++
++    echo 1>&2 "\
++WARNING: \`$1' is needed, but is $msg.
++         You might have modified some files without having the
++         proper tools for further handling them.
++         You can get \`$1' as part of \`Autoconf' from any GNU
++         archive site."
++
++    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
++    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
++    if test -f "$file"; then
++	touch $file
++    else
++	test -z "$file" || exec >$file
++	echo "#! /bin/sh"
++	echo "# Created by GNU Automake missing as a replacement of"
++	echo "#  $ $@"
++	echo "exit 0"
++	chmod +x $file
++	exit 1
++    fi
++    ;;
++
++  bison|yacc)
++    echo 1>&2 "\
++WARNING: \`$1' $msg.  You should only need it if
++         you modified a \`.y' file.  You may need the \`Bison' package
++         in order for those modifications to take effect.  You can get
++         \`Bison' from any GNU archive site."
++    rm -f y.tab.c y.tab.h
++    if [ $# -ne 1 ]; then
++        eval LASTARG="\${$#}"
++	case "$LASTARG" in
++	*.y)
++	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
++	    if [ -f "$SRCFILE" ]; then
++	         cp "$SRCFILE" y.tab.c
++	    fi
++	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
++	    if [ -f "$SRCFILE" ]; then
++	         cp "$SRCFILE" y.tab.h
++	    fi
++	  ;;
++	esac
++    fi
++    if [ ! -f y.tab.h ]; then
++	echo >y.tab.h
++    fi
++    if [ ! -f y.tab.c ]; then
++	echo 'main() { return 0; }' >y.tab.c
++    fi
++    ;;
++
++  lex|flex)
++    echo 1>&2 "\
++WARNING: \`$1' is $msg.  You should only need it if
++         you modified a \`.l' file.  You may need the \`Flex' package
++         in order for those modifications to take effect.  You can get
++         \`Flex' from any GNU archive site."
++    rm -f lex.yy.c
++    if [ $# -ne 1 ]; then
++        eval LASTARG="\${$#}"
++	case "$LASTARG" in
++	*.l)
++	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
++	    if [ -f "$SRCFILE" ]; then
++	         cp "$SRCFILE" lex.yy.c
++	    fi
++	  ;;
++	esac
++    fi
++    if [ ! -f lex.yy.c ]; then
++	echo 'main() { return 0; }' >lex.yy.c
++    fi
++    ;;
++
++  help2man)
++    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
++       # We have it, but it failed.
++       exit 1
++    fi
++
++    echo 1>&2 "\
++WARNING: \`$1' is $msg.  You should only need it if
++	 you modified a dependency of a manual page.  You may need the
++	 \`Help2man' package in order for those modifications to take
++	 effect.  You can get \`Help2man' from any GNU archive site."
++
++    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
++    if test -z "$file"; then
++	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
++    fi
++    if [ -f "$file" ]; then
++	touch $file
++    else
++	test -z "$file" || exec >$file
++	echo ".ab help2man is required to generate this page"
++	exit 1
++    fi
++    ;;
++
++  makeinfo)
++    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
++       # We have makeinfo, but it failed.
++       exit 1
++    fi
++
++    echo 1>&2 "\
++WARNING: \`$1' is $msg.  You should only need it if
++         you modified a \`.texi' or \`.texinfo' file, or any other file
++         indirectly affecting the aspect of the manual.  The spurious
++         call might also be the consequence of using a buggy \`make' (AIX,
++         DU, IRIX).  You might want to install the \`Texinfo' package or
++         the \`GNU make' package.  Grab either from any GNU archive site."
++    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
++    if test -z "$file"; then
++      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
++      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
++    fi
++    touch $file
++    ;;
++
++  tar)
++    shift
++    if test -n "$run"; then
++      echo 1>&2 "ERROR: \`tar' requires --run"
++      exit 1
++    fi
++
++    # We have already tried tar in the generic part.
++    # Look for gnutar/gtar before invocation to avoid ugly error
++    # messages.
++    if (gnutar --version > /dev/null 2>&1); then
++       gnutar "$@" && exit 0
++    fi
++    if (gtar --version > /dev/null 2>&1); then
++       gtar "$@" && exit 0
++    fi
++    firstarg="$1"
++    if shift; then
++	case "$firstarg" in
++	*o*)
++	    firstarg=`echo "$firstarg" | sed s/o//`
++	    tar "$firstarg" "$@" && exit 0
++	    ;;
++	esac
++	case "$firstarg" in
++	*h*)
++	    firstarg=`echo "$firstarg" | sed s/h//`
++	    tar "$firstarg" "$@" && exit 0
++	    ;;
++	esac
++    fi
++
++    echo 1>&2 "\
++WARNING: I can't seem to be able to run \`tar' with the given arguments.
++         You may want to install GNU tar or Free paxutils, or check the
++         command line arguments."
++    exit 1
++    ;;
++
++  *)
++    echo 1>&2 "\
++WARNING: \`$1' is needed, and is $msg.
++         You might have modified some files without having the
++         proper tools for further handling them.  Check the \`README' file,
++         it often tells you about the needed prerequisites for installing
++         this package.  You may also peek at any GNU archive site, in case
++         some other package would contain this missing \`$1' program."
++    exit 1
++    ;;
++esac
++
++exit 0
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
+diff -urNad iaxclient-0.0+svn20060520~/simpleclient/Makefile.in iaxclient-0.0+svn20060520/simpleclient/Makefile.in
+--- iaxclient-0.0+svn20060520~/simpleclient/Makefile.in	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/simpleclient/Makefile.in	2006-05-20 15:47:40.000000000 +0200
+@@ -0,0 +1,532 @@
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
 +# with or without modifications, as long as this notice is preserved.
@@ -46429,7 +47168,7 @@
 +pkgdatadir = $(datadir)/@PACKAGE@
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = .
++top_builddir = ..
 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 +INSTALL = @INSTALL@
 +install_sh_DATA = $(install_sh) -c -m 644
@@ -46443,23 +47182,18 @@
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
++build_triplet = @build@
 +host_triplet = @host@
-+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-+	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-+	$(top_srcdir)/configure AUTHORS COPYING COPYING.LIB ChangeLog \
-+	INSTALL NEWS compile config.guess config.sub depcomp \
-+	install-sh ltmain.sh missing
-+subdir = .
++subdir = simpleclient
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/macros/gsm.m4 \
 +	$(top_srcdir)/macros/iax2.m4 $(top_srcdir)/macros/portaudio.m4 \
 +	$(top_srcdir)/macros/speex.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
-+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-+ configure.lineno configure.status.lineno
-+mkinstalldirs = $(mkdir_p)
-+CONFIG_HEADER = config.h
++mkinstalldirs = $(install_sh) -d
++CONFIG_HEADER = $(top_builddir)/config.h
 +CONFIG_CLEAN_FILES =
 +SOURCES =
 +DIST_SOURCES =
@@ -46473,16 +47207,6 @@
 +CTAGS = ctags
 +DIST_SUBDIRS = $(SUBDIRS)
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+distdir = $(PACKAGE)-$(VERSION)
-+top_distdir = $(distdir)
-+am__remove_distdir = \
-+  { test ! -d $(distdir) \
-+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-+         && rm -fr $(distdir); }; }
-+DIST_ARCHIVES = $(distdir).tar.gz
-+GZIP_ENV = --best
-+distuninstallcheck_listfiles = find . -type f -print
-+distcleancheck_listfiles = find . -type f -print
 +ACLOCAL = @ACLOCAL@
 +AMDEP_FALSE = @AMDEP_FALSE@
 +AMDEP_TRUE = @AMDEP_TRUE@
@@ -46556,6 +47280,7 @@
 +PACKAGE_TARNAME = @PACKAGE_TARNAME@
 +PACKAGE_VERSION = @PACKAGE_VERSION@
 +PATH_SEPARATOR = @PATH_SEPARATOR@
++PKG_CONFIG = @PKG_CONFIG@
 +PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
 +PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
 +RANLIB = @RANLIB@
@@ -46611,6 +47336,8 @@
 +am__include = @am__include@
 +am__leading_dot = @am__leading_dot@
 +am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
 +bindir = @bindir@
 +build = @build@
 +build_alias = @build_alias@
@@ -46639,63 +47366,41 @@
 +sharedstatedir = @sharedstatedir@
 +sysconfdir = @sysconfdir@
 +target_alias = @target_alias@
-+ACLOCAL_AMFLAGS = -I macros
-+SUBDIRS = lib simpleclient
-+all: config.h
-+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
++SUBDIRS = $(CLIENTS)
++EXTRA_DIST = win32
++all: all-recursive
 +
 +.SUFFIXES:
-+am--refresh:
-+	@:
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 +	@for dep in $?; do \
 +	  case '$(am__configure_deps)' in \
 +	    *$$dep*) \
-+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-+	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
 +		&& exit 0; \
 +	      exit 1;; \
 +	  esac; \
 +	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  simpleclient/Makefile'; \
 +	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  Makefile
++	  $(AUTOMAKE) --gnu  simpleclient/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
 +	  *config.status*) \
-+	    echo ' $(SHELL) ./config.status'; \
-+	    $(SHELL) ./config.status;; \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 +	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 +	esac;
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	$(SHELL) ./config.status --recheck
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(srcdir) && $(AUTOCONF)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +
-+config.h: stamp-h1
-+	@if test ! -f $@; then \
-+	  rm -f stamp-h1; \
-+	  $(MAKE) stamp-h1; \
-+	else :; fi
-+
-+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-+	@rm -f stamp-h1
-+	cd $(top_builddir) && $(SHELL) ./config.status config.h
-+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
-+	cd $(top_srcdir) && $(AUTOHEADER)
-+	rm -f stamp-h1
-+	touch $@
-+
-+distclean-hdr:
-+	-rm -f config.h stamp-h1
-+
 +mostlyclean-libtool:
 +	-rm -f *.lo
 +
@@ -46713,7 +47418,13 @@
 +#     (which will cause the Makefiles to be regenerated when you run `make');
 +# (2) otherwise, pass the desired values on the `make' command line.
 +$(RECURSIVE_TARGETS):
-+	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
 +	dot_seen=no; \
 +	target=`echo $@ | sed s/-recursive//`; \
 +	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -46725,7 +47436,7 @@
 +	    local_target="$$target"; \
 +	  fi; \
 +	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
 +	done; \
 +	if test "$$dot_seen" = "no"; then \
 +	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -46733,7 +47444,13 @@
 +
 +mostlyclean-recursive clean-recursive distclean-recursive \
 +maintainer-clean-recursive:
-+	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
 +	dot_seen=no; \
 +	case "$@" in \
 +	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -46754,7 +47471,7 @@
 +	    local_target="$$target"; \
 +	  fi; \
 +	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
 +	done && test -z "$$fail"
 +tags-recursive:
 +	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -46775,7 +47492,7 @@
 +	mkid -fID $$unique
 +tags: TAGS
 +
-+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
++TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +		$(TAGS_FILES) $(LISP)
 +	tags=; \
 +	here=`pwd`; \
@@ -46792,7 +47509,7 @@
 +	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 +	  fi; \
 +	done; \
-+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
++	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +	unique=`for i in $$list; do \
 +	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +	  done | \
@@ -46804,11 +47521,11 @@
 +	    $$tags $$unique; \
 +	fi
 +ctags: CTAGS
-+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
++CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +		$(TAGS_FILES) $(LISP)
 +	tags=; \
 +	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
++	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +	unique=`for i in $$list; do \
 +	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +	  done | \
@@ -46827,9 +47544,6 @@
 +	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 +
 +distdir: $(DISTFILES)
-+	$(am__remove_distdir)
-+	mkdir $(distdir)
-+	$(mkdir_p) $(distdir)/macros
 +	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 +	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 +	list='$(DISTFILES)'; for file in $$list; do \
@@ -46856,119 +47570,24 @@
 +	    || exit 1; \
 +	  fi; \
 +	done
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 +	  if test "$$subdir" = .; then :; else \
 +	    test -d "$(distdir)/$$subdir" \
-+	    || mkdir "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
 +	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 +	    (cd $$subdir && \
 +	      $(MAKE) $(AM_MAKEFLAGS) \
-+	        top_distdir="../$(top_distdir)" \
-+	        distdir="../$(distdir)/$$subdir" \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
 +	        distdir) \
 +	      || exit 1; \
 +	  fi; \
 +	done
-+	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-+	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-+	|| chmod -R a+r $(distdir)
-+dist-gzip: distdir
-+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+	$(am__remove_distdir)
-+
-+dist-bzip2: distdir
-+	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
-+	$(am__remove_distdir)
-+
-+dist-tarZ: distdir
-+	$(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
-+	$(am__remove_distdir)
-+
-+dist-shar: distdir
-+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-+	$(am__remove_distdir)
-+
-+dist-zip: distdir
-+	-rm -f $(distdir).zip
-+	zip -rq $(distdir).zip $(distdir)
-+	$(am__remove_distdir)
-+
-+dist dist-all: distdir
-+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+	$(am__remove_distdir)
-+
-+# This target untars the dist file and tries a VPATH configuration.  Then
-+# it guarantees that the distribution is self-contained by making another
-+# tarfile.
-+distcheck: dist
-+	case '$(DIST_ARCHIVES)' in \
-+	*.tar.gz*) \
-+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
-+	*.tar.bz2*) \
-+	  bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
-+	*.tar.Z*) \
-+	  uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
-+	*.shar.gz*) \
-+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-+	*.zip*) \
-+	  unzip $(distdir).zip ;;\
-+	esac
-+	chmod -R a-w $(distdir); chmod a+w $(distdir)
-+	mkdir $(distdir)/_build
-+	mkdir $(distdir)/_inst
-+	chmod a-w $(distdir)
-+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-+	  && cd $(distdir)/_build \
-+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-+	    $(DISTCHECK_CONFIGURE_FLAGS) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-+	  && $(MAKE) $(AM_MAKEFLAGS) check \
-+	  && $(MAKE) $(AM_MAKEFLAGS) install \
-+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-+	        distuninstallcheck \
-+	  && chmod -R a-w "$$dc_install_base" \
-+	  && ({ \
-+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-+	  && rm -rf "$$dc_destdir" \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-+	  && rm -rf $(DIST_ARCHIVES) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-+	$(am__remove_distdir)
-+	@(echo "$(distdir) archives ready for distribution: "; \
-+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-+	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
-+distuninstallcheck:
-+	@cd $(distuninstallcheck_dir) \
-+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-+	   || { echo "ERROR: files left after uninstall:" ; \
-+	        if test -n "$(DESTDIR)"; then \
-+	          echo "  (check DESTDIR support)"; \
-+	        fi ; \
-+	        $(distuninstallcheck_listfiles) ; \
-+	        exit 1; } >&2
-+distcleancheck: distclean
-+	@if test '$(srcdir)' = . ; then \
-+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-+	  exit 1 ; \
-+	fi
-+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-+	  || { echo "ERROR: files left in build directory after distclean:" ; \
-+	       $(distcleancheck_listfiles) ; \
-+	       exit 1; } >&2
 +check-am: all-am
 +check: check-recursive
-+all-am: Makefile config.h
++all-am: Makefile
 +installdirs: installdirs-recursive
 +installdirs-am:
 +install: install-recursive
@@ -46990,7 +47609,7 @@
 +clean-generic:
 +
 +distclean-generic:
-+	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +
 +maintainer-clean-generic:
 +	@echo "This command is intended for maintainers to use"
@@ -47000,10 +47619,9 @@
 +clean-am: clean-generic clean-libtool mostlyclean-am
 +
 +distclean: distclean-recursive
-+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 +	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-hdr \
-+	distclean-libtool distclean-tags
++distclean-am: clean-am distclean-generic distclean-libtool \
++	distclean-tags
 +
 +dvi: dvi-recursive
 +
@@ -47026,8 +47644,6 @@
 +installcheck-am:
 +
 +maintainer-clean: maintainer-clean-recursive
-+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-+	-rm -rf $(top_srcdir)/autom4te.cache
 +	-rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
 +
@@ -47047,399 +47663,31 @@
 +
 +uninstall-info: uninstall-info-recursive
 +
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-+	check-am clean clean-generic clean-libtool clean-recursive \
-+	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-+	dist-shar dist-tarZ dist-zip distcheck distclean \
-+	distclean-generic distclean-hdr distclean-libtool \
-+	distclean-recursive distclean-tags distcleancheck distdir \
-+	distuninstallcheck dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am install-man \
-+	install-strip installcheck installcheck-am installdirs \
-+	installdirs-am maintainer-clean maintainer-clean-generic \
-+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-+	tags tags-recursive uninstall uninstall-am uninstall-info-am
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-recursive ctags \
++	ctags-recursive distclean distclean-generic distclean-libtool \
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-info-am
 +
-+
-+#EXTRA_DIST += iaxclient conf
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -urNad iaxclient-0.0+cvs20050725/missing /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/missing
---- iaxclient-0.0+cvs20050725/missing	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/missing	2005-08-10 15:15:32.000000000 +0200
-@@ -0,0 +1,360 @@
-+#! /bin/sh
-+# Common stub for a few missing GNU programs while installing.
-+
-+scriptversion=2003-09-02.23
-+
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 
-+#   Free Software Foundation, Inc.
-+# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+if test $# -eq 0; then
-+  echo 1>&2 "Try \`$0 --help' for more information"
-+  exit 1
-+fi
-+
-+run=:
-+
-+# In the cases where this matters, `missing' is being run in the
-+# srcdir already.
-+if test -f configure.ac; then
-+  configure_ac=configure.ac
-+else
-+  configure_ac=configure.in
-+fi
-+
-+msg="missing on your system"
-+
-+case "$1" in
-+--run)
-+  # Try to run requested program, and just exit if it succeeds.
-+  run=
-+  shift
-+  "$@" && exit 0
-+  # Exit code 63 means version mismatch.  This often happens
-+  # when the user try to use an ancient version of a tool on
-+  # a file that requires a minimum version.  In this case we
-+  # we should proceed has if the program had been absent, or
-+  # if --run hadn't been passed.
-+  if test $? = 63; then
-+    run=:
-+    msg="probably too old"
-+  fi
-+  ;;
-+esac
-+
-+# If it does not exist, or fails to run (possibly an outdated version),
-+# try to emulate it.
-+case "$1" in
-+
-+  -h|--h|--he|--hel|--help)
-+    echo "\
-+$0 [OPTION]... PROGRAM [ARGUMENT]...
-+
-+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-+error status if there is no known handling for PROGRAM.
-+
-+Options:
-+  -h, --help      display this help and exit
-+  -v, --version   output version information and exit
-+  --run           try to run the given command, and emulate it if it fails
-+
-+Supported PROGRAM values:
-+  aclocal      touch file \`aclocal.m4'
-+  autoconf     touch file \`configure'
-+  autoheader   touch file \`config.h.in'
-+  automake     touch all \`Makefile.in' files
-+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-+  flex         create \`lex.yy.c', if possible, from existing .c
-+  help2man     touch the output file
-+  lex          create \`lex.yy.c', if possible, from existing .c
-+  makeinfo     touch the output file
-+  tar          try tar, gnutar, gtar, then tar without non-portable flags
-+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-+
-+Send bug reports to <bug-automake at gnu.org>."
-+    ;;
-+
-+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-+    echo "missing $scriptversion (GNU Automake)"
-+    ;;
-+
-+  -*)
-+    echo 1>&2 "$0: Unknown \`$1' option"
-+    echo 1>&2 "Try \`$0 --help' for more information"
-+    exit 1
-+    ;;
-+
-+  aclocal*)
-+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-+       # We have it, but it failed.
-+       exit 1
-+    fi
-+
-+    echo 1>&2 "\
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-+         to install the \`Automake' and \`Perl' packages.  Grab them from
-+         any GNU archive site."
-+    touch aclocal.m4
-+    ;;
-+
-+  autoconf)
-+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-+       # We have it, but it failed.
-+       exit 1
-+    fi
-+
-+    echo 1>&2 "\
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified \`${configure_ac}'.  You might want to install the
-+         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-+         archive site."
-+    touch configure
-+    ;;
-+
-+  autoheader)
-+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-+       # We have it, but it failed.
-+       exit 1
-+    fi
-+
-+    echo 1>&2 "\
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-+         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-+         from any GNU archive site."
-+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-+    test -z "$files" && files="config.h"
-+    touch_files=
-+    for f in $files; do
-+      case "$f" in
-+      *:*) touch_files="$touch_files "`echo "$f" |
-+				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-+      *) touch_files="$touch_files $f.in";;
-+      esac
-+    done
-+    touch $touch_files
-+    ;;
-+
-+  automake*)
-+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-+       # We have it, but it failed.
-+       exit 1
-+    fi
-+
-+    echo 1>&2 "\
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-+         You might want to install the \`Automake' and \`Perl' packages.
-+         Grab them from any GNU archive site."
-+    find . -type f -name Makefile.am -print |
-+	   sed 's/\.am$/.in/' |
-+	   while read f; do touch "$f"; done
-+    ;;
-+
-+  autom4te)
-+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-+       # We have it, but it failed.
-+       exit 1
-+    fi
-+
-+    echo 1>&2 "\
-+WARNING: \`$1' is needed, but is $msg.
-+         You might have modified some files without having the
-+         proper tools for further handling them.
-+         You can get \`$1' as part of \`Autoconf' from any GNU
-+         archive site."
-+
-+    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-+    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-+    if test -f "$file"; then
-+	touch $file
-+    else
-+	test -z "$file" || exec >$file
-+	echo "#! /bin/sh"
-+	echo "# Created by GNU Automake missing as a replacement of"
-+	echo "#  $ $@"
-+	echo "exit 0"
-+	chmod +x $file
-+	exit 1
-+    fi
-+    ;;
-+
-+  bison|yacc)
-+    echo 1>&2 "\
-+WARNING: \`$1' $msg.  You should only need it if
-+         you modified a \`.y' file.  You may need the \`Bison' package
-+         in order for those modifications to take effect.  You can get
-+         \`Bison' from any GNU archive site."
-+    rm -f y.tab.c y.tab.h
-+    if [ $# -ne 1 ]; then
-+        eval LASTARG="\${$#}"
-+	case "$LASTARG" in
-+	*.y)
-+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-+	    if [ -f "$SRCFILE" ]; then
-+	         cp "$SRCFILE" y.tab.c
-+	    fi
-+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-+	    if [ -f "$SRCFILE" ]; then
-+	         cp "$SRCFILE" y.tab.h
-+	    fi
-+	  ;;
-+	esac
-+    fi
-+    if [ ! -f y.tab.h ]; then
-+	echo >y.tab.h
-+    fi
-+    if [ ! -f y.tab.c ]; then
-+	echo 'main() { return 0; }' >y.tab.c
-+    fi
-+    ;;
-+
-+  lex|flex)
-+    echo 1>&2 "\
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified a \`.l' file.  You may need the \`Flex' package
-+         in order for those modifications to take effect.  You can get
-+         \`Flex' from any GNU archive site."
-+    rm -f lex.yy.c
-+    if [ $# -ne 1 ]; then
-+        eval LASTARG="\${$#}"
-+	case "$LASTARG" in
-+	*.l)
-+	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-+	    if [ -f "$SRCFILE" ]; then
-+	         cp "$SRCFILE" lex.yy.c
-+	    fi
-+	  ;;
-+	esac
-+    fi
-+    if [ ! -f lex.yy.c ]; then
-+	echo 'main() { return 0; }' >lex.yy.c
-+    fi
-+    ;;
-+
-+  help2man)
-+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-+       # We have it, but it failed.
-+       exit 1
-+    fi
-+
-+    echo 1>&2 "\
-+WARNING: \`$1' is $msg.  You should only need it if
-+	 you modified a dependency of a manual page.  You may need the
-+	 \`Help2man' package in order for those modifications to take
-+	 effect.  You can get \`Help2man' from any GNU archive site."
-+
-+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-+    if test -z "$file"; then
-+	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-+    fi
-+    if [ -f "$file" ]; then
-+	touch $file
-+    else
-+	test -z "$file" || exec >$file
-+	echo ".ab help2man is required to generate this page"
-+	exit 1
-+    fi
-+    ;;
-+
-+  makeinfo)
-+    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
-+       # We have makeinfo, but it failed.
-+       exit 1
-+    fi
-+
-+    echo 1>&2 "\
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified a \`.texi' or \`.texinfo' file, or any other file
-+         indirectly affecting the aspect of the manual.  The spurious
-+         call might also be the consequence of using a buggy \`make' (AIX,
-+         DU, IRIX).  You might want to install the \`Texinfo' package or
-+         the \`GNU make' package.  Grab either from any GNU archive site."
-+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-+    if test -z "$file"; then
-+      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-+    fi
-+    touch $file
-+    ;;
-+
-+  tar)
-+    shift
-+    if test -n "$run"; then
-+      echo 1>&2 "ERROR: \`tar' requires --run"
-+      exit 1
-+    fi
-+
-+    # We have already tried tar in the generic part.
-+    # Look for gnutar/gtar before invocation to avoid ugly error
-+    # messages.
-+    if (gnutar --version > /dev/null 2>&1); then
-+       gnutar "$@" && exit 0
-+    fi
-+    if (gtar --version > /dev/null 2>&1); then
-+       gtar "$@" && exit 0
-+    fi
-+    firstarg="$1"
-+    if shift; then
-+	case "$firstarg" in
-+	*o*)
-+	    firstarg=`echo "$firstarg" | sed s/o//`
-+	    tar "$firstarg" "$@" && exit 0
-+	    ;;
-+	esac
-+	case "$firstarg" in
-+	*h*)
-+	    firstarg=`echo "$firstarg" | sed s/h//`
-+	    tar "$firstarg" "$@" && exit 0
-+	    ;;
-+	esac
-+    fi
-+
-+    echo 1>&2 "\
-+WARNING: I can't seem to be able to run \`tar' with the given arguments.
-+         You may want to install GNU tar or Free paxutils, or check the
-+         command line arguments."
-+    exit 1
-+    ;;
-+
-+  *)
-+    echo 1>&2 "\
-+WARNING: \`$1' is needed, and is $msg.
-+         You might have modified some files without having the
-+         proper tools for further handling them.  Check the \`README' file,
-+         it often tells you about the needed prerequisites for installing
-+         this package.  You may also peek at any GNU archive site, in case
-+         some other package would contain this missing \`$1' program."
-+    exit 1
-+    ;;
-+esac
-+
-+exit 0
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/Makefile.in /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/Makefile.in
---- iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/Makefile.in	2005-08-10 15:15:57.000000000 +0200
-@@ -0,0 +1,660 @@
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+diff -urNad iaxclient-0.0+svn20060520~/simpleclient/WinIAX/Makefile.in iaxclient-0.0+svn20060520/simpleclient/WinIAX/Makefile.in
+--- iaxclient-0.0+svn20060520~/simpleclient/WinIAX/Makefile.in	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/simpleclient/WinIAX/Makefile.in	2006-05-20 15:47:41.000000000 +0200
+@@ -0,0 +1,529 @@
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
 +# with or without modifications, as long as this notice is preserved.
@@ -47451,9 +47699,6 @@
 +
 + at SET_MAKE@
 +
-+
-+SOURCES = $(iaxcomm_SOURCES)
-+
 +srcdir = @srcdir@
 +top_srcdir = @top_srcdir@
 +VPATH = @srcdir@
@@ -47474,75 +47719,49 @@
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
++build_triplet = @build@
 +host_triplet = @host@
-+ at MACOSX_TRUE@noinst_PROGRAMS = iaxcomm$(EXEEXT)
-+ at MACOSX_FALSE@bin_PROGRAMS = iaxcomm$(EXEEXT)
-+ at WIN32_TRUE@am__append_1 = -D__WIN95__
-+ at WIN32_TRUE@am__append_2 = -fno-rtti -fno-exceptions -fno-pcc-struct-return -fstrict-aliasing
-+ at WIN32_TRUE@am__append_3 = iaxcomm.rc rc/application.ico iaxcomm.exe.manifest
-+ at MACOSX_TRUE@am__append_4 = Info.plist
-+subdir = simpleclient/iaxcomm
-+DIST_COMMON = README $(nobase_dist_iaxcommdata_DATA) \
-+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
++bin_PROGRAMS = WinIAX$(EXEEXT)
++subdir = simpleclient/WinIAX
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/macros/gsm.m4 \
 +	$(top_srcdir)/macros/iax2.m4 $(top_srcdir)/macros/portaudio.m4 \
 +	$(top_srcdir)/macros/speex.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
-+mkinstalldirs = $(mkdir_p)
++mkinstalldirs = $(install_sh) -d
 +CONFIG_HEADER = $(top_builddir)/config.h
 +CONFIG_CLEAN_FILES =
-+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(iaxcommdatadir)"
++am__installdirs = "$(DESTDIR)$(bindir)"
 +binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
-+am__iaxcomm_SOURCES_DIST = main.cc prefs.cc calls.cc directory.cc \
-+	dial.cc frame.cc devices.cc accounts.cc ringer.cc accounts.h \
-+	app.h calls.h devices.h dial.h directory.h frame.h main.h \
-+	prefs.h ringer.h rc/logo.xpm rc/accounts.xrc rc/devices.xrc \
-+	rc/directory.xrc rc/frame.xrc rc/menubar.xrc rc/panel.xrc \
-+	rc/prefs.xrc iaxcomm.rc rc/application.ico \
-+	iaxcomm.exe.manifest Info.plist
-+am__objects_1 =
-+ at WIN32_TRUE@am__objects_2 = iaxcomm.$(OBJEXT)
-+am_iaxcomm_OBJECTS = main.$(OBJEXT) prefs.$(OBJEXT) calls.$(OBJEXT) \
-+	directory.$(OBJEXT) dial.$(OBJEXT) frame.$(OBJEXT) \
-+	devices.$(OBJEXT) accounts.$(OBJEXT) ringer.$(OBJEXT) \
-+	$(am__objects_1) $(am__objects_2) $(am__objects_1)
-+iaxcomm_OBJECTS = $(am_iaxcomm_OBJECTS)
-+iaxcomm_LDADD = $(LDADD)
-+am__DEPENDENCIES_1 =
-+iaxcomm_DEPENDENCIES = $(top_builddir)/lib/libiaxclient.la \
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1)
++PROGRAMS = $(bin_PROGRAMS)
++am_WinIAX_OBJECTS = StdAfx.$(OBJEXT) WinIAX.$(OBJEXT) \
++	resource.$(OBJEXT)
++WinIAX_OBJECTS = $(am_WinIAX_OBJECTS)
++WinIAX_LDADD = $(LDADD)
++WinIAX_DEPENDENCIES = $(top_builddir)/lib/libiaxclient.la
 +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 +depcomp = $(SHELL) $(top_srcdir)/depcomp
 +am__depfiles_maybe = depfiles
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/accounts.Po ./$(DEPDIR)/calls.Po \
-+ at AMDEP_TRUE@	./$(DEPDIR)/devices.Po ./$(DEPDIR)/dial.Po \
-+ at AMDEP_TRUE@	./$(DEPDIR)/directory.Po ./$(DEPDIR)/frame.Po \
-+ at AMDEP_TRUE@	./$(DEPDIR)/main.Po ./$(DEPDIR)/prefs.Po \
-+ at AMDEP_TRUE@	./$(DEPDIR)/ringer.Po
 +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
 +	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 +	$(AM_CXXFLAGS) $(CXXFLAGS)
 +CXXLD = $(CXX)
-+CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 +	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 +	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 +	$(AM_CFLAGS) $(CFLAGS)
 +CCLD = $(CC)
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 +	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(iaxcomm_SOURCES)
-+DIST_SOURCES = $(am__iaxcomm_SOURCES_DIST)
-+nobase_dist_iaxcommdataDATA_INSTALL = $(install_sh_DATA)
-+DATA = $(nobase_dist_iaxcommdata_DATA)
++SOURCES = $(WinIAX_SOURCES)
++DIST_SOURCES = $(WinIAX_SOURCES)
 +ETAGS = etags
 +CTAGS = ctags
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -47619,6 +47838,7 @@
 +PACKAGE_TARNAME = @PACKAGE_TARNAME@
 +PACKAGE_VERSION = @PACKAGE_VERSION@
 +PATH_SEPARATOR = @PATH_SEPARATOR@
++PKG_CONFIG = @PKG_CONFIG@
 +PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
 +PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
 +RANLIB = @RANLIB@
@@ -47674,6 +47894,8 @@
 +am__include = @am__include@
 +am__leading_dot = @am__leading_dot@
 +am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
 +bindir = @bindir@
 +build = @build@
 +build_alias = @build_alias@
@@ -47702,44 +47924,19 @@
 +sharedstatedir = @sharedstatedir@
 +sysconfdir = @sysconfdir@
 +target_alias = @target_alias@
-+PROG = iaxcomm
-+IAXCOMM_VERSION = 1.0rc3
-+iaxcommdatadir = ${datadir}/iaxcomm
-+XRCS = rc/accounts.xrc rc/devices.xrc rc/directory.xrc rc/frame.xrc	\
-+rc/menubar.xrc rc/panel.xrc rc/prefs.xrc
++WinIAX_SOURCES = StdAfx.cpp StdAfx.h WinIAX.cpp winiax.h resource.rc	\
++	default1.bin resource.h icon1.ico
 +
-+BITMAPS = rc/bitmaps/KP0.bmp rc/bitmaps/KP1.bmp rc/bitmaps/KP2.bmp	\
-+rc/bitmaps/KP3.bmp rc/bitmaps/KP4.bmp rc/bitmaps/KP5.bmp		\
-+rc/bitmaps/KP6.bmp rc/bitmaps/KP7.bmp rc/bitmaps/KP8.bmp		\
-+rc/bitmaps/KP9.bmp rc/bitmaps/KPPOUND.bmp rc/bitmaps/KPSTAR.bmp
-+
-+nobase_dist_iaxcommdata_DATA = $(XRCS) $(BITMAPS) rc/application.ico	\
-+rc/logo.xpm iaxcomm.htb
-+
-+iaxcomm_SOURCES = main.cc prefs.cc calls.cc directory.cc dial.cc	\
-+frame.cc devices.cc accounts.cc ringer.cc accounts.h app.h calls.h	\
-+devices.h dial.h directory.h frame.h main.h prefs.h ringer.h		\
-+rc/logo.xpm $(XRCS)\
-+$(am__append_3) $(am__append_4)
-+
-+# BUILT_SOURCES = xrc_res.cc
-+# nodist_iaxcomm_SOURCES = $(BUILT_SOURCES)
-+CLEANFILES = $(BUILT_SOURCES)
-+AM_CPPFLAGS = -I$(top_srcdir)/lib $(WX_CPPFLAGS) -DIAXCOMM_VERSION=\"$(IAXCOMM_VERSION)\" -DXRCDIRECTORY=\"$(iaxcommdatadir)/rc\" -DDATADIR=\"$(iaxcommdatadir)\" $(am__append_1)
-+AM_CXXFLAGS = $(GTK_CFLAGS) $(WX_CXXFLAGS_ONLY) $(am__append_2)
-+LDADD = $(top_builddir)/lib/libiaxclient.la $(GTK_LIBS) $(WX_LIBS)	\
-+$(WX_XRC_LIBS)
-+
-+ at WIN32_TRUE@AM_RCFLAGS = -D__WIN32__ -D__WIN95__ -D__GNUWIN32__
++AM_CPPFLAGS = -I$(top_srcdir)/lib -D_WIN32_IE=0x0300
++LDADD = $(top_builddir)/lib/libiaxclient.la -lcomdlg32 -lgdi32 -lcomctl32 -lmingwthrd
 +RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(CPPFLAGS) $(AM_RCFLAGS) $(RCFLAGS)
++	$(AM_CPPFLAGS) $(CPPFLAGS)
 +
-+ at MACOSX_TRUE@TARGET = $(PROG).app
-+EXTRA_DIST = QUICKSTART ring.raw
++EXTRA_DIST = ReadMe.txt WinIAX.dsp WinIAX.dsw
 +all: all-am
 +
 +.SUFFIXES:
-+.SUFFIXES: .cc .lo .o .obj .rc
++.SUFFIXES: .cpp .lo .o .obj .rc
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 +	@for dep in $?; do \
 +	  case '$(am__configure_deps)' in \
@@ -47749,9 +47946,9 @@
 +	      exit 1;; \
 +	  esac; \
 +	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  simpleclient/iaxcomm/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  simpleclient/WinIAX/Makefile'; \
 +	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  simpleclient/iaxcomm/Makefile
++	  $(AUTOMAKE) --gnu  simpleclient/WinIAX/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
@@ -47797,55 +47994,38 @@
 +	  echo " rm -f $$p $$f"; \
 +	  rm -f $$p $$f ; \
 +	done
++WinIAX$(EXEEXT): $(WinIAX_OBJECTS) $(WinIAX_DEPENDENCIES) 
++	@rm -f WinIAX$(EXEEXT)
++	$(CXXLINK) $(WinIAX_LDFLAGS) $(WinIAX_OBJECTS) $(WinIAX_LDADD) $(LIBS)
 +
-+clean-noinstPROGRAMS:
-+	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	  echo " rm -f $$p $$f"; \
-+	  rm -f $$p $$f ; \
-+	done
-+iaxcomm$(EXEEXT): $(iaxcomm_OBJECTS) $(iaxcomm_DEPENDENCIES) 
-+	@rm -f iaxcomm$(EXEEXT)
-+	$(CXXLINK) $(iaxcomm_LDFLAGS) $(iaxcomm_OBJECTS) $(iaxcomm_LDADD) $(LIBS)
-+
 +mostlyclean-compile:
 +	-rm -f *.$(OBJEXT)
 +
 +distclean-compile:
 +	-rm -f *.tab.c
 +
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/accounts.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/calls.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/devices.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dial.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/directory.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/frame.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/prefs.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ringer.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/StdAfx.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/WinIAX.Po at am__quote@
 +
-+.cc.o:
++.cpp.o:
 + at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 + at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 + at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 +
-+.cc.obj:
++.cpp.obj:
 + at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 + at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 + at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 +
-+.cc.lo:
++.cpp.lo:
 + at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 + at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 + at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 +
 +mostlyclean-libtool:
@@ -47857,32 +48037,7 @@
 +distclean-libtool:
 +	-rm -f libtool
 +uninstall-info-am:
-+install-nobase_dist_iaxcommdataDATA: $(nobase_dist_iaxcommdata_DATA)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(iaxcommdatadir)" || $(mkdir_p) "$(DESTDIR)$(iaxcommdatadir)"
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	list='$(nobase_dist_iaxcommdata_DATA)'; for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  case $$p in \
-+	    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+	    *) f=$$p;; \
-+	  esac; \
-+	  echo " $(nobase_dist_iaxcommdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iaxcommdatadir)/$$f'"; \
-+	  $(nobase_dist_iaxcommdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iaxcommdatadir)/$$f"; \
-+	done
 +
-+uninstall-nobase_dist_iaxcommdataDATA:
-+	@$(NORMAL_UNINSTALL)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	list='$(nobase_dist_iaxcommdata_DATA)'; for p in $$list; do \
-+	  case $$p in \
-+	    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+	    *) f=$$p;; \
-+	  esac; \
-+	  echo " rm -f '$(DESTDIR)$(iaxcommdatadir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(iaxcommdatadir)/$$f"; \
-+	done
-+
 +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 +	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 +	unique=`for i in $$list; do \
@@ -47932,7 +48087,6 @@
 +	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 +
 +distdir: $(DISTFILES)
-+	$(mkdir_p) $(distdir)/rc $(distdir)/rc/bitmaps
 +	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 +	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 +	list='$(DISTFILES)'; for file in $$list; do \
@@ -47961,9 +48115,9 @@
 +	done
 +check-am: all-am
 +check: check-am
-+all-am: Makefile $(PROGRAMS) $(DATA) all-local
-+installdirs: installdirs-local
-+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(iaxcommdatadir)"; do \
++all-am: Makefile $(PROGRAMS)
++installdirs:
++	for dir in "$(DESTDIR)$(bindir)"; do \
 +	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 +	done
 +install: install-am
@@ -47983,18 +48137,16 @@
 +mostlyclean-generic:
 +
 +clean-generic:
-+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 +
 +distclean-generic:
-+	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +
 +maintainer-clean-generic:
 +	@echo "This command is intended for maintainers to use"
 +	@echo "it deletes files that may require special tools to rebuild."
 +clean: clean-am
 +
-+clean-am: clean-binPROGRAMS clean-generic clean-libtool clean-local \
-+	clean-noinstPROGRAMS mostlyclean-am
++clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
 +
 +distclean: distclean-am
 +	-rm -rf ./$(DEPDIR)
@@ -48012,9 +48164,9 @@
 +
 +info-am:
 +
-+install-data-am: install-nobase_dist_iaxcommdataDATA
++install-data-am:
 +
-+install-exec-am: install-binPROGRAMS install-exec-local
++install-exec-am: install-binPROGRAMS
 +
 +install-info: install-info-am
 +
@@ -48040,70 +48192,35 @@
 +
 +ps-am:
 +
-+uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-local \
-+	uninstall-nobase_dist_iaxcommdataDATA
++uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 +
-+.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
-+	clean-binPROGRAMS clean-generic clean-libtool clean-local \
-+	clean-noinstPROGRAMS ctags distclean distclean-compile \
++.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
++	clean-generic clean-libtool ctags distclean distclean-compile \
 +	distclean-generic distclean-libtool distclean-tags distdir dvi \
 +	dvi-am html html-am info info-am install install-am \
 +	install-binPROGRAMS install-data install-data-am install-exec \
-+	install-exec-am install-exec-local install-info \
-+	install-info-am install-man \
-+	install-nobase_dist_iaxcommdataDATA install-strip installcheck \
-+	installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+	tags uninstall uninstall-am uninstall-binPROGRAMS \
-+	uninstall-info-am uninstall-local \
-+	uninstall-nobase_dist_iaxcommdataDATA
++	install-exec-am install-info install-info-am install-man \
++	install-strip installcheck installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++	pdf pdf-am ps ps-am tags uninstall uninstall-am \
++	uninstall-binPROGRAMS uninstall-info-am
 +
 +
 +.rc.o:
 +	$(RCCOMPILE) -o $@ -i $<
-+
-+xrc_res.cc: $(XRCS)
-+	$(WXRC) -c -o $@ $^
-+
-+ at MACOSX_TRUE@all-local: $(TARGET)
-+
-+ at MACOSX_TRUE@installdirs-local:
-+ at MACOSX_TRUE@	test -z "$(DESTDIR)$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-+
-+ at MACOSX_TRUE@install-exec-local:
-+ at MACOSX_TRUE@	test -z "$(DESTDIR)$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-+ at MACOSX_TRUE@	cp -ar $(PROG).app "$(DESTDIR)$(bindir)/"
-+ at MACOSX_TRUE@	$(LIBTOOL) --mode=clean $(RM) "$(DESTDIR)$(bindir)/$(PROG).app/Contents/MacOS/$(PROG)"
-+ at MACOSX_TRUE@	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(PROG) "$(DESTDIR)$(bindir)/$(PROG).app/Contents/MacOS/$(PROG)"
-+
-+ at MACOSX_TRUE@uninstall-local:
-+ at MACOSX_TRUE@	$(RM) -r "$(DESTDIR)$(bindir)/$(PROG).app"
-+
-+ at MACOSX_TRUE@clean-local:
-+ at MACOSX_TRUE@	$(RM) -r $(PROG).app
-+
-+ at MACOSX_TRUE@$(PROG).app: $(PROG)
-+ at MACOSX_TRUE@	-$(mkdir_p) $@/Contents/MacOS
-+ at MACOSX_TRUE@	-$(mkdir_p) $@/Contents/Resources
-+ at MACOSX_TRUE@	cp `$(WX_CONFIG_PATH) --prefix`/lib/libwx_mac-2.4*.rsrc $@/Contents/Resources/$(PROG).rsrc
-+ at MACOSX_TRUE@	echo -n "APPL????" > $@/Contents/PkgInfo
-+ at MACOSX_TRUE@	sed "s/@VERSION@/$(VERSION)/g" < $(srcdir)/Info.plist > $@/Contents/Info.plist
-+ at MACOSX_TRUE@	cp iaxcomm.icns  $@/Contents/Resources
-+ at MACOSX_TRUE@	cp -r $(srcdir)/rc $@/Contents/Resources
-+ at MACOSX_TRUE@	$(INSTALL_PROGRAM) $(PROG) "`pwd`/$@/Contents/MacOS/$(PROG)"
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/iaxphone/Makefile.in /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/simpleclient/iaxphone/Makefile.in
---- iaxclient-0.0+cvs20050725/simpleclient/iaxphone/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/simpleclient/iaxphone/Makefile.in	2005-08-10 15:15:57.000000000 +0200
-@@ -0,0 +1,567 @@
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+diff -urNad iaxclient-0.0+svn20060520~/simpleclient/iaxcomm/Makefile.in iaxclient-0.0+svn20060520/simpleclient/iaxcomm/Makefile.in
+--- iaxclient-0.0+svn20060520~/simpleclient/iaxcomm/Makefile.in	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/simpleclient/iaxcomm/Makefile.in	2006-05-20 15:47:41.000000000 +0200
+@@ -0,0 +1,661 @@
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
 +# with or without modifications, as long as this notice is preserved.
@@ -48115,7 +48232,6 @@
 +
 + at SET_MAKE@
 +
-+SOURCES = $(iaxphone_SOURCES)
 +
 +srcdir = @srcdir@
 +top_srcdir = @top_srcdir@
@@ -48137,57 +48253,77 @@
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
++build_triplet = @build@
 +host_triplet = @host@
-+ at MACOSX_TRUE@noinst_PROGRAMS = iaxphone$(EXEEXT)
-+ at MACOSX_FALSE@bin_PROGRAMS = iaxphone$(EXEEXT)
++ at MACOSX_TRUE@noinst_PROGRAMS = iaxcomm$(EXEEXT)
++ at MACOSX_FALSE@bin_PROGRAMS = iaxcomm$(EXEEXT)
 + at WIN32_TRUE@am__append_1 = -D__WIN95__
 + at WIN32_TRUE@am__append_2 = -fno-rtti -fno-exceptions -fno-pcc-struct-return -fstrict-aliasing
-+ at WIN32_FALSE@am__append_3 = -DPOSIXSLEEP
++ at WIN32_TRUE@am__append_3 = iaxcomm.rc rc/application.ico iaxcomm.exe.manifest
 + at MACOSX_TRUE@am__append_4 = Info.plist
-+subdir = simpleclient/iaxphone
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++subdir = simpleclient/iaxcomm
++DIST_COMMON = README $(nobase_dist_iaxcommdata_DATA) \
++	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/macros/gsm.m4 \
 +	$(top_srcdir)/macros/iax2.m4 $(top_srcdir)/macros/portaudio.m4 \
 +	$(top_srcdir)/macros/speex.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
-+mkinstalldirs = $(mkdir_p)
++mkinstalldirs = $(install_sh) -d
 +CONFIG_HEADER = $(top_builddir)/config.h
 +CONFIG_CLEAN_FILES =
-+am__installdirs = "$(DESTDIR)$(bindir)"
++am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(iaxcommdatadir)"
 +binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 +PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
-+am__iaxphone_SOURCES_DIST = iaxphone.cc iaxphone.h Info.plist
++am__iaxcomm_SOURCES_DIST = main.cc prefs.cc calls.cc directory.cc \
++	dial.cc frame.cc devices.cc accounts.cc ringer.cc accounts.h \
++	app.h calls.h devices.h dial.h directory.h frame.h main.h \
++	prefs.h ringer.h rc/logo.xpm rc/accounts.xrc rc/devices.xrc \
++	rc/directory.xrc rc/frame.xrc rc/menubar.xrc rc/panel.xrc \
++	rc/prefs.xrc iaxcomm.rc rc/application.ico \
++	iaxcomm.exe.manifest Info.plist
 +am__objects_1 =
-+am_iaxphone_OBJECTS = iaxphone.$(OBJEXT) $(am__objects_1)
-+iaxphone_OBJECTS = $(am_iaxphone_OBJECTS)
-+iaxphone_LDADD = $(LDADD)
++ at WIN32_TRUE@am__objects_2 = iaxcomm.$(OBJEXT)
++am_iaxcomm_OBJECTS = main.$(OBJEXT) prefs.$(OBJEXT) calls.$(OBJEXT) \
++	directory.$(OBJEXT) dial.$(OBJEXT) frame.$(OBJEXT) \
++	devices.$(OBJEXT) accounts.$(OBJEXT) ringer.$(OBJEXT) \
++	$(am__objects_1) $(am__objects_2) $(am__objects_1)
++iaxcomm_OBJECTS = $(am_iaxcomm_OBJECTS)
++iaxcomm_LDADD = $(LDADD)
 +am__DEPENDENCIES_1 =
-+iaxphone_DEPENDENCIES = $(top_builddir)/lib/libiaxclient.la \
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++iaxcomm_DEPENDENCIES = $(top_builddir)/lib/libiaxclient.la \
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1)
 +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 +depcomp = $(SHELL) $(top_srcdir)/depcomp
 +am__depfiles_maybe = depfiles
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/iaxphone.Po
 +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
 +	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 +	$(AM_CXXFLAGS) $(CXXFLAGS)
 +CXXLD = $(CXX)
-+CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 +	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 +	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 +	$(AM_CFLAGS) $(CFLAGS)
 +CCLD = $(CC)
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 +	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(iaxphone_SOURCES)
-+DIST_SOURCES = $(am__iaxphone_SOURCES_DIST)
++SOURCES = $(iaxcomm_SOURCES)
++DIST_SOURCES = $(am__iaxcomm_SOURCES_DIST)
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++nobase_dist_iaxcommdataDATA_INSTALL = $(install_sh_DATA)
++DATA = $(nobase_dist_iaxcommdata_DATA)
 +ETAGS = etags
 +CTAGS = ctags
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -48264,6 +48400,7 @@
 +PACKAGE_TARNAME = @PACKAGE_TARNAME@
 +PACKAGE_VERSION = @PACKAGE_VERSION@
 +PATH_SEPARATOR = @PATH_SEPARATOR@
++PKG_CONFIG = @PKG_CONFIG@
 +PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
 +PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
 +RANLIB = @RANLIB@
@@ -48319,6 +48456,8 @@
 +am__include = @am__include@
 +am__leading_dot = @am__leading_dot@
 +am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
 +bindir = @bindir@
 +build = @build@
 +build_alias = @build_alias@
@@ -48347,16 +48486,46 @@
 +sharedstatedir = @sharedstatedir@
 +sysconfdir = @sysconfdir@
 +target_alias = @target_alias@
-+PROG = iaxphone
-+iaxphone_SOURCES = iaxphone.cc iaxphone.h $(am__append_4)
-+LDADD = $(top_builddir)/lib/libiaxclient.la $(GTK_LIBS) $(WX_LIBS)
-+AM_CPPFLAGS = -I$(top_srcdir)/lib $(WX_CPPFLAGS) $(am__append_1) $(am__append_3)
-+AM_CXXFLAGS = $(GTK_CFLAGS) $(WX_CXXFLAGS_ONLY)  $(am__append_2)
++PROG = iaxcomm
++IAXCOMM_VERSION = 1.1.0final
++iaxcommdatadir = ${datadir}/iaxcomm
++XRCS = rc/accounts.xrc rc/devices.xrc rc/directory.xrc rc/frame.xrc	\
++rc/menubar.xrc rc/panel.xrc rc/prefs.xrc
++
++BITMAPS = rc/bitmaps/KP0.bmp rc/bitmaps/KP1.bmp rc/bitmaps/KP2.bmp	\
++rc/bitmaps/KP3.bmp rc/bitmaps/KP4.bmp rc/bitmaps/KP5.bmp		\
++rc/bitmaps/KP6.bmp rc/bitmaps/KP7.bmp rc/bitmaps/KP8.bmp		\
++rc/bitmaps/KP9.bmp rc/bitmaps/KPPOUND.bmp rc/bitmaps/KPSTAR.bmp
++
++nobase_dist_iaxcommdata_DATA = $(XRCS) $(BITMAPS) rc/application.ico	\
++rc/logo.xpm iaxcomm.htb
++
++iaxcomm_SOURCES = main.cc prefs.cc calls.cc directory.cc dial.cc \
++	frame.cc devices.cc accounts.cc ringer.cc accounts.h app.h \
++	calls.h devices.h dial.h directory.h frame.h main.h prefs.h \
++	ringer.h rc/logo.xpm $(XRCS) $(am__append_3) $(am__append_4)
++
++# BUILT_SOURCES = xrc_res.cc
++# nodist_iaxcomm_SOURCES = $(BUILT_SOURCES)
++CLEANFILES = $(BUILT_SOURCES)
++AM_CPPFLAGS = -I$(top_srcdir)/lib $(WX_CPPFLAGS) \
++	-DIAXCOMM_VERSION=\"$(IAXCOMM_VERSION)\" \
++	-DXRCDIRECTORY=\"$(iaxcommdatadir)/rc\" \
++	-DDATADIR=\"$(iaxcommdatadir)\" $(am__append_1)
++AM_CXXFLAGS = $(GTK_CFLAGS) $(WX_CXXFLAGS_ONLY) $(am__append_2)
++LDADD = $(top_builddir)/lib/libiaxclient.la $(GTK_LIBS) $(WX_LIBS)	\
++$(WX_XRC_LIBS)
++
++ at WIN32_TRUE@AM_RCFLAGS = -D__WIN32__ -D__WIN95__ -D__GNUWIN32__
++RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(CPPFLAGS) $(AM_RCFLAGS) $(RCFLAGS)
++
 + at MACOSX_TRUE@TARGET = $(PROG).app
++EXTRA_DIST = QUICKSTART ring.raw
 +all: all-am
 +
 +.SUFFIXES:
-+.SUFFIXES: .cc .lo .o .obj
++.SUFFIXES: .cc .lo .o .obj .rc
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 +	@for dep in $?; do \
 +	  case '$(am__configure_deps)' in \
@@ -48366,9 +48535,9 @@
 +	      exit 1;; \
 +	  esac; \
 +	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  simpleclient/iaxphone/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  simpleclient/iaxcomm/Makefile'; \
 +	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  simpleclient/iaxphone/Makefile
++	  $(AUTOMAKE) --gnu  simpleclient/iaxcomm/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
@@ -48421,9 +48590,9 @@
 +	  echo " rm -f $$p $$f"; \
 +	  rm -f $$p $$f ; \
 +	done
-+iaxphone$(EXEEXT): $(iaxphone_OBJECTS) $(iaxphone_DEPENDENCIES) 
-+	@rm -f iaxphone$(EXEEXT)
-+	$(CXXLINK) $(iaxphone_LDFLAGS) $(iaxphone_OBJECTS) $(iaxphone_LDADD) $(LIBS)
++iaxcomm$(EXEEXT): $(iaxcomm_OBJECTS) $(iaxcomm_DEPENDENCIES) 
++	@rm -f iaxcomm$(EXEEXT)
++	$(CXXLINK) $(iaxcomm_LDFLAGS) $(iaxcomm_OBJECTS) $(iaxcomm_LDADD) $(LIBS)
 +
 +mostlyclean-compile:
 +	-rm -f *.$(OBJEXT)
@@ -48431,30 +48600,35 @@
 +distclean-compile:
 +	-rm -f *.tab.c
 +
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/iaxphone.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/accounts.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/calls.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/devices.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dial.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/directory.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/frame.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/prefs.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ringer.Po at am__quote@
 +
 +.cc.o:
 + at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 + at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 + at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 +
 +.cc.obj:
 + at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 + at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 + at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 +
 +.cc.lo:
 + at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 + at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 + at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 +
 +mostlyclean-libtool:
@@ -48466,7 +48640,26 @@
 +distclean-libtool:
 +	-rm -f libtool
 +uninstall-info-am:
++install-nobase_dist_iaxcommdataDATA: $(nobase_dist_iaxcommdata_DATA)
++	@$(NORMAL_INSTALL)
++	test -z "$(iaxcommdatadir)" || $(mkdir_p) "$(DESTDIR)$(iaxcommdatadir)"
++	@$(am__vpath_adj_setup) \
++	list='$(nobase_dist_iaxcommdata_DATA)'; for p in $$list; do \
++	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++	  $(am__vpath_adj) \
++	  echo " $(nobase_dist_iaxcommdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iaxcommdatadir)/$$f'"; \
++	  $(nobase_dist_iaxcommdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iaxcommdatadir)/$$f"; \
++	done
 +
++uninstall-nobase_dist_iaxcommdataDATA:
++	@$(NORMAL_UNINSTALL)
++	@$(am__vpath_adj_setup) \
++	list='$(nobase_dist_iaxcommdata_DATA)'; for p in $$list; do \
++	  $(am__vpath_adj) \
++	  echo " rm -f '$(DESTDIR)$(iaxcommdatadir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(iaxcommdatadir)/$$f"; \
++	done
++
 +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 +	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 +	unique=`for i in $$list; do \
@@ -48516,6 +48709,7 @@
 +	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 +
 +distdir: $(DISTFILES)
++	$(mkdir_p) $(distdir)/rc $(distdir)/rc/bitmaps
 +	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 +	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 +	list='$(DISTFILES)'; for file in $$list; do \
@@ -48544,9 +48738,11 @@
 +	done
 +check-am: all-am
 +check: check-am
-+all-am: Makefile $(PROGRAMS) all-local
++ at MACOSX_FALSE@all-local:
++all-am: Makefile $(PROGRAMS) $(DATA) all-local
++ at MACOSX_FALSE@installdirs-local:
 +installdirs: installdirs-local
-+	for dir in "$(DESTDIR)$(bindir)"; do \
++	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(iaxcommdatadir)"; do \
 +	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 +	done
 +install: install-am
@@ -48566,13 +48762,17 @@
 +mostlyclean-generic:
 +
 +clean-generic:
++	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 +
 +distclean-generic:
-+	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +
 +maintainer-clean-generic:
 +	@echo "This command is intended for maintainers to use"
 +	@echo "it deletes files that may require special tools to rebuild."
++ at MACOSX_FALSE@uninstall-local:
++ at MACOSX_FALSE@install-exec-local:
++ at MACOSX_FALSE@clean-local:
 +clean: clean-am
 +
 +clean-am: clean-binPROGRAMS clean-generic clean-libtool clean-local \
@@ -48594,7 +48794,7 @@
 +
 +info-am:
 +
-+install-data-am:
++install-data-am: install-nobase_dist_iaxcommdataDATA
 +
 +install-exec-am: install-binPROGRAMS install-exec-local
 +
@@ -48622,7 +48822,8 @@
 +
 +ps-am:
 +
-+uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-local
++uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-local \
++	uninstall-nobase_dist_iaxcommdataDATA
 +
 +.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
 +	clean-binPROGRAMS clean-generic clean-libtool clean-local \
@@ -48631,14 +48832,22 @@
 +	dvi-am html html-am info info-am install install-am \
 +	install-binPROGRAMS install-data install-data-am install-exec \
 +	install-exec-am install-exec-local install-info \
-+	install-info-am install-man install-strip installcheck \
-+	installcheck-am installdirs maintainer-clean \
++	install-info-am install-man \
++	install-nobase_dist_iaxcommdataDATA install-strip installcheck \
++	installcheck-am installdirs installdirs-local maintainer-clean \
 +	maintainer-clean-generic mostlyclean mostlyclean-compile \
 +	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 +	tags uninstall uninstall-am uninstall-binPROGRAMS \
-+	uninstall-info-am uninstall-local
++	uninstall-info-am uninstall-local \
++	uninstall-nobase_dist_iaxcommdataDATA
 +
 +
++.rc.o:
++	$(RCCOMPILE) -o $@ -i $<
++
++xrc_res.cc: $(XRCS)
++	$(WXRC) -c -o $@ $^
++
 + at MACOSX_TRUE@all-local: $(TARGET)
 +
 + at MACOSX_TRUE@installdirs-local:
@@ -48659,22 +48868,24 @@
 + at MACOSX_TRUE@$(PROG).app: $(PROG)
 + at MACOSX_TRUE@	-$(mkdir_p) $@/Contents/MacOS
 + at MACOSX_TRUE@	-$(mkdir_p) $@/Contents/Resources
-+ at MACOSX_TRUE@	cp `$(WX_CONFIG_PATH) --prefix`/lib/libwx_mac*.rsrc $@/Contents/Resources/$(PROG).rsrc
++ at MACOSX_TRUE@	cp `$(WX_CONFIG_PATH) --prefix`/lib/libwx_mac-2.4*.rsrc $@/Contents/Resources/$(PROG).rsrc
 + at MACOSX_TRUE@	echo -n "APPL????" > $@/Contents/PkgInfo
-+ at MACOSX_TRUE@	cp $(srcdir)/Info.plist $@/Contents/Info.plist 
++ at MACOSX_TRUE@	sed "s/@VERSION@/$(VERSION)/g" < $(srcdir)/Info.plist > $@/Contents/Info.plist
++ at MACOSX_TRUE@	cp iaxcomm.icns  $@/Contents/Resources
++ at MACOSX_TRUE@	cp -r $(srcdir)/rc $@/Contents/Resources
 + at MACOSX_TRUE@	$(INSTALL_PROGRAM) $(PROG) "`pwd`/$@/Contents/MacOS/$(PROG)"
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/Makefile.in /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/simpleclient/Makefile.in
---- iaxclient-0.0+cvs20050725/simpleclient/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/simpleclient/Makefile.in	2005-08-10 15:15:56.000000000 +0200
-@@ -0,0 +1,514 @@
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+diff -urNad iaxclient-0.0+svn20060520~/simpleclient/iaxphone/Makefile.in iaxclient-0.0+svn20060520/simpleclient/iaxphone/Makefile.in
+--- iaxclient-0.0+svn20060520~/simpleclient/iaxphone/Makefile.in	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/simpleclient/iaxphone/Makefile.in	2006-05-20 15:47:41.000000000 +0200
+@@ -0,0 +1,571 @@
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
 +# with or without modifications, as long as this notice is preserved.
@@ -48685,13 +48896,14 @@
 +# PARTICULAR PURPOSE.
 +
 + at SET_MAKE@
++
 +srcdir = @srcdir@
 +top_srcdir = @top_srcdir@
 +VPATH = @srcdir@
 +pkgdatadir = $(datadir)/@PACKAGE@
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ..
++top_builddir = ../..
 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 +INSTALL = @INSTALL@
 +install_sh_DATA = $(install_sh) -c -m 644
@@ -48705,8 +48917,15 @@
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
++build_triplet = @build@
 +host_triplet = @host@
-+subdir = simpleclient
++ at MACOSX_TRUE@noinst_PROGRAMS = iaxphone$(EXEEXT)
++ at MACOSX_FALSE@bin_PROGRAMS = iaxphone$(EXEEXT)
++ at WIN32_TRUE@am__append_1 = -D__WIN95__
++ at WIN32_TRUE@am__append_2 = -fno-rtti -fno-exceptions -fno-pcc-struct-return -fstrict-aliasing
++ at WIN32_FALSE@am__append_3 = -DPOSIXSLEEP
++ at MACOSX_TRUE@am__append_4 = Info.plist
++subdir = simpleclient/iaxphone
 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/macros/gsm.m4 \
@@ -48714,20 +48933,43 @@
 +	$(top_srcdir)/macros/speex.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
-+mkinstalldirs = $(mkdir_p)
++mkinstalldirs = $(install_sh) -d
 +CONFIG_HEADER = $(top_builddir)/config.h
 +CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+	html-recursive info-recursive install-data-recursive \
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive
++am__installdirs = "$(DESTDIR)$(bindir)"
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
++PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
++am__iaxphone_SOURCES_DIST = iaxphone.cc iaxphone.h Info.plist
++am__objects_1 =
++am_iaxphone_OBJECTS = iaxphone.$(OBJEXT) $(am__objects_1)
++iaxphone_OBJECTS = $(am_iaxphone_OBJECTS)
++iaxphone_LDADD = $(LDADD)
++am__DEPENDENCIES_1 =
++iaxphone_DEPENDENCIES = $(top_builddir)/lib/libiaxclient.la \
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CXXFLAGS) $(CXXFLAGS)
++CXXLD = $(CXX)
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(iaxphone_SOURCES)
++DIST_SOURCES = $(am__iaxphone_SOURCES_DIST)
 +ETAGS = etags
 +CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +ACLOCAL = @ACLOCAL@
 +AMDEP_FALSE = @AMDEP_FALSE@
@@ -48802,6 +49044,7 @@
 +PACKAGE_TARNAME = @PACKAGE_TARNAME@
 +PACKAGE_VERSION = @PACKAGE_VERSION@
 +PATH_SEPARATOR = @PATH_SEPARATOR@
++PKG_CONFIG = @PKG_CONFIG@
 +PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
 +PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
 +RANLIB = @RANLIB@
@@ -48857,6 +49100,8 @@
 +am__include = @am__include@
 +am__leading_dot = @am__leading_dot@
 +am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
 +bindir = @bindir@
 +build = @build@
 +build_alias = @build_alias@
@@ -48885,11 +49130,17 @@
 +sharedstatedir = @sharedstatedir@
 +sysconfdir = @sysconfdir@
 +target_alias = @target_alias@
-+SUBDIRS = $(CLIENTS)
-+EXTRA_DIST = win32
-+all: all-recursive
++PROG = iaxphone
++iaxphone_SOURCES = iaxphone.cc iaxphone.h $(am__append_4)
++LDADD = $(top_builddir)/lib/libiaxclient.la $(GTK_LIBS) $(WX_LIBS)
++AM_CPPFLAGS = -I$(top_srcdir)/lib $(WX_CPPFLAGS) $(am__append_1) \
++	$(am__append_3)
++AM_CXXFLAGS = $(GTK_CFLAGS) $(WX_CXXFLAGS_ONLY) $(am__append_2)
++ at MACOSX_TRUE@TARGET = $(PROG).app
++all: all-am
 +
 +.SUFFIXES:
++.SUFFIXES: .cc .lo .o .obj
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 +	@for dep in $?; do \
 +	  case '$(am__configure_deps)' in \
@@ -48899,9 +49150,9 @@
 +	      exit 1;; \
 +	  esac; \
 +	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  simpleclient/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  simpleclient/iaxphone/Makefile'; \
 +	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  simpleclient/Makefile
++	  $(AUTOMAKE) --gnu  simpleclient/iaxphone/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
@@ -48919,7 +49170,74 @@
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++install-binPROGRAMS: $(bin_PROGRAMS)
++	@$(NORMAL_INSTALL)
++	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	@list='$(bin_PROGRAMS)'; for p in $$list; do \
++	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
++	  if test -f $$p \
++	     || test -f $$p1 \
++	  ; then \
++	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
++	  else :; fi; \
++	done
 +
++uninstall-binPROGRAMS:
++	@$(NORMAL_UNINSTALL)
++	@list='$(bin_PROGRAMS)'; for p in $$list; do \
++	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
++	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
++	done
++
++clean-binPROGRAMS:
++	@list='$(bin_PROGRAMS)'; for p in $$list; do \
++	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
++	  echo " rm -f $$p $$f"; \
++	  rm -f $$p $$f ; \
++	done
++
++clean-noinstPROGRAMS:
++	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
++	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
++	  echo " rm -f $$p $$f"; \
++	  rm -f $$p $$f ; \
++	done
++iaxphone$(EXEEXT): $(iaxphone_OBJECTS) $(iaxphone_DEPENDENCIES) 
++	@rm -f iaxphone$(EXEEXT)
++	$(CXXLINK) $(iaxphone_LDFLAGS) $(iaxphone_OBJECTS) $(iaxphone_LDADD) $(LIBS)
++
++mostlyclean-compile:
++	-rm -f *.$(OBJEXT)
++
++distclean-compile:
++	-rm -f *.tab.c
++
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/iaxphone.Po at am__quote@
++
++.cc.o:
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
++
++.cc.obj:
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
++
++.cc.lo:
++ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
++
 +mostlyclean-libtool:
 +	-rm -f *.lo
 +
@@ -48930,65 +49248,6 @@
 +	-rm -f libtool
 +uninstall-info-am:
 +
-+# This directory's subdirectories are mostly independent; you can cd
-+# into them and run `make' without going through this Makefile.
-+# To change the values of `make' variables: instead of editing Makefiles,
-+# (1) if the variable is set in `config.status', edit `config.status'
-+#     (which will cause the Makefiles to be regenerated when you run `make');
-+# (2) otherwise, pass the desired values on the `make' command line.
-+$(RECURSIVE_TARGETS):
-+	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	dot_seen=no; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    dot_seen=yes; \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	done; \
-+	if test "$$dot_seen" = "no"; then \
-+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-+	fi; test -z "$$fail"
-+
-+mostlyclean-recursive clean-recursive distclean-recursive \
-+maintainer-clean-recursive:
-+	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	dot_seen=no; \
-+	case "$@" in \
-+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-+	  *) list='$(SUBDIRS)' ;; \
-+	esac; \
-+	rev=''; for subdir in $$list; do \
-+	  if test "$$subdir" = "."; then :; else \
-+	    rev="$$subdir $$rev"; \
-+	  fi; \
-+	done; \
-+	rev="$$rev ."; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	for subdir in $$rev; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	done && test -z "$$fail"
-+tags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-+	done
-+ctags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-+	done
-+
 +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 +	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 +	unique=`for i in $$list; do \
@@ -48999,23 +49258,10 @@
 +	mkid -fID $$unique
 +tags: TAGS
 +
-+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
++TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +		$(TAGS_FILES) $(LISP)
 +	tags=; \
 +	here=`pwd`; \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-+	  include_option=--etags-include; \
-+	  empty_fix=.; \
-+	else \
-+	  include_option=--include; \
-+	  empty_fix=; \
-+	fi; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test ! -f $$subdir/TAGS || \
-+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-+	  fi; \
-+	done; \
 +	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +	unique=`for i in $$list; do \
 +	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
@@ -49028,7 +49274,7 @@
 +	    $$tags $$unique; \
 +	fi
 +ctags: CTAGS
-+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
++CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +		$(TAGS_FILES) $(LISP)
 +	tags=; \
 +	here=`pwd`; \
@@ -49077,33 +49323,24 @@
 +	    || exit 1; \
 +	  fi; \
 +	done
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test -d "$(distdir)/$$subdir" \
-+	    || mkdir "$(distdir)/$$subdir" \
-+	    || exit 1; \
-+	    (cd $$subdir && \
-+	      $(MAKE) $(AM_MAKEFLAGS) \
-+	        top_distdir="../$(top_distdir)" \
-+	        distdir="../$(distdir)/$$subdir" \
-+	        distdir) \
-+	      || exit 1; \
-+	  fi; \
-+	done
 +check-am: all-am
-+check: check-recursive
-+all-am: Makefile
-+installdirs: installdirs-recursive
-+installdirs-am:
-+install: install-recursive
-+install-exec: install-exec-recursive
-+install-data: install-data-recursive
-+uninstall: uninstall-recursive
++check: check-am
++ at MACOSX_FALSE@all-local:
++all-am: Makefile $(PROGRAMS) all-local
++ at MACOSX_FALSE@installdirs-local:
++installdirs: installdirs-local
++	for dir in "$(DESTDIR)$(bindir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
++install: install-am
++install-exec: install-exec-am
++install-data: install-data-am
++uninstall: uninstall-am
 +
 +install-am: all-am
 +	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 +
-+installcheck: installcheck-recursive
++installcheck: installcheck-am
 +install-strip:
 +	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 +	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
@@ -49114,85 +49351,116 @@
 +clean-generic:
 +
 +distclean-generic:
-+	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +
 +maintainer-clean-generic:
 +	@echo "This command is intended for maintainers to use"
 +	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-recursive
++ at MACOSX_FALSE@uninstall-local:
++ at MACOSX_FALSE@install-exec-local:
++ at MACOSX_FALSE@clean-local:
++clean: clean-am
 +
-+clean-am: clean-generic clean-libtool mostlyclean-am
++clean-am: clean-binPROGRAMS clean-generic clean-libtool clean-local \
++	clean-noinstPROGRAMS mostlyclean-am
 +
-+distclean: distclean-recursive
++distclean: distclean-am
++	-rm -rf ./$(DEPDIR)
 +	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool \
-+	distclean-tags
++distclean-am: clean-am distclean-compile distclean-generic \
++	distclean-libtool distclean-tags
 +
-+dvi: dvi-recursive
++dvi: dvi-am
 +
 +dvi-am:
 +
-+html: html-recursive
++html: html-am
 +
-+info: info-recursive
++info: info-am
 +
 +info-am:
 +
 +install-data-am:
 +
-+install-exec-am:
++install-exec-am: install-binPROGRAMS install-exec-local
 +
-+install-info: install-info-recursive
++install-info: install-info-am
 +
 +install-man:
 +
 +installcheck-am:
 +
-+maintainer-clean: maintainer-clean-recursive
++maintainer-clean: maintainer-clean-am
++	-rm -rf ./$(DEPDIR)
 +	-rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
 +
-+mostlyclean: mostlyclean-recursive
++mostlyclean: mostlyclean-am
 +
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
++mostlyclean-am: mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool
 +
-+pdf: pdf-recursive
++pdf: pdf-am
 +
 +pdf-am:
 +
-+ps: ps-recursive
++ps: ps-am
 +
 +ps-am:
 +
-+uninstall-am: uninstall-info-am
++uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-local
 +
-+uninstall-info: uninstall-info-recursive
-+
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+	clean clean-generic clean-libtool clean-recursive ctags \
-+	ctags-recursive distclean distclean-generic distclean-libtool \
-+	distclean-recursive distclean-tags distdir dvi dvi-am html \
-+	html-am info info-am install install-am install-data \
-+	install-data-am install-exec install-exec-am install-info \
++.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
++	clean-binPROGRAMS clean-generic clean-libtool clean-local \
++	clean-noinstPROGRAMS ctags distclean distclean-compile \
++	distclean-generic distclean-libtool distclean-tags distdir dvi \
++	dvi-am html html-am info info-am install install-am \
++	install-binPROGRAMS install-data install-data-am install-exec \
++	install-exec-am install-exec-local install-info \
 +	install-info-am install-man install-strip installcheck \
-+	installcheck-am installdirs installdirs-am maintainer-clean \
-+	maintainer-clean-generic maintainer-clean-recursive \
-+	mostlyclean mostlyclean-generic mostlyclean-libtool \
-+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am uninstall-info-am
++	installcheck-am installdirs installdirs-local maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags uninstall uninstall-am uninstall-binPROGRAMS \
++	uninstall-info-am uninstall-local
 +
++
++ at MACOSX_TRUE@all-local: $(TARGET)
++
++ at MACOSX_TRUE@installdirs-local:
++ at MACOSX_TRUE@	test -z "$(DESTDIR)$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++
++ at MACOSX_TRUE@install-exec-local:
++ at MACOSX_TRUE@	test -z "$(DESTDIR)$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++ at MACOSX_TRUE@	cp -ar $(PROG).app "$(DESTDIR)$(bindir)/"
++ at MACOSX_TRUE@	$(LIBTOOL) --mode=clean $(RM) "$(DESTDIR)$(bindir)/$(PROG).app/Contents/MacOS/$(PROG)"
++ at MACOSX_TRUE@	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(PROG) "$(DESTDIR)$(bindir)/$(PROG).app/Contents/MacOS/$(PROG)"
++
++ at MACOSX_TRUE@uninstall-local:
++ at MACOSX_TRUE@	$(RM) -r "$(DESTDIR)$(bindir)/$(PROG).app"
++
++ at MACOSX_TRUE@clean-local:
++ at MACOSX_TRUE@	$(RM) -r $(PROG).app
++
++ at MACOSX_TRUE@$(PROG).app: $(PROG)
++ at MACOSX_TRUE@	-$(mkdir_p) $@/Contents/MacOS
++ at MACOSX_TRUE@	-$(mkdir_p) $@/Contents/Resources
++ at MACOSX_TRUE@	cp `$(WX_CONFIG_PATH) --prefix`/lib/libwx_mac*.rsrc $@/Contents/Resources/$(PROG).rsrc
++ at MACOSX_TRUE@	echo -n "APPL????" > $@/Contents/PkgInfo
++ at MACOSX_TRUE@	cp $(srcdir)/Info.plist $@/Contents/Info.plist 
++ at MACOSX_TRUE@	$(INSTALL_PROGRAM) $(PROG) "`pwd`/$@/Contents/MacOS/$(PROG)"
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/testcall/Makefile.in /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/simpleclient/testcall/Makefile.in
---- iaxclient-0.0+cvs20050725/simpleclient/testcall/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/simpleclient/testcall/Makefile.in	2005-08-10 15:15:57.000000000 +0200
-@@ -0,0 +1,514 @@
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+diff -urNad iaxclient-0.0+svn20060520~/simpleclient/testcall/Makefile.in iaxclient-0.0+svn20060520/simpleclient/testcall/Makefile.in
+--- iaxclient-0.0+svn20060520~/simpleclient/testcall/Makefile.in	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/simpleclient/testcall/Makefile.in	2006-05-20 15:47:42.000000000 +0200
+@@ -0,0 +1,512 @@
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
 +# with or without modifications, as long as this notice is preserved.
@@ -49204,8 +49472,6 @@
 +
 + at SET_MAKE@
 +
-+SOURCES = $(testcall_SOURCES)
-+
 +srcdir = @srcdir@
 +top_srcdir = @top_srcdir@
 +VPATH = @srcdir@
@@ -49226,6 +49492,7 @@
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
++build_triplet = @build@
 +host_triplet = @host@
 +bin_PROGRAMS = testcall$(EXEEXT)
 + at WIN32_FALSE@am__append_1 = -DPOSIXSLEEP
@@ -49237,7 +49504,7 @@
 +	$(top_srcdir)/macros/speex.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
-+mkinstalldirs = $(mkdir_p)
++mkinstalldirs = $(install_sh) -d
 +CONFIG_HEADER = $(top_builddir)/config.h
 +CONFIG_CLEAN_FILES =
 +am__installdirs = "$(DESTDIR)$(bindir)"
@@ -49250,14 +49517,13 @@
 +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 +depcomp = $(SHELL) $(top_srcdir)/depcomp
 +am__depfiles_maybe = depfiles
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/testcall.Po
 +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 +	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 +	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 +	$(AM_CFLAGS) $(CFLAGS)
 +CCLD = $(CC)
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 +	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +SOURCES = $(testcall_SOURCES)
 +DIST_SOURCES = $(testcall_SOURCES)
@@ -49337,6 +49603,7 @@
 +PACKAGE_TARNAME = @PACKAGE_TARNAME@
 +PACKAGE_VERSION = @PACKAGE_VERSION@
 +PATH_SEPARATOR = @PATH_SEPARATOR@
++PKG_CONFIG = @PKG_CONFIG@
 +PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
 +PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
 +RANLIB = @RANLIB@
@@ -49392,6 +49659,8 @@
 +am__include = @am__include@
 +am__leading_dot = @am__leading_dot@
 +am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
 +bindir = @bindir@
 +build = @build@
 +build_alias = @build_alias@
@@ -49501,24 +49770,21 @@
 + at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 + at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCC_FALSE@	$(COMPILE) -c $<
 +
 +.c.obj:
 + at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 + at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 +
 +.c.lo:
 + at am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 + at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 +
 +mostlyclean-libtool:
@@ -49632,7 +49898,7 @@
 +clean-generic:
 +
 +distclean-generic:
-+	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +
 +maintainer-clean-generic:
 +	@echo "This command is intended for maintainers to use"
@@ -49702,15 +49968,15 @@
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/tkphone/Makefile.in /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/simpleclient/tkphone/Makefile.in
---- iaxclient-0.0+cvs20050725/simpleclient/tkphone/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/simpleclient/tkphone/Makefile.in	2005-08-10 15:15:58.000000000 +0200
-@@ -0,0 +1,603 @@
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+diff -urNad iaxclient-0.0+svn20060520~/simpleclient/tkphone/Makefile.in iaxclient-0.0+svn20060520/simpleclient/tkphone/Makefile.in
+--- iaxclient-0.0+svn20060520~/simpleclient/tkphone/Makefile.in	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/simpleclient/tkphone/Makefile.in	2006-05-20 15:47:42.000000000 +0200
+@@ -0,0 +1,608 @@
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
 +# with or without modifications, as long as this notice is preserved.
@@ -49724,8 +49990,6 @@
 +
 +
 +
-+SOURCES = $(iaxcli_SOURCES)
-+
 +srcdir = @srcdir@
 +top_srcdir = @top_srcdir@
 +VPATH = @srcdir@
@@ -49746,6 +50010,7 @@
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
++build_triplet = @build@
 +host_triplet = @host@
 +iaxcli_PROGRAMS = iaxcli$(EXEEXT)
 + at WIN32_FALSE@am__append_1 = -DPOSIXSLEEP
@@ -49758,10 +50023,11 @@
 +	$(top_srcdir)/macros/speex.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
-+mkinstalldirs = $(mkdir_p)
++mkinstalldirs = $(install_sh) -d
 +CONFIG_HEADER = $(top_builddir)/config.h
 +CONFIG_CLEAN_FILES =
-+am__installdirs = "$(DESTDIR)$(iaxclidir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(iaxclidir)" "$(DESTDIR)$(iaxclidir)"
++am__installdirs = "$(DESTDIR)$(iaxclidir)" "$(DESTDIR)$(bindir)" \
++	"$(DESTDIR)$(iaxclidir)" "$(DESTDIR)$(iaxclidir)"
 +iaxcliPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 +PROGRAMS = $(iaxcli_PROGRAMS)
 +am_iaxcli_OBJECTS = iaxcli.$(OBJEXT) tones.$(OBJEXT)
@@ -49776,17 +50042,22 @@
 +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 +depcomp = $(SHELL) $(top_srcdir)/depcomp
 +am__depfiles_maybe = depfiles
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/iaxcli.Po ./$(DEPDIR)/tones.Po
 +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 +	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 +	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 +	$(AM_CFLAGS) $(CFLAGS)
 +CCLD = $(CC)
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 +	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +SOURCES = $(iaxcli_SOURCES)
 +DIST_SOURCES = $(iaxcli_SOURCES)
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 +dist_iaxcliDATA_INSTALL = $(INSTALL_DATA)
 +DATA = $(dist_iaxcli_DATA)
 +ETAGS = etags
@@ -49865,6 +50136,7 @@
 +PACKAGE_TARNAME = @PACKAGE_TARNAME@
 +PACKAGE_VERSION = @PACKAGE_VERSION@
 +PATH_SEPARATOR = @PATH_SEPARATOR@
++PKG_CONFIG = @PKG_CONFIG@
 +PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
 +PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
 +RANLIB = @RANLIB@
@@ -49920,6 +50192,8 @@
 +am__include = @am__include@
 +am__leading_dot = @am__leading_dot@
 +am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
 +bindir = @bindir@
 +build = @build@
 +build_alias = @build_alias@
@@ -49956,7 +50230,7 @@
 +iaxcli_SCRIPTS = tkiaxphone
 +dist_iaxcli_DATA = monitor.ui monitor.ui.tcl phone.ui phone.ui.tcl pref.ui pref.ui.tcl
 +LDADD = $(top_builddir)/lib/libiaxclient.la $(GTK_LIBS)
-+AM_CPPFLAGS = -I$(top_srcdir)/lib -DUSE_HOTKEY $(am__append_1)
++AM_CPPFLAGS = -I$(top_srcdir)/lib -DUSE_HOTKEY=0 $(am__append_1)
 +AM_CFLAGS = $(GTK_CFLAGS)
 +SUBST = sed \
 +	-e 's,[@]iaxclidir[@],$(iaxclidir),g' \
@@ -50080,24 +50354,21 @@
 + at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 + at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCC_FALSE@	$(COMPILE) -c $<
 +
 +.c.obj:
 + at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 + at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 +
 +.c.lo:
 + at am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 + at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 +
 +mostlyclean-libtool:
@@ -50114,7 +50385,7 @@
 +	test -z "$(iaxclidir)" || $(mkdir_p) "$(DESTDIR)$(iaxclidir)"
 +	@list='$(dist_iaxcli_DATA)'; for p in $$list; do \
 +	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
++	  f=$(am__strip_dir) \
 +	  echo " $(dist_iaxcliDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iaxclidir)/$$f'"; \
 +	  $(dist_iaxcliDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iaxclidir)/$$f"; \
 +	done
@@ -50122,7 +50393,7 @@
 +uninstall-dist_iaxcliDATA:
 +	@$(NORMAL_UNINSTALL)
 +	@list='$(dist_iaxcli_DATA)'; for p in $$list; do \
-+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
++	  f=$(am__strip_dir) \
 +	  echo " rm -f '$(DESTDIR)$(iaxclidir)/$$f'"; \
 +	  rm -f "$(DESTDIR)$(iaxclidir)/$$f"; \
 +	done
@@ -50229,7 +50500,7 @@
 +	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 +
 +distclean-generic:
-+	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +
 +maintainer-clean-generic:
 +	@echo "This command is intended for maintainers to use"
@@ -50309,15 +50580,15 @@
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/WinIAX/Makefile.in /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/simpleclient/WinIAX/Makefile.in
---- iaxclient-0.0+cvs20050725/simpleclient/WinIAX/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/simpleclient/WinIAX/Makefile.in	2005-08-10 15:15:56.000000000 +0200
-@@ -0,0 +1,531 @@
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+diff -urNad iaxclient-0.0+svn20060520~/simpleclient/wx/Makefile.in iaxclient-0.0+svn20060520/simpleclient/wx/Makefile.in
+--- iaxclient-0.0+svn20060520~/simpleclient/wx/Makefile.in	1970-01-01 01:00:00.000000000 +0100
++++ iaxclient-0.0+svn20060520/simpleclient/wx/Makefile.in	2006-05-20 15:47:42.000000000 +0200
+@@ -0,0 +1,537 @@
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
 +# with or without modifications, as long as this notice is preserved.
@@ -50329,8 +50600,6 @@
 +
 + at SET_MAKE@
 +
-+SOURCES = $(WinIAX_SOURCES)
-+
 +srcdir = @srcdir@
 +top_srcdir = @top_srcdir@
 +VPATH = @srcdir@
@@ -50351,542 +50620,8 @@
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
++build_triplet = @build@
 +host_triplet = @host@
-+bin_PROGRAMS = WinIAX$(EXEEXT)
-+subdir = simpleclient/WinIAX
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/macros/gsm.m4 \
-+	$(top_srcdir)/macros/iax2.m4 $(top_srcdir)/macros/portaudio.m4 \
-+	$(top_srcdir)/macros/speex.m4 $(top_srcdir)/configure.ac
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(mkdir_p)
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__installdirs = "$(DESTDIR)$(bindir)"
-+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-+PROGRAMS = $(bin_PROGRAMS)
-+am_WinIAX_OBJECTS = StdAfx.$(OBJEXT) WinIAX.$(OBJEXT) \
-+	resource.$(OBJEXT)
-+WinIAX_OBJECTS = $(am_WinIAX_OBJECTS)
-+WinIAX_LDADD = $(LDADD)
-+WinIAX_DEPENDENCIES = $(top_builddir)/lib/libiaxclient.la
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/depcomp
-+am__depfiles_maybe = depfiles
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/StdAfx.Po ./$(DEPDIR)/WinIAX.Po
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CXXFLAGS) $(CXXFLAGS)
-+CXXLD = $(CXX)
-+CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(WinIAX_SOURCES)
-+DIST_SOURCES = $(WinIAX_SOURCES)
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+AS = @AS@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CLIENTS = @CLIENTS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+EXEEXT = @EXEEXT@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+GSM_CFLAGS = @GSM_CFLAGS@
-+GSM_LIBS = @GSM_LIBS@
-+GTK_CFLAGS = @GTK_CFLAGS@
-+GTK_CONFIG = @GTK_CONFIG@
-+GTK_LIBS = @GTK_LIBS@
-+IAX2_CFLAGS = @IAX2_CFLAGS@
-+IAX2_CONFIG = @IAX2_CONFIG@
-+IAX2_LIBS = @IAX2_LIBS@
-+IAX_CFLAGS = @IAX_CFLAGS@
-+IAX_LIBS = @IAX_LIBS@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+ISODATE = @ISODATE@
-+JITTERBUF_FALSE = @JITTERBUF_FALSE@
-+JITTERBUF_TRUE = @JITTERBUF_TRUE@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
-+LIBTOOL = @LIBTOOL@
-+LINUX_FALSE = @LINUX_FALSE@
-+LINUX_TRUE = @LINUX_TRUE@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
-+MACOSX_FALSE = @MACOSX_FALSE@
-+MACOSX_TRUE = @MACOSX_TRUE@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+OBJDUMP = @OBJDUMP@
-+OBJEXT = @OBJEXT@
-+OSTYPE = @OSTYPE@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
-+PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
-+RANLIB = @RANLIB@
-+RC = @RC@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SOLARIS_FALSE = @SOLARIS_FALSE@
-+SOLARIS_TRUE = @SOLARIS_TRUE@
-+SPAN_EC_FALSE = @SPAN_EC_FALSE@
-+SPAN_EC_TRUE = @SPAN_EC_TRUE@
-+SPEEX_CFLAGS = @SPEEX_CFLAGS@
-+SPEEX_LIBS = @SPEEX_LIBS@
-+STRIP = @STRIP@
-+USE_LOCAL_GSM_FALSE = @USE_LOCAL_GSM_FALSE@
-+USE_LOCAL_GSM_TRUE = @USE_LOCAL_GSM_TRUE@
-+USE_LOCAL_IAX2_FALSE = @USE_LOCAL_IAX2_FALSE@
-+USE_LOCAL_IAX2_TRUE = @USE_LOCAL_IAX2_TRUE@
-+USE_LOCAL_ILBC_FALSE = @USE_LOCAL_ILBC_FALSE@
-+USE_LOCAL_ILBC_TRUE = @USE_LOCAL_ILBC_TRUE@
-+USE_LOCAL_PORTAUDIO_FALSE = @USE_LOCAL_PORTAUDIO_FALSE@
-+USE_LOCAL_PORTAUDIO_TRUE = @USE_LOCAL_PORTAUDIO_TRUE@
-+USE_LOCAL_SPEEX_FALSE = @USE_LOCAL_SPEEX_FALSE@
-+USE_LOCAL_SPEEX_TRUE = @USE_LOCAL_SPEEX_TRUE@
-+VERSION = @VERSION@
-+WIN32_FALSE = @WIN32_FALSE@
-+WIN32_TRUE = @WIN32_TRUE@
-+WISH = @WISH@
-+WXRC = @WXRC@
-+WX_CFLAGS = @WX_CFLAGS@
-+WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
-+WX_CONFIG_PATH = @WX_CONFIG_PATH@
-+WX_CPPFLAGS = @WX_CPPFLAGS@
-+WX_CXXFLAGS = @WX_CXXFLAGS@
-+WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
-+WX_LIBS = @WX_LIBS@
-+WX_LIBS_STATIC = @WX_LIBS_STATIC@
-+WX_VERSION = @WX_VERSION@
-+WX_XRC_LIBS = @WX_XRC_LIBS@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_AS = @ac_ct_AS@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_RC = @ac_ct_RC@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+oldincludedir = @oldincludedir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
-+WinIAX_SOURCES = StdAfx.cpp StdAfx.h WinIAX.cpp winiax.h resource.rc	\
-+	default1.bin resource.h icon1.ico
-+
-+AM_CPPFLAGS = -I$(top_srcdir)/lib -D_WIN32_IE=0x0300
-+LDADD = $(top_builddir)/lib/libiaxclient.la -lcomdlg32 -lgdi32 -lcomctl32 -lmingwthrd
-+RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS)
-+
-+EXTRA_DIST = ReadMe.txt WinIAX.dsp WinIAX.dsw
-+all: all-am
-+
-+.SUFFIXES:
-+.SUFFIXES: .cpp .lo .o .obj .rc
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  simpleclient/WinIAX/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  simpleclient/WinIAX/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+install-binPROGRAMS: $(bin_PROGRAMS)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	  if test -f $$p \
-+	     || test -f $$p1 \
-+	  ; then \
-+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-+	  else :; fi; \
-+	done
-+
-+uninstall-binPROGRAMS:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-+	done
-+
-+clean-binPROGRAMS:
-+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	  echo " rm -f $$p $$f"; \
-+	  rm -f $$p $$f ; \
-+	done
-+WinIAX$(EXEEXT): $(WinIAX_OBJECTS) $(WinIAX_DEPENDENCIES) 
-+	@rm -f WinIAX$(EXEEXT)
-+	$(CXXLINK) $(WinIAX_LDFLAGS) $(WinIAX_OBJECTS) $(WinIAX_LDADD) $(LIBS)
-+
-+mostlyclean-compile:
-+	-rm -f *.$(OBJEXT)
-+
-+distclean-compile:
-+	-rm -f *.tab.c
-+
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/StdAfx.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/WinIAX.Po at am__quote@
-+
-+.cpp.o:
-+ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
-+
-+.cpp.obj:
-+ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-+
-+.cpp.lo:
-+ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
-+tags: TAGS
-+
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
-+ctags: CTAGS
-+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
-+
-+distclean-tags:
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-+
-+distdir: $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile $(PROGRAMS)
-+installdirs:
-+	for dir in "$(DESTDIR)$(bindir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
-+
-+clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am: install-binPROGRAMS
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
-+
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-+	clean-generic clean-libtool ctags distclean distclean-compile \
-+	distclean-generic distclean-libtool distclean-tags distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-binPROGRAMS install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am install-man \
-+	install-strip installcheck installcheck-am installdirs \
-+	maintainer-clean maintainer-clean-generic mostlyclean \
-+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-+	uninstall-binPROGRAMS uninstall-info-am
-+
-+
-+.rc.o:
-+	$(RCCOMPILE) -o $@ -i $<
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/wx/Makefile.in /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/simpleclient/wx/Makefile.in
---- iaxclient-0.0+cvs20050725/simpleclient/wx/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.e5c3yf/iaxclient-0.0+cvs20050725/simpleclient/wx/Makefile.in	2005-08-10 15:15:58.000000000 +0200
-@@ -0,0 +1,538 @@
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+
-+SOURCES = $(wxiax_SOURCES)
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+host_triplet = @host@
 +bin_PROGRAMS = wxiax$(EXEEXT)
 + at WIN32_FALSE@am__append_1 = -DPOSIXSLEEP
 + at WIN32_TRUE@am__append_2 = -D__WIN95__
@@ -50900,7 +50635,7 @@
 +	$(top_srcdir)/macros/speex.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
-+mkinstalldirs = $(mkdir_p)
++mkinstalldirs = $(install_sh) -d
 +CONFIG_HEADER = $(top_builddir)/config.h
 +CONFIG_CLEAN_FILES =
 +am__installdirs = "$(DESTDIR)$(bindir)"
@@ -50915,15 +50650,14 @@
 +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 +depcomp = $(SHELL) $(top_srcdir)/depcomp
 +am__depfiles_maybe = depfiles
-+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/wx.Po
 +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
 +	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 +	$(AM_CXXFLAGS) $(CXXFLAGS)
 +CXXLD = $(CXX)
-+CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 +SOURCES = $(wxiax_SOURCES)
 +DIST_SOURCES = $(wxiax_SOURCES)
 +ETAGS = etags
@@ -51002,6 +50736,7 @@
 +PACKAGE_TARNAME = @PACKAGE_TARNAME@
 +PACKAGE_VERSION = @PACKAGE_VERSION@
 +PATH_SEPARATOR = @PATH_SEPARATOR@
++PKG_CONFIG = @PKG_CONFIG@
 +PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
 +PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
 +RANLIB = @RANLIB@
@@ -51057,6 +50792,8 @@
 +am__include = @am__include@
 +am__leading_dot = @am__leading_dot@
 +am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
 +bindir = @bindir@
 +build = @build@
 +build_alias = @build_alias@
@@ -51086,9 +50823,10 @@
 +sysconfdir = @sysconfdir@
 +target_alias = @target_alias@
 +wxiax_SOURCES = wx.cc
-+AM_CPPFLAGS = -DDEFAULT_DESTSERV=\"guest at ast1\" -DDEFAULT_DESTEXT=\"1001\" \
-+  -DDEFAULT_NUM_CALLS=1 -I$(top_srcdir)/lib $(WX_CPPFLAGS)\
-+$(am__append_1) $(am__append_2)
++AM_CPPFLAGS = -DDEFAULT_DESTSERV=\"guest at ast1\" \
++	-DDEFAULT_DESTEXT=\"1001\" -DDEFAULT_NUM_CALLS=1 \
++	-I$(top_srcdir)/lib $(WX_CPPFLAGS) $(am__append_1) \
++	$(am__append_2)
 +AM_CXXFLAGS = $(GTK_CFLAGS) $(WX_CXXFLAGS_ONLY) $(am__append_3)
 +LDADD = $(top_builddir)/lib/libiaxclient.la $(GTK_LIBS) $(WX_LIBS)
 +
@@ -51185,24 +50923,21 @@
 + at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 + at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 + at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 +
 +.cc.obj:
 + at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 + at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 + at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 +
 +.cc.lo:
 + at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 + at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 + at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 +
 +mostlyclean-libtool:
@@ -51316,7 +51051,7 @@
 +clean-generic:
 +
 +distclean-generic:
-+	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +
 +maintainer-clean-generic:
 +	@echo "This command is intended for maintainers to use"

Modified: iaxclient/trunk/debian/patches/150_iax2_newjb.dpatch
===================================================================
--- iaxclient/trunk/debian/patches/150_iax2_newjb.dpatch	2006-05-16 10:42:26 UTC (rev 1767)
+++ iaxclient/trunk/debian/patches/150_iax2_newjb.dpatch	2006-05-20 16:14:40 UTC (rev 1768)
@@ -5,17 +5,17 @@
 ## DP: Include config.h in iax.c, since it defines NEWJB
 
 @DPATCH@
-diff -urNad iaxclient-20050503/lib/libiax2/src/iax.c /tmp/dpep.DJKdeR/iaxclient-20050503/lib/libiax2/src/iax.c
---- iaxclient-20050503/lib/libiax2/src/iax.c	2005-05-19 23:47:33.836684033 +0200
-+++ /tmp/dpep.DJKdeR/iaxclient-20050503/lib/libiax2/src/iax.c	2005-05-19 23:47:59.160774486 +0200
+diff -urNad iaxclient-0.0+cvs20060227~/lib/libiax2/src/iax.c iaxclient-0.0+cvs20060227/lib/libiax2/src/iax.c
+--- iaxclient-0.0+cvs20060227~/lib/libiax2/src/iax.c	2006-02-19 14:54:45.000000000 +0100
++++ iaxclient-0.0+cvs20060227/lib/libiax2/src/iax.c	2006-02-27 20:46:19.000000000 +0100
 @@ -9,6 +9,10 @@
   * the GNU Lesser (Library) General Public License
   */
-  
+ 
 +#ifdef HAVE_CONFIG_H
 +#include "config.h"
 +#endif
 +
- #ifdef	WIN32
+ #if defined(WIN32)  ||  defined(_WIN32_WCE)
+ #undef __STRICT_ANSI__ //for strdup with ms
  
- #include <string.h>

Deleted: iaxclient/trunk/debian/patches/160_umask.dpatch
===================================================================
--- iaxclient/trunk/debian/patches/160_umask.dpatch	2006-05-16 10:42:26 UTC (rev 1767)
+++ iaxclient/trunk/debian/patches/160_umask.dpatch	2006-05-20 16:14:40 UTC (rev 1768)
@@ -1,337 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 160_umask.dpatch by  <mikma at users.sourceforge.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Create config file with umask 077, readable only by the owner. 
-
- at DPATCH@
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/accounts.cc /tmp/dpep.snwcJd/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/accounts.cc
---- iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/accounts.cc	2005-07-25 22:25:32.000000000 +0200
-+++ /tmp/dpep.snwcJd/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/accounts.cc	2005-07-25 22:26:01.000000000 +0200
-@@ -79,7 +79,7 @@
- 
- void AccountsDialog::Show( void )
- {
--    wxConfig  *config = new wxConfig(_T("iaxComm"));
-+    wxConfig  *config = theApp::getConfig();
-     wxString   str;
-     long       dummy;
-     bool       bCont;
-@@ -117,7 +117,7 @@
- 
- AddAccountDialog::AddAccountDialog( wxWindow* parent, wxString Selection )
- {
--    wxConfig  *config = new wxConfig(_T("iaxComm"));
-+    wxConfig  *config = theApp::getConfig();
-     wxXmlResource::Get()->LoadDialog(this, parent, wxT("AddAccount"));
- 
-     //----Reach in for our controls-----------------------------------------------------
-@@ -161,7 +161,7 @@
- 
- void AccountsDialog::OnRemoveAccountList(wxCommandEvent &event)
- {
--    wxConfig  *config = new wxConfig(_T("iaxComm"));
-+    wxConfig  *config = theApp::getConfig();
-     long       sel = -1;
-     int        isOK;
- 
-@@ -183,7 +183,7 @@
- #if defined(__UNICODE__)
-     wxMBConvUTF8 utf8;
- #endif
--    wxConfig  *config = new wxConfig(_T("iaxComm"));
-+    wxConfig  *config = theApp::getConfig();
- 
-     if(!Password->GetValue().IsSameAs(Confirm->GetValue())) {
-         wxMessageBox(_("Try Again"),
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/calls.cc /tmp/dpep.snwcJd/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/calls.cc
---- iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/calls.cc	2005-04-13 12:28:06.000000000 +0200
-+++ /tmp/dpep.snwcJd/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/calls.cc	2005-07-25 22:26:01.000000000 +0200
-@@ -70,7 +70,7 @@
-                     const wxSize& size, long style)
-                   : wxListCtrl( parent, id, pos, size, style)
- {
--    wxConfig   *config = new wxConfig(_T("iaxComm"));
-+    wxConfig   *config = theApp::getConfig();
-     long        i;
-     wxListItem  item;
- 
-@@ -188,7 +188,7 @@
- 
- int CallList::HandleStateEvent(struct iaxc_ev_call_state c)
- {
--    wxConfig  *config = new wxConfig(_T("iaxComm"));
-+    wxConfig  *config = theApp::getConfig();
-     wxString   str;
-     long       dummy;
-     bool       bCont;
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/devices.cc /tmp/dpep.snwcJd/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/devices.cc
---- iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/devices.cc	2005-07-25 22:25:32.000000000 +0200
-+++ /tmp/dpep.snwcJd/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/devices.cc	2005-07-25 22:26:01.000000000 +0200
-@@ -166,7 +166,7 @@
-     //First, apply the changes
-     OnApply(event);
- 
--    wxConfig *config = new wxConfig(_T("iaxComm"));
-+    wxConfig *config = theApp::getConfig();
- 
-     config->SetPath(_T("/Prefs"));
- 
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/dial.cc /tmp/dpep.snwcJd/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/dial.cc
---- iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/dial.cc	2005-04-13 12:28:06.000000000 +0200
-+++ /tmp/dpep.snwcJd/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/dial.cc	2005-07-25 22:26:01.000000000 +0200
-@@ -53,7 +53,7 @@
-     wxString Msg;
-     wxString FQIN;
- 
--    wxConfig *config = new wxConfig(_T("iaxComm"));
-+    wxConfig *config = theApp::getConfig();
-     wxString  val;
-     wxString  KeyPath;
- 
-@@ -74,7 +74,7 @@
- 
- void Dial( wxString DialStr )
- {
--    wxConfig *config = new wxConfig(_T("iaxComm"));
-+    wxConfig *config = theApp::getConfig();
-     wxString  FQIN;
- #if defined(__UNICODE__)
-     wxMBConvUTF8 utf8;
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/directory.cc /tmp/dpep.snwcJd/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/directory.cc
---- iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/directory.cc	2005-07-25 22:25:32.000000000 +0200
-+++ /tmp/dpep.snwcJd/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/directory.cc	2005-07-25 22:26:01.000000000 +0200
-@@ -95,7 +95,7 @@
- 
- void DirectoryDialog::Show( void )
- {
--    wxConfig  *config = new wxConfig(_T("iaxComm"));
-+    wxConfig  *config = theApp::getConfig();
-     wxString   str;
-     long       dummy;
-     bool       bCont;
-@@ -162,7 +162,7 @@
- 
- AddOTListDialog::AddOTListDialog( wxWindow* parent, wxString Selection )
- {
--    wxConfig  *config = new wxConfig(_T("iaxComm"));
-+    wxConfig  *config = theApp::getConfig();
-     wxXmlResource::Get()->LoadDialog(this, parent, wxT("AddOT"));
- 
-     //----Reach in for our controls-----------------------------------------------------
-@@ -190,7 +190,7 @@
- 
- AddPhoneListDialog::AddPhoneListDialog( wxWindow* parent, wxString Selection )
- {
--    wxConfig  *config = new wxConfig(_T("iaxComm"));
-+    wxConfig  *config = theApp::getConfig();
-     wxXmlResource::Get()->LoadDialog(this, parent, wxT("AddPhoneList"));
- 
-     //----Reach in for our controls-----------------------------------------------------
-@@ -251,7 +251,7 @@
- 
- void DirectoryDialog::OnDialOTList(wxCommandEvent &event)
- {
--    wxConfig  *config = new wxConfig(_T("iaxComm"));
-+    wxConfig  *config = theApp::getConfig();
-     long       sel = -1;
-     wxString   DialString;
- 
-@@ -277,7 +277,7 @@
- 
- void DirectoryDialog::OnDialPhoneList(wxCommandEvent &event)
- {
--    wxConfig  *config = new wxConfig(_T("iaxComm"));
-+    wxConfig  *config = theApp::getConfig();
-     long       sel = -1;
-     wxString   DialString;
- 
-@@ -294,7 +294,7 @@
- 
- void DirectoryDialog::OnRemoveOTList(wxCommandEvent &event)
- {
--    wxConfig  *config = new wxConfig(_T("iaxComm"));
-+    wxConfig  *config = theApp::getConfig();
-     long       sel = -1;
-     int        isOK;
- 
-@@ -312,7 +312,7 @@
- 
- void DirectoryDialog::OnRemovePhoneList(wxCommandEvent &event)
- {
--    wxConfig  *config = new wxConfig(_T("iaxComm"));
-+    wxConfig  *config = theApp::getConfig();
-     long       sel = -1;
-     int        isOK;
- 
-@@ -331,7 +331,7 @@
- 
- void AddOTListDialog::OnAdd(wxCommandEvent &event)
- {
--    wxConfig  *config = new wxConfig(_T("iaxComm"));
-+    wxConfig  *config = theApp::getConfig();
-     wxString   Path;
- 
-     Path.Printf(_T("/OT/%d"), OTNo->GetValue());
-@@ -348,7 +348,7 @@
- 
- void AddPhoneListDialog::OnAdd(wxCommandEvent &event)
- {
--    wxConfig  *config = new wxConfig(_T("iaxComm"));
-+    wxConfig  *config = theApp::getConfig();
- 
-     config->SetPath(_T("/PhoneBook/") + Name->GetValue());
-     config->Write(_T("Extension"), Extension->GetValue());
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc /tmp/dpep.snwcJd/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc
---- iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc	2005-07-25 22:25:32.000000000 +0200
-+++ /tmp/dpep.snwcJd/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc	2005-07-25 22:26:01.000000000 +0200
-@@ -128,7 +128,7 @@
- 
- MyFrame::MyFrame(wxWindow *parent)
- {
--    wxConfig   *config = new wxConfig(_T("iaxComm"));
-+    wxConfig   *config = theApp::getConfig();
-     wxMenuBar  *aMenuBar;
-     wxString    Name;
-     MyTimer    *timer;
-@@ -391,7 +391,7 @@
- 
- void MyFrame::ShowDirectoryControls()
- {
--    wxConfig   *config = new wxConfig(_T("iaxComm"));
-+    wxConfig   *config = theApp::getConfig();
-     wxButton   *ot;
-     wxString    OTName;
-     wxString    DialString;
-@@ -723,7 +723,7 @@
- 
- void MyFrame::OnOneTouch(wxCommandEvent &event)
- {
--    wxConfig *config = new wxConfig(_T("iaxComm"));
-+    wxConfig *config = theApp::getConfig();
-     wxString  Message;
-     int       OTNo;
-     wxString  PathName;
-@@ -778,7 +778,7 @@
- {
-     wxString  DialString;
-     wxString  Value       = Extension->GetValue();
--    wxConfig *config      = new wxConfig(_T("iaxComm"));
-+    wxConfig *config      = theApp::getConfig();
- 
-     DialString = config->Read(_T("/PhoneBook/") + Value + _T("/Extension"), _T(""));
- 
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/main.cc /tmp/dpep.snwcJd/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/main.cc
---- iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/main.cc	2005-07-25 22:25:32.000000000 +0200
-+++ /tmp/dpep.snwcJd/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/main.cc	2005-07-25 22:26:01.000000000 +0200
-@@ -89,7 +89,7 @@
- 
- bool theApp::OnInit()
- {
--    wxConfig *config = new wxConfig(_T("iaxComm"));
-+    wxConfig *config = theApp::getConfig();
- 
-     wxString str;
-     wxString reginfo;
-@@ -244,7 +244,7 @@
- 
- void theApp::RegisterByName(wxString RegName)
- {
--    wxConfig    *config = new wxConfig(_T("iaxComm"));
-+    wxConfig    *config = theApp::getConfig();
-     wxChar      KeyPath[256];
-     wxListItem  item;
- #if defined(__UNICODE__)
-@@ -305,7 +305,7 @@
- 
- void theApp::load_xrc_resource( const wxString& xrc_filename )
- {
--    wxConfig        *config = new wxConfig(_T("iaxComm"));
-+    wxConfig        *config = theApp::getConfig();
-     wxString         xrc_fullname;
-     static wxString  xrc_subdirectory = _T("");
- 
-@@ -366,6 +366,14 @@
-     }
- }
- 
-+wxConfig *theApp::getConfig()
-+{
-+    wxConfig  *config = new wxConfig(_T("iaxComm"));
-+
-+    config->SetUmask(0077);	// owner only
-+    return config;
-+}
-+
- #ifdef __WXMSW__
- BEGIN_EVENT_TABLE(MyTaskBarIcon, wxTaskBarIcon)
-     EVT_MENU(XRCID("TaskBarRestore"), MyTaskBarIcon::OnRestore)
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/main.h /tmp/dpep.snwcJd/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/main.h
---- iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/main.h	2004-03-05 04:47:46.000000000 +0100
-+++ /tmp/dpep.snwcJd/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/main.h	2005-07-25 22:26:01.000000000 +0200
-@@ -95,6 +95,8 @@
-     wxString      Number;
-     wxString      DefaultAccount;
- 
-+    static wxConfig *getConfig();
-+
- protected:
- 
- private:
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/prefs.cc /tmp/dpep.snwcJd/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/prefs.cc
---- iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/prefs.cc	2005-07-25 22:25:32.000000000 +0200
-+++ /tmp/dpep.snwcJd/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/prefs.cc	2005-07-25 22:26:01.000000000 +0200
-@@ -120,7 +120,7 @@
- 
- PrefsDialog::PrefsDialog(wxWindow* parent)
- {    
--    wxConfig *config = new wxConfig(_T("iaxComm"));
-+    wxConfig *config = theApp::getConfig();
-     long      dummy;
-     bool      bCont;
-     wxString  str;
-@@ -342,7 +342,7 @@
- 
- void PrefsDialog::OnSaveAudio(wxCommandEvent &event)
- {
--    wxConfig *config = new wxConfig(_T("iaxComm"));
-+    wxConfig *config = theApp::getConfig();
-     config->SetPath(_T("/Prefs"));
- 
-     config->Write(_T("RingTone"),   RingTone->GetValue());
-@@ -370,7 +370,7 @@
- 
- void PrefsDialog::OnSaveCallerID(wxCommandEvent &event)
- {
--    wxConfig *config = new wxConfig(_T("iaxComm"));
-+    wxConfig *config = theApp::getConfig();
-     config->SetPath(_T("/Prefs"));
- 
-     config->Write(_T("Name"),       Name->GetValue());
-@@ -393,7 +393,7 @@
- 
- void PrefsDialog::OnSaveMisc(wxCommandEvent &event)
- {
--    wxConfig *config = new wxConfig(_T("iaxComm"));
-+    wxConfig *config = theApp::getConfig();
-     config->SetPath(_T("/Prefs"));
- 
-     config->Write(_T("UseSkin"),        UseSkin->GetValue());
-@@ -424,7 +424,7 @@
- 
- void PrefsDialog::OnSaveFilters(wxCommandEvent &event)
- {
--    wxConfig *config = new wxConfig(_T("iaxComm"));
-+    wxConfig *config = theApp::getConfig();
-     config->SetPath(_T("/Prefs"));
- 
-     config->Write(_T("AGC"),            AGC->GetValue());
-@@ -525,7 +525,7 @@
- 
- void PrefsDialog::OnSaveCodecs(wxCommandEvent &event)
- {
--    wxConfig *config = new wxConfig(_T("iaxComm"));
-+    wxConfig *config = theApp::getConfig();
-     config->SetPath(_T("/Codecs"));
- 
-     config->Write(_T("AllowuLaw"),       AllowuLaw->GetValue());

Modified: iaxclient/trunk/debian/patches/170_deadlock.dpatch
===================================================================
--- iaxclient/trunk/debian/patches/170_deadlock.dpatch	2006-05-16 10:42:26 UTC (rev 1767)
+++ iaxclient/trunk/debian/patches/170_deadlock.dpatch	2006-05-20 16:14:40 UTC (rev 1768)
@@ -5,16 +5,24 @@
 ## DP: Resolve deadlock in iaxc_stop_processing_thread by unlocking gui mutex.
 
 @DPATCH@
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc /tmp/dpep.DKi6Ff/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc
---- iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc	2005-08-08 17:27:07.000000000 +0200
-+++ /tmp/dpep.DKi6Ff/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc	2005-08-08 17:27:19.000000000 +0200
-@@ -381,7 +381,10 @@
+diff -urNad iaxclient-0.0+cvs20060227~/simpleclient/iaxcomm/frame.cc iaxclient-0.0+cvs20060227/simpleclient/iaxcomm/frame.cc
+--- iaxclient-0.0+cvs20060227~/simpleclient/iaxcomm/frame.cc	2006-02-27 20:57:50.000000000 +0100
++++ iaxclient-0.0+cvs20060227/simpleclient/iaxcomm/frame.cc	2006-02-27 20:59:56.000000000 +0100
+@@ -373,15 +373,16 @@
+     delete wxGetApp().theTaskBarIcon;
+ #endif
+ 
+-#if 0
+     // Getting rid of this block seems to be harmless, and also seems to get rid of the 
+     // frequent hang when exiting on linux.
+     iaxc_dump_all_calls();
      for(int i=0;i<10;i++) {
          iaxc_millisleep(100);
      }
 +
 +    wxMutexGuiLeave();
      iaxc_stop_processing_thread();
+-#endif
 +    wxMutexGuiEnter();
      
      if(help != NULL)

Deleted: iaxclient/trunk/debian/patches/180_filter.dpatch
===================================================================
--- iaxclient/trunk/debian/patches/180_filter.dpatch	2006-05-16 10:42:26 UTC (rev 1767)
+++ iaxclient/trunk/debian/patches/180_filter.dpatch	2006-05-20 16:14:40 UTC (rev 1768)
@@ -1,41 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 180_filter.dpatch by  <mikma at users.sourceforge.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: The AGC and AAGC filter were always disabled
-
- at DPATCH@
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc /tmp/dpep.2hLDj6/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc
---- iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc	2005-08-08 17:27:55.000000000 +0200
-+++ /tmp/dpep.2hLDj6/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc	2005-08-08 17:28:06.000000000 +0200
-@@ -322,17 +322,16 @@
-     // Clear these filters
-     int flag = ~(IAXC_FILTER_AGC | IAXC_FILTER_AAGC | IAXC_FILTER_CN |
-                  IAXC_FILTER_DENOISE | IAXC_FILTER_ECHO);
--    iaxc_set_filters(iaxc_get_filters() & flag);
-+    flag = flag & iaxc_get_filters();
- 
--    flag = 0;
-     if(AGC)
--       flag = IAXC_FILTER_AGC;
-+       flag |= IAXC_FILTER_AGC;
- 
-     if(AAGC)
--       flag = IAXC_FILTER_AAGC;
-+       flag |= IAXC_FILTER_AAGC;
- 
-     if(CN)
--       flag = IAXC_FILTER_CN;
-+       flag |= IAXC_FILTER_CN;
- 
-     if(NoiseReduce)
-        flag |= IAXC_FILTER_DENOISE;
-@@ -340,7 +339,7 @@
-     if(EchoCancel)
-        flag |= IAXC_FILTER_ECHO;
- 
--    iaxc_set_filters(iaxc_get_filters() | flag);
-+    iaxc_set_filters(flag);
- }
- 
- void MyFrame::ApplyCodecs()

Modified: iaxclient/trunk/debian/patches/200_version.dpatch
===================================================================
--- iaxclient/trunk/debian/patches/200_version.dpatch	2006-05-16 10:42:26 UTC (rev 1767)
+++ iaxclient/trunk/debian/patches/200_version.dpatch	2006-05-20 16:14:40 UTC (rev 1768)
@@ -8,13 +8,12 @@
 diff -urNad iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc /tmp/dpep.jflKHr/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc
 --- iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc	2005-08-08 17:28:59.000000000 +0200
 +++ /tmp/dpep.jflKHr/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc	2005-08-08 17:29:07.000000000 +0200
-@@ -690,7 +690,8 @@
+@@ -690,7 +690,7 @@
      char*     libver = (char *)malloc(256);
      
      libver = iaxc_version(libver);
--    msg.Printf(_T("iaxComm version:\t%s\nlibiaxclient version:\t%s"), VERSION, libver);
-+    msg.Printf(_T("iaxComm version:\t%s\nlibiaxclient version:\t%s"),
-+	       IAXCOMM_VERSION, libver);
+-    msg.Printf(_T("iaxComm version:\t%s\nlibiaxclient version:\t%s"), wxString(VERSION, wxConvUTF8).c_str(), wxString(libver, wxConvUTF8).c_str());
++    msg.Printf(_T("iaxComm version:\t%s\nlibiaxclient version:\t%s"), wxString(IAXCOMM_VERSION, wxConvUTF8).c_str(), wxString(libver, wxConvUTF8).c_str());
      wxMessageBox(msg, _("iaxComm"), wxOK | wxICON_INFORMATION, this);
  }
  

Deleted: iaxclient/trunk/debian/patches/20_lib.dpatch
===================================================================
--- iaxclient/trunk/debian/patches/20_lib.dpatch	2006-05-16 10:42:26 UTC (rev 1767)
+++ iaxclient/trunk/debian/patches/20_lib.dpatch	2006-05-20 16:14:40 UTC (rev 1768)
@@ -1,115 +0,0 @@
-#! /bin/sh -e
-## 20_lib.dpatch by  <mikma at users.sourceforge.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Support disabled SPEEX_PREPROCESS 
-
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -urNad iaxclient-20041112/lib/audio_encode.c /tmp/dpep.QfqzWY/iaxclient-20041112/lib/audio_encode.c
---- iaxclient-20041112/lib/audio_encode.c	2004-11-12 10:40:14.000000000 +0100
-+++ /tmp/dpep.QfqzWY/iaxclient-20041112/lib/audio_encode.c	2004-11-16 21:13:01.000000000 +0100
-@@ -8,9 +8,11 @@
- 
- static double input_level = 0, output_level = 0;
- 
-+#ifdef SPEEX_PREPROCESS
- static SpeexPreprocessState *st = NULL;
- static int speex_state_size = 0;
- int    iaxc_filters = IAXC_FILTER_AGC|IAXC_FILTER_DENOISE|IAXC_FILTER_AAGC|IAXC_FILTER_CN;
-+#endif
- 
- /* use to measure time since last audio was processed */
- static struct timeval timeLastInput ;
-@@ -47,6 +49,7 @@
- }
- 
- 
-+#ifdef SPEEX_PREPROCESS
- void iaxc_set_speex_filters() 
- {
-     int i;
-@@ -60,6 +63,7 @@
-     i = (iaxc_filters & IAXC_FILTER_DENOISE) ? 1 : 0;
-     speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_DENOISE, &i);
- }
-+#endif
- 
- static void calculate_level(short *audio, int len, double *level) {
-     short now = 0;
-@@ -80,17 +84,21 @@
-     static double lowest_volume = 1;
-     int silent;
- 
-+#ifdef SPEEX_PREPROCESS
-     if(!st || (speex_state_size != len)) {
- 	st = speex_preprocess_state_init(len,8000);
- 	speex_state_size = len;
- 	iaxc_set_speex_filters();
-     }
-+#endif
- 
-     calculate_level(audio, len, &input_level);
- 
-+#ifdef SPEEX_PREPROCESS
-     /* only preprocess if we're interested in VAD, AGC, or DENOISE */
-     if((iaxc_filters & (IAXC_FILTER_DENOISE | IAXC_FILTER_AGC)) || iaxc_silence_threshold > 0)
- 	silent = !speex_preprocess(st, audio, NULL);
-+#endif
- 
-     /* Analog AGC: Bring speex AGC gain out to mixer, with lots of hysteresis */
-     if(!silent && (iaxc_filters & IAXC_FILTER_AGC) && (iaxc_filters & IAXC_FILTER_AAGC)) {
-diff -urNad iaxclient-20041112/lib/audio_portaudio.c /tmp/dpep.QfqzWY/iaxclient-20041112/lib/audio_portaudio.c
---- iaxclient-20041112/lib/audio_portaudio.c	2004-11-12 10:40:15.000000000 +0100
-+++ /tmp/dpep.QfqzWY/iaxclient-20041112/lib/audio_portaudio.c	2004-11-16 21:11:21.000000000 +0100
-@@ -250,6 +250,7 @@
-   return retval; /* found? */
- }
- 
-+#if defined(USE_MEC2) || defined(SPAN_EC) || defined(SPEEX_EC)
- static void iaxc_echo_can(short *inputBuffer, short *outputBuffer, int n)
- {
-     static RingBuffer outRing;
-@@ -323,6 +324,7 @@
- #endif
- 
- }
-+#endif
- 
- int pa_callback(void *inputBuffer, void *outputBuffer,
- 	    unsigned long framesPerBuffer, PaTimestamp outTime, void *userData ) {
-@@ -370,13 +372,17 @@
- 	/* input overflow might happen here */
- 	if(virtualMonoIn) {
- 	  stereo2mono(virtualInBuffer, inputBuffer, framesPerBuffer);
-+#if defined(USE_MEC2) || defined(SPAN_EC) || defined(SPEEX_EC)
- 	  iaxc_echo_can(virtualInBuffer, virtualOutBuffer, framesPerBuffer);
-+#endif
- 
- 	  RingBuffer_Write(&inRing, virtualInBuffer, totBytes);
- 	} else {
- 
-+#if defined(USE_MEC2) || defined(SPAN_EC) || defined(SPEEX_EC)
- 	  iaxc_echo_can(inputBuffer, outputBuffer, framesPerBuffer);
- 
-+#endif
- 	  RingBuffer_Write(&inRing, inputBuffer, totBytes);
- 	}
-     }

Deleted: iaxclient/trunk/debian/patches/210_ringback.dpatch
===================================================================
--- iaxclient/trunk/debian/patches/210_ringback.dpatch	2006-05-16 10:42:26 UTC (rev 1767)
+++ iaxclient/trunk/debian/patches/210_ringback.dpatch	2006-05-20 16:14:40 UTC (rev 1768)
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 210_ringback.dpatch by  <mikma at users.sourceforge.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Stop ring back tone if voice data are received.
-
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./lib/iaxclient_lib.c /tmp/dpep-work.3VAEK5/iaxclient-0.0+cvs20050725/lib/iaxclient_lib.c
---- ./lib/iaxclient_lib.c	2005-10-20 21:25:22.000000000 +0200
-+++ /tmp/dpep-work.3VAEK5/iaxclient-0.0+cvs20050725/lib/iaxclient_lib.c	2005-10-20 21:25:25.000000000 +0200
-@@ -830,6 +830,12 @@
-             break;
- 		case IAX_EVENT_VOICE:
- 			handle_audio_event(e, callNo); 
-+			if (calls[callNo].state & IAXC_CALL_STATE_RINGING) {
-+				calls[callNo].state &= ~IAXC_CALL_STATE_RINGING;
-+				iaxc_do_state_callback(callNo);
-+				iaxc_usermsg(IAXC_STATUS,"Call %d progress",
-+					callNo);
-+			}
- 			break;
- 		case IAX_EVENT_TEXT:
- 			handle_text_event(e, callNo);
-diff -urNad --exclude=CVS --exclude=.svn ./simpleclient/iaxcomm/calls.cc /tmp/dpep-work.3VAEK5/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/calls.cc
---- ./simpleclient/iaxcomm/calls.cc	2005-10-20 21:25:22.000000000 +0200
-+++ /tmp/dpep-work.3VAEK5/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/calls.cc	2005-10-20 21:26:19.000000000 +0200
-@@ -250,6 +250,7 @@
-                 SetItem(c.callNo, 1, _T("ring out"));
-                 wxGetApp().RingbackTone.Start(0);
-             } else {
-+               wxGetApp().RingbackTone.Stop();
-                 if(complete) {
-                     // I really need to clean up this spaghetti code
-                     if(selected)

Added: iaxclient/trunk/debian/patches/230_unicode.dpatch
===================================================================
--- iaxclient/trunk/debian/patches/230_unicode.dpatch	2006-05-16 10:42:26 UTC (rev 1767)
+++ iaxclient/trunk/debian/patches/230_unicode.dpatch	2006-05-20 16:14:40 UTC (rev 1768)
@@ -0,0 +1,448 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 230_unicode.dpatch by  <mikma at users.sourceforge.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Unicode related bugfixes. Printf %s formats requires wxChar* 
+
+ at DPATCH@
+diff -urNad iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/accounts.cc iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/accounts.cc
+--- iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/accounts.cc	2006-05-18 20:56:46.000000000 +0200
++++ iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/accounts.cc	2006-05-18 20:56:47.000000000 +0200
+@@ -180,9 +180,6 @@
+ 
+ void AddAccountDialog::OnAdd(wxCommandEvent &event)
+ {
+-#if defined(__UNICODE__)
+-    wxMBConvUTF8 utf8;
+-#endif
+     wxConfig  *config = theApp::getConfig();
+ 
+     if(!Password->GetValue().IsSameAs(Confirm->GetValue())) {
+@@ -205,17 +202,12 @@
+     // Thanks, AJ
+     char user[256], pass[256], host[256];
+ 
+-#if defined(__UNICODE__)
+-    utf8.WC2MB(user, UserName->GetValue().c_str(), 256);
+-    utf8.WC2MB(pass, Password->GetValue().c_str(), 256);
+-    utf8.WC2MB(host, HostName->GetValue().c_str(), 256);
+-#else
+-    wxStrcpy(user, UserName->GetValue());
+-    wxStrcpy(pass, Password->GetValue());
+-    wxStrcpy(host, HostName->GetValue());
+-#endif
++    strncpy(user, UserName->GetValue().mb_str(*(wxGetApp().ConvIax)), sizeof(user));
++    strncpy(pass, Password->GetValue().mb_str(*(wxGetApp().ConvIax)), sizeof(pass));
++    strncpy(host, HostName->GetValue().mb_str(*(wxGetApp().ConvIax)), sizeof(host));
+     iaxc_register(user, pass, host);
+ 
++
+     AccountName->SetValue(_T(""));
+     HostName->SetValue(_T(""));
+     UserName->SetValue(_T(""));
+diff -urNad iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/calls.cc iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/calls.cc
+--- iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/calls.cc	2006-05-18 20:27:47.000000000 +0200
++++ iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/calls.cc	2006-05-18 20:56:47.000000000 +0200
+@@ -145,9 +145,6 @@
+     int      selected = event.m_itemIndex;
+     char     ext[256];
+     wxString Title;
+-#if defined(__UNICODE__)
+-    wxMBConvUTF8 utf8;
+-#endif
+   
+     Title.Printf(_T("Transfer Call %d"), selected);
+     wxTextEntryDialog dialog(this,
+@@ -158,11 +155,7 @@
+ 
+     if(dialog.ShowModal() != wxID_CANCEL) {
+ 
+-#if defined(__UNICODE__)
+-        utf8.WC2MB(ext, dialog.GetValue().c_str(), 256);
+-#else
+-        strncpy(ext, dialog.GetValue().c_str(), 256);
+-#endif
++        strncpy(ext, dialog.GetValue().mb_str(*(wxGetApp().ConvIax)), sizeof(ext));
+ 
+         iaxc_blind_transfer_call(selected, ext);
+     }
+@@ -193,10 +186,7 @@
+     long       dummy;
+     bool       bCont;
+     static int selectedcall = -1;
+-#if defined(__UNICODE__)
+-    wchar_t ws[256];
+-    wxMBConvUTF8 utf8;
+-#endif
++    wxString   ws;
+ 
+     if(c.state & IAXC_CALL_STATE_RINGING) {
+       wxGetApp().theFrame->Show();
+@@ -227,18 +217,18 @@
+         wxString Remote;
+         
+ 
+-        RemoteName.Printf(_T("%s"), c.remote_name);
++        RemoteName = wxString(c.remote_name, *(wxGetApp().ConvIax));
+         Info  = RemoteName.AfterLast('@');	// Hide username:password
+         Info  = Info.BeforeFirst('/');          // Remove extension in outbound call
+         					// (it will be duplicated in <>)
+ 
+-        Remote.Printf(_T("%s"), c.remote);
++        Remote = wxString(c.remote, *(wxGetApp().ConvIax));
+         if(!Remote.IsEmpty())			// Additional info in Remote
+             Info += _T(" <") + Remote + _T(">");
+ 
+         Codec = GetCodec(c);			// Negotiated codec
+         if(!Codec.IsEmpty())
+-            Info += _T(" [") + GetCodec(c) + _T("]");	// Indicate Negotiated codec
++	    Info += _T(" [") + GetCodec(c) + _T("]");	// Indicate Negotiated codec
+ 
+         SetItem(c.callNo, 2, Info );
+ 
+@@ -274,8 +264,7 @@
+                 // Look for the caller in our phonebook
+                 config->SetPath(_T("/PhoneBook"));
+                 bCont = config->GetFirstGroup(str, dummy);
+-#if defined(__UNICODE__)
+-                utf8.MB2WC(ws, c.remote_name, 256);
++                ws = wxString(c.remote_name, *(wxGetApp().ConvIax));
+                 while ( bCont ) {
+                     if(str.IsSameAs(ws))
+                         break;
+@@ -283,31 +272,17 @@
+                 }
+ 
+                 if(!str.IsSameAs(ws)) {
+-#else
+-                while ( bCont ) {
+-                    if(str.IsSameAs(c.remote_name))
+-                        break;
+-                    bCont = config->GetNextGroup(str, dummy);
+-                }
+-
+-                if(!str.IsSameAs(c.remote_name)) {
+-#endif
+                     // Add to phone book if not there already
+-                    str.Printf(_T("%s/Extension"), c.remote_name);
++                    str.Printf(_T("%s/Extension"), wxString(c.remote_name, *(wxGetApp().ConvIax)).c_str());
+                     config->Write(str, c.remote);
+                 } else {
+                     // Since they're in the phone book, look for ringtone
+-                    str.Printf(_T("%s/RingTone"), c.remote_name);
++                    str.Printf(_T("%s/RingTone"), wxString(c.remote_name, *(wxGetApp().ConvIax)).c_str());
+                     wxGetApp().CallerIDRingName = config->Read(str, _T(""));
+                 }
+ 
+                 if(strcmp(c.local_context, "intercom") == 0) {
+-#if defined(__UNICODE__)
+-                    utf8.MB2WC(ws, c.local, 256);
+-                    if(config->Read(_T("/Prefs/IntercomPass"), _T("s")).IsSameAs(ws)) {
+-#else
+-                    if(config->Read(_T("/Prefs/IntercomPass"), _T("s")).IsSameAs(c.local)) {
+-#endif
++                    if(config->Read(_T("/Prefs/IntercomPass"), _T("s")).IsSameAs(wxString(c.local, *(wxGetApp().ConvIax)))) {
+                         wxGetApp().IntercomTone.Start(1);
+                         iaxc_millisleep(1000);
+                         iaxc_unquelch(c.callNo);
+diff -urNad iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/devices.cc iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/devices.cc
+--- iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/devices.cc	2006-05-18 20:56:46.000000000 +0200
++++ iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/devices.cc	2006-05-18 20:56:47.000000000 +0200
+@@ -101,21 +101,12 @@
+     int               i;
+     long              caps;
+     wxString          devname;
+-#if defined(__UNICODE__)
+-    wchar_t           wdevname[256];
+-    wxMBConvUTF8      utf8;
+-#endif
+ 
+     iaxc_audio_devices_get(&devices, &nDevs, &input, &output, &ring);
+ 
+     for(i=0; i<nDevs; i++) {
+         caps =    devices->capabilities;
+-#if defined(__UNICODE__)
+-        utf8.MB2WC(wdevname, devices->name, 256);
+-        devname = wdevname;
+-#else
+-        devname = devices->name;
+-#endif
++        devname = wxString(devices->name, wxConvUTF8);
+ 
+         if(caps & IAXC_AD_INPUT) {
+             InputDevice->Append(devname);
+@@ -216,10 +207,6 @@
+     int                      input  = 0;
+     int                      output = 0;
+     int                      ring   = 0;
+-#if defined(__UNICODE__)
+-    wchar_t                  wdevname[256];
+-    wxMBConvUTF8             utf8;
+-#endif
+ 
+     // Note that if we're called with an invalid devicename, the deviceID
+     // stays 0, which equals default.
+@@ -228,32 +215,17 @@
+ 
+     for(i=0; i<nDevs; i++) {
+         if(devices->capabilities & IAXC_AD_INPUT) {
+-#if defined(__UNICODE__)
+-            utf8.MB2WC(wdevname, devices->name, 256);
+-            if(inname.Cmp(wdevname) == 0)
+-#else
+-            if(inname.Cmp(devices->name) == 0)
+-#endif
++            if(inname.Cmp(wxString(devices->name, wxConvUTF8)) == 0)
+                 input = devices->devID;
+         }
+ 
+         if(devices->capabilities & IAXC_AD_OUTPUT) {
+-#if defined(__UNICODE__)
+-            utf8.MB2WC(wdevname, devices->name, 256);
+-            if(outname.Cmp(wdevname) == 0)
+-#else
+-            if(outname.Cmp(devices->name) == 0)
+-#endif
++            if(outname.Cmp(wxString(devices->name, wxConvUTF8)) == 0)
+                 output = devices->devID;
+         }
+ 
+         if(devices->capabilities & IAXC_AD_RING) {
+-#if defined(__UNICODE__)
+-            utf8.MB2WC(wdevname, devices->name, 256);
+-            if(ringname.Cmp(wdevname) == 0)
+-#else
+-            if(ringname.Cmp(devices->name) == 0)
+-#endif
++            if(ringname.Cmp(wxString(devices->name, wxConvUTF8)) == 0)
+                 ring = devices->devID;
+         }
+         devices++;
+diff -urNad iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/dial.cc iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/dial.cc
+--- iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/dial.cc	2006-05-18 20:27:47.000000000 +0200
++++ iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/dial.cc	2006-05-18 20:56:47.000000000 +0200
+@@ -76,10 +76,6 @@
+ {
+     wxConfig *config = theApp::getConfig();
+     wxString  FQIN;
+-#if defined(__UNICODE__)
+-    wxMBConvUTF8 utf8;
+-    char to[256];
+-#endif
+ 
+     wxString  AccountInfo = DialStr.BeforeLast('/');    // Empty   if no '/'
+     wxString  Extension   = DialStr.AfterLast('/');     // dialstr if no '/'
+@@ -117,11 +113,6 @@
+                 Host.c_str(),
+                 Extension.c_str());
+ 
+-#if defined(__UNICODE__)
+-    utf8.WC2MB(to, FQIN.c_str(), 256);
+-    iaxc_call(to);
+-#else
+-    iaxc_call((char *) FQIN.c_str());
+-#endif
++    iaxc_call((char *)(const char *)FQIN.mb_str(*(wxGetApp().ConvIax)));
+ }
+ 
+diff -urNad iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/frame.cc iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/frame.cc
+--- iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/frame.cc	2006-05-18 20:56:46.000000000 +0200
++++ iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/frame.cc	2006-05-18 20:56:47.000000000 +0200
+@@ -250,7 +250,7 @@
+ #endif
+ 
+ #ifdef DATADIR
+-    filename = wxFileName(wxString(DATADIR) + wxFILE_SEP_PATH +
++    filename = wxFileName(wxString(DATADIR, wxConvUTF8) + wxFILE_SEP_PATH +
+ 			  _T("iaxcomm.htb"));
+ 
+     if (filename.FileExists()) {
+@@ -622,18 +622,8 @@
+ 
+ int MyFrame::HandleStatusEvent(char *msg)
+ {
+-#if defined(__UNICODE__)
+-    wchar_t ws[256];
+-    wxMBConvUTF8 utf8;
+-#endif
+-
+     MessageTicks = 0;
+-#if defined(__UNICODE__)
+-    utf8.MB2WC(ws, msg, 256);
+-    wxGetApp().theFrame->SetStatusText(ws);
+-#else
+-    wxGetApp().theFrame->SetStatusText(msg);
+-#endif
++    wxGetApp().theFrame->SetStatusText(wxString(msg, *(wxGetApp().ConvIax)));
+     return 1;
+ }
+ 
+@@ -695,7 +685,7 @@
+     char*     libver = (char *)malloc(256);
+     
+     libver = iaxc_version(libver);
+-    msg.Printf(_T("iaxComm version:\t%s\nlibiaxclient version:\t%s"), VERSION, libver);
++    msg.Printf(_T("iaxComm version:\t%s\nlibiaxclient version:\t%s"), wxString(VERSION, wxConvUTF8).c_str(), wxString(libver, wxConvUTF8).c_str());
+     wxMessageBox(msg, _("iaxComm"), wxOK | wxICON_INFORMATION, this);
+ }
+ 
+@@ -756,23 +746,19 @@
+ void MyFrame::OnKeyPad(wxCommandEvent &event)
+ {
+     wxString  Message;
+-#if defined(__UNICODE__)
+-    wchar_t   digit;
+-#else
+-    char      digit;
+-#endif
++    wxChar    digit;
+     int       OTNo;
+ 
+     OTNo  = event.GetId() - XRCID("KP0");
+-    digit = '0' + (char) OTNo;
++    digit = wxT('0') + OTNo;
+ 
+     if(OTNo == 10)
+-        digit = '*';
++        digit = wxT('*');
+ 
+     if(OTNo == 11)
+-        digit = '#';
++        digit = wxT('#');
+ 
+-    iaxc_send_dtmf(digit);
++    iaxc_send_dtmf((char)digit);
+ 
+     wxString SM;
+     SM.Printf(_T("DTMF %c"), digit); 
+@@ -803,9 +789,6 @@
+     int      selected = iaxc_selected_call();
+     char     ext[256];
+     wxString Title;
+-#if defined(__UNICODE__)
+-    wxMBConvUTF8 utf8;
+-#endif
+   
+     Title.Printf(_T("Transfer Call %d"), selected);
+     wxTextEntryDialog dialog(this,
+@@ -816,11 +799,7 @@
+ 
+     if(dialog.ShowModal() != wxID_CANCEL) {
+ 
+-#if defined(__UNICODE__)
+-        utf8.WC2MB(ext, dialog.GetValue().c_str(), 256);
+-#else
+-        strncpy(ext, dialog.GetValue().c_str(), 256);
+-#endif
++        strncpy(ext, dialog.GetValue().mb_str(*(wxGetApp().ConvIax)), sizeof(ext));
+ 
+         iaxc_blind_transfer_call(selected, ext);
+     }
+diff -urNad iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/main.cc iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/main.cc
+--- iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/main.cc	2006-05-18 20:56:46.000000000 +0200
++++ iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/main.cc	2006-05-18 20:56:47.000000000 +0200
+@@ -96,6 +96,8 @@
+     long     dummy;
+     bool     bCont;
+ 
++    ConvIax = &wxConvISO8859_1; /* Caller ID in IAX may be ISO-8859-1 encoded */
++
+ #ifndef __WXMAC__
+ // XXX this seems broken on mac with wx-2.4.2
+     m_single_instance_checker = new wxSingleInstanceChecker(_T("iaxcomm.lock"));
+@@ -245,9 +247,6 @@
+     wxConfig    *config = theApp::getConfig();
+     wxChar      KeyPath[256];
+     wxListItem  item;
+-#if defined(__UNICODE__)
+-    wxMBConvUTF8 utf8;
+-#endif
+ 
+     wxStringTokenizer tok(RegName, _T(":@"));
+     char user[256], pass[256], host[256];
+@@ -256,16 +255,9 @@
+         return;
+ 
+     if(tok.CountTokens() == 3) {
+-
+-#if defined(__UNICODE__)
+-        utf8.WC2MB(user, tok.GetNextToken().c_str(), 256);
+-        utf8.WC2MB(pass, tok.GetNextToken().c_str(), 256);
+-        utf8.WC2MB(host, tok.GetNextToken().c_str(), 256);
+-#else
+-        strncpy(user, tok.GetNextToken().c_str(), 256);
+-        strncpy(pass, tok.GetNextToken().c_str(), 256);
+-        strncpy(host, tok.GetNextToken().c_str(), 256);
+-#endif
++        strncpy(user, tok.GetNextToken().mb_str(*ConvIax), sizeof(user));
++        strncpy(pass, tok.GetNextToken().mb_str(*ConvIax), sizeof(pass));
++        strncpy(host, tok.GetNextToken().mb_str(*ConvIax), sizeof(host));
+     } else {
+         // Check if it's a Speed Dial
+         wxStrcpy(KeyPath,     _T("/Accounts/"));
+@@ -275,15 +267,9 @@
+             theFrame->SetStatusText(_T("Register format error"));
+             return;
+         }
+-#if defined(__UNICODE__)
+-        utf8.WC2MB(user, config->Read(_T("Username"), _T("")).c_str(), 256);
+-        utf8.WC2MB(pass, config->Read(_T("Password"), _T("")).c_str(), 256);
+-        utf8.WC2MB(host, config->Read(_T("Host"), _T("")).c_str(), 256);
+-#else
+-        wxStrcpy(user, config->Read(_T("Username"), _T("")));
+-        wxStrcpy(pass, config->Read(_T("Password"), _T("")));
+-        wxStrcpy(host, config->Read(_T("Host"), _T("")));
+-#endif
++        strncpy(user, config->Read(_T("Username"), _T("")).mb_str(*ConvIax), sizeof(user));
++        strncpy(pass, config->Read(_T("Password"), _T("")).mb_str(*ConvIax), sizeof(pass));;
++        strncpy(host, config->Read(_T("Host"), _T("")).mb_str(*ConvIax), sizeof(host));
+     }
+     iaxc_register(user, pass, host);
+ }
+diff -urNad iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/main.h iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/main.h
+--- iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/main.h	2006-03-06 16:26:22.000000000 +0100
++++ iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/main.h	2006-05-18 20:56:47.000000000 +0200
+@@ -96,6 +96,8 @@
+     wxString      Number;
+     wxString      DefaultAccount;
+ 
++    wxMBConv      *ConvIax;
++
+     static wxConfig *getConfig();
+ 
+   #ifdef __WXMSW__
+diff -urNad iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/prefs.cc iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/prefs.cc
+--- iaxclient-0.0+svn20060518.orig~/simpleclient/iaxcomm/prefs.cc	2006-05-18 20:56:46.000000000 +0200
++++ iaxclient-0.0+svn20060518.orig/simpleclient/iaxcomm/prefs.cc	2006-05-18 20:56:47.000000000 +0200
+@@ -125,9 +125,7 @@
+     bool      bCont;
+     wxString  str;
+ 
+-    if ( !wxXmlResource::Get()->LoadDialog(this, parent, wxT("Prefs")) ) {
+-      wxLogFatalError(_("Can't load Prefs dialog"));
+-    }
++    wxXmlResource::Get()->LoadDialog(this, parent, wxT("Prefs"));
+ 
+     // Reach in for our controls
+ 
+@@ -336,18 +334,8 @@
+ 
+ void SetCallerID(wxString name, wxString number)
+ {
+-#if defined(__UNICODE__)
+-    wxMBConvUTF8 utf8;
+-    char name8[256];
+-    char number8[256];
+-
+-    utf8.WC2MB(name8, name.c_str(), 256);
+-    utf8.WC2MB(number8, number.c_str(), 256);
+-    iaxc_set_callerid(name8, number8);
+-#else
+-    iaxc_set_callerid((char *) name.c_str(),
+-                      (char *) number.c_str());
+-#endif
++  iaxc_set_callerid((char *)(const char *) name.mb_str(*(wxGetApp().ConvIax)),
++		    (char *)(const char *) number.mb_str(*(wxGetApp().ConvIax)));
+ }
+ 
+ void PrefsDialog::OnSaveAudio(wxCommandEvent &event)


Property changes on: iaxclient/trunk/debian/patches/230_unicode.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: iaxclient/trunk/debian/patches/250_incoming_ringing.dpatch
===================================================================
--- iaxclient/trunk/debian/patches/250_incoming_ringing.dpatch	2006-05-16 10:42:26 UTC (rev 1767)
+++ iaxclient/trunk/debian/patches/250_incoming_ringing.dpatch	2006-05-20 16:14:40 UTC (rev 1768)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## incoming_ringing.dpatch by  <mikma at users.sourceforge.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't stop ringing when receiving voice audio during incoming call.
+
+ at DPATCH@
+diff -urNad iaxclient-0.0+cvs20060227~/lib/iaxclient_lib.c iaxclient-0.0+cvs20060227/lib/iaxclient_lib.c
+--- iaxclient-0.0+cvs20060227~/lib/iaxclient_lib.c	2006-03-06 19:43:20.000000000 +0100
++++ iaxclient-0.0+cvs20060227/lib/iaxclient_lib.c	2006-03-06 19:43:40.000000000 +0100
+@@ -853,7 +853,8 @@
+             break;
+ 		case IAX_EVENT_VOICE:
+ 			handle_audio_event(e, callNo); 
+-                        if (calls[callNo].state & IAXC_CALL_STATE_RINGING) {
++                        if (calls[callNo].state & IAXC_CALL_STATE_RINGING &&
++                            calls[callNo].state & IAXC_CALL_STATE_OUTGOING) {
+                                 calls[callNo].state &= ~IAXC_CALL_STATE_RINGING;
+                                 iaxc_do_state_callback(callNo);
+                                 iaxc_usermsg(IAXC_STATUS,"Call %d progress",


Property changes on: iaxclient/trunk/debian/patches/250_incoming_ringing.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: iaxclient/trunk/debian/patches/260_timer.dpatch
===================================================================
--- iaxclient/trunk/debian/patches/260_timer.dpatch	2006-05-16 10:42:26 UTC (rev 1767)
+++ iaxclient/trunk/debian/patches/260_timer.dpatch	2006-05-20 16:14:40 UTC (rev 1768)
@@ -0,0 +1,40 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 260_timer.dpatch by  <mikma at users.sourceforge.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix segfault during startup, caused by timeout running before
+## DP: the frame is fully initialized.
+
+ at DPATCH@
+diff -urNad iaxclient-0.0+svn20060518.debian~/simpleclient/iaxcomm/frame.cc iaxclient-0.0+svn20060518.debian/simpleclient/iaxcomm/frame.cc
+--- iaxclient-0.0+svn20060518.debian~/simpleclient/iaxcomm/frame.cc	2006-05-20 00:02:01.000000000 +0200
++++ iaxclient-0.0+svn20060518.debian/simpleclient/iaxcomm/frame.cc	2006-05-19 23:58:03.000000000 +0200
+@@ -133,6 +133,8 @@
+     wxString    Name;
+     MyTimer    *timer;
+ 
++    MessageTicks = 0;
++
+     // Load up this frame from XRC. [Note, instead of making a class's
+     // constructor take a wxWindow* parent with a default value of NULL,
+     // we could have just had designed MyFrame class with an empty
+@@ -231,9 +233,6 @@
+     keyStateWindow = gdk_window_new(NULL, &attr, 0);
+ #endif
+ 
+-    timer = new MyTimer();
+-    timer->Start(100);
+-
+     RePanel(Name);
+ 
+     wxImage::AddHandler(new wxPNGHandler);
+@@ -258,6 +257,9 @@
+ 	return;
+     }
+ #endif /* DATADIR */
++
++    timer = new MyTimer();
++    timer->Start(100);
+ }
+ 
+ void MyFrame::RePanel(wxString Name)


Property changes on: iaxclient/trunk/debian/patches/260_timer.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: iaxclient/trunk/debian/patches/40_fixes.dpatch
===================================================================
--- iaxclient/trunk/debian/patches/40_fixes.dpatch	2006-05-16 10:42:26 UTC (rev 1767)
+++ iaxclient/trunk/debian/patches/40_fixes.dpatch	2006-05-20 16:14:40 UTC (rev 1768)
@@ -5,24 +5,17 @@
 ## DP: Various changes for autoconf
 
 @DPATCH@
-diff -urNad iaxclient-0.0+cvs20050725/lib/iaxclient_lib.c /tmp/dpep.p4BvmA/iaxclient-0.0+cvs20050725/lib/iaxclient_lib.c
---- iaxclient-0.0+cvs20050725/lib/iaxclient_lib.c	2005-07-25 11:48:30.000000000 +0200
-+++ /tmp/dpep.p4BvmA/iaxclient-0.0+cvs20050725/lib/iaxclient_lib.c	2005-07-25 11:48:33.000000000 +0200
-@@ -16,10 +16,19 @@
- #include "iaxclient_lib.h"
- #include "jitterbuf.h"
+diff -urNad iaxclient-0.0+cvs20060227~/lib/iaxclient_lib.c iaxclient-0.0+cvs20060227/lib/iaxclient_lib.c
+--- iaxclient-0.0+cvs20060227~/lib/iaxclient_lib.c	2006-02-27 22:04:33.000000000 +0100
++++ iaxclient-0.0+cvs20060227/lib/iaxclient_lib.c	2006-02-27 22:06:58.000000000 +0100
+@@ -17,15 +17,24 @@
+ #include <stdlib.h>
+ #endif
  
 -#if defined(__STDC__) || defined(_MSC_VER)
 -#include <stdarg.h>
-+#if STDC_HEADERS
-+# include <stdarg.h>
- #else
+-#else
 -#include <varargs.h>
-+# if HAVE_VARARGS_H
-+#  include <varargs.h>
-+# endif
-+#endif
-+
 +/* Win32 has _vsnprintf instead of vsnprintf */
 +#if ! HAVE_VSNPRINTF
 +# if HAVE__VSNPRINTF
@@ -30,10 +23,23 @@
 +# endif
  #endif
  
+ #include "iaxclient_lib.h"
+ #include "jitterbuf.h"
+ 
++#if STDC_HEADERS
++# include <stdarg.h>
++#else
++# if HAVE_VARARGS_H
++#  include <varargs.h>
++# endif
++#endif
++
  #define IAXC_ERROR  IAXC_TEXT_TYPE_ERROR
-diff -urNad iaxclient-0.0+cvs20050725/lib/iaxclient_lib.h /tmp/dpep.p4BvmA/iaxclient-0.0+cvs20050725/lib/iaxclient_lib.h
---- iaxclient-0.0+cvs20050725/lib/iaxclient_lib.h	2005-07-25 11:48:30.000000000 +0200
-+++ /tmp/dpep.p4BvmA/iaxclient-0.0+cvs20050725/lib/iaxclient_lib.h	2005-07-25 11:48:33.000000000 +0200
+ #define IAXC_STATUS IAXC_TEXT_TYPE_STATUS
+ #define IAXC_NOTICE IAXC_TEXT_TYPE_NOTICE
+diff -urNad iaxclient-0.0+cvs20060227~/lib/iaxclient_lib.h iaxclient-0.0+cvs20060227/lib/iaxclient_lib.h
+--- iaxclient-0.0+cvs20060227~/lib/iaxclient_lib.h	2006-02-27 22:04:33.000000000 +0100
++++ iaxclient-0.0+cvs20060227/lib/iaxclient_lib.h	2006-02-27 22:05:47.000000000 +0100
 @@ -24,11 +24,15 @@
  /* This is the internal include file for IAXCLIENT -- externally
   * accessible APIs should be declared in iaxclient.h */
@@ -45,20 +51,22 @@
  #include <stdio.h>
  #include <string.h>
  
- #ifdef WIN32
+ #if defined(WIN32)  ||  defined(_WIN32_WCE)
 -#include "winpoop.h" // Win32 Support Functions
 +/* #include "winpoop.h" // Win32 Support Functions */
  #include <winsock.h>
+ #if !defined(_WIN32_WCE)
  #include <process.h>
- #include <stddef.h>
-diff -urNad iaxclient-0.0+cvs20050725/lib/unixfuncs.c /tmp/dpep.p4BvmA/iaxclient-0.0+cvs20050725/lib/unixfuncs.c
---- iaxclient-0.0+cvs20050725/lib/unixfuncs.c	2005-07-25 11:48:30.000000000 +0200
-+++ /tmp/dpep.p4BvmA/iaxclient-0.0+cvs20050725/lib/unixfuncs.c	2005-07-25 11:48:53.000000000 +0200
-@@ -12,9 +12,19 @@
-  * the GNU Lesser (Library) General Public License
-  */
+diff -urNad iaxclient-0.0+cvs20060227~/lib/unixfuncs.c iaxclient-0.0+cvs20060227/lib/unixfuncs.c
+--- iaxclient-0.0+cvs20060227~/lib/unixfuncs.c	2006-02-27 22:04:33.000000000 +0100
++++ iaxclient-0.0+cvs20060227/lib/unixfuncs.c	2006-02-27 22:05:47.000000000 +0100
+@@ -14,11 +14,21 @@
  
+ #define _BSD_SOURCE
+ #include <unistd.h>
 -#include <sys/time.h>
+ #define __USE_POSIX199309
+ #include <time.h>
  #include "iaxclient_lib.h"
  
 +#if TIME_WITH_SYS_TIME
@@ -75,9 +83,9 @@
  #ifndef NULL
  #define NULL (0)
  #endif
-diff -urNad iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc /tmp/dpep.p4BvmA/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc
---- iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc	2005-07-25 11:48:30.000000000 +0200
-+++ /tmp/dpep.p4BvmA/iaxclient-0.0+cvs20050725/simpleclient/iaxcomm/frame.cc	2005-07-25 11:48:33.000000000 +0200
+diff -urNad iaxclient-0.0+cvs20060227~/simpleclient/iaxcomm/frame.cc iaxclient-0.0+cvs20060227/simpleclient/iaxcomm/frame.cc
+--- iaxclient-0.0+cvs20060227~/simpleclient/iaxcomm/frame.cc	2006-02-27 22:04:33.000000000 +0100
++++ iaxclient-0.0+cvs20060227/simpleclient/iaxcomm/frame.cc	2006-02-27 22:05:47.000000000 +0100
 @@ -33,6 +33,10 @@
      #include "wx/wx.h"
  #endif

Modified: iaxclient/trunk/debian/patches/90_mixer.dpatch
===================================================================
--- iaxclient/trunk/debian/patches/90_mixer.dpatch	2006-05-16 10:42:26 UTC (rev 1767)
+++ iaxclient/trunk/debian/patches/90_mixer.dpatch	2006-05-20 16:14:40 UTC (rev 1768)
@@ -5,10 +5,10 @@
 ## DP: fixed #321305
 
 @DPATCH@
-diff -urNad iaxclient-0.0+cvs20050725/lib/audio_portaudio.c /tmp/dpep.LMoJfb/iaxclient-0.0+cvs20050725/lib/audio_portaudio.c
---- iaxclient-0.0+cvs20050725/lib/audio_portaudio.c	2005-07-25 00:26:03.000000000 +0200
-+++ /tmp/dpep.LMoJfb/iaxclient-0.0+cvs20050725/lib/audio_portaudio.c	2005-08-08 7:28:34.000000000 +0200
-@@ -144,6 +144,7 @@
+diff -urNad iaxclient-0.0+cvs20060227~/lib/audio_portaudio.c iaxclient-0.0+cvs20060227/lib/audio_portaudio.c
+--- iaxclient-0.0+cvs20060227~/lib/audio_portaudio.c	2006-02-27 21:39:06.000000000 +0100
++++ iaxclient-0.0+cvs20060227/lib/audio_portaudio.c	2006-02-27 21:39:29.000000000 +0100
+@@ -134,6 +134,7 @@
  static int virtualMonoOut;
  
  static int running;
@@ -16,16 +16,7 @@
  
  static struct iaxc_sound *sounds;
  static int  nextSoundId = 1;
-@@ -152,6 +153,8 @@
- 
- static int pa_start (struct iaxc_audio_driver *d ) ;
- static void handle_paerror(PaError err, char * where);
-+static int pa_input_level_set(struct iaxc_audio_driver *d, double level);
-+static double pa_input_level_get(struct iaxc_audio_driver *d);
- 
- /* scan devices and stash pointers to dev structures. 
-  *  But, these structures only remain valid while Pa is initialized,
-@@ -662,11 +665,11 @@
+@@ -657,11 +658,11 @@
      if(err != paNoError)
  	return -1;
  
@@ -39,47 +30,25 @@
  	if(err != paNoError) {
  	    Pa_StopStream(iStream);
  	    return -1;
-@@ -690,6 +693,15 @@
- 	/* select the microphone as the input source */
- 	if ( iMixer != NULL )
- 	{
-+		if (initialized && (iaxc_filters & IAXC_FILTER_AAGC)) {
-+			/* if input level is very low, raise it a bit;
-+			   helps AAGC work properly */
-+			double level;
-+			level = pa_input_level_get(d);
-+			if(level < 0.5)
-+				pa_input_level_set(d,0.6);
-+		}
-+
- #ifdef WIN32 // temporary until other impl have this function
- 		_Px_SetCurrentInputSourceByName( iMixer, "microphone" ) ;
- 		_Px_SetMicrophoneBoost( iMixer, 0 ) ;
-@@ -801,6 +813,7 @@
+@@ -704,11 +705,13 @@
+ 	      much more gracefully */
+ 	  Px_SetMicrophoneBoost( iMixer, 0 ) ;
  
++	  if (IAXC_FILTER_AAGC) {
+ 	  /* if the input level is very low, raise it up a bit.  Otherwise, AGC cannot detect speech, 
+ 	     and cannot adjust levels */
+ 	  level = pa_input_level_get(d);
+ 	  if(level < 0.5)
+ 	    pa_input_level_set(d,0.6);
++	  }
+ 	  mixers_initialized = 1;
+     }
+ 
+@@ -808,6 +811,7 @@
+ 
  static int pa_destroy (struct iaxc_audio_driver *d ) {
      //implementme
 +    initialized = 0;
      return 0;
  }
  
-@@ -933,14 +946,9 @@
- 
-     /* start, then stop streams, in order to test devices, and get mixers */
-     pa_start(d);
--    /* if input level is very low, raise it a bit;  helps AAGC work properly */
--    {
--      double level;
--      level = pa_input_level_get(d);
--      if(level < 0.5)
--	pa_input_level_set(d,0.6);
--    }
-     pa_stop(d);
- 
-+    initialized = 1;
-+
-     return 0;
- }
-
-
-

Modified: iaxclient/trunk/debian/rules
===================================================================
--- iaxclient/trunk/debian/rules	2006-05-16 10:42:26 UTC (rev 1767)
+++ iaxclient/trunk/debian/rules	2006-05-20 16:14:40 UTC (rev 1768)
@@ -15,7 +15,8 @@
 include /usr/share/dpatch/dpatch.make
 
 CFLAGS = -Wall -g -D_REENTRANT --std=gnu99
-CXXFLAGS = -Wall -g -D_REENTRANT
+CXXFLAGS = -Wall -g -D_REENTRANT -D__UNICODE__
+WX_CONFIG_NAME = /usr/bin/wx-config
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
@@ -27,11 +28,6 @@
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
-ifeq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	WX_CONFIG_NAME = wxgtk-2.4-config
-else
-	WX_CONFIG_NAME = wxgtkd-2.4-config
-endif
 
 autoreconf:
 	dh_testdir
@@ -43,7 +39,7 @@
 configure-stamp:
 	dh_testdir
 
-	test -z objs || mkdir objs
+	test -d objs || mkdir objs
 	(cd objs && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" WX_CONFIG_NAME="$(WX_CONFIG_NAME)" ../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-local-portaudio --disable-local-gsm --disable-local-speex --disable-shared --enable-clients="testcall iaxcomm")
 	touch configure-stamp
 




More information about the Pkg-voip-commits mailing list