--- sourceforge.net/trunk/rdesktop/configure	2001/09/15 09:37:17	32
+++ sourceforge.net/trunk/rdesktop/configure	2002/10/10 07:47:29	221
@@ -2,50 +2,72 @@
 #
 # rdesktop: A Remote Desktop Protocol client
 # configure script
-# Copyright (C) Matthew Chapman 1999-2001
+# Copyright (C) Matthew Chapman 1999-2002
 #
 
+echo "rdesktop build configuration script"
+echo
+
 echo "# Generated by $0 $*" >Makeconf
 
+
+# Process command line options
+
+cflags=
+ldflags=
+rpath=
+
 for arg in $*; do
-optarg=`echo $arg | sed 's/[-a-z]*=//'`    
+optarg=`echo $arg | sed 's/[-a-z]*=//'`
 case $arg in
   --prefix=*)
-    echo "PREFIX   = $optarg" >>Makeconf
+    echo "prefix      = $optarg" >>Makeconf
     ;;
   --exec-prefix=*)
-    echo "EPREFIX  = $optarg" >>Makeconf
+    echo "exec_prefix = $optarg" >>Makeconf
     ;;
   --bindir=*)
-    echo "BINDIR   = $optarg" >>Makeconf
+    echo "bindir      = $optarg" >>Makeconf
     ;;
   --mandir=*)
-    echo "MANDIR   = $optarg" >>Makeconf
+    echo "mandir      = $optarg" >>Makeconf
+    ;;
+  --sharedir=*)
+    echo "datadir     = $optarg" >>Makeconf
+    ;;
+  --with-x*)
+    extraxdir=$optarg
     ;;
   --with-openssl*)
-    echo "CFLAGS  += -DWITH_OPENSSL" >>Makeconf
-    echo "LDLIBS  += -lcrypto" >>Makeconf
-    echo "CRYPTOBJ =" >>Makeconf
+    extrassldir=$optarg
     ;;
   --without-openssl*)
     ;;
-  --with-debug*)
-    echo "CFLAGS  += -g -DWITH_DEBUG" >>Makeconf
+  --with-egd-socket=*)
+    extraegdpath=$optarg
+    ;;
+  --with-debug)
+    cflags="$cflags -g -DWITH_DEBUG"
+    ;;
+  --with-debug-kbd)
+    cflags="$cflags -g -DWITH_DEBUG_KBD"
     ;;
   --without-debug*)
     ;;
   *)
-    echo "rdesktop build configuration script"
-    echo
     echo "Target directories:"
-    echo " --prefix=PREFIX        location for architecture-independent files"
-    echo " --exec-prefix=EPREFIX  location for architecture-dependent files"
-    echo " --bindir=BINDIR        location for program binaries [EPREFIX/bin]"
-    echo " --mandir=MANDIR        location for man pages [PREFIX/man]"
+    echo " --prefix=PREFIX         location for architecture-independent files"
+    echo " --exec-prefix=EPREFIX   location for architecture-dependent files"
+    echo " --bindir=BINDIR         location for program binaries [EPREFIX/bin]"
+    echo " --mandir=MANDIR         location for man pages [PREFIX/man]"
+    echo " --sharedir=SHAREDIR     location for architecture-independent shared files [PREFIX/share/rdesktop]"
     echo
     echo "Build configuration:"
-    echo " --with-openssl         use system OpenSSL libraries for crypto"
-    echo " --with-debug           enable debugging output"
+    echo " --with-x=DIR            look for X Window System at DIR/include, DIR/lib"
+    echo " --with-openssl=DIR      look for OpenSSL at DIR/include, DIR/lib"
+    echo " --with-egd-socket=PATH  look for Entropy Gathering Daemon socket at PATH"
+    echo " --with-debug            enable protocol debugging output"
+    echo " --with-debug-kbd        enable debugging of keyboard handling"
     echo
     rm -f Makeconf
     exit 1
@@ -53,4 +75,124 @@
 esac
 done
 
+
+# Find X installation
+
+xdirs="$extraxdir /usr/X11R6 /usr/X11 /usr/openwin /usr /usr/local/X11R6 /usr/local/X11 /usr/local"
+
+for dir in $xdirs; do
+    if [ -f $dir/include/X11/Xlib.h ]; then
+	xdir=$dir
+	break
+    fi
+done
+
+if [ -z "$xdir" ]; then
+    echo "ERROR: could not find X Window System headers"
+    echo "(searched for include/X11/Xlib.h in: $xdirs)"
+
+    # additional helpful information for Linux users
+    if [ -f /etc/redhat_release ]; then
+      echo You probably need to install the XFree86-devel package
+    elif [ -f /etc/debian_version ]; then
+      echo You probably need to install the xlibs-dev package
+    fi
+    exit 1
+fi
+
+echo "X Window System:"
+echo "  includes  $xdir/include"
+echo "  libraries $xdir/lib"
+echo
+
+if [ $xdir != "/usr" ]; then
+    cflags="$cflags -I$xdir/include"
+    ldflags="$ldflags -L$xdir/lib"
+    rpath="$rpath:$xdir/lib"
+fi
+
+ldflags="$ldflags -lX11"
+
+
+# Find OpenSSL installation if available
+
+ssldirs="$extrassldir /usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local"
+
+for dir in $ssldirs; do
+    if [ -f $dir/include/openssl/rc4.h ]; then
+	ssldir=$dir
+	break
+    fi
+done
+
+if [ -z "$ssldir" ]; then
+    echo "WARNING: could not find OpenSSL headers"
+    echo "(searched for include/openssl/rc4.h in: $ssldirs)"
+    echo "Using in-tree crypto; installing OpenSSL is recommended."
+    echo
+else
+    echo "OpenSSL:"
+    echo "  includes  $ssldir/include"
+    echo "  libraries $ssldir/lib"
+    echo
+
+    echo "CRYPTOBJ    =" >>Makeconf
+
+    if [ $ssldir != "/usr" ]; then
+	cflags="$cflags -I$ssldir/include"
+	ldflags="$ldflags -L$ssldir/lib"
+	rpath="$rpath:$ssldir/lib"
+    fi
+
+    cflags="$cflags -DWITH_OPENSSL"
+    ldflags="$ldflags -lcrypto"
+fi
+
+
+# Find EGD socket if we don't have /dev/urandom or /dev/random
+
+if [ ! -c /dev/random -a ! -c /dev/urandom ]; then
+    egdpaths="$extraegdpath /var/run/egd-pool /dev/egd-pool /etc/egd-pool /etc/entropy"
+
+    for path in $egdpaths; do
+	# -e isn't portable, so we use -r
+	if [ -r $path ]; then
+	    egdpath=$path
+	    break
+	fi
+    done
+
+    if [ -z "$egdpath" ]; then
+	echo "WARNING: could not find /dev/urandom, /dev/random or Entropy Gathering Daemon (EGD) socket"
+	echo "(searched: $egdpaths)"
+	echo "Session keys may be less secure; installing a system randomness source is recommended."
+	echo
+    else
+	echo "Entropy Gathering Daemon (EGD):"
+        echo "  socket    $egdpath"
+	echo
+	cflags="$cflags -DEGD_SOCKET=\\\"$egdpath\\\""
+    fi
+fi
+
+
+# Platform-specific options
+
+# strip leading colon from rpath
+rpath=`echo $rpath |sed 's/^://'`
+
+case `uname -s` in
+  SunOS)
+    ldflags="$ldflags -lsocket -lnsl -R$rpath"
+    ;;
+  OSF1)
+    ldflags="$ldflags -Wl,-rpath,$rpath"
+    ;;
+esac
+
+
+echo "CFLAGS     += $cflags" >>Makeconf
+echo "LDFLAGS    += $ldflags" >>Makeconf
+
 echo "configure complete - now run make"
+