X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=configure.ac;h=2f8a3f3acad63d970ce34bfe27cf084741675cd3;hp=58a1103cb1e1db57903d726fd6ebad29677ca01a;hb=cbd3d3a794ee86f35b1a5c73ab37a0c9447c8f10;hpb=d01fb11de5bcf91224348bf41abb6788d0af2545

diff --git a/configure.ac b/configure.ac
index 58a1103..2f8a3f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,34 +1,43 @@
 # Init and options
-AC_INIT([aweather], [0.3-p0], [spenceal@rose-hulman.edu])
+AC_INIT([libgis], [0.4-p0], [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])
 
 # 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_SUBST(RSL_CFLAGS, "-I/usr/local/trmm/GVBOX/include/")
-#AC_SUBST(RSL_LIBS,   "-L/usr/local/trmm/GVBOX/lib/ -lrsl")
-AC_SUBST(RSL_CFLAGS, "")
-AC_SUBST(RSL_LIBS,   "-lrsl")
+# 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
 ])