X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=configure.ac;h=6aa57c8e9e1d5e348afd1d8d176d790d1ff8275a;hp=fb3359158e2fda856cda1fd55e09ddc0a34b6c1a;hb=e7127ea74717754c48779467aca2f9a1596a99f0;hpb=655a4be1e2fd1de5d324a948010b43b844aefede

diff --git a/configure.ac b/configure.ac
index fb33591..6aa57c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # Init and options
-AC_INIT([aweather], [0.3-p0], [spenceal@rose-hulman.edu])
+AC_INIT([libgis], [0.3], [andy753421@gmail.com])
 AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability foreign])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
@@ -8,32 +8,34 @@ AC_CONFIG_MACRO_DIR([m4])
 # Check for required programs
 AC_PROG_CC
 AC_PROG_LIBTOOL
+DOLT
 PKG_PROG_PKG_CONFIG
 GTK_DOC_CHECK(1.9)
 
 # Check for required packages
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.14 gobject-2.0 gthread-2.0 gmodule-export-2.0)
-PKG_CHECK_MODULES(GTK,  gtk+-2.0 >= 2.16 gtkglext-1.0)
-PKG_CHECK_MODULES(SOUP, libsoup-2.4 >= 2.26)
+PKG_CHECK_MODULES(GLIB,  glib-2.0 >= 2.14 gobject-2.0 gthread-2.0)
+PKG_CHECK_MODULES(CAIRO, cairo)
+PKG_CHECK_MODULES(GTK,   gtk+-2.0 >= 2.16 gtkglext-1.0)
+PKG_CHECK_MODULES(SOUP,  libsoup-2.4 >= 2.26)
 
-# Define odd RSL install location
-AC_CHECK_LIB(rsl, RSL_wsr88d_to_radar, RLS_LIBS="-lrsl")
-AM_CONDITIONAL(HAVE_RSL, test "$RSL_LIBS" != "")
+# Test for Windows vs. Unix
+case "${host}" in
+	*mingw32*) WIN32="yes" ;;
+	*cygwin*)  WIN32="yes" ;;
+	*)         WIN32="no"  ;;
+esac
+AM_CONDITIONAL([WIN32],    test "$WIN32" = "yes")
+AM_CONDITIONAL([NOTWIN32], test "$WIN32" = "no")
 
 # Output 
 AC_CONFIG_FILES([
 	Makefile
 	src/Makefile
-	src/gis/Makefile
-	src/gis/libgis.pc
+	src/data/Makefile
+	src/objects/Makefile
 	src/plugins/Makefile
-	data/Makefile
+	src/libgis.pc
 	docs/Makefile
 	docs/api/Makefile
 ])
 AC_OUTPUT
-
-# Print status messages
-if test "$RSL_LIBS" = ""; then
-	echo " ** Warning, RSL not found, radar plugin disabled"
-fi