CVS: rdesktop README, 1.5, 1.6 configure.ac, 1.40, 1.41

Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4578

Modified Files:
	README configure.ac 
Log Message:
Improve experience for new users - provide more intelligent errors when 
X11 or OpenSSL headers are missing, and clarify README


Index: README
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/README,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** README	1 Nov 2006 20:52:00 -0000	1.5
--- README	5 Jan 2008 05:35:56 -0000	1.6
***************
*** 10,38 ****
  Installation
  ------------
! rdesktop uses a typical GNU-style build procedure:
  
! 	% ./configure [options]
  	% make
  	% make install
  
! where documentation for [options] can be found by running "./configure --help".
! Usually no options are necessary.  The default is to install under /usr/local,
! this can be changed with --prefix=directory.
  
  Invocation
  ----------
  
! 	% rdesktop [options] server
  
! where server is the name of the Terminal Services machine.  Note: if you
! receive "Connection refused", this probably means that the server does not have
! Terminal Services enabled, or there is a firewall blocking access.
  
! The rdesktop manual page lists the possible options ("man rdesktop").
  
  Smart-card support notes
  ------------------------
! 
! Smart-card support module uses PCSC-lite. You should use PCSC-lite 1.2.9 or
  later.
  
--- 10,45 ----
  Installation
  ------------
! rdesktop uses a GNU-style build procedure.  Typically all that is necessary
! to install rdesktop is the following:
  
! 	% ./configure
  	% make
  	% make install
  
! The default is to install under /usr/local.  This can be changed by adding
! --prefix=directory to the configure line.
! 
! Note for CVS users
! ------------------
! If you have downloaded a snapshot of rdesktop using CVS, you will first need to
! run ./bootstrap in order to generate the build infrastructure.  This is not
! necessary for release versions of rdesktop.
  
  Invocation
  ----------
+ Simply run:
  
! 	% rdesktop server
  
! where server is the name of the Terminal Services machine.  (If you receive
! "Connection refused", this probably means that the server does not have
! Terminal Services enabled, or there is a firewall blocking access.)
  
! You can also specify a number of options on the command line.  These are listed
! in the rdesktop manual page (run "man rdesktop").
  
  Smart-card support notes
  ------------------------
! The smart-card support module uses PCSC-lite. You should use PCSC-lite 1.2.9 or
  later.
  

Index: configure.ac
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/configure.ac,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** configure.ac	28 Oct 2007 16:49:45 -0000	1.40
--- configure.ac	5 Jan 2008 05:35:56 -0000	1.41
***************
*** 13,17 ****
  AC_C_BIGENDIAN([AC_DEFINE(B_ENDIAN)], [AC_DEFINE(L_ENDIAN)])
  AC_PATH_XTRA
! 
  AC_PATH_PROG(PKG_CONFIG, pkg-config)
  
--- 13,29 ----
  AC_C_BIGENDIAN([AC_DEFINE(B_ENDIAN)], [AC_DEFINE(L_ENDIAN)])
  AC_PATH_XTRA
! if test "$no_x" = "yes"; then
!     echo
!     echo "ERROR: Could not find X Window System headers/libraries."
!     if test -f /etc/debian_version; then
!        echo "Probably you need to install the libx11-dev package."
!     elif test -f /etc/redhat-release; then
!        echo "Probably you need to install the libX11-devel package."
!     fi
!     echo "To specify paths manually, use the options --x-includes and --x-libraries."
!     echo
!     exit 1
! fi
!     
  AC_PATH_PROG(PKG_CONFIG, pkg-config)
  
***************
*** 68,73 ****
      AC_MSG_RESULT([Not found])
      echo
!     echo "Couldn't find your OpenSSL library installation dir"
!     echo "Use --with-openssl option to fix this problem"
      echo
      exit 1
--- 80,90 ----
      AC_MSG_RESULT([Not found])
      echo
!     echo "ERROR: Could not find OpenSSL headers/libraries."
!     if test -f /etc/debian_version; then
!        echo "Probably you need to install the libssl-dev package."
!     elif test -f /etc/redhat-release; then
!        echo "Probably you need to install the openssl-devel package."
!     fi
!     echo "To specify a path manually, use the --with-openssl option."
      echo
      exit 1


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/