X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/419893d77041c006cb22eeaa189f9797773fbdc1..5dcfc065d123f6643b12ed1766c7976e58b6941a:/configure.ac
diff --git a/configure.ac b/configure.ac
index 0f8f91c..3b0429f 100644
--- 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-2008 Richard Kettlewell
+# Copyright (C) 2004-2014 Richard Kettlewell
# Portions copyright (C) 2007 Ross Younger
#
# This program is free software: you can redistribute it and/or modify
@@ -18,11 +18,12 @@
# along with this program. If not, see .
#
-AC_INIT([disorder], [4.2+], [richard+disorder@sfere.greenend.org.uk])
+AC_INIT([disorder], [5.1.1], [rjk@greenend.org.uk])
AC_CONFIG_AUX_DIR([config.aux])
-AM_INIT_AUTOMAKE(disorder, [4.2+])
+AM_INIT_AUTOMAKE([foreign])
AC_CONFIG_SRCDIR([server/disorderd.c])
AM_CONFIG_HEADER([config.h])
+AC_CONFIG_MACRO_DIR([m4])
# Find host type
AC_CANONICAL_HOST
@@ -32,15 +33,35 @@ want_gtk=yes
want_python=yes
want_tests=yes
want_server=yes
+want_gstdecode=whatever
want_cgi=yes
# APIs we want
want_alsa=yes
want_oss=yes
want_coreaudio=yes
+want_pulseaudio=yes
+want_gstreamer=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)
+# - drag and drop doesn't work
+#
+# 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
@@ -61,6 +82,10 @@ AC_ARG_WITH([alsa],
[AS_HELP_STRING([--without-alsa],
[do not build with ALSA support])],
[want_alsa=$withval])
+AC_ARG_WITH([pulseaudio],
+ [AS_HELP_STRING([--without-pulseaudio],
+ [do not build with PulseAudio support])],
+ [want_pulseaudio=$withval])
AC_ARG_WITH([oss],
[AS_HELP_STRING([--without-oss],
[do not build with OSS support])],
@@ -73,6 +98,13 @@ 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_ARG_WITH([gstreamer],
+ [AS_HELP_STRING([--with-gstreamer], [select GStreamer version])],
+ [want_gstreamer=$withval])
AC_MSG_CHECKING([for a known target platform])
case "$host" in
@@ -87,11 +119,15 @@ case "$host" in
;;
*linux* | *Linux* )
AC_MSG_RESULT([Linux])
+ AC_DEFINE_UNQUOTED([PATH_PROC_MOUNTS],["/proc/mounts"],[path to kernel mount list])
;;
*-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])
@@ -117,9 +153,11 @@ case "$host" in
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* )
@@ -131,7 +169,7 @@ case "$host" in
# 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
+ for db in db43 db44 db45 db47 db48; do
if test -e /usr/local/lib/$db; then
rjk_cv_libdb=$db
break
@@ -142,6 +180,8 @@ case "$host" in
LDFLAGS="${LDFLAGS} -L/usr/local/lib/$rjk_cv_libdb"
CPPFLAGS="${CPPFLAGS} -isystem /usr/local/include/$rjk_cv_libdb"
fi
+ # iconv needs bodging
+ AC_SUBST(LIBICONV,[-liconv])
;;
* )
AC_MSG_RESULT([unknown, winging it])
@@ -188,7 +228,7 @@ AC_CACHE_CHECK([sox version],[rjk_cv_soxver],[
AC_CACHE_CHECK([default sox generation],[rjk_cv_soxgen],[
case $rjk_cv_soxver in
- [0-9].* | 1[0123].* )
+ [[0-9]].* | 1[[0123]].* )
rjk_cv_soxgen=0
;;
* )
@@ -215,9 +255,14 @@ AC_ARG_WITH([python],
[AS_HELP_STRING([--without-python],
[do not build Python support])],
[want_python=$withval])
+AC_ARG_WITH([gstdecode],
+ [AS_HELP_STRING([--with-gstdecode],
+ [require GStreamer-based decoder])],
+ [want_gstdecode=$withval])
if test $want_server = no; then
want_cgi=no
+ want_gstdecode=no
fi
#
@@ -245,7 +290,7 @@ fi
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"
+ rjk_cv_httpdir="/usr/local/apache/htdocs"
for dir in /var/www/html \
/var/www/htdocs \
/var/www/localhost/htdocs \
@@ -261,9 +306,6 @@ if test $want_cgi = yes; then
fi
done
])
- if test "$rjk_cv_cgiexecdir" = "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
@@ -272,7 +314,7 @@ if test $want_cgi = yes; then
fi
if test -z "$cgiexecdir"; then
AC_CACHE_CHECK([for CGI directory],[rjk_cv_cgiexecdir],[
- rjk_cv_cgiexecdir="not found"
+ rjk_cv_cgiexecdir="/usr/lib/cgi-bin"
for dir in /usr/lib/cgi-bin \
/Library/WebServer/CGI-Executables \
/srv/www/cgi-bin \
@@ -288,9 +330,6 @@ if test $want_cgi = yes; then
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
@@ -301,14 +340,19 @@ if test -z "$pkghttpdir"; then
fi
AC_SUBST([pkghttpdir])
-subdirs="scripts lib"
+if test -z "$dochtmldir"; then
+ dochtmldir='$(docdir)/html'
+fi
+AC_SUBST([dochtmldir])
+
+subdirs="scripts common 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 sounds"
+ subdirs="${subdirs} server plugins sounds"
fi
if test $want_cgi = yes; then
subdirs="${subdirs} cgi templates images"
@@ -320,7 +364,7 @@ if test $want_gtk = yes; then
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])
@@ -359,37 +403,133 @@ 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 packages.
+case $want_gstdecode,$want_gstreamer in
+ yes,no) AC_MSG_ERROR([gstdecode requires GStreamer]) ;;
+ whatever,no) want_gstdecode=no ;;
+ no,*) want_gstreamer=no ;;
+ *,yes) want_gstreamer="1.0 0.10" ;;
+esac
+
+AH_TEMPLATE([HAVE_GSTREAMER_0_10],
+ [Define if building against GStreamer 0.10])
+AH_TEMPLATE([HAVE_GSTREAMER_1_0],
+ [Define if building against GStreamer 1.0])
+
+mdw_gstreamer_version=nil
+for i in $want_gstreamer; do
+ case $i in
+ 0.10) v=0.10 V=0_10 ;;
+ 1.0) v=1.0 V=1_0 ;;
+ *) AC_MSG_ERROR([unrecognized GStreamer version]) ;;
+ esac
+ PKG_CHECK_MODULES([GSTREAMER],
+ [gstreamer-$v gstreamer-app-$v gstreamer-audio-$v gstreamer-pbutils-$v],
+ [have_gstreamer=$v], [have_gstreamer=no])
+ case $have_gstreamer in no) continue ;; esac
+ AC_DEFINE_UNQUOTED([HAVE_GSTREAMER_$V], [1])
+ mdw_gstreamer_version=$v
+ break
+done
+
+case $want_gstdecode,$have_gstreamer,$have_gst_plugins_base in
+ whatever,no,* | whatever,*,no)
+ want_gstdecode=no
+ ;;
+ yes,no,* | yes,*,no)
+ case $have_gstreamer in
+ no) missing_libraries="$missing_libraries gstreamer" ;;
+ esac
+ ;;
+ *)
+ want_gstdecode=yes
+ ;;
+esac
+
+mdw_SAVE_CFLAGS=$CFLAGS
+mdw_SAVE_LIBS=$LIBS
+CFLAGS="$CFLAGS $GSTREAMER_CFLAGS"
+LIBS="$LIBS $GSTREAMER_LIBS"
+AC_CHECK_FUNCS([gst_audio_info_from_caps])
+CFLAGS=$mdw_SAVE_CFLAGS
+LIBS=$mdw_SAVE_LIBS
+
# Checks for libraries.
# We save up a list of missing libraries that we can't do without
# and report them all at once.
AC_CHECK_LIB(gc, GC_malloc, [AC_SUBST(LIBGC,[-lgc])],
[missing_libraries="$missing_libraries libgc"])
+mdw_SAVE_LIBS=$LIBS
+LIBS="$LIBS $LIBGC"
+AC_CHECK_FUNCS(GC_get_all_interior_pointers)
+LIBS=$mdw_SAVE_LIBS
AC_CHECK_LIB(gcrypt, gcry_md_open,
[AC_SUBST(LIBGCRYPT,[-lgcrypt])],
[missing_libraries="$missing_libraries libgcrypt"])
-AC_CHECK_LIB(pcre, pcre_compile,
- [AC_SUBST(LIBPCRE,[-lpcre])],
- [missing_libraries="$missing_libraries libpcre"])
+PKG_CHECK_MODULES([PCRE2], [libpcre2-8], [have_pcre2=yes], [have_pcre2=no])
+case $have_pcre2 in
+ yes)
+ CFLAGS="$CFLAGS $PCRE2_CFLAGS" LIBPCRE=$PCRE2_LIBS
+ AC_DEFINE([HAVE_LIBPCRE2], [1], [Define if building with libpcre2.])
+ ;;
+ no)
+ AC_CHECK_LIB(pcre, pcre_compile,
+ [AC_SUBST(LIBPCRE,[-lpcre])],
+ [missing_libraries="$missing_libraries libpcre"])
+ ;;
+esac
if test $want_alsa = yes; then
AC_CHECK_LIB([asound], [snd_pcm_open],
[AC_SUBST(LIBASOUND,[-lasound])])
fi
+if test $want_pulseaudio = yes; then
+ PKG_CHECK_MODULES([PULSEAUDIO],[libpulse],
+ [AC_DEFINE([HAVE_PULSEAUDIO],[1],[define to 1 for PulseAudio support])],
+ [missing_libraries="$missing_libraries libpulse"])
+ PKG_CHECK_MODULES([PULSEAUDIO_SIMPLE],[libpulse-simple],,
+ [missing_libraries="$missing_libraries libpulse-simple"])
+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])],
@@ -404,9 +544,6 @@ if test $want_server = yes; then
AC_CHECK_LIB(mad, mad_stream_init,
[AC_SUBST(LIBMAD,[-lmad])],
[missing_libraries="$missing_libraries libmad"])
- AC_CHECK_LIB([ao], [ao_initialize],
- [AC_SUBST(LIBAO,[-lao])],
- [missing_libraries="$missing_libraries libao"])
AC_CHECK_LIB([FLAC], [FLAC__stream_decoder_new],
[AC_SUBST(LIBFLAC,[-lFLAC])],
[missing_libraries="$missing_libraries libFLAC"])
@@ -416,8 +553,14 @@ AC_CHECK_LIB([pthread], [pthread_create],
[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
@@ -453,7 +596,8 @@ fi
if test $want_coreaudio = yes; then
AC_CHECK_HEADERS([CoreAudio/AudioHardware.h])
fi
-AC_CHECK_HEADERS([inttypes.h])
+AC_CHECK_HEADERS([inttypes.h sys/time.h sys/socket.h netinet/in.h \
+ arpa/inet.h sys/un.h netdb.h pwd.h langinfo.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.
@@ -461,21 +605,30 @@ 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 \
- pcre.h sys/ioctl.h \
+ sys/ioctl.h \
syslog.h unistd.h],[:],[
missing_headers="$missing_headers $ac_header"
])
+case $have_pcre2 in
+ no)
+ AC_CHECK_HEADERS([pcre.h], [:],
+ [missing_headers="$missing_headers $ac_header"])
+ ;;
+esac
+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])
+case $have_pcre2 in
+ yes) RJK_REQUIRE_PCRE2_UTF8([$PCRE2_CFLAGS], [$PCRE2_LIBS]) ;;
+ no) RJK_REQUIRE_PCRE_UTF8([-lpcre]) ;;
+esac
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
@@ -485,29 +638,23 @@ AC_C_BIGENDIAN
AC_CHECK_TYPES([struct sockaddr_in6],,,[AC_INCLUDES_DEFAULT
#include ])
+# Figure out how we'll check for devices being mounted and unmounted
+AC_CACHE_CHECK([for list of mounted filesystems],[rjk_cv_mtab],[
+ if test -e /etc/mtab; then
+ rjk_cv_mtab=/etc/mtab
+ else
+ rjk_cv_mtab=none
+ fi
+])
+if test $rjk_cv_mtab != none; then
+ AC_DEFINE_UNQUOTED([PATH_MTAB],["$rjk_cv_mtab"],[path to file containing mount list])
+fi
+
# enable -Werror when we check for certain characteristics:
old_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} $gcc_werror"
-AC_CHECK_TYPES([long long,uint32_t,uint8_t,intmax_t,uintmax_t])
-
-# Some GCC invocations warn for converting function pointers to void *.
-# This is fair enough, as it's technically forbidden, but we use dlsym()
-# which can pretty much only exist if object and function pointers are
-# interconvertable. So we disable -Werror if need be.
-if test ! -z "$gcc_werror"; then
- AC_CACHE_CHECK([whether function pointers can be converted to void * without a warning],
- [rjk_cv_function_pointer_cast],[
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT
- void somefunction(void);],
- [(void *)somefunction])],
- [rjk_cv_function_pointer_cast=yes],
- [rjk_cv_function_pointer_cast=no])])
- if test $rjk_cv_function_pointer_cast = no; then
- gcc_werror=""
- fi
-fi
-
+AC_CHECK_TYPES([long long,uint32_t,uint16_t,uint8_t,intmax_t,uintmax_t])
CFLAGS="${old_CFLAGS}"
# gcrypt maintainers keep changing everything. Design your interface
@@ -575,14 +722,21 @@ AC_CHECK_FUNCS([fdatasync],[:],[
if test ! -z "$missing_functions"; then
AC_MSG_ERROR([missing functions:$missing_functions])
fi
+# dlsym will do if dlfunc not available
+AC_CHECK_FUNCS([dlfunc],[:],[
+ AC_DEFINE([dlfunc],[dlsym],[define dlfunc to dlsym if not available])
+])
+if test ! -z "$missing_functions"; then
+ AC_MSG_ERROR([missing functions:$missing_functions])
+fi
# Functions we can take or leave
-AC_CHECK_FUNCS([fls])
+AC_CHECK_FUNCS([fls getfsstat closesocket])
if test $want_server = yes; then
# had better be version 3 or later
AC_CACHE_CHECK([db.h version],[rjk_cv_db_version],[
- AC_PREPROC_IFELSE([
+ AC_PREPROC_IFELSE([AC_LANG_PROGRAM([
#include
#ifndef DB_VERSION_MAJOR
# error cannot determine db version
@@ -593,19 +747,57 @@ if test $want_server = yes; then
#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([AC_LANG_PROGRAM([
+ #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
+AM_CONDITIONAL([GTK], [test x$want_gtk = xyes])
+AM_CONDITIONAL([GSTDECODE], [test x$want_gstdecode = xyes])
+
+# Some GCC invocations warn for converting function pointers to void *.
+# This is fair enough, as it's technically forbidden, but we use dlsym()
+# which can pretty much only exist if object and function pointers are
+# interconvertable. So we disable -Werror if need be.
+if test ! -z "$gcc_werror" && test "$ac_cv_func_dlfunc" != yes; then
+ CFLAGS="${CFLAGS} $gcc_werror"
+ AC_CACHE_CHECK([whether function pointers can be converted to void * without a warning],
+ [rjk_cv_function_pointer_cast],[
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT
+ void somefunction(void);],
+ [(void *)somefunction])],
+ [rjk_cv_function_pointer_cast=yes],
+ [rjk_cv_function_pointer_cast=no])])
+ if test $rjk_cv_function_pointer_cast = no; then
+ gcc_werror=""
+ fi
+ CFLAGS="${old_CFLAGS}"
+fi
if test "x$GCC" = xyes; then
# We need LLONG_MAX and annoyingly GCC doesn't always give it to us
@@ -636,13 +828,13 @@ if test "x$GCC" = xyes; then
if test $GCC = yes; then
CC="$CC -Wall -Werror"
fi
- AC_COMPILE_IFELSE([
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
static int x(char *f) {
return *f;
}
int z(const char *g) {
return x((char *)g);
- }],
+ }],[])],
[rjk_cv_pr29478=no],
[rjk_cv_pr29478=yes]
)
@@ -652,8 +844,27 @@ if test "x$GCC" = xyes; 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([AC_LANG_PROGRAM([],[
+ 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 \
+ CC="${CC} -Wall -W -Wpointer-arith \
-Wwrite-strings -Wmissing-prototypes \
-Wmissing-declarations -Wnested-externs"
@@ -725,15 +936,16 @@ AH_BOTTOM([#ifdef __GNUC__
AC_CONFIG_FILES([Makefile
images/Makefile
scripts/Makefile
+ common/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
@@ -742,12 +954,25 @@ AC_CONFIG_FILES([Makefile
tests/Makefile])
AC_OUTPUT
+# A hack: communicate our selection of GStreamer version back to the
+# Debian packaging machinery so that it can build the right dependencies.
+echo '### extra control substitutions for Debian' >debian/substvars.auto.new
+case $mdw_gstreamer_version in
+ nil) ;;
+ *) echo >>debian/substvars.auto.new \
+ "disorder:GstVersion=gstreamer$mdw_gstreamer_version" ;;
+esac
+mv debian/substvars.auto.new debian/substvars.auto
+
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