Incorporate code review feedback and some minor fixes.

[aweather] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7223877522a29dff71ceff5b2c1730fd082a1cdf..c66b28578f2e94103eb5d2a2d00b389756ceae38 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -17,23 +17,13 @@ PKG_CHECK_MODULES(GLIB,  glib-2.0)
 PKG_CHECK_MODULES(GRITS, grits >= 0.6)
 
 # Check for gpsd support
-AC_ARG_WITH([gps], AS_HELP_STRING([--with-gps], [Build with gpsd support]))
-
-if test "x$with_gps" = "xyes"; then
-   PKG_CHECK_MODULES(GPSD, libgps >= 3.0)
+AC_ARG_ENABLE([gps], AS_HELP_STRING([--enable-gps], [Build with gpsd support]),
+   [PKG_CHECK_MODULES(GPSD, libgps >= 3.0)
    AC_DEFINE([HAVE_GPSD], [], [Have GPSD support])
-   AC_SUBST(HAVE_GPSD, [TRUE])
-fi
+   AC_SUBST(HAVE_GPSD, [TRUE])]
+)
 AM_CONDITIONAL([HAVE_GPSD], test "$HAVE_GPSD" = "TRUE")
 
-# PKG_CHECK_MODULES(GPSD, libgps >= 3.0)
-#AC_ARG_WITH([gps], AS_HELP_STRING([--with-gps], [Build with gpsd support]))
-#AS_IF([test "x$with_gps" = "xyes"], [
-#   PKG_CHECK_MODULES([GPSD], [libgps >= 3.0],
-#      [AC_DEFINE([HAVE_GPSD], [1], [Use GPSD])],
-#      [AC_DEFINE([HAVE_GPSD], [0], [No GPSD])]
-#   ])
-
 # Define odd RSL install location
 AC_CHECK_LIB(rsl, RSL_wsr88d_to_radar, RSL_LIBS="-lrsl")
 AM_CONDITIONAL(HAVE_RSL, test "$RSL_LIBS" != "")