[vinagre] Correct SSH and RDP conditional tests in configure



commit 43b103d4f42391e24e85c881ee85d2b5db2fb8f0
Author: Tomas Bzatek <tbzatek redhat com>
Date:   Mon Jun 20 16:50:14 2011 +0200

    Correct SSH and RDP conditional tests in configure
    
    The AM_CONDITIONAL for both SSH and RDP features was enabled depending
    on the state of the relevant argument to configure, not whether those
    features had been found on the system. The logic was fixed to be
    consistent with the other configure arguments.

 configure.ac |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e2402dd..7ba9746 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,7 +55,7 @@ AS_IF([test "x$have_ssh" = "xyes"],
     AS_IF([test "x$enable_ssh" = "xyes"],
       [AC_MSG_ERROR([SSH support requested but required dependencies not found])])])
 
-AM_CONDITIONAL([VINAGRE_ENABLE_SSH], [test "x$enable_ssh" = "xyes"])
+AM_CONDITIONAL([VINAGRE_ENABLE_SSH], [test "x$have_ssh" = "xyes"])
 
 # Whether to enable support for RDP.
 RDP_DEPS="$XML2_DEPS"
@@ -76,7 +76,7 @@ AS_IF([test "x$have_rdp" = "xyes"],
     AS_IF([test "x$enable_rdp" = "xyes"],
       [AC_MSG_ERROR([RDP support requested by required dependencies not found])])])
 
-AM_CONDITIONAL([VINAGRE_ENABLE_RDP], [test "x$enable_rdp" = "xyes"])
+AM_CONDITIONAL([VINAGRE_ENABLE_RDP], [test "x$have_rdp" = "xyes"])
 
 # Check for spice.
 SPICE_DEPS="spice-client-gtk-3.0 >= 0.5"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]