--- sourceforge.net/trunk/rdesktop/configure	2003/08/28 03:13:51	451
+++ sourceforge.net/trunk/rdesktop/configure	2004/02/14 22:54:38	605
@@ -67,6 +67,9 @@
     ;;
   --without-debug*)
     ;;
+  --with-ipv6)
+    cflags="$cflags -DIPv6"
+    ;;
   *)
     echo "Target directories:"
     echo " --prefix=PREFIX         location for architecture-independent files"
@@ -78,7 +81,7 @@
     echo "Build configuration:"
     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 " --without-openssl       use in-tree crypto, even if OpenSSL is available"
+    #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"
@@ -87,6 +90,7 @@
     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 " --with-ipv6             enable support for IPv6"
     echo
     rm -f Makeconf
     exit 1
@@ -121,6 +125,22 @@
 fi
 
 
+# Find install program
+
+if [ -z "$INSTALL" ]; then
+    # Want BSD install
+    if [ -x /usr/ucb/installbsd ]; then
+	INSTALL=/usr/ucb/installbsd
+    elif [ -x /usr/ucb/install ]; then
+	INSTALL=/usr/ucb/install
+    else
+	INSTALL=install
+    fi
+fi
+
+echo "INSTALL     = $INSTALL" >>Makeconf
+
+
 # Find X installation
 
 xdirs="$extraxdir /usr/X11R6 /usr/X11 /usr/openwin /usr /usr/local/X11R6 /usr/local/X11 /usr/local"
@@ -159,7 +179,8 @@
 ldflags="$ldflags"
 targets="$targets rdesktop"
 
-if [ -z "$withoutopenssl" ]; then
+#withoutopenssl not currently supported
+#if [ -z "$withoutopenssl" ]; then
     # Find OpenSSL installation if available
     ssldirs="$extrassldir /usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local"
     
@@ -171,10 +192,15 @@
     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
+	echo "ERROR: could not find OpenSSL headers"
+	echo "(searched for include/openssl/rc4.h in: $ssldirs)"
+	# additional helpful information for Linux users
+	if [ -f /etc/redhat-release ]; then
+	    echo You probably need to install the openssl-devel package
+	elif [ -f /etc/debian_version ]; then
+	    echo You probably need to install the libssl-dev package
+	fi
+	exit 1
     else
     	echo "OpenSSL:"
     	echo "  includes  $ssldir/include"
@@ -192,7 +218,7 @@
     	cflags="$cflags -DWITH_OPENSSL"
     	ldflags="$ldflags -lcrypto"
     fi
-fi
+#fi
     
 if [ ! -z "$withvncserver" ]; then
     if [ -z "$vncserverconfig" ]; then
@@ -235,6 +261,24 @@
     fi
 fi
 
+# Check for OSS sound support
+
+if [ -f /usr/include/sys/soundcard.h ]; then
+    echo Sound support enabled: Open Sound System
+    echo
+    echo "SOUNDOBJ    = rdpsnd.o rdpsnd_oss.o" >>Makeconf
+    cflags="$cflags -DWITH_RDPSND"
+elif [ -f /usr/include/sys/audioio.h ]; then
+    echo Sound support enabled: Sun/BSD
+    echo
+    echo "SOUNDOBJ    = rdpsnd.o rdpsnd_sun.o" >>Makeconf
+    cflags="$cflags -DWITH_RDPSND"
+else
+    echo "WARNING: sound support disabled (no /usr/include/sys/soundcard.h or /usr/include/sys/audioio.h)"
+    echo "Currently supported systems are Open Sound System and Sun"
+    echo
+fi
+
 
 # Platform-specific options
 
@@ -248,6 +292,9 @@
   OSF1)
     ldflags="$ldflags -Wl,-rpath,$rpath"
     ;;
+  HP-UX)
+    cflags="$cflags -D_XOPEN_SOURCE_EXTENDED"
+    ;;
 esac