Menu
▾
▴
[Iaxclient-cvs] SF.net SVN: iaxclient: [1428] branches/team/elbunce/iaxclient
|
From: <do...@us...> - 2008-05-04 15:33:51
|
Revision: 1428
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1428&view=rev
Author: dohpaz
Date: 2008-05-04 08:33:56 -0700 (Sun, 04 May 2008)
Log Message:
-----------
Merge up to trunk of r1427.
Modified Paths:
--------------
branches/team/elbunce/iaxclient/Makefile.am
branches/team/elbunce/iaxclient/README.VisualStudio
branches/team/elbunce/iaxclient/autogen.sh
branches/team/elbunce/iaxclient/configure.ac
branches/team/elbunce/iaxclient/contrib/macosx/Prefixes.h
branches/team/elbunce/iaxclient/contrib/tcl/Prefixes.h
branches/team/elbunce/iaxclient/contrib/tcl/XThreadUtil.c
branches/team/elbunce/iaxclient/contrib/tcl/configure
branches/team/elbunce/iaxclient/contrib/tcl/configure.in
branches/team/elbunce/iaxclient/contrib/tcl/iaxclient.c
branches/team/elbunce/iaxclient/contrib/tcl/macosx/PBExportedSymbols
branches/team/elbunce/iaxclient/contrib/tcl/pkgIndex.tcl
branches/team/elbunce/iaxclient/contrib/tcl/pkgIndex.tcl.in
branches/team/elbunce/iaxclient/contrib/win/vs2003/iaxclient_dll.vcproj
branches/team/elbunce/iaxclient/contrib/win/vs2003/iaxclient_lib.vcproj
branches/team/elbunce/iaxclient/contrib/win/vs2005/iaxclient.sln
branches/team/elbunce/iaxclient/contrib/win/vs2005/libiaxclient.vcproj
branches/team/elbunce/iaxclient/contrib/win/vs2005/libportmixer.vcproj
branches/team/elbunce/iaxclient/contrib/win/vs2005/libspeex.vcproj
branches/team/elbunce/iaxclient/contrib/win/vs2005/libtheora.vcproj
branches/team/elbunce/iaxclient/contrib/win/vs2005/libvidcap.vcproj
branches/team/elbunce/iaxclient/contrib/win/vs2005/testcall.vcproj
branches/team/elbunce/iaxclient/iaxclient.pc.in
branches/team/elbunce/iaxclient/lib/Makefile.am
branches/team/elbunce/iaxclient/lib/audio_encode.c
branches/team/elbunce/iaxclient/lib/audio_encode.h
branches/team/elbunce/iaxclient/lib/audio_portaudio.c
branches/team/elbunce/iaxclient/lib/iaxclient.h
branches/team/elbunce/iaxclient/lib/iaxclient_lib.c
branches/team/elbunce/iaxclient/lib/libiax2/src/frame.h
branches/team/elbunce/iaxclient/lib/libiax2/src/iax-client.h
branches/team/elbunce/iaxclient/lib/libiax2/src/iax.c
branches/team/elbunce/iaxclient/lib/libiax2/src/iax2.h
branches/team/elbunce/iaxclient/lib/portmixer/px_win_wmme/px_win_wmme.c
branches/team/elbunce/iaxclient/lib/video.c
branches/team/elbunce/iaxclient/m4/speex.m4
branches/team/elbunce/iaxclient/simpleclient/iaxcomm/Makefile.am
branches/team/elbunce/iaxclient/simpleclient/iaxcomm/prefs.cc
branches/team/elbunce/iaxclient/simpleclient/stresstest/Makefile.am
branches/team/elbunce/iaxclient/simpleclient/stresstest/file.c
branches/team/elbunce/iaxclient/simpleclient/stresstest/file.h
branches/team/elbunce/iaxclient/simpleclient/testcall/Makefile.am
branches/team/elbunce/iaxclient/simpleclient/testcall/testcall.c
branches/team/elbunce/iaxclient/simpleclient/vtestcall/Makefile.am
Added Paths:
-----------
branches/team/elbunce/iaxclient/contrib/tcl/build-iaxclient.txt
branches/team/elbunce/iaxclient/contrib/tcl/macosx/iaxclient.xcodeproj/
branches/team/elbunce/iaxclient/contrib/tcl/macosx/iaxclient.xcodeproj/project.pbxproj
branches/team/elbunce/iaxclient/contrib/win/vs2005/vtestcall.vcproj
branches/team/elbunce/iaxclient/simpleclient/iaxcomm/iaxcomm.sln
branches/team/elbunce/iaxclient/simpleclient/iaxcomm/iaxcomm.vcproj
Removed Paths:
-------------
branches/team/elbunce/iaxclient/contrib/tcl/macosx/iaxclient.pbproj/
branches/team/elbunce/iaxclient/contrib/tcl/macosx/iaxclient.xcodeproj/project.pbxproj
branches/team/elbunce/iaxclient/simpleclient/videotest/mihai.vcproj
branches/team/elbunce/iaxclient/simpleclient/vtestcall/vtestcall.vcproj
Modified: branches/team/elbunce/iaxclient/Makefile.am
===================================================================
--- branches/team/elbunce/iaxclient/Makefile.am 2008-04-24 18:58:00 UTC (rev 1427)
+++ branches/team/elbunce/iaxclient/Makefile.am 2008-05-04 15:33:56 UTC (rev 1428)
@@ -12,6 +12,8 @@
README.VisualStudio \
autogen.sh \
contrib \
+ doc \
+ Doxyfile \
m4
dist-hook:
Modified: branches/team/elbunce/iaxclient/README.VisualStudio
===================================================================
--- branches/team/elbunce/iaxclient/README.VisualStudio 2008-04-24 18:58:00 UTC (rev 1427)
+++ branches/team/elbunce/iaxclient/README.VisualStudio 2008-05-04 15:33:56 UTC (rev 1428)
@@ -2,69 +2,90 @@
2005. A reference solution file and project files are located in the
contrib/win/vs2005 directory.
- 1) The following environment variables must be set. Use the "System"
- properties dialog in the Windows Control Panel to set these
- variables either for the user or system-wide.
+Steps demarked with (*) are only required if building with video
+support.
- %DXSDK_DIR%
+ 1*) Set the DXSDK_DIR environment variable.
+
+ Use the "System" properties dialog in the Windows Control Panel to
+ set this variable either for the user or system-wide. The value is
+ the path to the DirectX SDK. The June 2007, August 2007, and
+ December 2006 versions of the DirectX SDK are known to work.
- Path to the DirectX SDK. The June 2007 version of the DirectX
- SDK is known to work. The December 2006 version is also know to
- work.
+ 2*) Install the Microsoft Windows Software Development Kit.
+
+ Version 6.0 is known to work. After installing the Windows SDK, run
+ the program "Start -> Microsoft Windows SDK -> Visual Studio
+ Registration -> Integrate Windows SDK with Visual Studio". This
+ registers include and library paths with Visual Studio.
+
+ See here for the Windows SDK:
- %PSDK_DIR%
+ http://www.microsoft.com/downloads/details.aspx?familyid=4377F86D-C913-4B5C-B87E-EF72E5B4E065
+
+ 3) Obtain dependencies.
+
+ 3a) At the time of this writing, portaudio-v19 and speex-1.2beta3 are
+ required for all configurations. Sources may be found here:
- Path to the Platform SDK. The Windows SDK is known to work for
- this. Assuming the Windows SDK is installed in the default
- location, PSDK_DIR would be set to:
+ http://portaudio.com/archives/pa_snapshot_v19.tar.gz
+ http://downloads.xiph.org/releases/speex/speex-1.2beta3.tar.gz
- C:\Program Files\Microsoft SDKs\Windows\v6.0
+ 3b*) For video support, libogg-1.1.3, libtheora-1.0beta2, and
+ libvidcap-0.2.1 are also required. Source for these dependencies
+ are available here:
- The older Platform SDK for Windows Server 2003 Release 2 is also
- known to work.
+ http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz
+ http://downloads.xiph.org/releases/theora/libtheora-1.0beta2.tar.gz
+ http://downloads.sourceforge.net/libvidcap/libvidcap-0.2.1.tar.gz
- See here for the Windows SDK:
+ 3c*) Additionally, to build vtestcall, SDL is required. A prebuilt
+ binary development package is available here:
- http://www.microsoft.com/downloads/details.aspx?FamilyID=c2b1e300-f358-4523-b479-f53d234cdccf
+ http://www.libsdl.org/release/SDL-devel-1.2.13-VC8.zip
- 2) Obtain dependencies. At the time of this writing, portaudio-v19,
- libogg 1.1.3, speex 1.2beta1, libtheora 1.0alpha7, and libvidcap are required.
- Source for these dependencies are available here:
+ 4) Rename/move directories.
- http://portaudio.com/archives/pa_snapshot_v19.tar.gz
- http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz
- http://downloads.xiph.org/releases/speex/speex-1.2beta1.tar.gz
- http://downloads.xiph.org/releases/theora/libtheora-1.0alpha7.tar.gz
- http://downloads.sourceforge.net/libvidcap/libvidcap-0.1.tar.gz
+ In order to build with the vcproj files provided by iaxclient, these
+ dependent libraries must be moved to be peer directories to the
+ iaxclient source directory. They also must have the following names:
+ portaudio, speex, libogg, libtheora, libvidcap, and SDL. So the
+ final directory layout must look like this:
- In order to build with the vcproj files provided by iaxclient,
- these dependent libraries must be moved to be peer directories to
- the iaxclient source directory. They also must have the following
- names: libogg, speex, libtheora and libvidcap. So the final directory
- layout would be as follows:
-
C:\...\whereever\iaxclient
C:\...\whereever\portaudio
+ C:\...\whereever\speex
C:\...\whereever\libogg
- C:\...\whereever\speex
C:\...\whereever\libtheora
C:\...\whereever\libvidcap
+ C:\...\whereever\SDL
- 2) Open the solution file: contrib/win/vs2005/iaxclient.sln
+ 5) Open the solution file.
+
+ Using Visual Studio 2005, open contrib/win/vs2005/iaxclient.sln.
- 3) Choose configuration. There are four options:
- Release -- optimized static library
- Release_dll -- optimized dynamic link library
- Debug -- debug static library
- Debug_dll -- debug dynamic link library
+ 6) Choose configuration.
- 4) Build the solution. This will build iaxclient and all its
- dependent libraries. All dependent libraries are linked into
- the final library. The final libiaxclient library can be found
- here (depending on the configuration chosen):
+ There are four options:
+ Release -- optimized static library
+ Release_dll -- optimized dynamic link library
+ Release_novideo -- optimized static library without video support
+ Debug -- debug static library
+ Debug_dll -- debug dynamic link library
+ Debug_novideo -- debug static library without video support
+
+ 6) Build the solution.
+
+ This will build iaxclient and all its dependent libraries. All
+ dependent libraries are linked into the final library. The final
+ libiaxclient library can be found here (depending on the
+ configuration chosen):
+
Release\libiaxclient\libiaxclient.lib
Release_dll\libiaxclient\libiaxclient.dll
+ Release_novideo\libiaxclient\libiaxclient.lib
Debug\libiaxclient\libiaxclient.lib
Debug_dll\libiaxclient\libiaxclient.dll
+ Debug_novideo\libiaxclient\libiaxclient.lib
Modified: branches/team/elbunce/iaxclient/autogen.sh
===================================================================
--- branches/team/elbunce/iaxclient/autogen.sh 2008-04-24 18:58:00 UTC (rev 1427)
+++ branches/team/elbunce/iaxclient/autogen.sh 2008-05-04 15:33:56 UTC (rev 1428)
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
error()
{
Modified: branches/team/elbunce/iaxclient/configure.ac
===================================================================
--- branches/team/elbunce/iaxclient/configure.ac 2008-04-24 18:58:00 UTC (rev 1427)
+++ branches/team/elbunce/iaxclient/configure.ac 2008-05-04 15:33:56 UTC (rev 1428)
@@ -3,9 +3,9 @@
AC_PREREQ(2.59)
dnl Package version
-m4_define(IAXC_VERSION, [2.1-svn])
+m4_define(IAXC_VERSION, [2.x-trunk])
-AC_INIT(iaxclient, IAXC_VERSION, [jpg...@gm...])
+AC_INIT(iaxclient, IAXC_VERSION, [iax...@li...])
AC_CONFIG_SRCDIR([lib/iaxclient.h])
AC_CONFIG_HEADERS([config.h])
@@ -15,7 +15,7 @@
dnl Libtool library version
IAXC_LT_CURRENT=1
-IAXC_LT_REVISION=0
+IAXC_LT_REVISION=2
IAXC_LT_AGE=0
AC_SUBST(IAXC_LT_CURRENT)
@@ -66,7 +66,6 @@
CFLAGS=${CFLAGS-"-O2 -g -Wall --std=gnu99"}
CXXFLAGS=${CXXFLAGS-"-O2 -g -Wall"}
-# 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]])],,
@@ -80,17 +79,17 @@
AC_ARG_ENABLE(debug-iax,
[AS_HELP_STRING([--enable-debug-iax],
[Enable debug support in local iax library])],
- enable_debug_iax2=$enableval,
- enable_debug_iax2="no")
+ enable_debug_iax2=$enableval,
+ enable_debug_iax2="no")
-AC_ARG_ENABLE(speex_preprocess,
- [AS_HELP_STRING([--disable-speex-preprocess],
- [Turn off speex preprocessing])],,
- [enable_speex_preprocess="yes"])
+AC_ARG_ENABLE(video,
+ [AS_HELP_STRING([--enable-video],
+ [Enable video support [default=yes]])],,
+ [enable_video="yes"])
AC_ARG_WITH(echo-can,
[AS_HELP_STRING([--with-echo-can],
- [use echo can (span, speex or mec2) [default=speex]])],
+ [use echo can (span or speex) [default=speex]])],
use_echo_can=$withval,
use_echo_can="speex")
@@ -104,35 +103,12 @@
[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(wish,
[AS_HELP_STRING([--with-wish],
[Path to Tcl command language interpreter])],
WISH="${with_wish}",
with_wish="auto")
-AC_ARG_WITH(video,
- [AS_HELP_STRING([--without-video],
- [Video support])],,
- with_video="yes")
-
AC_ARG_WITH(ogg,
[AS_HELP_STRING([--without-ogg],
[OGG support])],,
@@ -154,24 +130,23 @@
FFMPEG="${with_ffmpeg}",
with_ffmpeg="no")
-if test ! "x$enable_clients" = "xauto"; then
- for client in ${enable_clients}; do
- case "$client" in
- iaxcomm | iaxphone | stresstest | testcall | tkphone | vtestcall | WinIAX | wx)
- clients="$clients $client" ;;
- all | yes)
- clients="iaxcomm iaxphone stresstest testcall tkphone vtestcall WinIAX wx"
- break ;;
- none | no)
- clients=""
- break ;;
- *)
- AC_MSG_ERROR(bad value ${client} for --enable-clients) ;;
- esac
- done
-fi
+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]) ;;
-AM_OPTIONS_WXCONFIG
+ *)
+ AC_MSG_ERROR([bad value ${with_ilbc} for --with-ilbc]) ;;
+esac
case $host_os in
*mingw32*|*cygwin* )
@@ -200,6 +175,28 @@
obtain a copy.
]))
+PKG_CHECK_MODULES(SPEEX, [speex >= 1.2],,AC_MSG_ERROR([
+ speex is required to build this package!
+ please see http://www.xiph.org/ for how to
+ obtain a copy.
+]))
+
+PKG_CHECK_MODULES(SPEEXDSP, [speexdsp >= 1.2],,AC_MSG_ERROR([
+ speexdsp is required to build this package!
+ please see http://www.xiph.org/ for how to
+ obtain a copy.
+]))
+
+PKG_CHECK_MODULES(SDL, [sdl >= 1.2], has_sdl=yes, has_sdl=no)
+PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.0], has_gtk2=yes, has_gtk2=no)
+PKG_CHECK_MODULES(GDK2, [gdk-2.0 >= 2.0.0], has_gdk2=yes, has_gdk2=no)
+PKG_CHECK_MODULES(ALSA, [alsa >= 1.0], has_alsa=yes, has_alsa=no)
+PKG_CHECK_MODULES(OGG, [ogg >= 1.1.3], has_ogg=yes, has_ogg=no)
+PKG_CHECK_MODULES(OGGZ, [oggz >= 0.9.5], has_oggz=yes, has_oggz=no)
+PKG_CHECK_MODULES(THEORA, [theora >= 1.0alpha7], has_theora=yes, has_theora=no)
+PKG_CHECK_MODULES(VIDCAP, [vidcap >= 0.1], has_vidcap=yes, has_vidcap=no)
+PKG_CHECK_MODULES(FFMPEG, [libavcodec >= 51.40.3], has_ffmpeg=yes, has_ffmpeg=no)
+
has_gsm=no
if test x$enable_local_gsm = xyes; then
has_gsm=yes
@@ -208,93 +205,67 @@
AM_PATH_GSM(has_gsm=yes, has_gsm=no)
fi
-if test x$with_video = xyes; then
- AC_DEFINE(USE_VIDEO, 1, [Define to 1 to enable Video support])
-fi
-AM_CONDITIONAL(VIDEO, test x$with_video = xyes)
+PACKAGE_REQUIRES=""
-has_ogg=no
-if test ! x$with_ogg = xno; then
-PKG_CHECK_MODULES(OGG, [ogg >= 1.1.3],has_ogg=yes)
-if test x$has_ogg = xyes; then
- AC_DEFINE(USE_OGG, 1, [OGG])
- PKG_REQUIRES="$PKG_REQUIRES ogg"
-elif test ! x$with_ogg = xauto ; then
- AC_MSG_ERROR([
- libogg is required to build this package!
- please see http://www.xiph.org/ for how to
- obtain a copy.
- ])
-fi
-fi
-AM_CONDITIONAL(OGG, test x$has_ogg = xyes)
-
-PKG_CHECK_MODULES(SPEEX, [speex >= 1.2],,AC_MSG_ERROR([
- speex is required to build this package!
- please see http://www.xiph.org/ for how to
- obtain a copy.
-]))
+if test x$enable_video = xyes; then
-has_theora=no
-if test ! x$with_theora = xno; then
-PKG_CHECK_MODULES(THEORA, [theora >= 1.0alpha7],has_theora=yes)
-if test x$has_theora = xyes; then
- AC_DEFINE(USE_THEORA, 1, [THEORA])
- PKG_REQUIRES="$PKG_REQUIRES theora"
-elif test ! x$with_theora = xauto ; then
- AC_MSG_ERROR([
- libtheora is required to build this package!
- please see http://www.xiph.org/ for how to
- obtain a copy.
- ])
-fi
-fi
-AM_CONDITIONAL(THEORA, test x$has_theora = xyes)
-
-has_vidcap=no
-if test ! x$with_vidcap = xno; then
- PKG_CHECK_MODULES(VIDCAP, [vidcap >= 0.1],has_vidcap=yes)
+ if test x$with_ogg != xno; then
+ if test x$has_ogg = xyes; then
+ AC_DEFINE(USE_OGG, 1, [OGG])
+ PACKAGE_REQUIRES="$PACKAGE_REQUIRES ogg"
+ elif test x$with_ogg != xauto ; then
+ AC_MSG_ERROR([
+ libogg is required to build this package!
+ please see http://www.xiph.org/ for how to
+ obtain a copy.
+ ])
+ fi
+ fi
+
+ if test x$with_theora != xno; then
+ if test x$has_theora = xyes; then
+ AC_DEFINE(USE_THEORA, 1, [THEORA])
+ PACKAGE_REQUIRES="$PACKAGE_REQUIRES theora"
+ elif test x$with_theora != xauto ; then
+ AC_MSG_ERROR([
+ libtheora is required to build this package!
+ please see http://www.xiph.org/ for how to
+ obtain a copy.
+ ])
+ fi
+ fi
+
if test x$has_vidcap = xyes; then
AC_DEFINE(USE_VIDCAP, 1, [VIDCAP])
- PKG_REQUIRES="$PKG_REQUIRES vidcap"
- elif test ! x$with_vidcap = xauto ; then
+ PACKAGE_REQUIRES="$PACKAGE_REQUIRES vidcap"
+ else
AC_MSG_ERROR([
libvidcap is required to build this package!
please see http://libvidcap.sourceforge.net/ for how to
obtain a copy.
])
fi
+
+ if test x$with_ffmpeg != xno; then
+ if test x$has_ffmpeg = xyes; then
+ AC_DEFINE(USE_FFMPEG, 1, [FFMPEG])
+ PACKAGE_REQUIRES="$PACKAGE_REQUIRES ffmpeg"
+ elif test x$with_ffmpeg != xauto ; then
+ AC_MSG_ERROR([
+ FFmpeg is required to build this package!
+ please see http://ffmpeg.mplayerhq.hu/ for how to
+ obtain a copy.
+ ])
+ fi
+ fi
fi
-AM_CONDITIONAL(VIDCAP, test x$has_vidcap = xyes)
-has_ffmpeg=no
-if test ! x$with_ffmpeg = xno; then
-PKG_CHECK_MODULES(FFMPEG, [libavcodec >= 51.40.3],has_ffmpeg=yes)
-if test x$has_ffmpeg = xyes; then
- AC_DEFINE(USE_FFMPEG, 1, [FFMPEG])
- PKG_REQUIRES="$PKG_REQUIRES ffmpeg"
-elif test ! x$with_ffmpeg = xauto ; then
- AC_MSG_ERROR([
- FFmpeg is required to build this package!
- please see http://ffmpeg.mplayerhq.hu/ for how to
- obtain a copy.
- ])
-fi
-fi
-AM_CONDITIONAL(FFMPEG, test x$has_ffmpeg = xyes)
-
-PKG_CHECK_MODULES(SDL, [sdl >= 1.2], has_sdl=yes, has_sdl=no)
-PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.0], has_gtk2=yes, has_gtk2=no)
-PKG_CHECK_MODULES(GDK2, [gdk-2.0 >= 2.0.0], has_gdk2=yes, has_gdk2=no)
-PKG_CHECK_MODULES(ALSA, [alsa >= 1.0], has_alsa=yes, has_alsa=no)
-PKG_CHECK_MODULES(OGGZ, [oggz >= 0.9.5], has_oggz=yes, has_oggz=no)
-
has_iax2=no
-if test ! x$enable_local_iax = xyes; then
+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
+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'
@@ -302,6 +273,8 @@
IAX2_CONFIG=""
fi
+AM_OPTIONS_WXCONFIG
+
has_wx="no"
AM_PATH_WXCONFIG(2.6.0, [has_wx="2.6"],
[AM_PATH_WXCONFIG(2.4.0, [has_wx="2.4"])])
@@ -316,7 +289,7 @@
CXXFLAGS="$WX_CXXFLAGS_ONLY"
AC_LANG_PUSH(C++)
-if test ! x$has_wx = xno; then
+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])
@@ -358,32 +331,33 @@
CXXFLAGS="$save_CXXFLAGS"
dnl End wx xrc check
-if test x$enable_speex_preprocess = xyes; then
- AC_DEFINE(SPEEX_PREPROCESS, 1, [Speex preprocess])
+if test x$enable_video = xyes; then
+ AC_DEFINE(USE_VIDEO, 1, [Define to 1 to enable video support])
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])
+ AC_DEFINE(SPAN_EC, 1, [Define to 1 to enable span echo cancellation])
fi
if test x$use_echo_can = xspeex; then
- AC_DEFINE(SPEEX_EC, 1, [Speex echo can])
+ AC_DEFINE(SPEEX_EC, 1, [Define to 1 to enable speex echo cancellation])
fi
-if test x$use_echo_can = xmec2; then
- AC_DEFINE(MEC2_EC, 1, [Mec echo can])
-fi
-
if test x$enable_local_ilbc = xyes; then
- AC_DEFINE(CODEC_ILBC,,[Enable ILBC support])
+ AC_DEFINE(CODEC_ILBC,,[Define to 1 to enable ILBC support])
fi
-if test x$has_gsm = xyes && test ! x$with_gsm = xno; then
- AC_DEFINE(CODEC_GSM,,[Enable GSM support])
+if test x$has_gsm = xyes && test x$with_gsm != xno; then
+ AC_DEFINE(CODEC_GSM,,[Define to 1 to enable GSM support])
fi
-AM_CONDITIONAL(USE_CODEC_GSM, test x$has_gsm = xyes && test ! x$with_gsm = xno)
+AM_CONDITIONAL(VIDEO, test x$enable_video = xyes)
+AM_CONDITIONAL(OGG, test x$has_ogg = xyes && test x$with_ogg != xno)
+AM_CONDITIONAL(THEORA, test x$has_theora = xyes && test x$with_theora != xno)
+AM_CONDITIONAL(VIDCAP, test x$has_vidcap = xyes && test x$with_vidcap != xno)
+AM_CONDITIONAL(FFMPEG, test x$has_ffmpeg = xyes && test x$with_ffmpeg != xno)
+AM_CONDITIONAL(SPAN_EC, test x$use_echo_can = xspan)
+AM_CONDITIONAL(USE_CODEC_GSM, test x$has_gsm = xyes && test x$with_gsm != xno)
AM_CONDITIONAL(USE_LOCAL_GSM, test x$enable_local_gsm = xyes)
AM_CONDITIONAL(USE_LOCAL_IAX2, test x$enable_local_iax2 = xyes)
AM_CONDITIONAL(USE_DEBUG_IAX2, test x$enable_debug_iax2 = xyes)
@@ -393,14 +367,29 @@
AM_CONDITIONAL(MACOSX, test x$OSTYPE = xMACOSX)
# Autodetect clients
-if test "x$enable_clients" = "xauto"; then
+if test "x$enable_clients" != "xauto"; then
+ for client in ${enable_clients}; do
+ case "$client" in
+ iaxcomm | iaxphone | stresstest | testcall | tkphone | vtestcall | WinIAX | wx)
+ clients="$clients $client" ;;
+ all | yes)
+ clients="iaxcomm iaxphone stresstest testcall tkphone vtestcall WinIAX wx"
+ break ;;
+ none | no)
+ clients=""
+ break ;;
+ *)
+ AC_MSG_ERROR(bad value ${client} for --enable-clients) ;;
+ esac
+ done
+else
clients="$clients testcall"
- if test x$has_oggz = xyes && test x$has_theora = xyes; then
+ if test x$enable_video = xyes && test x$has_oggz = xyes && test x$has_theora = xyes; then
clients="$clients stresstest"
fi
- if test ! x$has_wx = xno; then
+ if test x$has_wx != xno; then
clients="$clients iaxphone"
if test "x$has_gdk2" = xyes; then
clients="$clients wx"
@@ -411,7 +400,7 @@
fi
fi
- if test x$has_sdl = xyes && test x$with_video = xyes; then
+ if test x$has_sdl = xyes && test x$enable_video = xyes; then
clients="$clients vtestcall"
fi
@@ -419,7 +408,7 @@
clients="$clients WinIAX"
fi
- if test ! x$WISH = x && test "x$has_gdk2" = "xyes"; then
+ if test x$WISH != x && test "x$has_gdk2" = "xyes"; then
clients="$clients tkphone"
fi
fi
@@ -434,7 +423,7 @@
CLIENTS="$CLIENTS $client";;
vtestcall)
- if test ! x$has_sdl = xyes || test ! x$with_video = xyes ; then
+ if test x$has_sdl != xyes || test x$enable_video != xyes ; then
AC_MSG_ERROR([vtestcall requires SDL and video])
fi
CLIENTS="$CLIENTS $client";;
@@ -474,7 +463,7 @@
done
AC_SUBST(CLIENTS)
-AC_SUBST(PKG_REQUIRES)
+AC_SUBST(PACKAGE_REQUIRES)
AC_CONFIG_FILES([
Makefile
Modified: branches/team/elbunce/iaxclient/contrib/macosx/Prefixes.h
===================================================================
--- branches/team/elbunce/iaxclient/contrib/macosx/Prefixes.h 2008-04-24 18:58:00 UTC (rev 1427)
+++ branches/team/elbunce/iaxclient/contrib/macosx/Prefixes.h 2008-05-04 15:33:56 UTC (rev 1428)
@@ -3,10 +3,8 @@
#define LIBIAX
//#define CODEC_ILBC 0
-#define SPEEX_PREPROCESS 1
//#define SPAN_EC 0
#define SPEEX_EC 1
-//#define MEC2_EC 0
Modified: branches/team/elbunce/iaxclient/contrib/tcl/Prefixes.h
===================================================================
--- branches/team/elbunce/iaxclient/contrib/tcl/Prefixes.h 2008-04-24 18:58:00 UTC (rev 1427)
+++ branches/team/elbunce/iaxclient/contrib/tcl/Prefixes.h 2008-05-04 15:33:56 UTC (rev 1428)
@@ -5,10 +5,8 @@
//#define CODEC_ILBC 0
-#define SPEEX_PREPROCESS 1
//#define SPAN_EC 0
#define SPEEX_EC 1
-//#define MEC2_EC 0
#define USE_NEWJB 1
//#define USE_VIDEO 0
Modified: branches/team/elbunce/iaxclient/contrib/tcl/XThreadUtil.c
===================================================================
--- branches/team/elbunce/iaxclient/contrib/tcl/XThreadUtil.c 2008-04-24 18:58:00 UTC (rev 1427)
+++ branches/team/elbunce/iaxclient/contrib/tcl/XThreadUtil.c 2008-05-04 15:33:56 UTC (rev 1428)
@@ -12,9 +12,9 @@
*
* By Mats Bengtsson and Zoran Vasiljevic 2006
*
- * \xCA 1. XThread_RegisterThread
- * \xCA 2. XThread_UnregisterThread
- * \xCA 3. XThread_EvalInThread
+ * 1. XThread_RegisterThread
+ * 2. XThread_UnregisterThread
+ * 3. XThread_EvalInThread
*
* The 1. needs to be called from your master thread, i.e. the
* one you would like to execute the callbacks within.
@@ -30,9 +30,9 @@
#include <string.h>
#if TARGET_API_MAC_CARBON
-# include <Tcl/tcl.h>
+# include <Tcl/tcl.h>
#else
-# include "tcl.h"
+# include "tcl.h"
#endif
#ifndef TCL_TSD_INIT
@@ -46,7 +46,7 @@
*/
typedef struct ThreadSpecificData {
- Tcl_Interp *interp; /* Interp to evaluate scripts */
+ Tcl_Interp *interp; /* Interp to evaluate scripts */
} ThreadSpecificData;
static Tcl_ThreadDataKey dataKey;
@@ -76,15 +76,10 @@
} ThreadSendData;
-static void
-ThreadSend _ANSI_ARGS_((Tcl_ThreadId targetId, ThreadSendData *send));
+static void ThreadSend _ANSI_ARGS_((Tcl_ThreadId targetId, ThreadSendData *send));
+static int ThreadEventProc _ANSI_ARGS_((Tcl_Event *evPtr, int mask));
+static void ThreadFreeProc _ANSI_ARGS_((ClientData clientData));
-static int
-ThreadEventProc _ANSI_ARGS_((Tcl_Event *evPtr, int mask));
-
-static void
-ThreadFreeProc _ANSI_ARGS_((ClientData clientData));
-
/*
*----------------------------------------------------------------------
*
@@ -102,7 +97,8 @@
*----------------------------------------------------------------------
*/
-void XThread_RegisterThread(Tcl_Interp *interp)
+void
+XThread_RegisterThread(Tcl_Interp *interp)
{
ThreadSpecificData* tsdPtr = TCL_TSD_INIT(&dataKey);
@@ -126,7 +122,8 @@
*----------------------------------------------------------------------
*/
-void XThread_UnregisterThread()
+void
+XThread_UnregisterThread()
{
ThreadSpecificData* tsdPtr = TCL_TSD_INIT(&dataKey);
@@ -158,7 +155,8 @@
*----------------------------------------------------------------------
*/
-void XThread_EvalInThread(Tcl_ThreadId threadId, const char *script, int flags)
+void
+XThread_EvalInThread(Tcl_ThreadId threadId, const char *script, int flags)
{
ThreadSendData *sendPtr;
int len = strlen(script);
Copied: branches/team/elbunce/iaxclient/contrib/tcl/build-iaxclient.txt (from rev 1427, trunk/contrib/tcl/build-iaxclient.txt)
===================================================================
--- branches/team/elbunce/iaxclient/contrib/tcl/build-iaxclient.txt (rev 0)
+++ branches/team/elbunce/iaxclient/contrib/tcl/build-iaxclient.txt 2008-05-04 15:33:56 UTC (rev 1428)
@@ -0,0 +1,78 @@
+
+My own HOWTO of how I built all this stuff
+------------------------------------------
+
+Linux/Unix:
+-----------
+
+1) Portaudio:
+./configure --disable-shared --without-jack
+make
+make install
+
+2) Speex:
+./configure --disable-shared
+make
+make install
+
+for the external libs. For iaxclient I do:
+
+./configure --without-ogg --without-theora --without-vidcap \
+ --disable-video --disable-clients --disable-shared
+
+etc. The tcl package should build as usual using ./configure && make.
+You may need to edit configure.in since I have added -lasound which
+I really don't know the details of. Don't forget to use autconf after
+editing. I read somewhere that setting
+
+export LDFLAGS="-Wl,-static"
+
+can be helpful to force linking to static libs. Use this *only* for the
+tcl package. Noted that ./configure bails with hese flags.
+
+
+MacOSX 10.5
+-----------
+
+1) pkg-config:
+Installed darwinports and|or fink and be sure to get pkgconfig as well
+
+2) Portaudio:
+http://www.portaudio.com/archives/pa_stable_v19_20071207.tar.gz
+#export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"
+./configure --disable-shared && make install
+
+3) Speex:
+http://downloads.xiph.org/releases/speex/speex-1.2beta3.tar.gz
+#export CFLAGS="-arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"
+./configure --disable-shared && make install
+
+4) iaxclient 2.1beta3:
+ PKG_CONFIG path to pkg-config utility
+export PKG_CONFIG=`which pkg-config`
+export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/
+./autogen.sh
+./configure --without-ogg --without-theora --without-vidcap \
+ --disable-video --disable-clients --disable-shared
+make
+ll lib/.libs/
+make install
+
+For the actual tcl package you have two options:
+1) use the Xcode project
+2) use the TEA configure/make system as:
+ ./configure --prefix=/usr/local --libdir=/Library/Tcl --with-tcl=/Library/Frameworks/Tcl.framework --with-tclinclude=/Library/Frameworks/Tcl.framework/Headers --enable-threads
+ make
+
+Alternatively you can create a separate build directory.
+cd iaxclient/contrib/tcl/
+mkdir build
+cd build
+../configure ...
+I haven't figured out how to make a universal build since portaudio (?)
+complains when setting export CFLAGS="-arch ppc -arch i386"
+
+
+Windows:
+--------
+
Modified: branches/team/elbunce/iaxclient/contrib/tcl/configure
===================================================================
--- branches/team/elbunce/iaxclient/contrib/tcl/configure 2008-04-24 18:58:00 UTC (rev 1427)
+++ branches/team/elbunce/iaxclient/contrib/tcl/configure 2008-05-04 15:33:56 UTC (rev 1428)
@@ -1,9 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57 for iaxclient 0.2.
+# Generated by GNU Autoconf 2.59 for tcliaxclient 0.2.
#
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
@@ -20,9 +19,10 @@
elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
set -o posix
fi
+DUALCASE=1; export DUALCASE # for MKS sh
# Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
else
as_unset=false
@@ -41,7 +41,7 @@
LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
LC_TELEPHONE LC_TIME
do
- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
$as_unset $as_var
@@ -218,16 +218,17 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
else
+ test -d ./-p && rmdir ./-p
as_mkdir_p=false
fi
as_executable_p="test -f"
# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
# Sed expression to map a string onto a valid variable name.
-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
# IFS
@@ -264,10 +265,10 @@
: ${ac_max_here_lines=38}
# Identity of this package.
-PACKAGE_NAME='iaxclient'
-PACKAGE_TARNAME='iaxclient'
+PACKAGE_NAME='tcliaxclient'
+PACKAGE_TARNAME='tcliaxclient'
PACKAGE_VERSION='0.2'
-PACKAGE_STRING='iaxclient 0.2'
+PACKAGE_STRING='tcliaxclient 0.2'
PACKAGE_BUGREPORT=''
# Factoring default headers for most tests.
@@ -666,7 +667,7 @@
# Be sure to have absolute paths.
for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
- localstatedir libdir includedir oldincludedir infodir mandir
+ localstatedir libdir includedir oldincludedir infodir mandir
do
eval ac_val=$`echo $ac_var`
case $ac_val in
@@ -706,10 +707,10 @@
# Try the directory containing this script, then its parent.
ac_confdir=`(dirname "$0") 2>/dev/null ||
$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$0" : 'X\(//\)[^/]' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$0" : 'X\(//\)[^/]' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$0" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -776,7 +777,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.2 to adapt to many kinds of systems.
+\`configure' configures tcliaxclient 0.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -801,9 +802,9 @@
cat <<_ACEOF
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
+ [$ac_default_prefix]
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- [PREFIX]
+ [PREFIX]
By default, \`make install' will install all the files in
\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
@@ -833,7 +834,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of iaxclient 0.2:";;
+ short | recursive ) echo "Configuration of tcliaxclient 0.2:";;
esac
cat <<\_ACEOF
@@ -902,13 +903,46 @@
ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
ac_top_srcdir=$ac_top_builddir$srcdir ;;
esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-# absolute.
-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+ case "$ac_dir" in
+ .) ac_abs_builddir=`pwd`;;
+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+ case ${ac_top_builddir}. in
+ .) ac_abs_top_builddir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+ case $ac_srcdir in
+ .) ac_abs_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+ case $ac_top_srcdir in
+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+ esac;;
+esac
+
cd $ac_dir
# Check for guested configure; otherwise get Cygnus style configure.
if test -f $ac_srcdir/configure.gnu; then
@@ -918,7 +952,7 @@
echo
$SHELL $ac_srcdir/configure --help=recursive
elif test -f $ac_srcdir/configure.ac ||
- test -f $ac_srcdir/configure.in; then
+ test -f $ac_srcdir/configure.in; then
echo
$ac_configure --help
else
@@ -931,11 +965,10 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-iaxclient configure 0.2
-generated by GNU Autoconf 2.57
+tcliaxclient configure 0.2
+generated by GNU Autoconf 2.59
-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-Free Software Foundation, Inc.
+Copyright (C) 2003 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -946,8 +979,8 @@
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.2, which was
-generated by GNU Autoconf 2.57. Invocation command line was
+It was created by tcliaxclient $as_me 0.2, which was
+generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1024,19 +1057,19 @@
2)
ac_configure_args1="$ac_configure_args1 '$ac_arg'"
if test $ac_must_keep_next = true; then
- ac_must_keep_next=false # Got value, back to normal.
+ ac_must_keep_next=false # Got value, back to normal.
else
- case $ac_arg in
- *=* | --config-cache | -C | -disable-* | --disable-* \
- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
- | -with-* | --with-* | -without-* | --without-* | --x)
- case "$ac_configure_args0 " in
- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
- esac
- ;;
- -* ) ac_must_keep_next=true ;;
- esac
+ case $ac_arg in
+ *=* | --config-cache | -C | -disable-* | --disable-* \
+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+ | -with-* | --with-* | -without-* | --without-* | --x)
+ case "$ac_configure_args0 " in
+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+ esac
+ ;;
+ -* ) ac_must_keep_next=true ;;
+ esac
fi
ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
# Get rid of the leading space.
@@ -1070,12 +1103,12 @@
case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
*ac_space=\ *)
sed -n \
- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
;;
*)
sed -n \
- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
;;
esac;
}
@@ -1104,7 +1137,7 @@
for ac_var in $ac_subst_files
do
eval ac_val=$`echo $ac_var`
- echo "$ac_var='"'"'$ac_val'"'"'"
+ echo "$ac_var='"'"'$ac_val'"'"'"
done | sort
echo
fi
@@ -1123,7 +1156,7 @@
echo "$as_me: caught signal $ac_signal"
echo "$as_me: exit $exit_status"
} >&5
- rm -f core core.* *.core &&
+ rm -f core *.core &&
rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
exit $exit_status
' 0
@@ -1203,7 +1236,7 @@
# value.
ac_cache_corrupted=false
for ac_var in `(set) 2>&1 |
- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+ sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
eval ac_old_set=\$ac_cv_env_${ac_var}_set
eval ac_new_set=\$ac_env_${ac_var}_set
eval ac_old_val="\$ac_cv_env_${ac_var}_value"
@@ -1220,13 +1253,13 @@
,);;
*)
if test "x$ac_old_val" != "x$ac_new_val"; then
- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
+ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
echo "$as_me: former value: $ac_old_val" >&2;}
- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
+ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
echo "$as_me: current value: $ac_new_val" >&2;}
- ac_cache_corrupted=:
+ ac_cache_corrupted=:
fi;;
esac
# Pass precious variables to config.status.
@@ -2027,7 +2060,6 @@
(exit $ac_status); }
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2047,8 +2079,8 @@
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output" >&5
-echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
(eval $ac_link_default) 2>&5
@@ -2068,23 +2100,23 @@
test -f "$ac_file" || continue
case $ac_file in
*.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
- ;;
+ ;;
conftest.$ac_ext )
- # This is the source file.
- ;;
+ # This is the source file.
+ ;;
[ab].out )
- # We found the default executable, but exeext='' is most
- # certainly right.
- break;;
+ # We found the default executable, but exeext='' is most
+ # certainly right.
+ break;;
*.* )
- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- # FIXME: I believe we export ac_cv_exeext for Libtool,
- # but it would be cool to find out if it's true. Does anybody
- # maintain Libtool? --akim.
- export ac_cv_exeext
- break;;
+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ # FIXME: I believe we export ac_cv_exeext for Libtool,
+ # but it would be cool to find out if it's true. Does anybody
+ # maintain Libtool? --akim.
+ export ac_cv_exeext
+ break;;
* )
- break;;
+ break;;
esac
done
else
@@ -2158,8 +2190,8 @@
case $ac_file in
*.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- export ac_cv_exeext
- break;;
+ export ac_cv_exeext
+ break;;
* ) break;;
esac
done
@@ -2184,7 +2216,6 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2235,7 +2266,6 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2255,15 +2285,25 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { 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_objext'
+ { (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
ac_compiler_gnu=yes
else
@@ -2272,7 +2312,7 @@
ac_compiler_gnu=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
@@ -2288,7 +2328,6 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2305,15 +2344,25 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { 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_objext'
+ { (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
ac_cv_prog_cc_g=yes
else
@@ -2322,7 +2371,7 @@
ac_cv_prog_cc_g=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
@@ -2349,7 +2398,6 @@
ac_cv_prog_cc_stdc=no
ac_save_CC=$CC
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2377,6 +2425,16 @@
va_end (v);
return s;
}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not '\xHH' hex character constants.
+ These don't provoke an error unfortunately, instead are silently treated
+ as 'x'. The following induces an error, until -std1 is added to get
+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+ array size at least. It's necessary to write '\x00'==0 to get something
+ that's true only with -std1. */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
int test (int i, double x);
struct s1 {int (*f) (int a);};
struct s2 {int (*f) (double a);};
@@ -2403,15 +2461,25 @@
CC="$ac_save_CC $ac_arg"
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { 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_objext'
+ { (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
ac_cv_prog_cc_stdc=$ac_arg
break
@@ -2420,7 +2488,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.$ac_objext
+rm -f conftest.err conftest.$ac_objext
done
rm -f conftest.$ac_ext conftest.$ac_objext
CC=$ac_save_CC
@@ -2448,19 +2516,28 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { 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_objext'
+ { (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
for ac_declaration in \
- ''\
- '#include <stdlib.h>' \
+ '' \
'extern "C" void std::exit (int) throw (); using std::exit;' \
'extern "C" void std::exit (int); using std::exit;' \
'extern "C" void exit (int) throw ();' \
@@ -2468,14 +2545,13 @@
'void exit (int);'
do
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+$ac_declaration
#include <stdlib.h>
-$ac_declaration
int
main ()
{
@@ -2486,15 +2562,25 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { 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_objext'
+ { (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
@@ -2503,9 +2589,8 @@
continue
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2522,15 +2607,25 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { 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_objext'
+ { (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
break
else
@@ -2538,7 +2633,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
done
rm -f conftest*
if test -n "$ac_declaration"; then
@@ -2552,7 +2647,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2587,7 +2682,6 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2598,7 +2692,7 @@
#else
# include <assert.h>
#endif
- Syntax error
+ Syntax error
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -2610,6 +2704,7 @@
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=
fi
@@ -2630,7 +2725,6 @@
# OK, works on sane cases. Now check whether non-existent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2648,6 +2742,7 @@
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=
fi
@@ -2694,7 +2789,6 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2705,7 +2799,7 @@
#else
# include <assert.h>
#endif
- Syntax error
+ Syntax error
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -2717,6 +2811,7 @@
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=
fi
@@ -2737,7 +2832,6 @@
# OK, works on sane cases. Now check whether non-existent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2755,6 +2849,7 @@
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=
fi
@@ -2805,6 +2900,7 @@
# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
@@ -2821,6 +2917,7 @@
case $as_dir/ in
./ | .// | /cC/* | \
/etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
@@ -2828,20 +2925,20 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
- if test $ac_prog = install &&
- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
- :
- elif test $ac_prog = install &&
- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # program-specific install script used by HP pwplus--don't use.
- :
- else
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
- break 3
- fi
- fi
+ if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+ if test $ac_prog = install &&
+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # AIX install. It has an incompatible calling convention.
+ :
+ elif test $ac_prog = install &&
+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # program-specific install script used by HP pwplus--don't use.
+ :
+ else
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ break 3
+ fi
+ fi
done
done
;;
@@ -2878,7 +2975,7 @@
echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -3021,7 +3118,6 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3042,15 +3138,25 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { 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_objext'
+ { (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
ac_cv_header_stdc=yes
else
@@ -3059,12 +3165,11 @@
ac_cv_header_stdc=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3086,7 +3191,6 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3111,7 +3215,6 @@
:
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3123,9 +3226,9 @@
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
#else
# define ISLOWER(c) \
- (('a' <= (c) && (c) <= 'i') \
- || ('j' <= (c) && (c) <= 'r') \
- || ('s' <= (c) && (c) <= 'z'))
+ (('a' <= (c) && (c) <= 'i') \
+ || ('j' <= (c) && (c) <= 'r') \
+ || ('s' <= (c) && (c) <= 'z'))
# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
#endif
@@ -3136,7 +3239,7 @@
int i;
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
+ || toupper (i) != TOUPPER (i))
exit(2);
exit (0);
}
@@ -3161,7 +3264,7 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
fi
@@ -3186,7 +3289,7 @@
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
- inttypes.h stdint.h unistd.h
+ inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_h...
[truncated message content] |
