X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/515cd2bb4f4ec548f464edeb5be7564fa5b0139f..f326f12d2a097236a173c97abc6717626b715ae3:/configure.ac diff --git a/configure.ac b/configure.ac index 32eaeaf..80e8e24 100644 --- a/configure.ac +++ b/configure.ac @@ -1,27 +1,26 @@ # 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-2009 Richard Kettlewell +# Portions copyright (C) 2007 Ross Younger # -# This program is free software; you can redistribute it and/or modify +# 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 -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA +# along with this program. If not, see . # -AC_INIT(disorder, 1.5.99+, 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, 1.5.99+) +AM_INIT_AUTOMAKE(disorder, [4.3+]) AC_CONFIG_SRCDIR([server/disorderd.c]) AM_CONFIG_HEADER([config.h]) @@ -31,34 +30,208 @@ AC_CANONICAL_HOST # What we want to build want_gtk=yes want_python=yes +want_tests=yes +want_server=yes +want_cgi=yes + +# APIs we want +want_alsa=yes +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 + gcc_werror=-Werror + case "$CC" in + *-std=* ) + ;; + * ) + CC="${CC} -std=gnu99" + ;; + esac +else + AC_MSG_ERROR([GNU C is required to build this program]) + gcc_werror="" +fi +AC_ARG_WITH([alsa], + [AS_HELP_STRING([--without-alsa], + [do not build with ALSA support])], + [want_alsa=$withval]) +AC_ARG_WITH([oss], + [AS_HELP_STRING([--without-oss], + [do not build with OSS support])], + [want_oss=$withval]) +AC_ARG_WITH([coreaudio], + [AS_HELP_STRING([--without-coreaudio], + [do not build with Core Audio support])], + [want_coreaudio=$withval]) +AC_ARG_WITH([tests], + [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 +*empeg* ) + AC_MSG_RESULT([empeg car stereo]) + AC_DEFINE([EMPEG_HOST],[1],[define if host is an empeg car stereo]) + # work around broken toolchain + AC_CHECK_LIB([gpg-error], [gpg_strerror]) + AC_CHECK_LIB([pthread], [pthread_create]) + want_server=no + want_cgi=no + ;; *linux* | *Linux* ) - want_server=yes + AC_MSG_RESULT([Linux]) ;; *-apple-darwin* ) - want_server=no - COREAUDIO="-framework CoreAudio" + 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 CoreFoundation -framework CoreServices -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]) + + 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* ) + AC_MSG_RESULT([FreeBSD]) + # 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" + # 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 ;; * ) - want_server=no + AC_MSG_RESULT([unknown, winging it]) ;; esac AC_SUBST([COREAUDIO]) -# Checks for programs. -AC_PROG_CC -AC_SET_MAKE -if test "x$GCC" = xyes; then - gcc_werror=-Werror -else - gcc_werror="" +AC_ARG_WITH([browser], + [AS_HELP_STRING([--with-browser=BROWSER], + [use BROWSER to display HTML])], + [browser=$withval]) + +AC_CACHE_CHECK([default HTML viewer],[rjk_cv_browser],[ + rjk_cv_browser=UNKNOWN + 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 + fi + done +]) +if test -z "$browser"; then + browser="$rjk_cv_browser" fi +AC_DEFINE_UNQUOTED([BROWSER],["$browser"],[HTML viewer]) + +# Figure out what version of sox is installed +AC_CACHE_CHECK([sox version],[rjk_cv_soxver],[ + rjk_cv_soxver=UNKNOWN + if sox --version > /dev/null 2>&1; then + rjk_cv_soxver=`sox --version|$AWK '{ if(match($0, /[[0-9\.]]+/)) print substr($0,RSTART,RLENGTH)}'` + else + rjk_cv_soxver=`sox -h 2>&1|$AWK '/Version/ { if(match($0, /[[0-9\.]]+/)) print substr($0,RSTART,RLENGTH)}'` + fi +]) + +# Decide what command line options to use +# +# sox version endian bits deployed +# 12.17.9 -x -[bwld] debian etch, ubuntu dapper +# 14.0.0 -x/-[BL] -[bwld] ubuntu hardy +# 14.0.1 -x/-[BL] -[1248] debian lenny +# 14.2.0 -x/-[BL] -[1248] debian sid (at 2008-12) + +AC_CACHE_CHECK([default sox generation],[rjk_cv_soxgen],[ + case $rjk_cv_soxver in + [[0-9]].* | 1[[0123]].* ) + rjk_cv_soxgen=0 + ;; + * ) + rjk_cv_soxgen=1 + ;; + esac +]) +AC_DEFINE_UNQUOTED([DEFAULT_SOX_GENERATION],[$rjk_cv_soxgen], + [default sox generation]) AC_ARG_WITH([server], [AS_HELP_STRING([--without-server], [do not build server])], [want_server=$withval]) +AC_ARG_WITH([cgi], + [AS_HELP_STRING([--without-cgi], + [do not build CGI])], + [want_cgi=$withval]) AC_ARG_WITH([gtk], [AS_HELP_STRING([--without-gtk], [do not build GTK+ client])], @@ -68,14 +241,107 @@ AC_ARG_WITH([python], [do not build Python support])], [want_python=$withval]) -subdirs="scripts lib clients doc examples debian" +if test $want_server = no; then + want_cgi=no +fi + +# +# OS Document Root CGI directory +# == ============= ============= +# Debian /var/www /usr/lib/cgi-bin +# Ubuntu /var/www /usr/lib/cgi-bin +# Red Hat /var/www/html /var/www/cgi-bin +# or: /home/httpd/html/ /home/httpd/cgi-bin +# Slackware /var/www/htdocs (unknown) +# SuSE /srv/www/html /srv/www/cgi-bin +# Gentoo /var/www/localhost/htdocs /var/www/localhost/cgi-bin/ +# FreeBSD /usr/local/www/data /usr/local/www/cgi-bin +# or: /usr/local/www/???/data /usr/local/www/???/cgi-bin +# OS X /Library/WebServer/Documents /Library/WebServer/CGI-Executables +# Apache /usr/local/apache/htdocs (none) +# +# Sources: +# http://wiki.linuxquestions.org/wiki/Apache +# http://mapserver.gis.umn.edu/docs/howto/suse-linux +# http://www.yolinux.com/TUTORIALS/LinuxTutorialWebSiteConfig.html +# http://sources.gentoo.org/viewcvs.py/apache/trunk/dist/2.2/conf/vhosts.d/default_vhost.include?rev=198&view=log +# http://httpd.apache.org/docs/ +# +if test $want_cgi = yes; then + if test -z "$httpdir"; then + AC_CACHE_CHECK([for httpd document root],[rjk_cv_httpdir],[ + rjk_cv_httpdir="not found" + for dir in /var/www/html \ + /var/www/htdocs \ + /var/www/localhost/htdocs \ + /var/www \ + /home/httpd/html \ + /srv/www/html \ + /usr/local/www/data \ + /usr/local/www/*/data \ + /Library/WebServer/Documents \ + /usr/local/apache/htdocs; do + if test -d "$dir"; then + rjk_cv_httpdir="$dir" + fi + done + ]) + 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 + if test ! -z "$cgidir"; then + # This is a bit harsh but should stop any disasters + AC_MSG_ERROR([cgidir has been renamed to cgiexecdir]) + fi + if test -z "$cgiexecdir"; then + AC_CACHE_CHECK([for CGI directory],[rjk_cv_cgiexecdir],[ + rjk_cv_cgiexecdir="not found" + for dir in /usr/lib/cgi-bin \ + /Library/WebServer/CGI-Executables \ + /srv/www/cgi-bin \ + /var/www/cgi-bin \ + /home/httpd/cgi-bin \ + /var/www/localhost/cgi-bin \ + /usr/local/lib/cgi-bin \ + /usr/local/www/cgi-bin \ + /usr/local/www/*/cgi-bin; do + if test -d "$dir"; then + rjk_cv_cgiexecdir="$dir" + break + fi + done + ]) + if test "$rjk_cv_cgiexecdir" = "not found"; then + AC_MSG_ERROR([cannot identify CGI install directory. Set cgiexecdir on configure command line]) + fi + cgiexecdir="$rjk_cv_cgiexecdir" + fi +fi +AC_ARG_VAR([cgiexecdir], [location of cgi-bin directory, e.g. /usr/lib/cgi-bin]) +AC_ARG_VAR([httpdir], [location of http document root, e.g. /var/www/htdocs]) +if test -z "$pkghttpdir"; then + pkghttpdir='$(httpdir)/disorder' +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 +subdirs="${subdirs} clients doc examples debian" if test $want_server = yes; then - subdirs="${subdirs} server plugins driver templates sounds images" + subdirs="${subdirs} server plugins driver sounds" fi -if test $want_python = yes; then - AM_PATH_PYTHON - subdirs="${subdirs} python" +if test $want_cgi = yes; then + subdirs="${subdirs} cgi templates images" fi if test $want_gtk = yes; then subdirs="${subdirs} disobedience" @@ -83,7 +349,10 @@ if test $want_gtk = yes; then subdirs="${subdirs} images" fi fi -subdirs="${subdirs} tests" +if test $want_tests = yes && test $want_python = yes; then + AM_PATH_PYTHON([2.5]) + subdirs="${subdirs} python tests" +fi AC_SUBST([subdirs]) # libtool config @@ -92,27 +361,71 @@ 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]) + +AC_CHECK_PROGS([GROG],[grog]) +AM_CONDITIONAL([GROG],[test "x$GROG" != xnone]) + missing_libraries="" missing_headers="" missing_functions="" AC_DEFINE(_GNU_SOURCE, 1, [required for e.g. strsignal]) +AC_PATH_PROG([SENDMAIL],[sendmail],[none],[$PATH:/usr/sbin:/usr/lib]) + # 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_SUBST([finkdir]) AC_SUBST([finkbindir]) # Checks for libraries. @@ -126,8 +439,12 @@ AC_CHECK_LIB(gcrypt, gcry_md_open, AC_CHECK_LIB(pcre, pcre_compile, [AC_SUBST(LIBPCRE,[-lpcre])], [missing_libraries="$missing_libraries libpcre"]) -AC_CHECK_LIB([asound], [snd_pcm_open], - [AC_SUBST(LIBASOUND,[-lasound])]) +if test $want_alsa = yes; then + 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 ], [AC_SUBST(LIBDB,[-ldb])], @@ -149,10 +466,19 @@ 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"]) - 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 @@ -177,12 +503,18 @@ 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 -AC_CHECK_HEADERS([inttypes.h CoreAudio/AudioHardware.h sys/soundcard.h alsa/asoundlib.h linux/empeg.h]) +if test $want_oss = yes; then + AC_CHECK_HEADERS([sys/soundcard.h]) +fi +if test $want_alsa = yes; then + AC_CHECK_HEADERS([alsa/asoundlib.h]) +fi +if test $want_coreaudio = yes; then + AC_CHECK_HEADERS([CoreAudio/AudioHardware.h]) +fi +AC_CHECK_HEADERS([inttypes.h]) # We don't bother checking very standard stuff # Compilation will fail if any of these headers are missing, so we # check for them here and fail early. @@ -190,6 +522,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 \ @@ -197,11 +530,15 @@ AC_CHECK_HEADERS([dlfcn.h gcrypt.h \ 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]) 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 @@ -289,7 +626,7 @@ if test $ac_cv_type_long_long = yes; then AC_DEFINE([DECLARES_ATOLL],[1],[define if declares atoll]) fi fi -AC_CHECK_FUNCS([ioctl nl_langinfo strsignal],[:],[ +AC_CHECK_FUNCS([ioctl nl_langinfo strsignal setenv unsetenv],[:],[ missing_functions="$missing_functions $ac_func" ]) # fsync will do if fdatasync not available @@ -300,6 +637,10 @@ AC_CHECK_FUNCS([fdatasync],[:],[ if test ! -z "$missing_functions"; then AC_MSG_ERROR([missing functions:$missing_functions]) fi + +# Functions we can take or leave +AC_CHECK_FUNCS([fls]) + if test $want_server = yes; then # had better be version 3 or later AC_CACHE_CHECK([db.h version],[rjk_cv_db_version],[ @@ -311,19 +652,104 @@ 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 ], [rjk_cv_db_version=ok], [rjk_cv_db_version=inadequate]) + if test $rjk_cv_db_version = ok; then + AC_PREPROC_IFELSE([ + #include + #if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 6 + # error http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=510270 + #endif + ], + [rjk_cv_db_version=ok], + [rjk_cv_db_version=toxic]) + fi ]) - if test $rjk_cv_db_version != ok; then - AC_MSG_ERROR([need db.h version at least 4.2]) - fi + case $rjk_cv_db_version in + ok ) + ;; + inadequate ) + AC_MSG_ERROR([need db version at least 4.3 (but not 4.6)]) + ;; + toxic ) + AC_MSG_ERROR([db version 4.6.x does not work - see debian bug 510270]) + ;; + esac +fi + +AM_CONDITIONAL([SERVER], [test x$want_server = xyes]) +if test $want_gtk = yes; then + AC_DEFINE([WITH_GTK], [1], [define if using GTK+]) fi if test "x$GCC" = xyes; then + # We need LLONG_MAX and annoyingly GCC doesn't always give it to us + # by default. + AC_CACHE_CHECK([what C version to ask for],[rjk_cv_cstd],[ + AC_TRY_COMPILE([#include ],[ + long long n = LLONG_MAX; + ],[rjk_cv_cstd=default],[ + old_CC="$CC" + CC="${CC} -std=gnu99" + AC_TRY_COMPILE([#include ],[ + long long n = LLONG_MAX; + ],[rjk_cv_cstd=gnu99],[rjk_cv_cstd=unknown]) + CC="$old_CC" + ]) + ]) + case $rjk_cv_cstd in + default | unknown ) + ;; + * ) + CC="${CC} -std=${rjk_cv_cstd}" + ;; + esac + + # 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 + + 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 \ @@ -333,19 +759,26 @@ 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([#if WITH_GTK + #include +#endif + +struct s { int a, b; }; +const struct s sv = { .a = 1 };], + [], + [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" @@ -377,10 +810,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 @@ -388,19 +821,36 @@ AH_BOTTOM([#ifdef __GNUC__ #endif]) AC_CONFIG_FILES([Makefile - templates/Makefile images/Makefile scripts/Makefile lib/Makefile server/Makefile + cgi/Makefile clients/Makefile disobedience/Makefile + disobedience/manual/Makefile doc/Makefile + templates/Makefile plugins/Makefile driver/Makefile debian/Makefile sounds/Makefile python/Makefile examples/Makefile + libtests/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 +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 +# End: