Merge branch 'Subsurface-branch' of github.com:Subsurface-divelog/libdc into Subsurface-branch

Merge with Dirk's cleanups.

I had intentionally not updated my tree while I was pondering the
upstream merge with Jef's iostream changes, so I didn't have Dirk's
cleanups in my tree when I did that big merge.

This merge was trivial in comparison.

* 'Subsurface-branch' of github.com:Subsurface-divelog/libdc:
  Correctly determine git SHA if libdivecomputer is a git submodule
  Disable a couple of overly aggressive warnings
  Add configure flag to explicitly enable BLE support

configure.ac

@@ -60,6 +60,15 @@ AC_ARG_ENABLE([doc],
 	[], [enable_doc=yes])
 AM_CONDITIONAL([ENABLE_DOC], [test "x$enable_doc" = "xyes"])
 
+# BLE support
+AC_ARG_ENABLE([ble],
+	[AS_HELP_STRING([--enable-ble=@<:@yes/no@:>@],
+                [Enable BLE dive computers @<:@default=yes@:>@])],
+        [], [enable_ble=no])
+AS_IF([test "x$enable_ble" = "xyes"], [
+	AC_DEFINE(ENABLE_BLE, [1], [Enable support for BLE dive computers.])
+])
+
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_CC_C99
@@ -173,9 +182,7 @@ AC_CHECK_FUNCS([getopt_long])
 
 # Checks for supported compiler options.
 AX_APPEND_COMPILE_FLAGS([ \
-	-pedantic \
 	-Wall \
-	-Wextra \
 	-Wshadow \
 	-Wrestrict \
 	-Wformat=2 \

src/descriptor.c

@@ -98,7 +98,7 @@ static const dc_descriptor_t g_descriptors[] = {
 	{"Suunto", "Zoop Novo",  DC_FAMILY_SUUNTO_D9, 0x1E},  // FTDI
 	{"Suunto", "D4f",        DC_FAMILY_SUUNTO_D9, 0x20},  // FTDI
 	/* Suunto EON Steel */
-#ifdef USBHID
+#if defined(USBHID) || defined(ENABLE_BLE)
 	{"Suunto", "EON Steel", DC_FAMILY_SUUNTO_EONSTEEL, 0},  // BLE
 	{"Suunto", "EON Core",  DC_FAMILY_SUUNTO_EONSTEEL, 1},  // BLE
 #endif
@@ -139,7 +139,7 @@ static const dc_descriptor_t g_descriptors[] = {
 	{"Scubapro", "Chromis",     DC_FAMILY_UWATEC_MERIDIAN, 0x24},
 	{"Scubapro", "Mantis 2",    DC_FAMILY_UWATEC_MERIDIAN, 0x26},
 	/* Scubapro G2 */
-#ifdef USBHID
+#if defined(USBHID) || defined(ENABLE_BLE)
 	{"Scubapro", "Aladin Sport Matrix", DC_FAMILY_UWATEC_G2, 0x17},  // BLE
 	{"Scubapro", "Aladin Square",       DC_FAMILY_UWATEC_G2, 0x22},
 	{"Scubapro", "G2",                  DC_FAMILY_UWATEC_G2, 0x32},  // BLE