Deprecated libQgpsmm config option involved.

The backwards-compatibility code caused a bug.

All regression tests pass.

2 files changed, 1 insertions, 5 deletions

diff --git a/NEWS b/NEWS
index 3af58fb8..29617343 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ Repository head:
   option sets all boolean options not explicitly set on the build
   command line to false.  The 'limited_max_devices' option is now
   'max_devices'; the 'limited_max_clients' option is now 'max_clients'
+  The previously deprecated 'libQgpsmm' option has been removed; use 'qt'.
   A bug fix for error modeling when NMEA 0183 reports empty DOP
   fields.  Mac OS X has been dropped from the list of supported platforms
   due to persistent flakiness in its serial layer.
diff --git a/SConstruct b/SConstruct
index 25d17760..6ab0a66d 100644
--- a/SConstruct
+++ b/SConstruct
@@ -147,7 +147,6 @@ boolopts = (
     ("clientdebug",   True,  "client debugging support"),
     ("oldstyle",      True,  "oldstyle (pre-JSON) protocol support"),
     ("libgpsmm",      True,  "build C++ bindings"),
-    ("libQgpsmm",     True,  "build QT bindings (deprecated alias)"),
     ("qt",            True,  "build QT bindings"),
     # Daemon options
     ("reconfigure",   True,  "allow gpsd to change device settings"),
@@ -775,10 +774,6 @@ pid_t getsid(pid_t pid);
         env['BUILDERS']["HTML"] = Builder(action=htmlbuilder,
                                           src_suffix=".xml", suffix=".html")
 
-    # If libQgpsmm is enabled, force on qt (deprecated config support).
-    if env["libQgpsmm"]:
-        env["qt"] = True
-
     # Determine if Qt network libraries are present, and if not, force qt to off
     qt_network = config.CheckPKG('QtNetwork')
     if not qt_network: