DisOrder 3.0

[disorder] / configure.ac

diff --git a/configure.ac b/configure.ac
index 4bae211aec895a11bbf246ae62e5f23314943f7d..091f96a59cc2fb68557c574d38003cf671c6e4fb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 #
 # This file is part of DisOrder.
-# Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell
+# Copyright (C) 2004-2008 Richard Kettlewell
 # Portions copyright (C) 2007 Ross Younger
 #
 # This program is free software; you can redistribute it and/or modify
@@ -20,9 +20,9 @@
 # USA
 #
 
-AC_INIT([disorder], [2.0+], [richard+disorder@sfere.greenend.org.uk])
+AC_INIT([disorder], [3.0], [richard+disorder@sfere.greenend.org.uk])
 AC_CONFIG_AUX_DIR([config.aux])
-AM_INIT_AUTOMAKE(disorder, [2.0+])
+AM_INIT_AUTOMAKE(disorder, [3.0])
 AC_CONFIG_SRCDIR([server/disorderd.c])
 AM_CONFIG_HEADER([config.h])
 
@@ -81,6 +81,28 @@ case "$host" in
     COREAUDIO="-framework CoreAudio"
   fi
   browser=open
+  AC_MSG_CHECKING([Mac OS X target version])
+  # We honor MACOSX_DEPLOYMENT_TARGET in the environment, emulating gcc's
+  # behaviour.  But we provide a command line option to override it and
+  # we default to wide support instead of supporting only the build platform.
+  #
+  # Currently if you ask for 10.5 you will get a deprecation warning
+  # when building the CoreAudio support code.  For the time being the
+  # answer to this is "don't do that then".  If a good reason to ask
+  # for a 10.5 deployment target emerges then this will be fixed.
+  if test -z "$MACOSX_DEPLOYMENT_TARGET"; then
+    MACOSX_DEPLOYMENT_TARGET=10.0
+  fi
+  AC_ARG_WITH([deployment-target],
+              [AS_HELP_STRING([--with-deployment-target=TARGET],
+                              [set target OS X version])],
+              [MACOSX_DEPLOYMENT_TARGET=$withval])
+  # Convert to desired format
+  underscored=`echo $MACOSX_DEPLOYMENT_TARGET|sed 's/\./_/'`
+  minver="MAC_OS_X_VERSION_$underscored"
+  AC_MSG_RESULT([$minver])
+  AC_DEFINE_UNQUOTED([MAC_OS_X_VERSION_MIN_REQUIRED], [$minver],
+                     [define to minimum version of Mac OS X to support])
   ;;
 *-freebsd* )
   AC_MSG_RESULT([FreeBSD])
@@ -88,10 +110,21 @@ case "$host" in
   # Ports install to /usr/local but the compiler stupidly doesn't look
   # there by default
   LDFLAGS="${LDFLAGS} -L/usr/local/lib"
-  CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
-  # libdb installs elsewhere again
-  LDFLAGS="${LDFLAGS} -L/usr/local/lib/db44"
-  CPPFLAGS="${CPPFLAGS} -I/usr/local/include/db44"
+  CPPFLAGS="${CPPFLAGS} -isystem /usr/local/include"
+  # Look for a suitable version of libdb among the versions found in FreeBSD 7.0
+  AC_CACHE_CHECK([looking for a libdb install],[rjk_cv_libdb],[
+    rjk_cv_libdb="none"
+    for db in db43 db44 db45 db46; do
+      if test -e /usr/local/lib/$db; then
+        rjk_cv_libdb=$db
+        break
+      fi
+    done
+  ])
+  if test $rjk_cv_libdb != none; then
+    LDFLAGS="${LDFLAGS} -L/usr/local/lib/$rjk_cv_libdb"
+    CPPFLAGS="${CPPFLAGS} -isystem /usr/local/include/$rjk_cv_libdb"
+  fi
   ;;
 * )
   AC_MSG_RESULT([unknown, winging it])
@@ -107,7 +140,7 @@ AC_ARG_WITH([browser],
 
 AC_CACHE_CHECK([default HTML viewer],[rjk_cv_browser],[
   rjk_cv_browser=UNKNOWN
-  for candidate in x-www-browser firefox mozilla konqueror netscape; do
+  for candidate in x-www-browser sensible-browser firefox mozilla konqueror netscape; do
     if type $candidate >/dev/null 2>&1; then
       rjk_cv_browser="$candidate"
       break
@@ -405,7 +438,7 @@ if test $want_server = yes; then
                       #if DB_VERSION_MAJOR < 4
                       # error inadequate db version
                       #endif
-                      #if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 2
+                      #if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR <= 2
                       # error inadequate db version
                       #endif
                      ],