[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gpsd-dev] [PATCH 2/2] Build: remove a redundant check.
From: |
Beat Bolli |
Subject: |
[gpsd-dev] [PATCH 2/2] Build: remove a redundant check. |
Date: |
Tue, 19 Nov 2013 23:05:52 +0100 |
Signed-off-by: Beat Bolli <address@hidden>
---
SConstruct | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/SConstruct b/SConstruct
index e93f219..f47b52a 100644
--- a/SConstruct
+++ b/SConstruct
@@ -749,12 +749,11 @@ size_t strlcpy(/address@hidden@*/char *dst,
/address@hidden@*/const char *src, size_t size);
if qt_network:
qt_env = env.Clone()
qt_env.MergeFlags('-DUSE_QT')
- if qt_network:
- try:
- qt_env.MergeFlags(pkg_config('QtNetwork'))
- except OSError:
- announce("pkg_config is confused about the state of
QtNetwork.")
- qt_env = None
+ try:
+ qt_env.MergeFlags(pkg_config('QtNetwork'))
+ except OSError:
+ announce("pkg_config is confused about the state of QtNetwork.")
+ qt_env = None
else:
qt_env = None
--
1.8.4.2