X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=configure.ac;h=b75ee4a3c34550f0c0b54256d4b75525244654e0;hp=0f21b0834d35911804695f73b1b80b1e99a28b59;hb=c2e55f28ba50e19fbf792a27009778e9dcca6fbb;hpb=42eaa69adc4578f47225ce8e1a7f89fdfaedffa4

diff --git a/configure.ac b/configure.ac
index 0f21b08..b75ee4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,40 +1,54 @@
+m4_define([gis_release], [0.4.2])
+m4_define([gis_version], [0:0:0])
+m4_define([gis_subdir],  [libgis0])
+
 # Init and options
-AC_INIT([aweather], [0.3-p0], [spenceal@rose-hulman.edu])
+AC_INIT([libgis], [gis_release], [andy753421@gmail.com])
 AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability foreign])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 #AM_SILENT_RULES([yes])
 
+# For library versioning
+LIB_VERSION=gis_version
+GIS_SUBDIR=gis_subdir
+AC_SUBST(LIB_VERSION)
+AC_SUBST(GIS_SUBDIR)
+
 # 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, RSL_LIBS="-lrsl")
-AM_CONDITIONAL(HAVE_RSL, test "$RSL_LIBS" != "")
-AC_SUBST(RSL_LIBS)
+# Test for Windows vs. Unix
+case "${host}" in
+	*mingw32*) WIN32="yes" ;;
+	*cygwin*)  WIN32="yes" ;;
+	*)         WIN32="no"  ;;
+esac
+if test "$WIN32" = yes; then
+	ac_default_prefix="/"
+fi
+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