Merge with upstream

ChangeLog

@@ -1,5 +1,13 @@
 Change Log:
 
+2.05  1) Converted entire make system over to the GNU autoconf / automake
+         format.  See the INSTALL file for additional information
+      2) Corrected various minor bugs
+      3) Added mouse wheel functions when mouse is in waterfall display
+         a) click - toggle AFC
+         b) shift - alter SQL level
+         c) ctrl - alter PSK search range.
+      4) modified waterfall cursors to show the search range
 2.04  1) added full waterfall video texting using FeldHell Modern-8-14 font.
          1, 2, 3 or 4 characters per video line.
       2) bug fix for center mouse button toggle of AFC.

README

@@ -1,40 +1,18 @@
-The following development libraries need to be present and installed on 
+Fldigi is a software modem program for Amateur Radio use.  It is a sound card
-your system before you compile Fldigi.
+based program that both is used for both transmitting and receiving data in any
+of the following modes:
    
-1. Fast Light Tool Kit -  FLTK  version 1.1.7 or greater.
+CW          speeds from 5 to 200 wpm	 	 	 	 	 	 	
+DominoEX 4 	DominoEX 5 	DominoEX 8 	DominoEX 11 	DominoEX 16 	DominoEX 22 		
+Feld-Hell 	FSK-Hell 	FSK-Hell 105 					
+MFSK-8 	    MFSK-16 	MFSK-16 pix 					
+PSK-31 	    QPSK-31 	PSK-63 	    QPSK-63 	    
+PSK-125     QPSK-125    PSK-250	    QPSK-250
+Throb-1 	Throb-2 	Throb-4 	ThrobX-1 	ThrobX-2 	ThrobX-4 		
+OLIVIA 	    various tones and bandwidth 		
+RTTY 	    various Baud Rates, Shifts, Nbr of data bits, etc. 		
+WWV 	    Receive only - calibrate your sound card to WWV 		
+Freq Anal 	Receive only to measure the frequency of a received carrier
 
-   * configure the compilation of Fltk as:  
 
-      o ./configure --enable-threads --enable-xft --enable-shared
 
-      o if you do not use the --enable-xft switch you will get segfaults 
-        when selecting True Type fonts for display!!
-
-      o if you do not use the --enable-threads the application will not 
-        compile and link
-
-      o if you do not have the jpeg, png and zlib libraries on your system 
-        you can compile them for local use by fltk.  Add the following to 
-        the ./configure line
-           --enable-localjpeg 
-           --enable-localpng 
-           --enable-localzlib
-                
-   * then simply execute make and make install (make install as super user)
-          
-2. Hamlib - The hamlib library is required if you plan to interface to
-your transceiver using those common libs.  You can also use the fldigi
-internal RigCAT controller and avoid the use of hamlib.  If you compile
-for hamlib the RigCAT functionality is still compiled into fldigi.
-Hamlib Library Source the latest release is 1.2.6, download this release.
-Follow the instruction in the source code top directory.  The library must 
-be installed as super user.  You should compile as your normal login user.  
-The precompiled hamlib RPM and DEB distributions usually work OK.
-
-3. PortAudio - you will need to build and install both libportaudio and 
-libportaudiocpp.  See website, www.portaudio.com
-
-4. Sndfile - you will need to build and install libsndfile.  See website,
-http://www.mega-nerd.com/libsndfile by  Erik de Castro Lopo.  Erik is also
-the author of the resampling library that is used in fldigi to compensate
-for the sound card offsets.

configure.ac

@@ -4,7 +4,7 @@
 # Copyright (C) 2007 Stelios Bounanos, M0GLD (m0gld AT enotty DOT net)
 
 AC_PREREQ(2.61)
-AC_INIT([fldigi], [2.05b], [w1hkj AT w1hkj DOT com])
+AC_INIT([fldigi], [2.05c], [w1hkj AT w1hkj DOT com])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([-Wall foreign 1.9.6])
 AM_MAINTAINER_MODE