diff --git a/configure.ac b/configure.ac
index b2fa58d..35bb02c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,12 +25,14 @@
 
 # Do you want to install with the Google OEM Number as well.
 AC_ARG_ENABLE([google],
-    AS_HELP_STRING([--enable-google], [Enable registering with Google OEN])
+    AS_HELP_STRING(
+        [--enable-google], [Enable registering with Google OEN.]
+    )
 )
-AC_ARG_VAR(ENABLE_GOOGLE, [Enable registering with Google OEN])
-AS_IF([test "x$enable_google" == "xyes"],
-      [ENABLE_GOOGLE="yes"]
-      AC_DEFINE_UNQUOTED([ENABLE_GOOGLE], ["$ENABLE_GOOGLE"], [Enable registering with Google OEN])
+AM_CONDITIONAL(ENABLE_GOOGLE, [test "x$enable_google" = "xyes"])
+AS_IF([test "x$enable_google" = "xyes"],
+    [AC_DEFINE(ENABLE_GOOGLE, [1], [Register with Google OEN.])],
+    [AC_DEFINE(ENABLE_GOOGLE, [0], [Do not register with Google OEN.])]
 )
 
 # Create configured output
diff --git a/main.cpp b/main.cpp
index edac802..0f9bcad 100644
--- a/main.cpp
+++ b/main.cpp
@@ -178,7 +178,7 @@
 {
     oem::Router* oemRouter = oem::mutableRouter();
 
-#ifdef ENABLE_GOOGLE
+#if ENABLE_GOOGLE
     /* Install in Google OEM Namespace when enabled. */
     std::fprintf(stderr,
                  "Registering OEM:[%#08X], Cmd:[%#04X] for Ethstats Commands\n",