HAVE_BLUEZ -> ENABLE_BLUEZ. It's a feature flag, not a platform quirk.

All regression tests pass.
 

2 files changed, 5 insertions, 5 deletions

diff --git a/SConstruct b/SConstruct
index 372c617d..d4caee67 100644
--- a/SConstruct
+++ b/SConstruct
@@ -600,10 +600,10 @@ else:
         env["dbus_export"] = False
 
     if env['bluez'] and config.CheckPKG('bluez'):
-        confdefs.append("#define HAVE_BLUEZ 1\n")
+        confdefs.append("#define ENABLE_BLUEZ 1\n")
         bluezlibs = pkg_config('bluez')
     else:
-        confdefs.append("/* #undef HAVE_BLUEZ */\n")
+        confdefs.append("/* #undef ENABLE_BLUEZ */\n")
         bluezlibs = []
         if env["bluez"]:
             announce("Turning off Bluetooth support, library not found.")
diff --git a/serial.c b/serial.c
index 83cea6df..0c76b36e 100644
--- a/serial.c
+++ b/serial.c
@@ -18,12 +18,12 @@
 #include <sys/param.h>	/* defines BSD */
 
 #include "gpsd_config.h"
-#ifdef HAVE_BLUEZ
+#ifdef ENABLE_BLUEZ
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hci.h>
 #include <bluetooth/hci_lib.h>
 #include <bluetooth/rfcomm.h>
-#endif /* HAVE_BLUEZ */
+#endif /* ENABLE_BLUEZ */
 
 #include "gpsd.h"
 
@@ -429,7 +429,7 @@ int gpsd_serial_open(struct gps_device_t *session)
 		    (int)session->sourcetype, session->gpsdata.dev.path);
     }
     /*@ +boolops +type @*/
-#ifdef HAVE_BLUEZ
+#ifdef ENABLE_BLUEZ
     if (bachk(session->gpsdata.dev.path) == 0) {
         struct sockaddr_rc addr = { 0, *BDADDR_ANY, 0};
         session->gpsdata.gps_fd = socket(AF_BLUETOOTH,