Add timeout for http servers

[grits] / configure.ac

diff --git a/configure.ac b/configure.ac
index 0f21b0834d35911804695f73b1b80b1e99a28b59..b166c38ebe9724fc30ad11b629e645a51614509c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,40 +1,65 @@
+m4_define([grits_release], [0.5])
+m4_define([grits_version], [1:0:1])
+m4_define([grits_subdir],  [grits0])
+
 # Init and options
-AC_INIT([aweather], [0.3-p0], [spenceal@rose-hulman.edu])
+AC_INIT([grits], [grits_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=grits_version
+GRITS_SUBDIR=grits_subdir
+AC_SUBST(LIB_VERSION)
+AC_SUBST(GRITS_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)
+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")
+
+# Configure GL flags
+if test "$WIN32" = yes; then
+       GL_CFLAGS=""
+       GL_LIBS="-lglu32 -lopengl32"
+else
+       GL_CFLAGS=""
+       GL_LIBS="-lGL -lGLU"
+fi
+AC_SUBST([GL_CFLAGS])
+AC_SUBST([GL_LIBS])
 
 # 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/grits.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