[X2Go-Commits] [x2goclient] 01/01: x2goclient.pro: fix qmake control flow for libssh logic, we really wanted to use else if for the Windows section and have the general else section being the general fallback.

git-admin at x2go.org git-admin at x2go.org
Wed Oct 31 03:22:12 CET 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit ac893e1f52e9e036e3ec8b7570f2c18f4b14d652
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Oct 31 03:20:00 2018 +0100

    x2goclient.pro: fix qmake control flow for libssh logic, we really wanted to use else if for the Windows section and have the general else section being the general fallback.
---
 debian/changelog | 3 +++
 x2goclient.pro   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 20afe0c..894d215 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,9 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium
       pkgconfig-based libssh usage.
     - x2goclient.pro: make system a non-variable call.
     - x2goclient.spec: build-depend on pkg-config.
+    - x2goclient.pro: fix qmake control flow for libssh logic, we really
+      wanted to use else if for the Windows section and have the general else
+      section being the general fallback.
   * debian/control:
     - Add build-depend on pkg-config.
 
diff --git a/x2goclient.pro b/x2goclient.pro
index c94f427..bfdc5a8 100644
--- a/x2goclient.pro
+++ b/x2goclient.pro
@@ -152,7 +152,7 @@ unix {
     LIBS += -lssh_static
   }
 }
-win32 {
+else:win32 {
   # pkgconfig is... tricky on Windows.
   # We'll hardcode stuff here. Make sure that it's consistent with the
   # libraries we use on Windows.

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git


More information about the x2go-commits mailing list