X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/0b29fd3d4584bdaee16b1289fc19b43fac5eb285..9db4c365d579ae79d0d14fca218d61573d2f7379:/configure.ac diff --git a/configure.ac b/configure.ac index dd46045..023aa9d 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-2013 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,7 +18,7 @@ # along with this program. If not, see . # -AC_INIT([disorder], [5.1.1], [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([foreign]) AC_CONFIG_SRCDIR([server/disorderd.c]) @@ -33,6 +33,7 @@ want_gtk=yes want_python=yes want_tests=yes want_server=yes +want_gstdecode=whatever want_cgi=yes # APIs we want @@ -40,6 +41,7 @@ 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... # @@ -100,6 +102,9 @@ 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 @@ -164,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 db47; do + for db in db43 db44 db45 db47 db48; do if test -e /usr/local/lib/$db; then rjk_cv_libdb=$db break @@ -175,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]) @@ -189,7 +196,7 @@ AC_ARG_WITH([browser], 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 + for candidate in sensible-browser x-www-browser firefox mozilla konqueror netscape; do if type $candidate >/dev/null 2>&1; then rjk_cv_browser="$candidate" break @@ -248,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 # @@ -278,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 \ @@ -294,9 +306,6 @@ if test $want_cgi = yes; then 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 @@ -305,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 \ @@ -321,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 @@ -339,7 +345,7 @@ if test -z "$dochtmldir"; then fi AC_SUBST([dochtmldir]) -subdirs="scripts lib" +subdirs="scripts common lib" if test $want_tests = yes; then subdirs="${subdirs} libtests" fi @@ -436,17 +442,81 @@ 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])]) @@ -527,7 +597,7 @@ if test $want_coreaudio = yes; then AC_CHECK_HEADERS([CoreAudio/AudioHardware.h]) fi AC_CHECK_HEADERS([inttypes.h sys/time.h sys/socket.h netinet/in.h \ - arpa/inet.h sys/un.h netdb.h pcre.h pwd.h langinfo.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. @@ -538,10 +608,16 @@ if test $want_server = yes; then 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 @@ -549,7 +625,10 @@ if test ! -z "$missing_headers"; then 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 @@ -576,24 +655,6 @@ fi old_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} $gcc_werror" AC_CHECK_TYPES([long long,uint32_t,uint16_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 - CFLAGS="${old_CFLAGS}" # gcrypt maintainers keep changing everything. Design your interface @@ -661,6 +722,13 @@ 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 getfsstat closesocket]) @@ -710,6 +778,26 @@ 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 @@ -848,6 +936,7 @@ AH_BOTTOM([#ifdef __GNUC__ AC_CONFIG_FILES([Makefile images/Makefile scripts/Makefile + common/Makefile lib/Makefile server/Makefile cgi/Makefile @@ -865,6 +954,16 @@ 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