Win32 port

[grits] / configure.ac

diff --git a/configure.ac b/configure.ac
index 08cb84cd6815b45b2aa7bc45344abc861087f9f5..6aa57c8e9e1d5e348afd1d8d176d790d1ff8275a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,18 +8,31 @@ 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)
-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)
+
+# 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/data/Makefile
+       src/objects/Makefile
        src/plugins/Makefile
        src/libgis.pc
        docs/Makefile