--- sourceforge.net/trunk/rdesktop/configure	2002/10/10 07:47:29	221
+++ sourceforge.net/trunk/rdesktop/configure	2002/11/19 11:06:12	267
@@ -42,6 +42,7 @@
     extrassldir=$optarg
     ;;
   --without-openssl*)
+    withoutopenssl=yes
     ;;
   --with-egd-socket=*)
     extraegdpath=$optarg
@@ -65,6 +66,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 " --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"
@@ -76,6 +78,32 @@
 done
 
 
+# Find compiler
+
+compilers="$CC gcc cc"
+
+for compiler in $compilers; do
+    if [ -x "`which $compiler`" ]; then
+	cc=$compiler
+	break
+    fi
+done
+
+if [ -z "$cc" ]; then
+    echo "ERROR: could not find a C compiler (tried: $compilers)"
+    echo "You probably want to install gcc"
+    exit 1
+fi
+
+echo "CC          = $cc" >>Makeconf
+
+if $cc -v 2>&1 |grep '^gcc' >/dev/null; then
+    cflags="$cflags -Wall -O2"
+else
+    cflags="$cflags -O"
+fi
+
+
 # Find X installation
 
 xdirs="$extraxdir /usr/X11R6 /usr/X11 /usr/openwin /usr /usr/local/X11R6 /usr/local/X11 /usr/local"
@@ -114,40 +142,41 @@
 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
+if [ -z "$withoutopenssl" ]; then
+    # 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
-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