# Process this file with autoconf to produce a configure script.
#
# This file is part of DisOrder.
-# Copyright (C) 2004-2008 Richard Kettlewell
+# Copyright (C) 2004-2009 Richard Kettlewell
# Portions copyright (C) 2007 Ross Younger
#
# This program is free software: you can redistribute it and/or modify
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-AC_INIT([disorder], [4.2+], [richard+disorder@sfere.greenend.org.uk])
+AC_INIT([disorder], [4.3+], [richard+disorder@sfere.greenend.org.uk])
AC_CONFIG_AUX_DIR([config.aux])
-AM_INIT_AUTOMAKE(disorder, [4.2+])
+AM_INIT_AUTOMAKE(disorder, [4.3+])
AC_CONFIG_SRCDIR([server/disorderd.c])
AM_CONFIG_HEADER([config.h])
want_oss=yes
want_coreaudio=yes
+# By default we don't want gtk-osx. But if you ask for --with-gtk-osx...
+#
+# Disobedience can be built to a native OS X application. There are some
+# caveats:
+# - you will still need Fink (or something) for other libraries
+# - if you wanted an application bundle you are out of luck
+# - the menu bar is still in the main window (not at the top of the screen)
+#
+# So it's still rather rough and ready. But it does work...
+#
+# See:
+# http://www.gtk-osx.org/
+# http://live.gnome.org/GTK%2B/OSX/Framework
+want_gtkosx=no
+
# Checks for programs.
AC_PROG_CC
+AM_PROG_CC_C_O
AC_PROG_AWK
AC_SET_MAKE
if test "x$GCC" = xyes; then
[AS_HELP_STRING([--without-tests],
[do not build test suit])],
[want_tests=$withval])
+AC_ARG_WITH([gtk-osx],
+ [AS_HELP_STRING([--with-gtk-osx],
+ [use native GTK+ (OS X only)])],
+ [want_gtkosx=$withval])
AC_MSG_CHECKING([for a known target platform])
case "$host" in
;;
*-apple-darwin* )
AC_MSG_RESULT([Mac OS X])
+ # AudioHardwareGetProperty is deprecated in 10.6, but it's still _there_,
+ # so we'll just turn off the warning.
+ CC="$CC -Wno-deprecated-declarations"
if test $want_coreaudio = yes; then
- COREAUDIO="-framework CoreAudio"
+ COREAUDIO="-framework CoreFoundation -framework CoreServices -framework CoreAudio"
fi
browser=open
AC_MSG_CHECKING([Mac OS X target version])
AC_DEFINE_UNQUOTED([MAC_OS_X_VERSION_MIN_REQUIRED], [$minver],
[define to minimum version of Mac OS X to support])
- # Fink's GTK+ is hopelessly broken
- PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/sw/lib/pango-ft219/lib/pkgconfig}
- export PKG_CONFIG_PATH
+ if test $want_gtkosx = no; then
+ # Fink's GTK+ is hopelessly broken
+ PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/sw/lib/pango-ft219/lib/pkgconfig}
+ export PKG_CONFIG_PATH
+ fi
;;
*-freebsd* )
fi
done
])
- if test "$rjk_cv_cgiexecdir" = "not found"; then
+ if test "$rjk_cv_httpdir" = "not found"; then
AC_MSG_ERROR([cannot identify httpd documentroot. Set httpdir on configure command line])
fi
httpdir="$rjk_cv_httpdir"
fi
AC_SUBST([pkghttpdir])
+if test -z "$dochtmldir"; then
+ dochtmldir='$(docdir)/html'
+fi
+AC_SUBST([dochtmldir])
+
subdirs="scripts lib"
if test $want_tests = yes; then
subdirs="${subdirs} libtests"
fi
fi
if test $want_tests = yes && test $want_python = yes; then
- AM_PATH_PYTHON([2.4])
+ AM_PATH_PYTHON([2.5])
subdirs="${subdirs} python tests"
fi
AC_SUBST([subdirs])
# Macs might have libraries under fink's root
AC_PATH_PROG([FINK],[fink],[none],[$PATH:/sw/bin])
if test "x$FINK" != xnone; then
+ # Find Fink prefix
AC_CACHE_CHECK([fink install directory],[rjk_cv_finkprefix],[
rjk_cv_finkprefix="`echo "$FINK" | sed 's,/bin/fink$,,'`"
])
+ # Add include and link paths
finkdir="${rjk_cv_finkprefix}"
finkbindir="${rjk_cv_finkprefix}/bin"
- CPPFLAGS="${CPPFLAGS} -I${rjk_cv_finkprefix}/include/gc -I${rjk_cv_finkprefix}/include"
+ CPPFLAGS="${CPPFLAGS} -isystem ${rjk_cv_finkprefix}/include/gc -isystem ${rjk_cv_finkprefix}/include"
if test $want_server = yes; then
- CPPFLAGS="${CPPFLAGS} -I${rjk_cv_finkprefix}/include/db4"
+ CPPFLAGS="${CPPFLAGS} -isystem ${rjk_cv_finkprefix}/include/db4"
fi
LDFLAGS="${LDFLAGS} -L${rjk_cv_finkprefix}/lib"
+ # Distinguish 32- and 64-bit fink
+ AC_CACHE_CHECK([whether Fink is 32-bit or 64-bit],[rjk_cv_finkbits],[
+ odata=`otool -v -h $finkbindir/dpkg`
+ case "$odata" in
+ *X86_64* )
+ rjk_cv_finkbits=64
+ ;;
+ *I386* )
+ rjk_cv_finkbits=32
+ ;;
+ * )
+ rjk_cv_finkbits=unknown
+ ;;
+ esac
+ ])
+ # Match Fink so we can use its libraries
+ case $rjk_cv_finkbits in
+ 32 | 64 )
+ CC="$CC -m$rjk_cv_finkbits"
+ ;;
+ esac
else
finkbindir=""
fi
AC_CHECK_LIB([asound], [snd_pcm_open],
[AC_SUBST(LIBASOUND,[-lasound])])
fi
+AC_CHECK_LIB([samplerate],[src_new],
+ [AC_SUBST([LIBSAMPLERATE],[-lsamplerate])])
if test $want_server = yes; then
RJK_CHECK_LIB(db, db_create, [#include <db.h>],
[AC_SUBST(LIBDB,[-ldb])],
[missing_libraries="$missing_libraries libpthread"])
if test $want_gtk = yes; then
- AM_PATH_GLIB_2_0([],[],[missing_libraries="$missing_libraries libglib"])
- AM_PATH_GTK_2_0([],[],[missing_libraries="$missing_libraries libgtk"])
+ if test $want_gtkosx = yes; then
+ GTK_CFLAGS="-isystem /Library/Frameworks/Gtk.framework/Headers -isystem /Library/Frameworks/Cairo.framework/Headers"
+ GLIB_CFLAGS="-isystem /Library/Frameworks/GLib.framework/Headers"
+ GTK_LIBS="-framework Gtk -framework GLib"
+ else
+ AM_PATH_GLIB_2_0([],[],[missing_libraries="$missing_libraries libglib"])
+ AM_PATH_GTK_2_0([],[],[missing_libraries="$missing_libraries libgtk"])
+ fi
fi
# Some platforms have iconv already
syslog.h unistd.h],[:],[
missing_headers="$missing_headers $ac_header"
])
+AC_CHECK_HEADERS([samplerate.h])
if test ! -z "$missing_headers"; then
AC_MSG_ERROR([missing headers:$missing_headers])
#if DB_VERSION_MAJOR < 4
# error inadequate db version
#endif
- #if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR <= 3
+ #if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR <= 2
# error inadequate db version
#endif
],
gcc_werror=''
fi
+ AC_CACHE_CHECK([checking for excessively strict -Wreturn-type],
+ [rjk_cv_gcc44_stupidity],[
+ old_CC="$CC"
+ if test $GCC = yes; then
+ CC="$CC -Wreturn-type -Werror"
+ fi
+ AC_COMPILE_IFELSE([
+ static void *threadfn(void) {
+ for(;;)
+ ;
+ }],
+ [rjk_cv_gcc44_stupidity=no],
+ [rjk_cv_gcc44_stupidity=yes])
+ CC="$old_CC"
+ ])
+ if test $rjk_cv_gcc44_stupidity = yes; then
+ AC_DEFINE([HAVE_STUPID_GCC44],[1],[Define if your compiler has excessively strict -Wreturn-type])
+ fi
+
# a reasonable default set of warnings
CC="${CC} -Wall -W -Wpointer-arith -Wbad-function-cast \
-Wwrite-strings -Wmissing-prototypes \
cgi/Makefile
clients/Makefile
disobedience/Makefile
+ disobedience/manual/Makefile
doc/Makefile
templates/Makefile
plugins/Makefile
if test $want_python = no; then
AC_MSG_WARN([cannot run the test suit without Python])
fi
+if test $want_server = yes && test "$ac_cv_lib_samplerate_src_new" != yes; then
+ AC_MSG_WARN([libsamplerate will be required in a future version])
+fi
# Local Variables:
# indent-tabs-mode:nil
~mdw / disorder / blobdiff