--- sourceforge.net/trunk/rdesktop/configure 2002/11/14 13:56:16 258 +++ sourceforge.net/trunk/rdesktop/configure 2004/02/14 22:54:38 605 @@ -13,8 +13,8 @@ # Process command line options -cflags= -ldflags= +cflags='-DKEYMAP_PATH=\"$(KEYMAP_PATH)\"' +ldflags='' rpath= for arg in $*; do @@ -42,18 +42,34 @@ extrassldir=$optarg ;; --without-openssl*) + withoutopenssl=yes ;; --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*) ;; + --with-ipv6) + cflags="$cflags -DIPv6" + ;; *) echo "Target directories:" echo " --prefix=PREFIX location for architecture-independent files" @@ -65,9 +81,16 @@ 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-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 " --with-ipv6 enable support for IPv6" echo rm -f Makeconf exit 1 @@ -102,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" @@ -118,7 +157,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 @@ -137,41 +176,62 @@ rpath="$rpath:$xdir/lib" fi -ldflags="$ldflags -lX11" - - -# Find OpenSSL installation if available +ldflags="$ldflags" +targets="$targets rdesktop" -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 +#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" + + for dir in $ssldirs; do + if [ -f $dir/include/openssl/rc4.h ]; then + ssldir=$dir + break + fi + done + + if [ -z "$ssldir" ]; then + 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" + 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 + +if [ ! -z "$withvncserver" ]; then + if [ -z "$vncserverconfig" ]; then + vncserverconfig=libvncserver-config fi - cflags="$cflags -DWITH_OPENSSL" - ldflags="$ldflags -lcrypto" + 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 @@ -201,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 @@ -214,11 +292,15 @@ OSF1) ldflags="$ldflags -Wl,-rpath,$rpath" ;; + HP-UX) + cflags="$cflags -D_XOPEN_SOURCE_EXTENDED" + ;; esac -echo "CFLAGS += $cflags" >>Makeconf -echo "LDFLAGS += $ldflags" >>Makeconf +echo "CFLAGS = $cflags" >>Makeconf +echo "LDFLAGS = $ldflags" >>Makeconf +echo "TARGETS = $targets" >>Makeconf echo "configure complete - now run make"