X-Git-Url: http://pileus.org/git/?p=aweather;a=blobdiff_plain;f=configure.ac;h=cfc16508b97513aa6c7992b2973736822f466762;hp=59d2c1b895c0146d6601ccadba4f7ff67b4b0e68;hb=refs%2Fheads%2Fmac;hpb=1d506d5e87c013a9255ffc7de1c4a9ee4c157747

diff --git a/configure.ac b/configure.ac
index 59d2c1b..cfc1650 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # Init and options
-AC_INIT([aweather], [0.4], [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,38 @@ 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)
 
 # 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_SUBST([SYS])
+if test "$SYS" = "WIN"; then
 	ac_default_prefix="/"
 fi
-AM_CONDITIONAL([WIN32], test "$WIN32" = "yes")
+AM_CONDITIONAL([SYS_WIN], test "$SYS" = "WIN")
+AM_CONDITIONAL([SYS_MAC], test "$SYS" = "MAC")
+AM_CONDITIONAL([SYS_X11], test "$SYS" = "X11")
 
 # Output 
 AC_CONFIG_FILES([
 	Makefile
-	lib/Makefile
 	src/Makefile
 	src/resource.rc
 	src/plugins/Makefile