X-Git-Url: http://pileus.org/git/?p=aweather;a=blobdiff_plain;f=configure.ac;h=6f1fbe1fa71b821569e9a5c18ca8f86b8f2556a6;hp=8cfd14cd7bbd405789878d102cf3ac7c437c3ddc;hb=5d7ed88c487a02cc335dcd38260681cd3ce145a8;hpb=b5d84249ef033970530e27f3debb8f38c0321bdf diff --git a/configure.ac b/configure.ac index 8cfd14c..6f1fbe1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # Init and options -AC_INIT([aweather], [0.7], [andy753421@gmail.com]) +AC_INIT([aweather], [0.8.1], [andy753421@gmail.com]) AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability foreign]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) @@ -14,15 +14,14 @@ PKG_PROG_PKG_CONFIG # Check for required packages PKG_CHECK_MODULES(GLIB, glib-2.0) -PKG_CHECK_MODULES(GRITS, grits >= 0.6) +PKG_CHECK_MODULES(GRITS, grits >= 0.8.1) # 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")