X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=configure.ac;h=7223877522a29dff71ceff5b2c1730fd082a1cdf;hb=b36a6339619c2b5a6c39ba3679433ee0d48796a1;hp=3df2071c20cc2b7514908490a5497f089134e542;hpb=8e40f97cbc7606f8e366a391b6457614eb41fcc5;p=aweather

diff --git a/configure.ac b/configure.ac
index 3df2071..7223877 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # Init and options
-AC_INIT([aweather], [0.4-p0], [andy753421@gmail.com])
+AC_INIT([aweather], [0.6.1], [andy753421@gmail.com])
 AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability foreign])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
@@ -7,35 +7,63 @@ AC_CONFIG_MACRO_DIR([m4])
 
 # Check for required programs
 AC_PROG_CC
-gl_EARLY
 LT_PROG_RC
 AC_PROG_LIBTOOL
+DOLT
 PKG_PROG_PKG_CONFIG
-gl_INIT
 
 # Check for required packages
-PKG_CHECK_MODULES(GLIB, glib-2.0)
-PKG_CHECK_MODULES(GIS,  libgis = $VERSION)
+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_DEFINE([HAVE_GPSD], [], [Have GPSD support])
+   AC_SUBST(HAVE_GPSD, [TRUE])
+fi
+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" != "")
 AC_SUBST(RSL_LIBS)
 
-# Test for Windows vs. Unix
+# Test for windowing system
 case "${host}" in
-	*mingw32*) WIN32="yes" ;;
-	*)         WIN32="no"  ;;
+	*mingw32*) SYS="WIN" ;;
+	*cygwin*)  SYS="WIN" ;;
+	*apple*)   SYS="MAC" ;;
+	*)         SYS="X11" ;;
 esac
-if test "$WIN32" = yes; then
-	ac_default_prefix="/"
+AM_CONDITIONAL([SYS_WIN], test "$SYS" = "WIN")
+AM_CONDITIONAL([SYS_MAC], test "$SYS" = "MAC")
+AM_CONDITIONAL([SYS_X11], test "$SYS" = "X11")
+
+# Check for Mac OX
+if test "$SYS" = "MAC"; then
+	PKG_CHECK_MODULES(MAC, gtk-mac-integration)
 fi
-AM_CONDITIONAL([WIN32], test "$WIN32" = "yes")
 
-# Output 
+# Check for relative build
+AC_ARG_ENABLE(relative, [AS_HELP_STRING([--enable-relative],
+	[enable runtime search paths @<:@default=no@:>@])],
+	[DOTS=".."; ac_default_prefix="/"])
+AC_SUBST([DOTS])
+
+# Output
 AC_CONFIG_FILES([
 	Makefile
-	lib/Makefile
 	src/Makefile
 	src/resource.rc
 	src/plugins/Makefile