org.handhelds.familiar/packages/rdesktop/rdesktop-1.3.1/configure.patch

   1 --- rdesktop-1.3.1/configure    2003-12-11 07:59:54.000000000 -0700
   2 +++ rdesktop-1.3.1.new/configure        2004-05-25 11:17:14.661455560 -0700
   3 @@ -53,6 +53,9 @@
   4    --with-libvncserver-config=*)
   5      vncserverconfig=$optarg
   6      ;;
   7 +  --with-oss)
   8 +    withoss=yes
   9 +    ;;
  10    --with-debug)
  11      cflags="$cflags -g -DWITH_DEBUG"
  12      ;;
  13 @@ -83,6 +86,7 @@
  14      echo " --with-libvncserver     make rdp2vnc"
  15      echo " --with-libvncserver-config=CMD"
  16      echo "                         use CMD as libvncserver-config"
  17 +    echo " --with-oss              Specify that we should use the OSS system"
  18      echo " --with-debug            enable protocol debugging output"
  19      echo " --with-debug-kbd        enable debugging of keyboard handling"
  20      echo " --with-debug-rdp5       enable debugging of RDP5 code"
  21 @@ -139,7 +143,9 @@
  22
  23  # Find X installation
  24
  25 -xdirs="$extraxdir /usr/X11R6 /usr/X11 /usr/openwin /usr /usr/local/X11R6 /usr/local/X11 /usr/local"
  26 +#xdirs="$extraxdir /usr/X11R6 /usr/X11 /usr/openwin /usr /usr/local/X11R6 /usr/local/X11 /usr/local"
  27 +
  28 +xdirs="$extraxdir"
  29
  30  for dir in $xdirs; do
  31      if [ -f $dir/include/X11/Xlib.h ]; then
  32 @@ -178,7 +184,10 @@
  33  #withoutopenssl not currently supported
  34  #if [ -z "$withoutopenssl" ]; then
  35      # Find OpenSSL installation if available
  36 -    ssldirs="$extrassldir /usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local"
  37 +
  38 +#ssldirs="$extrassldir /usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local"
  39 +
  40 +ssldirs="$extrassldir"
  41
  42      for dir in $ssldirs; do
  43         if [ -f $dir/include/openssl/rc4.h ]; then
  44 @@ -259,22 +268,27 @@
  45
  46  # Check for OSS sound support
  47
  48 -if [ -f /usr/include/sys/soundcard.h ]; then
  49 -    echo Sound support enabled: Open Sound System
  50 -    echo
  51 -    echo "SOUNDOBJ    = rdpsnd.o rdpsnd_oss.o" >>Makeconf
  52 -    cflags="$cflags -DWITH_RDPSND"
  53 -elif [ -f /usr/include/sys/audioio.h ]; then
  54 -    echo Sound support enabled: Sun/BSD
  55 -    echo
  56 -    echo "SOUNDOBJ    = rdpsnd.o rdpsnd_sun.o" >>Makeconf
  57 -    cflags="$cflags -DWITH_RDPSND"
  58 -else
  59 -    echo "WARNING: sound support disabled (no /usr/include/sys/soundcard.h or /usr/include/sys/audio.h)"
  60 -    echo "Currently supported systems are Open Sound System and Sun"
  61 -    echo
  62 +if [ -z "$withoss" ]; then
  63 +       if [ -f /usr/include/sys/soundcard.h ]; then
  64 +               withoss=yes
  65 +       elif [ -f /usr/include/sys/audioio.h ]; then
  66 +               echo Sound support enabled: Sun/BSD
  67 +               echo
  68 +               echo "SOUNDOBJ    = rdpsnd.o rdpsnd_sun.o" >>Makeconf
  69 +               cflags="$cflags -DWITH_RDPSND"
  70 +       else
  71 +               echo "WARNING: sound support disabled (no /usr/include/sys/soundcard.h or /usr/include/sys/audio.h)"
  72 +               echo "Currently supported systems are Open Sound System and Sun"
  73 +               echo
  74 +       fi
  75  fi
  76
  77 +if [ ! -z "$withoss" ]; then
  78 +       echo Sound support enabled: Open Sound System
  79 +       echo
  80 +       echo "SOUNDOBJ    = rdpsnd.o rdpsnd_oss.o" >>Makeconf
  81 +       cflags="$cflags -DWITH_RDPSND"
  82 +fi
  83
  84  # Platform-specific options
  85
  86 @@ -294,8 +308,8 @@
  87  esac
  88
  89
  90 -echo "CFLAGS      = $cflags" >>Makeconf
  91 -echo "LDFLAGS     = $ldflags" >>Makeconf
  92 +echo "LCFLAGS      = $cflags" >>Makeconf
  93 +echo "LLDFLAGS     = $ldflags" >>Makeconf
  94  echo "TARGETS     = $targets" >>Makeconf
  95
  96  echo "configure complete - now run make"
  97 --- rdesktop-1.3.1/Makefile     2004-01-21 20:26:01.000000000 -0700
  98 +++ rdesktop-1.3.1.new/Makefile 2004-05-25 11:16:59.338784960 -0700
  99 @@ -25,22 +25,22 @@
 100  all: $(TARGETS)
 101
 102  rdesktop: $(X11OBJ) $(SOUNDOBJ) $(RDPOBJ) $(CRYPTOBJ)
 103 -       $(CC) $(CFLAGS) -o rdesktop $(X11OBJ) $(SOUNDOBJ) $(RDPOBJ) $(CRYPTOBJ) $(LDFLAGS) -lX11
 104 +       $(CC) $(CFLAGS) $(LCFLAGS) -o rdesktop $(X11OBJ) $(SOUNDOBJ) $(RDPOBJ) $(CRYPTOBJ) $(LDFLAGS) $(LLDFLAGS) -lX11
 105
 106  rdp2vnc: $(VNCOBJ) $(SOUNDOBJ) $(RDPOBJ) $(CRYPTOBJ)
 107 -       $(CCLD) $(CFLAGS) -o rdp2vnc $(VNCOBJ) $(SOUNDOBJ) $(RDPOBJ) $(CRYPTOBJ) $(LDFLAGS) $(LDVNC)
 108 +       $(CCLD) $(CFLAGS) $(LCFLAGS) -o rdp2vnc $(VNCOBJ) $(SOUNDOBJ) $(RDPOBJ) $(CRYPTOBJ) $(LDFLAGS) $(LLDFLAGS) $(LDVNC)
 109
 110  vnc/rdp2vnc.o: rdesktop.c
 111 -       $(CC) $(CFLAGS) $(VNCINC) -DRDP2VNC -o vnc/rdp2vnc.o -c rdesktop.c
 112 +       $(CC) $(CFLAGS) $(LCFLAGS) $(VNCINC) -DRDP2VNC -o vnc/rdp2vnc.o -c rdesktop.c
 113
 114  vnc/vnc.o: vnc/vnc.c
 115 -       $(CC) $(CFLAGS) $(VNCINC) -DRDP2VNC -o vnc/vnc.o -c vnc/vnc.c
 116 +       $(CC) $(CFLAGS) $(LCFLAGS) $(VNCINC) -DRDP2VNC -o vnc/vnc.o -c vnc/vnc.c
 117
 118  vnc/xkeymap.o: xkeymap.c
 119 -       $(CC) $(CFLAGS) $(VNCINC) -DRDP2VNC -o vnc/xkeymap.o -c xkeymap.c
 120 +       $(CC) $(CFLAGS) $(LCFLAGS) $(VNCINC) -DRDP2VNC -o vnc/xkeymap.o -c xkeymap.c
 121
 122  vnc/x11stubs.o: vnc/x11stubs.c
 123 -       $(CC) $(CFLAGS) $(VNCINC) -o vnc/x11stubs.o -c vnc/x11stubs.c
 124 +       $(CC) $(CFLAGS) $(LCFLAGS) $(VNCINC) -o vnc/x11stubs.o -c vnc/x11stubs.c
 125
 126  Makeconf:
 127         ./configure
 128 @@ -106,5 +106,5 @@
 129  .SUFFIXES: .c .o
 130
 131  .c.o:
 132 -       $(CC) $(CFLAGS) -o $@ -c $<
 133 +       $(CC) $(CFLAGS) $(LCFLAGS) -o $@ -c $<
 134