X-Git-Url: http://pileus.org/git/?p=aweather;a=blobdiff_plain;f=configure.ac;h=9ad99112886aecf78b8b7fad589c53ed36ad3d5e;hp=52d3c9ac1378cd7e5f4146a689b5e534267a30e3;hb=9e734911e96ae83b0f41afa5073d5313bc197d96;hpb=9986adc25084c91a4b9dbc8c5d8141c2ed3c62bf diff --git a/configure.ac b/configure.ac index 52d3c9a..9ad9911 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # Init and options -AC_INIT([aweather], [0.6.3], [andy753421@gmail.com]) +AC_INIT([aweather], [0.7], [andy753421@gmail.com]) AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability foreign]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) @@ -17,12 +17,11 @@ PKG_CHECK_MODULES(GLIB, glib-2.0) PKG_CHECK_MODULES(GRITS, grits >= 0.6) # Check for gpsd support -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])] -) -AM_CONDITIONAL([HAVE_GPSD], test "$HAVE_GPSD" = "TRUE") +AC_ARG_ENABLE([gps], + AS_HELP_STRING([--enable-gps], [Build with gpsd support])) +AS_IF([test "$enable_gps" = "yes"], + [PKG_CHECK_MODULES(GPSD, libgps >= 3.0)]) +AM_CONDITIONAL([HAVE_GPSD], test "x$enable_gps" = "xyes") # Define odd RSL install location AC_CHECK_LIB(rsl, RSL_wsr88d_to_radar, RSL_LIBS="-lrsl")