--- sourceforge.net/trunk/rdesktop/configure	2003/01/30 10:57:38	298
+++ sourceforge.net/trunk/rdesktop/configure	2003/08/28 03:13:51	451
@@ -47,12 +47,24 @@
   --with-egd-socket=*)
     extraegdpath=$optarg
     ;;
+  --with-libvncserver)
+    withvncserver=yes
+    ;;
+  --with-libvncserver-config=*)
+    vncserverconfig=$optarg
+    ;;
   --with-debug)
     cflags="$cflags -g -DWITH_DEBUG"
     ;;
   --with-debug-kbd)
     cflags="$cflags -g -DWITH_DEBUG_KBD"
     ;;
+  --with-debug-rdp5)
+    cflags="$cflags -g -DWITH_DEBUG_RDP5"
+    ;;
+  --with-debug-clipboard)
+    cflags="$cflags -g -DWITH_DEBUG_CLIPBOARD"
+    ;;
   --without-debug*)
     ;;
   *)
@@ -68,8 +80,13 @@
     echo " --with-openssl=DIR      look for OpenSSL at DIR/include, DIR/lib"
     echo " --without-openssl       use in-tree crypto, even if OpenSSL is available"
     echo " --with-egd-socket=PATH  look for Entropy Gathering Daemon socket at PATH"
+    echo " --with-libvncserver     make rdp2vnc"
+    echo " --with-libvncserver-config=CMD"
+    echo "                         use CMD as libvncserver-config"
     echo " --with-debug            enable protocol debugging output"
     echo " --with-debug-kbd        enable debugging of keyboard handling"
+    echo " --with-debug-rdp5       enable debugging of RDP5 code"
+    echo " --with-debug-clipboard  enable debugging of clipboard code"
     echo
     rm -f Makeconf
     exit 1
@@ -120,7 +137,7 @@
     echo "(searched for include/X11/Xlib.h in: $xdirs)"
 
     # additional helpful information for Linux users
-    if [ -f /etc/redhat_release ]; then
+    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
@@ -139,8 +156,8 @@
     rpath="$rpath:$xdir/lib"
 fi
 
-ldflags="$ldflags -lX11"
-
+ldflags="$ldflags"
+targets="$targets rdesktop"
 
 if [ -z "$withoutopenssl" ]; then
     # Find OpenSSL installation if available
@@ -177,6 +194,20 @@
     fi
 fi
     
+if [ ! -z "$withvncserver" ]; then
+    if [ -z "$vncserverconfig" ]; then
+	vncserverconfig=libvncserver-config
+    fi
+
+    echo "VNCINC=`$vncserverconfig --cflags`" >> Makeconf
+    echo "LDVNC=`$vncserverconfig --libs`" >> Makeconf
+    echo "CCLD=`$vncserverconfig --link`" >> Makeconf
+    echo >> Makeconf
+    targets="$targets rdp2vnc"
+
+    echo "Found libvncserver: Building rdp2vnc"
+fi
+
 
 # Find EGD socket if we don't have /dev/urandom or /dev/random
 
@@ -222,6 +253,7 @@
 
 echo "CFLAGS      = $cflags" >>Makeconf
 echo "LDFLAGS     = $ldflags" >>Makeconf
+echo "TARGETS     = $targets" >>Makeconf
 
 echo "configure complete - now run make"