Changeset 18866 in vbox for trunk/src/VBox/RDP/client

Timestamp:

Apr 10, 2009 2:13:10 PM (16 years ago)

Author:

vboxsync

Message:

*: VBOX_WITHOUT_LINUX_COMPILER_H -> VBOX_WITH_LINUX_COMPILER_H. TODO: regenerate RDP/client/configure.

Location:

trunk/src/VBox/RDP/client

Files:

• Makefile.kmk (modified) (1 diff)
• configure (modified) (2 diffs)
• configure.ac (modified) (15 diffs)
• vrdp/USBProxyDevice-linux.c (modified) (1 diff)

trunk/src/VBox/RDP/client/Makefile.kmk

@@ -51 +51 @@
 rdesktop-vrdp_DEFS.linux += \
         HAVE_DIRFD=1 HAVE_DECL_DIRFD=1
-ifdef VBOX_WITHOUT_LINUX_COMPILER_H
- rdesktop-vrdp_DEFS.linux += VBOX_WITHOUT_LINUX_COMPILER_H
+ifdef VBOX_WITH_LINUX_COMPILER_H
+ rdesktop-vrdp_DEFS.linux += VBOX_WITH_LINUX_COMPILER_H
 endif
 # @todo once rdp proxy is available on Solaris, add WITH_RDPUSB=1

trunk/src/VBox/RDP/client/configure

@@ -6727 +6727 @@
   echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
+  cat >>confdefs.h <<\_ACEOF
+#define VBOX_WITH_LINUX_COMPILER_H 1
+_ACEOF
+
 else
   echo "$as_me: failed program was:" >&5
@@ -6733 +6737 @@
 echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
-  cat >>confdefs.h <<\_ACEOF
-#define VBOX_WITHOUT_LINUX_COMPILER_H 1
-_ACEOF
 
 fi

trunk/src/VBox/RDP/client/configure.ac

@@ -25 +25 @@
     exit 1
 fi
-    
+
 AC_PATH_PROG(PKG_CONFIG, pkg-config)
 
@@ -96 +96 @@
 dnl Add OpenSSL includes and libraries
 CFLAGS="$CFLAGS -I$ssldir/include"
-AC_ARG_ENABLE(static-openssl, 
+AC_ARG_ENABLE(static-openssl,
              [  --enable-static-openssl link OpenSSL statically],
-             [ 
-LIBS="$LIBS $ssldir/lib/libcrypto.a" 
+             [
+LIBS="$LIBS $ssldir/lib/libcrypto.a"
              ],
-             [ 
-LIBS="$LIBS -L$ssldir/lib -lcrypto" 
+             [
+LIBS="$LIBS -L$ssldir/lib -lcrypto"
 rpath="$rpath:$ssldir/lib"
              ])
 
-AC_ARG_ENABLE(smartcard, 
+AC_ARG_ENABLE(smartcard,
              [  --enable-smartcard        Enables smart-card support.
              ],
-             [ 
+             [
                 case "$OSTYPE" in
                         darwin*)
@@ -165 +165 @@
         }
         return 0;
-}], 
- [AC_MSG_RESULT(no)], 
- [AC_MSG_RESULT(yes) 
-  AC_DEFINE(NEED_ALIGN)], 
- [AC_MSG_RESULT(assuming yes) 
+}],
+ [AC_MSG_RESULT(no)],
+ [AC_MSG_RESULT(yes)
+  AC_DEFINE(NEED_ALIGN)],
+ [AC_MSG_RESULT(assuming yes)
   AC_DEFINE(NEED_ALIGN)])
 
@@ -179 +179 @@
 #include <linux/compiler.h>
 ],[],
-[AC_MSG_RESULT(yes)],
-[AC_MSG_RESULT(no)
- AC_DEFINE(VBOX_WITHOUT_LINUX_COMPILER_H)])
+[AC_MSG_RESULT(yes)
+ AC_DEFINE(VBOX_WITH_LINUX_COMPILER_H)],
+[AC_MSG_RESULT(no)])
 
 
@@ -205 +205 @@
 AC_ARG_WITH(libvncserver,
     [  --with-libvncserver     make rdp2vnc],
-    [ 
+    [
     VNCINC=`$vncserverconfig --cflags`
     AC_SUBST(VNCINC)
@@ -224 +224 @@
 AC_ARG_WITH(sound,
     [  --with-sound            select sound system ("oss", "sgi", "sun", "alsa" or "libao") ],
-    [ 
-    sound="$withval" 
+    [
+    sound="$withval"
     ])
 
@@ -232 +232 @@
 AC_CHECK_HEADER(sys/audioio.h, [HAVE_SUN=1], [HAVE_SUN=0])
 
-AC_ARG_ENABLE(static-libsamplerate, 
-    [  --enable-static-libsamplerate link libsamplerate statically], 
-    [static_libsamplerate=yes], 
+AC_ARG_ENABLE(static-libsamplerate,
+    [  --enable-static-libsamplerate link libsamplerate statically],
+    [static_libsamplerate=yes],
     [static_libsamplerate=no])
 
@@ -807 +807 @@
 AC_ARG_WITH(ipv6,
     [  --with-ipv6             enable IPv6-support],
-    [ 
+    [
         if test $withval != "no";
         then
@@ -822 +822 @@
     [
         if test $withval != "no";
-        then 
+        then
             AC_DEFINE(WITH_DEBUG,1)
         fi
@@ -831 +831 @@
     [
         if test $withval != "no";
-        then 
+        then
             AC_DEFINE(WITH_DEBUG_KBD,1)
         fi
@@ -840 +840 @@
     [
         if test $withval != "no";
-        then 
+        then
             AC_DEFINE(WITH_DEBUG_RDP5,1)
         fi
@@ -849 +849 @@
     [
         if test $withval != "no";
-        then 
+        then
             AC_DEFINE(WITH_DEBUG_CLIPBOARD,1)
         fi
@@ -858 +858 @@
     [
         if test $withval != "no";
-        then 
+        then
             AC_DEFINE(WITH_DEBUG_SOUND,1)
         fi
@@ -867 +867 @@
     [
         if test $withval != "no";
-        then 
+        then
             AC_DEFINE(WITH_DEBUG_CHANNEL,1)
         fi
@@ -876 +876 @@
     [
         if test $withval != "no";
-        then 
+        then
             AC_DEFINE(WITH_DEBUG_SEAMLESS,1)
         fi

trunk/src/VBox/RDP/client/vrdp/USBProxyDevice-linux.c

@@ -52 +52 @@
 #include <errno.h>
 #include <ctype.h>
-#ifndef VBOX_WITHOUT_LINUX_COMPILER_H
+#ifdef VBOX_WITH_LINUX_COMPILER_H
 # include <linux/compiler.h>
 #endif