diff --git a/COPYING b/COPYING index 8648c8a0eaf..623b6258a13 100644 --- a/COPYING +++ b/COPYING @@ -1,12 +1,8 @@ -All of the code (except when other copyright is specified) is -(c) 2004-2005 Savoir-faire Linux inc. -and released under the terms of the venerable - GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -114,7 +110,7 @@ above, provided that you also meet all of these conditions: License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -282,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest @@ -309,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found. 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 Also add information on how to contact you by electronic and paper mail. @@ -317,7 +313,7 @@ Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) year name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. @@ -342,4 +338,3 @@ proprietary programs. If your program is a subroutine library, you may 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 --git a/ChangeLog b/ChangeLog index c77713e882d..bb86269229a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,85 +1,177 @@ -Jean-Philippe Barette-LaPierre (30 April 2005) version 0.4.1-pre1 -- Changed the order of initialization of modules, in order to - removed a race condition. -- We can build in different build directories. - (thanks to Mikael Magnusson) -- We actualy check if portaudio and eXosip2 libs - are installed. (thanks to Mikael Magnusson) -- zeroconf integration start - -Jean-Philippe Barette-LaPierre (30 April 2005) version 0.4.1-pre1 -- Now, we send a final response to reINVITEs - (thanks to Mikael Magnusson) - -Jean-Philippe Barette-LaPierre (29 April 2005) version 0.4.1-pre1 -- Bug fix when trying to use more than 6 lines. - -Jean-Philippe Barette-LaPierre (20 August 2005) version 0.4.1-pre1 -- Manager has now a LifetimeLibrary policy. -- Utilspp has been rearranged. - -Laurielle LEA (10 August 2005) version 0.4 -- Add blink notification for voice-message -- Cleanup code - -Laurielle LEA (1st August 2005) version 0.4 -- Add comments in header files - -Laurielle LEA (29 July 2005) version 0.4 -- Add scrolling message - -Laurielle LEA (27 July 2005) version 0.4 -- Migrate from libeXoSIP 0.9.0 to libeXosip2-1.9.1-pre15 - (http://www.antisip.com/download/) - -Laurielle LEA (21 July 2005) version 0.4 -- Change README. - -Laurielle LEA (20 July 2005) version 0.4 -- Fix mute feature. -- Fix many bugs about line management. -- Add "Compose" item in trayicon menu. - -Jean-Philippe Barette-LaPierre (18 July 2005) version 0.4 -- Bug fix if error was raised before setGUI. - -Laurielle LEA (18 July 2005) version 0.4 -- Fix incoming call sound notification. -- Fix transfer if no busy line. - -Laurielle LEA (15 July 2005) version 0.4 -- Fix configuration init. - -Jerome OUFELLA (13 July 2005) version 0.4 -- Fix tone. - -Jean-Philippe Barette-LaPierre (13 July 2005) version 0.4 -- Change "Manager" to a singleton. - -Laurielle LEA (13 July 2005) version 0.4 -- Fix bug if network is not available. -- Fix apply skin feature. - -Laurielle LEA (11 July 2005) version 0.4 -- Check functions return. -- Remove unused mute functions. - -Laurielle LEA (8 July 2005) version 0.4 -- Stop program when error opening skin file. -- Divide toggle() of qtguimainwindow.cpp in small functions. -- Add return test. - -Laurielle LEA (7 July 2005) version 0.4 -- Cleanup audiortp.cpp. -- Replace #define by global variable in codecDescriptor.cpp. -- Set mutex of ringbuffer in the functions of RingBuffer object. -- Divide run() of audiortp.cpp in 3 small functions. -- Changed device static function in Manager for configurationpanel.ui.h. -- Updated README. - -Jean-Philippe Barrette-LaPierre (6 July 2005) version 0.4 -- Fixed all autotools problems. -- Updated all autotools scripts to use PortAudioCpp. - -Jean-Philippe Barrette-LaPierre (9 June 2005) version 0.4 -- Added the autotools support. +2006-05-21 Julien Plissonneau Duquene + + * Removed checks for osip from configure.ac (this is needed and + checked by eXosip anyway), fixed the check for libs in exosip.m4 + + * Fixed Makefiles and autoqt for building on Debian sarge + +2006-05-20 Julien Plissonneau Duquene + + * Fixed autotools setup, replaced kde m4 files by autoqt, + added tools/autotoolize.sh and tools/bleach.sh + + * Cleaned up the mess in the top directory, merged some files, + rewrote the ChangeLog using GNU format, updated the README + + * Removed eXosip2 headers + +2005-11-26 The SFLPhone Team + + * Version 0.6.1 + +2005-11-21 The SFLPhone Team + + * Version 0.6 + +2005-11-11 The SFLPhone Team + + * Version 0.6 RC3 + +2005-10-17 The SFLPhone Team + + * Version 0.5 + +2005-08-30 Jean-Philippe Barette-LaPierre + + * Changed the order of initialization of modules, in order to + remove a race condition. + + * We can build in different build directories. + (thanks to Mikael Magnusson) + + * We actualy check if portaudio and eXosip2 libs + are installed. (thanks to Mikael Magnusson) + + * zeroconf integration start + +2005-08-30 Jean-Philippe Barette-LaPierre + + * Now, we send a final response to reINVITEs + (thanks to Mikael Magnusson) + +2005-08-29 Jean-Philippe Barette-LaPierre + + * Bug fix when trying to use more than 6 lines. + +2005-08-20 Jean-Philippe Barette-LaPierre + + * Manager has now a LifetimeLibrary policy. + + * Utilspp has been rearranged. + +2005-08-11 The SFLPhone Team + + * Version 0.4.1-pre1 + +2005-08-10 Laurielle Lea + + * Add blink notification for voice-message + + * Cleanup code + +2005-08-01 Laurielle Lea + + * Add comments in header files + +2005-07-29 Laurielle Lea + + * Add scrolling message + +2005-07-25 Laurielle Lea + + * Migrate from libeXoSIP 0.9.0 to libeXosip2-1.9.1-pre15 + (http://www.antisip.com/download/) + +2005-07-21 Laurielle Lea + + * Change README. + +2005-07-20 Laurielle Lea + + * Fix mute feature. + + * Fix many bugs about line management. + + * Add "Compose" item in trayicon menu. + +2005-07-18 Jean-Philippe Barette-LaPierre + + * Bug fix if error was raised before setGUI. + +2005-07-18 Laurielle Lea + + * Fix incoming call sound notification. + + * Fix transfer if no busy line. + +2005-07-15 Laurielle Lea + + * Fix configuration init. + +2005-07-13 Jerome Oufella + + * Fix tone. + +2005-07-13 Jean-Philippe Barette-LaPierre + + * Change "Manager" to a singleton. + +2005-07-13 Laurielle Lea + + * Fix bug if network is not available. + + * Fix apply skin feature. + +2005-07-11 Laurielle Lea + + * Check functions return. + + * Remove unused mute functions. + +2005-07-08 The SFLPhone Team + + * Version 0.4 + +2005-07-08 Laurielle Lea + + * Stop program when error opening skin file. + + * Divide toggle() of qtguimainwindow.cpp in small functions. + + * Add return test. + +2005-07-07 Laurielle Lea + + * Cleanup audiortp.cpp. + + * Replace #define by global variable in codecDescriptor.cpp. + + * Set mutex of ringbuffer in the functions of RingBuffer object. + + * Divide run() of audiortp.cpp in 3 small functions. + + * Changed device static function in Manager for configurationpanel.ui.h. + + * Updated README. + +2005-07-06 Jean-Philippe Barrette-LaPierre + + * Fixed all autotools problems. + + * Updated all autotools scripts to use PortAudioCpp. + +2005-06-09 Jean-Philippe Barrette-LaPierre + + * Added the autotools support. + +2005-04-07 The SFLPhone Team + + * Version 0.3 + +2005-01-18 The SFLPhone Team + + * Version 0.2 + +2004-12-21 The SFLPhone Team + + * Version 0.1 (initial release) diff --git a/FIXME b/FIXME index d99e52bf525..e69de29bb2d 100644 --- a/FIXME +++ b/FIXME @@ -1,4 +0,0 @@ -- sflphoned don't return any result at the second time getcallstatus is called. -- sflphoned don't return a 206 on getcallstatus when one call is ringing. -- unhold should not return an error if it's not holded - diff --git a/Makefile.am b/Makefile.am index bf26725eb06..6bdd2302db7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,8 @@ -SUBDIRS = include libs src ringtones skins m4 -EXTRA_DIST = tools/*.sh debian/* README.cvs CHANGES images/* +# Makefile.am + +ACLOCAL_FLAGS = -I m4 + +SUBDIRS = libs src ringtones skins +EXTRA_DIST = m4/*.m4 tools/*.sh platform/* images/* -ACLOCAL_FLAGS=-I$(top_srcdir)/m4 diff --git a/NEWS b/NEWS index e69de29bb2d..ee7b15f69a9 100644 --- a/NEWS +++ b/NEWS @@ -0,0 +1,94 @@ +SFLphoned (0.7.0) / 2006-..-.. + * fix: click on flashing buttons + * fix: send ringing, hangup, busy message + * fix for using call command two times in a row + * add --disable-sflphoneqt 2006-05-01 + * remove libexosip2 internally, it's in debian unstable 2005-01-01 + * add iax support - in development + * add account support + * remove callid string/int + * add account SIP0 (default) in sflphone-cli + * add account SIP0 (default) in sflphone-qt + * fix nat handling (use the same port that it test) + * add register/unregister in qt + +SFLphoned (0.6.2) / 2005-11-29 + * integral mono support + * libsamplerate added for macosx + +SFLphoned (0.6.1) / 2005-11-26 + * add speex codec (experimental) + * fix for codec handling in sdp and audiortp + * new codec class + * add portaudio missing file + (thanks to Pierre POMES) + * add samplerate and inChannel/outChannel in AudioLayer + we could use microphone in mono and speaker in stereo + +SFLphoned/SFLphone (0.6) / 2005-11-04 + * improve sip protocol + * can now receive text message + * accept reinvite call + * cleaning headers + * improving bash launcher script + * select audio input and output device + * installation review + +SFLphoned/SFLphone (0.5a) / 2005-10-17 + * sflphoned + * bug fixes + * sflphone-qt + * client/server protocol + +SFLphone (0.4.1-pre2) / 2005-09-30 + * rearranged utilspp use + * Bug fix when trying to use more than 6 lines. + * Now, we send a final response to reINVITEs + (thanks to Mikael Magnusson) + * We can build in different build directories. + (thanks to Mikael Magnusson) + * We actualy check if portaudio and eXosip2 libs + are installed + * zeroconf integration start + +SFLphone (0.4.1-pre1) / 2005-08-11 + * Use libeXosip2 + * Add blink notification for voice-message + * Add scrolling text + +SFLphone (0.4) / 2005-07-06 + * Cleanup code + * Add autotools support + * Handle CANCEL method + * PortAudio replace OSS and ALSA devices choice + * Add PortAudioCpp to make easy use of RingBuffer object for + audio callback + * Add PortAudio library to make easy sound portability + * Fix a few memory leak + * Reorganisation of SFLphone architecture + * Handle error messages on screen + * Handle "refused call" + * Notification of remote RINGING event added + * Call management updated + +SFLphone (0.3) / 2005-04-05 + * ALSA driver support added + * GSM audio codec support added + * Ringtones support (just ulaw format) added + * Notification incoming call added + * Apply skin feature added + * Volume control added + * Registration manually added + * Config-file in home directory changed to ".sflphone" + +SFLphone (0.2) / 2005-01-18 + * Lines management updated + * Blocking bug fixed + * Configuration tree, made from a config file, added for setup + * Dial tone updated + * Timer call updated + * Apply feature updated + * Non-network or request failure cases updated + +SFLphone (0.1a) / 2004-12-22 + * First release diff --git a/README b/README index 82b9ee9b7ba..15f456e9c27 100644 --- a/README +++ b/README @@ -1,59 +1,130 @@ -This is SFLPhoned-0.7 release. - -You need -- commoncpp2 >= 1.3.20 -- libxml2, libxml2-devel and pkgconfig -- ccrtp >= 1.3.4 -- libosip2 >= 2.2.1 - -See http://www.sflphone.org/#downloads to download required libraries. +This is SFLPhoned, release 0.7pre0cvs. + +Copyright (c) Savoir-faire Linux, Inc 2004-2006 + + +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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Introduction +------------ + +SFLPhone is a Voice-over-IP software phone. We want it to be: +- portable (it runs under GNU/Linux, Mac OS X, Win32) +- user friendly (fast, sleek, easy to learn interface) +- corporate grade (transfers, holds, perfect audio quality) +- fully compatible with Asterisk (SIP and IAX protocols) +- customizable (support for custom skins in the QT interface) + +As the SIP/audio daemon and the user interface are separate processes, +it is easy to provide different user interfaces. SFLPhone comes with +a QT graphical user interface, an interactive command line interface, +and even scripts to control the daemon from the shell. + +SFLPhone is actually used by the support team of Savoir-Faire Linux Inc. + +More information is available on the project homepage: + http://www.sflphone.org/ + + +Getting the dependencies +------------------------ + +Required libraries and tools: +- ccRTP >= 1.3.4 (tested with ccrtp 1.4.1) + and Common C++ 2 >= 1.3.20 (tested with commoncpp2 1.4.1) + http://sourceforge.net/projects/gnutelephony/ +- libeXosip2 >= 2.2.2 (tested with eXosip2 2.2.3) + and libosip2 >= 2.2.1 (tested with libosip2-2.2.2) + http://savannah.gnu.org/projects/exosip/ + http://savannah.gnu.org/projects/osip/ +- libxml2, libxml2-devel, pkgconfig + usually available in distribution repositories + +Optional libraries: +- zeroconf: (tested with mDNSResponder87) + http://developer.apple.com/darwin/projects/bonjour/ +- QT: required for the graphical user interface + usually available in distribution repositories +- speex : codec for sound + +Some of the required libraries may be downloaded from + http://www.sflphone.org/#downloads + or + http://www.sflphone.org/dev/ +See tools/config.sh for details Dependencies build instructions: -------------------------------- -You can use the builds script in tools directory. -1. Change the default configuration in config.sh (~/sflphone) is the prefix -2. ./download.sh -3. ./install.sh +If you don't use development files of your distribution and you don't want +to go on dependencies web site, you can use a custom dependencies building +script in tools/ directory. + +1. Go to tools/ (cd tools) +2. Change the default configuration in config.sh (~/sflphone) is the prefix +3. ./download.sh +4. ./install.sh You can also compile each dependencies, one by one: -1/ For commoncpp2-1.3.21 +1/ For commoncpp2 ./configure [option] make make install -2/ For ccrtp-1.3.5 +2/ For ccrtp ./configure [option] make make install -3/ For libosip2-2.2.1 +3/ For libosip2 ./configure [option] make make install -How to compile SFLphoned ? -------------------------- + +Preparing a CVS checkout of SFLPhone to be built +------------------------------------------------ + +Before building from a CVS checkout, the GNU autotools suite must be used +to generate the configure script and Makefiles. The current version +of SFLPhone has been tested with Automake 1.9 and Autoconf 2.59. + +To do so, you may run the following script from the top directory: + ./tools/autotoolize.sh + +Building SFLPhone +----------------- ./configure [option] make make install (as root) - ( Be sure you have the correct permissions). -How to use it ? ---------------- +Using SFLPhone +-------------- If you have the sflphone 0.3 or 0.4 release, copy the file sflphonerc to sflphonedrc -cp ~/.sflphone/sflphonerc ~/.sflphone/sflphonedrc + cp ~/.sflphone/sflphonerc ~/.sflphone/sflphonedrc If you have an older version, remove your sflphonerc file located in $HOME/.sflphone 1. Install a GUI like sflphone-qt 2. Lauch sflphone interface, a setup window appears. -3. If you do have a SIP account, fill the SIP stuff where related. You can use - STUN too. +3. If you do have a SIP account, fill the SIP stuff where related. You can + use STUN too. 4. Save your settings, restart it. You're done. @@ -61,44 +132,52 @@ A user's guide will be available on: http://www.sflphone.org/doc/ -Why does it not compile ? +What if it does not build? ------------------------- - -- You don't have the same library versions as we do. +- Try using the same versions of the libraries as we do. See http://www.sflphone.org in section Downloads. -- You don't have the same compiler (some libraries dislike - some compilers). We are using gcc 4.0.1 on - Fedora Core 4 Linux. +- Try using the same compilers as ours: gcc 4.1.0 on Fedora Linux Core 5 + is known to work. + +- If you have dependencies installed in unusual directories, try setting + the environment variable CXXFLAGS before building, for example: + export CXXFLAGS="-I/opt/include" -- If error occured while loading shared libraries, - you have to export LD_LIBRARY_PATH with your lib directory. - ( example: export LD_LIBRARY_PATH=/opt/lib:${LD_LIBRARY_PATH} ) -- If you don't install dependencies in classic install directories, - you have to export CXXFLAGS. - ( example: export CXXFLAGS="-I/opt/include" ) -How to enable iax support? +How to enable IAX support? -------------------------- + Go inside libs directory and execute ./libiax2.sh script. Run ./configure with --enable-iax2 option. -Why does it not work ? ----------------------- + + +Run-time troubleshooting +------------------------ + +- If errors occured when trying to load shared libraries, check that the + value of the environment variable LD_LIBRARY_PATH include the + directories containing the required libraries, eg: + export LD_LIBRARY_PATH=/path/to/my/lib:${LD_LIBRARY_PATH} - Portaudio don't detect your sound card because : * artsd is running * jackd is running - On 2005/11/22, jack wasn't working with these settings: jackd -d alsa -r 8000 - * you use alsa with sflphone and another application, but dmixer isn't configurated - correctly inside ~/.asoundrc or /etc/alsa/alsa.conf + On 2005/11/22, jack wasn't working with these settings: + jackd -d alsa -r 8000 + * you use alsa with sflphone and another application, but dmixer isn't + configurated correctly inside ~/.asoundrc or /etc/alsa/alsa.conf + - sflphone refuse to start because it's running You could have something like: "Exception: could not bind socket" Try to close sflphone before - - echo "stop sflphone" | nc localhost 3999 + echo "stop sflphone" | nc localhost 3999 or - - killall sflphone + killall sflphone + + Short description of content of source tree: ------------------------------------------- @@ -106,7 +185,6 @@ Short description of content of source tree: - ringtones/ contains the different ringtones. - stund/ is an implementation of the protocol STUN used when there is a NAT. - utilspp/ allows to implement a singleton. - - src/ is the core of SFLphone. It contains the main.cpp, managerimpl.cpp files, audio and gui directories, and files about signalisation SIP. Later, it should be better, when IAX will be implemented, that a directory @@ -124,6 +202,7 @@ Short description of content of source tree: to sflphone client. The slfphone client can be a console program or a graphical interface + How is structured SFLphone (>=0.5) ---------------------------------- @@ -166,19 +245,23 @@ VoIPLink vector contains all different VoIP link like SIP, IAX, ... Call vector contains all the calls according to the kind of VoIP link. -Misc. ------ -Of course we love patches. And contribution. See http://www.sflphone.org/ . -The project infrastructure (CVS, bugtraqer, MLs) is maintained on : -http://forge.novell.com/modules/xfmod/project/?sflphone +About Savoir-Faire Linux +------------------------ -Don't hesitate to post your comments/suggestions/questions on the -forge.novell mailing-list. +Savoir-Faire Linux is a consulting company based in Montreal, Quebec. + + + +Contributing to SFLPhone +------------------------ + +Of course we love patches. And contributions. And spring rolls. + +The project infrastructure (CVS, bugtracker, MLs) is maintained on: +http://forge.novell.com/modules/xfmod/project/?sflphone +Do not hesitate to join us and post comments, suggestions, questions +and general feedback on the forge.novell mailing-list. -Jean-Philippe Barette-LaPierre -(jean-philippe.barrette-lapierre@savoirfairelinux.com) -Laurielle Lea (laurielle.lea@savoirfairelinux.com) -Jerome Oufella (jerome.oufella@savoirfairelinux.com) -Yan Morin (yan.morin@savoirfairelinux.com) + -- The SFLPhone Team diff --git a/TODO b/TODO index 4e24abf9c53..ffa40d4b2a4 100644 --- a/TODO +++ b/TODO @@ -12,4 +12,10 @@ For project dependencies: ------------------------ Improve the autotools scripts of PortAudioCpp +From FIXME: +- sflphoned don't return any result at the second time getcallstatus is called. +- sflphoned don't return a 206 on getcallstatus when one call is ringing. +- unhold should not return an error if it's not holded + + diff --git a/config.h.in b/config.h.in index 7d9c98a4bb0..8dd3259044b 100644 --- a/config.h.in +++ b/config.h.in @@ -1,16 +1,28 @@ /* config.h.in. Generated from configure.ac by autoheader. */ -/* Define to 1 if you have the header file. */ -#undef HAVE_CARBON_CARBON_H +/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP + systems. This function is required for `alloca.c' support on those systems. + */ +#undef CRAY_STACKSEG_END -/* Define if you have the CoreAudio API */ -#undef HAVE_COREAUDIO +/* Define to 1 if using `alloca.c'. */ +#undef C_ALLOCA -/* Define to 1 if you have the header file. */ -#undef HAVE_CRT_EXTERNS_H +/* Define to 1 if you have `alloca', as a function or macro. */ +#undef HAVE_ALLOCA -/* Defines if your system has the crypt function */ -#undef HAVE_CRYPT +/* Define to 1 if you have and it should be used (not on Ultrix). + */ +#undef HAVE_ALLOCA_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_ARPA_INET_H + +/* Define to 1 if you have the `bzero' function. */ +#undef HAVE_BZERO + +/* Define to 1 if your system has a working `chown' function. */ +#undef HAVE_CHOWN /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H @@ -18,50 +30,107 @@ /* Define if dns-sd is available */ #undef HAVE_DNSSD +/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ +#undef HAVE_DOPRNT + +/* Define to 1 if you have the header file. */ +#undef HAVE_FCNTL_H + +/* Define to 1 if you have the `floor' function. */ +#undef HAVE_FLOOR + +/* Define to 1 if you have the `fork' function. */ +#undef HAVE_FORK + +/* Define to 1 if you have the `gethostbyname' function. */ +#undef HAVE_GETHOSTBYNAME + +/* Define to 1 if you have the `gethrtime' function. */ +#undef HAVE_GETHRTIME + +/* Define to 1 if you have the `gettimeofday' function. */ +#undef HAVE_GETTIMEOFDAY + +/* Define to 1 if you have the `inet_ntoa' function. */ +#undef HAVE_INET_NTOA + /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H /* Define to 1 if you have the `eXosip2' library (-leXosip2). */ #undef HAVE_LIBEXOSIP2 -/* Define if you have libjpeg */ -#undef HAVE_LIBJPEG +/* Define to 1 if you have the header file. */ +#undef HAVE_LIBINTL_H /* Define to 1 if you have the `osipparser2' library (-losipparser2). */ #undef HAVE_LIBOSIPPARSER2 -/* Define if you have libpng */ -#undef HAVE_LIBPNG - -/* Define if you have a working libpthread (will enable threaded code) */ +/* Define to 1 if you have the `pthread' library (-lpthread). */ #undef HAVE_LIBPTHREAD /* Define to 1 if you have a fully functional readline library. */ #undef HAVE_LIBREADLINE -/* Define if you have libz */ -#undef HAVE_LIBZ +/* Define to 1 if you have the header file. */ +#undef HAVE_LIMITS_H + +/* Define to 1 if your system has a GNU libc compatible `malloc' function, and + to 0 otherwise. */ +#undef HAVE_MALLOC + +/* Define to 1 if you have the header file. */ +#undef HAVE_MALLOC_H /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H -/* Define if your system needs _NSGetEnviron to set up the environment */ -#undef HAVE_NSGETENVIRON +/* Define to 1 if you have the `memset' function. */ +#undef HAVE_MEMSET + +/* Define to 1 if you have the `mkdir' function. */ +#undef HAVE_MKDIR -/* Define to 1 if you have the header file. */ -#undef HAVE_OSTREAM +/* Define to 1 if you have the header file. */ +#undef HAVE_NETDB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETINET_IN_H + +/* Define to 1 if you have the `pathconf' function. */ +#undef HAVE_PATHCONF + +/* Define to 1 if you have the `pow' function. */ +#undef HAVE_POW /* Define if you have POSIX threads libraries and header files. */ #undef HAVE_PTHREAD -/* Define if you have res_init */ -#undef HAVE_RES_INIT +/* Define to 1 if the system has the type `ptrdiff_t'. */ +#undef HAVE_PTRDIFF_T + +/* Define to 1 if your system has a GNU libc compatible `realloc' function, + and to 0 otherwise. */ +#undef HAVE_REALLOC -/* Define if you have the res_init prototype */ -#undef HAVE_RES_INIT_PROTO +/* Define to 1 if you have the `regcomp' function. */ +#undef HAVE_REGCOMP -/* Define to 1 if you have the `snprintf' function. */ -#undef HAVE_SNPRINTF +/* Define to 1 if you have the `select' function. */ +#undef HAVE_SELECT + +/* Define to 1 if you have the `setlocale' function. */ +#undef HAVE_SETLOCALE + +/* Define to 1 if you have the `socket' function. */ +#undef HAVE_SOCKET + +/* Define to 1 if `stat' has the bug that it succeeds when given the + zero-length file name argument. */ +#undef HAVE_STAT_EMPTY_STRING_BUG + +/* Define to 1 if stdbool.h conforms to C99. */ +#undef HAVE_STDBOOL_H /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H @@ -69,41 +138,81 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H +/* Define to 1 if you have the `strchr' function. */ +#undef HAVE_STRCHR + +/* Define to 1 if you have the `strdup' function. */ +#undef HAVE_STRDUP + +/* Define to 1 if you have the `strerror' function. */ +#undef HAVE_STRERROR + /* Define to 1 if you have the header file. */ #undef HAVE_STRINGS_H /* Define to 1 if you have the header file. */ #undef HAVE_STRING_H -/* Define if you have strlcat */ -#undef HAVE_STRLCAT +/* Define to 1 if you have the `strrchr' function. */ +#undef HAVE_STRRCHR -/* Define if you have the strlcat prototype */ -#undef HAVE_STRLCAT_PROTO +/* Define to 1 if you have the `strstr' function. */ +#undef HAVE_STRSTR -/* Define if you have strlcpy */ -#undef HAVE_STRLCPY +/* Define to 1 if you have the `strtol' function. */ +#undef HAVE_STRTOL -/* Define if you have the strlcpy prototype */ -#undef HAVE_STRLCPY_PROTO +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_IOCTL_H -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_BITYPES_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SELECT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SOCKET_H /* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TIME_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_TYPES_H /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to 1 if you have the `vsnprintf' function. */ -#undef HAVE_VSNPRINTF +/* Define to 1 if you have the `utime' function. */ +#undef HAVE_UTIME -/* Suffix for lib directories */ -#undef KDELIBSUFF +/* Define to 1 if you have the header file. */ +#undef HAVE_UTIME_H + +/* Define to 1 if `utime(file, NULL)' sets file's timestamp to the present. */ +#undef HAVE_UTIME_NULL + +/* Define to 1 if you have the `vfork' function. */ +#undef HAVE_VFORK + +/* Define to 1 if you have the header file. */ +#undef HAVE_VFORK_H + +/* Define to 1 if you have the `vprintf' function. */ +#undef HAVE_VPRINTF + +/* Define to 1 if `fork' works. */ +#undef HAVE_WORKING_FORK + +/* Define to 1 if `vfork' works. */ +#undef HAVE_WORKING_VFORK + +/* Define to 1 if the system has the type `_Bool'. */ +#undef HAVE__BOOL + +/* Define to 1 if `lstat' dereferences a symlink specified with a trailing + slash. */ +#undef LSTAT_FOLLOWS_SLASHED_SYMLINK /* Name of package */ #undef PACKAGE @@ -127,27 +236,44 @@ your system. */ #undef PTHREAD_CREATE_JOINABLE -/* The size of a `char *', as computed by sizeof. */ -#undef SIZEOF_CHAR_P +/* Define as the return type of signal handlers (`int' or `void'). */ +#undef RETSIGTYPE + +/* Define to the type of arg 1 for `select'. */ +#undef SELECT_TYPE_ARG1 -/* The size of a `int', as computed by sizeof. */ +/* Define to the type of args 2, 3 and 4 for `select'. */ +#undef SELECT_TYPE_ARG234 + +/* Define to the type of arg 5 for `select'. */ +#undef SELECT_TYPE_ARG5 + +/* The size of `int', as computed by sizeof. */ #undef SIZEOF_INT -/* The size of a `long', as computed by sizeof. */ +/* The size of `long', as computed by sizeof. */ #undef SIZEOF_LONG -/* The size of a `short', as computed by sizeof. */ +/* The size of `short', as computed by sizeof. */ #undef SIZEOF_SHORT -/* The size of a `size_t', as computed by sizeof. */ -#undef SIZEOF_SIZE_T +/* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be + automatically deduced at runtime. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ +#undef STACK_DIRECTION -/* The size of a `unsigned long', as computed by sizeof. */ -#undef SIZEOF_UNSIGNED_LONG +/* Define to 1 if the `S_IS*' macros in do not work properly. */ +#undef STAT_MACROS_BROKEN /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* Define to 1 if you can safely include both and . */ +#undef TIME_WITH_SYS_TIME + /* Version number of package */ #undef VERSION @@ -155,103 +281,36 @@ first (like Motorola and SPARC, unlike Intel and VAX). */ #undef WORDS_BIGENDIAN -/* - * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system - * headers and I'm too lazy to write a configure test as long as only - * unixware is related - */ -#ifdef _UNIXWARE -#define HAVE_BOOLEAN -#endif - - - -/* - * AIX defines FD_SET in terms of bzero, but fails to include - * that defines bzero. - */ - -#if defined(_AIX) -#include -#endif - - - -#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H) -# include -# include -# define environ (*_NSGetEnviron()) -#endif - - - -#if !defined(HAVE_RES_INIT_PROTO) -#ifdef __cplusplus -extern "C" { -#endif -int res_init(void); -#ifdef __cplusplus -} -#endif -#endif - +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const +/* Define to `int' if doesn't define. */ +#undef gid_t -#if !defined(HAVE_STRLCAT_PROTO) -#ifdef __cplusplus -extern "C" { -#endif -unsigned long strlcat(char*, const char*, unsigned long); -#ifdef __cplusplus -} -#endif -#endif - - - -#if !defined(HAVE_STRLCPY_PROTO) -#ifdef __cplusplus -extern "C" { -#endif -unsigned long strlcpy(char*, const char*, unsigned long); -#ifdef __cplusplus -} -#endif +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +#undef inline #endif +/* Define to rpl_malloc if the replacement function should be used. */ +#undef malloc +/* Define to `int' if does not define. */ +#undef pid_t -/* - * On HP-UX, the declaration of vsnprintf() is needed every time ! - */ +/* Define to rpl_realloc if the replacement function should be used. */ +#undef realloc -#if !defined(HAVE_VSNPRINTF) || defined(hpux) -#if __STDC__ -#include -#include -#else -#include -#endif -#ifdef __cplusplus -extern "C" -#endif -int vsnprintf(char *str, size_t n, char const *fmt, va_list ap); -#ifdef __cplusplus -extern "C" -#endif -int snprintf(char *str, size_t n, char const *fmt, ...); -#endif - - - -#if defined(__SVR4) && !defined(__svr4__) -#define __svr4__ 1 -#endif +/* Define to `unsigned int' if does not define. */ +#undef size_t +/* Define to `int' if doesn't define. */ +#undef uid_t -/* type to use in place of socklen_t if not defined */ -#undef kde_socklen_t +/* Define as `fork' if `vfork' does not work. */ +#undef vfork -/* type to use in place of socklen_t if not defined (deprecated, use - kde_socklen_t) */ -#undef ksize_t +/* 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 --git a/ltmain.sh b/ltmain.sh index 8fc56db8fc6..c715b59412e 100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -43,7 +43,7 @@ EXIT_FAILURE=1 PROGRAM=ltmain.sh PACKAGE=libtool -VERSION="1.5.22 Debian 1.5.22-2" +VERSION="1.5.22 Debian 1.5.22-4" TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" # See if we are running on zsh, and set the options which allow our diff --git a/sflphone.spec.in b/sflphone.spec.in deleted file mode 100644 index acd9ce12bea..00000000000 --- a/sflphone.spec.in +++ /dev/null @@ -1,38 +0,0 @@ -%define name sflphoned -%define version 0.6 -%define release 1 -%define prefix /usr -Autoreq: 0 - -Name: %name -Summary: A VoIP daemon with SIP protocol -Version: %version -Release: %release -License: GPL -Group: Networking/Utilities -URL: http://www.sflphone.org/ -Packager: Cyrille Béraud -Source: http://www.sflphone.org/releases/sflphone-0.5.tar.gz -BuildRoot: /tmp/sflphone-%{version}-%{release} - -%description -SFLPhoned is a VoIP daemon with SIP protocol. -%prep -%setup -CXXFLAGS="$RPM_OPT_FLAGS" ./configure --prefix %{prefix} - -%build -make - -%install -make DESTDIR=$RPM_BUILD_ROOT install - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-, root, root) -%{prefix}/bin/sflphoned -%dir %{prefix}/share/sflphone/ringtones -%{prefix}/share/sflphone/ringtones/* -