X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/0ec4c5e69dc74bbe543506cd3bbd812d686fb4fd..f4687532612acdf8e79e937301aa50df6bf3a657:/configure.ac diff --git a/configure.ac b/configure.ac index 28e8775..22c47f6 100644 --- a/configure.ac +++ b/configure.ac @@ -2,6 +2,7 @@ # # This file is part of DisOrder. # Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell +# Portions copyright (C) 2007 Ross Younger # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,9 +20,9 @@ # USA # -AC_INIT([disorder], [1.5.99+], [richard+disorder@sfere.greenend.org.uk]) +AC_INIT([disorder], [2.0+], [richard+disorder@sfere.greenend.org.uk]) AC_CONFIG_AUX_DIR([config.aux]) -AM_INIT_AUTOMAKE(disorder, [1.5.99+]) +AM_INIT_AUTOMAKE(disorder, [2.0+]) AC_CONFIG_SRCDIR([server/disorderd.c]) AM_CONFIG_HEADER([config.h]) @@ -81,6 +82,17 @@ case "$host" in fi browser=open ;; +*-freebsd* ) + AC_MSG_RESULT([FreeBSD]) + want_server=yes + # Ports install to /usr/local but the compiler stupidly doesn't look + # there by default + LDFLAGS="${LDFLAGS} -L/usr/local/lib" + CPPFLAGS="${CPPFLAGS} -isystem /usr/local/include" + # libdb installs elsewhere again + LDFLAGS="${LDFLAGS} -L/usr/local/lib/db44" + CPPFLAGS="${CPPFLAGS} -isystem /usr/local/include/db44" + ;; * ) AC_MSG_RESULT([unknown, winging it]) want_server=no @@ -125,17 +137,16 @@ subdirs="scripts lib clients doc examples debian" if test $want_server = yes; then subdirs="${subdirs} server plugins driver templates sounds images" fi -if test $want_python = yes; then - AM_PATH_PYTHON - subdirs="${subdirs} python" -fi if test $want_gtk = yes; then subdirs="${subdirs} disobedience" if test $want_server = no; then subdirs="${subdirs} images" fi fi -subdirs="${subdirs} tests" +if test $want_python = yes; then + AM_PATH_PYTHON([2.4]) + subdirs="${subdirs} python tests" +fi AC_SUBST([subdirs]) # libtool config @@ -144,6 +155,20 @@ AC_DISABLE_STATIC AC_PROG_LIBTOOL +AC_CACHE_CHECK([for GNU sed],[rjk_cv_gnused],[ + rjk_cv_gnused="not found" + for candidate in sed gsed; do + if $candidate --version >/dev/null 2>&1; then + rjk_cv_gnused=$candidate + fi + done +]) +GNUSED="${GNUSED:-$rjk_cv_gnused}" +if test "$GNUSED" = "not found"; then + AC_MSG_ERROR([GNU sed is required to build this program]) +fi +AC_SUBST([GNUSED]) + missing_libraries="" missing_headers="" missing_functions="" @@ -205,6 +230,9 @@ if test $want_server = yes; then [AC_SUBST(LIBFLAC,[-lFLAC])], [missing_libraries="$missing_libraries libFLAC"]) fi +AC_CHECK_LIB([pthread], [pthread_create], + [AC_SUBST(LIBPTHREAD,[-lpthread])], + [missing_libraries="$missing_libraries libpthread"]) if test $want_gtk = yes; then AM_PATH_GLIB_2_0([],[],[missing_libraries="$missing_libraries libglib"]) @@ -233,9 +261,6 @@ if test ! -z "$missing_libraries"; then AC_MSG_ERROR([missing libraries:$missing_libraries]) fi -# We require that libpcre support UTF-8 -RJK_REQUIRE_PCRE_UTF8([-lpcre]) - # Checks for header files. RJK_FIND_GC_H if test $want_oss = yes; then @@ -255,6 +280,7 @@ if test $want_server = yes; then AC_CHECK_HEADERS([db.h],[:],[ missing_headers="$missing_headers $ac_header" ]) + AC_CHECK_HEADERS([FLAC/file_decoder.h]) fi AC_CHECK_HEADERS([dlfcn.h gcrypt.h \ getopt.h iconv.h langinfo.h \ @@ -267,6 +293,9 @@ if test ! -z "$missing_headers"; then AC_MSG_ERROR([missing headers:$missing_headers]) fi +# We require that libpcre support UTF-8 +RJK_REQUIRE_PCRE_UTF8([-lpcre]) + # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST AC_TYPE_SIZE_T @@ -376,7 +405,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 ], @@ -389,6 +418,28 @@ if test $want_server = yes; then fi if test "x$GCC" = xyes; then + # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29478 + AC_CACHE_CHECK([checking for GCC bug 29478],[rjk_cv_pr29478],[ + old_CC="$CC" + if test $GCC = yes; then + CC="$CC -Wall -Werror" + fi + AC_COMPILE_IFELSE([ + static int x(char *f) { + return *f; + } + int z(const char *g) { + return x((char *)g); + }], + [rjk_cv_pr29478=no], + [rjk_cv_pr29478=yes] + ) + CC="$old_CC" + ]) + if test $rjk_cv_pr29478 = yes; then + gcc_werror='' + fi + # a reasonable default set of warnings CC="${CC} -Wall -W -Wpointer-arith -Wbad-function-cast \ -Wwrite-strings -Wmissing-prototypes \ @@ -398,19 +449,21 @@ if test "x$GCC" = xyes; then GTK_CFLAGS="`echo \"$GTK_CFLAGS\"|sed 's/-I/-isystem /g'`" GLIB_CFLAGS="`echo \"$GLIB_CFLAGS\"|sed 's/-I/-isystem /g'`" - # GCC 2.95 doesn't know to ignore warnings from system headers - AC_CACHE_CHECK([whether -Werror is usable], - rjk_cv_werror, [ - save_CFLAGS="${CFLAGS}" - CFLAGS="${CFLAGS} ${GTK_CFLAGS} -Werror" - AC_TRY_COMPILE([#include ], - [], - [rjk_cv_werror=yes], - [rjk_cv_werror=no]) - CFLAGS="${save_CFLAGS}" - ]) - if test $rjk_cv_werror = no; then - gcc_werror='' + if test "$gcc_werror" != ''; then + # GCC 2.95 doesn't know to ignore warnings from system headers + AC_CACHE_CHECK([whether -Werror is usable], + rjk_cv_werror, [ + save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} ${GTK_CFLAGS} -Werror" + AC_TRY_COMPILE([#include ], + [], + [rjk_cv_werror=yes], + [rjk_cv_werror=no]) + CFLAGS="${save_CFLAGS}" + ]) + if test $rjk_cv_werror = no; then + gcc_werror='' + fi fi CC="${CC} $gcc_werror" @@ -442,10 +495,10 @@ if test "x$GCC" = xyes; then if test $rjk_cv_shadow = yes; then CC="${CC} -Wshadow" fi - - fi +RJK_GCOV + AH_BOTTOM([#ifdef __GNUC__ # define attribute(x) __attribute__(x) #else @@ -469,3 +522,10 @@ AC_CONFIG_FILES([Makefile examples/Makefile tests/Makefile]) AC_OUTPUT + +if test $GCC = yes && test "$gcc_werror" = ''; then + AC_MSG_WARN([building without -Werror]) +fi +if test $want_python = no; then + AC_MSG_WARN([cannot run the test suit without Python]) +fi