X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/ed9292409297f93ea2df30f7e67e35a266acc548..HEAD:/configure.ac diff --git a/configure.ac b/configure.ac index 79778fd..fcec0af 100644 --- a/configure.ac +++ b/configure.ac @@ -18,13 +18,17 @@ # along with this program. If not, see . # -AC_INIT([disorder], [5.1.1], [rjk@greenend.org.uk]) +AC_INIT([disorder], [5.2], [mdw@distorted.org.uk]) AC_CONFIG_AUX_DIR([config.aux]) AM_INIT_AUTOMAKE([foreign]) AC_CONFIG_SRCDIR([server/disorderd.c]) AM_CONFIG_HEADER([config.h]) AC_CONFIG_MACRO_DIR([m4]) +m4_ifdef([AM_SILENT_RULES], + [AM_SILENT_RULES([yes])], + [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])]) + # Find host type AC_CANONICAL_HOST @@ -41,6 +45,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... # @@ -101,6 +106,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 @@ -192,7 +200,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 chromium google-chrome konqueror netscape; do if type $candidate >/dev/null 2>&1; then rjk_cv_browser="$candidate" break @@ -439,33 +447,52 @@ AC_SUBST([finkdir]) AC_SUBST([finkbindir]) # Checks for packages. -case $want_gstdecode in - yes | whatever) - PKG_CHECK_MODULES([GSTREAMER], [gstreamer-0.10], - [have_gstreamer=yes], [have_gstreamer=no]) - PKG_CHECK_MODULES([GSTREAMER_PLUGINS_BASE], - [gstreamer-plugins-base-0.10], - [have_gst_plugins_base=yes], [have_gst_plugins_base=no]) - ;; +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,yes,yes | yes,yes,yes) want_gstdecode=yes ;; - whatever,*) want_gstdecode=no ;; - yes,*) + whatever,no,* | whatever,*,no) + want_gstdecode=no + ;; + yes,no,* | yes,*,no) case $have_gstreamer in - no) missing_libraries="$missing_libraries gstreamer-0.10" ;; - esac - case $have_gst_plugins_base in - no) missing_libraries="$missing_libraries gstreamer-plugins-base-0.10" ;; + no) missing_libraries="$missing_libraries gstreamer" ;; esac + ;; + *) + want_gstdecode=yes + ;; esac mdw_SAVE_CFLAGS=$CFLAGS mdw_SAVE_LIBS=$LIBS -CFLAGS="$CFLAGS $GSTREAMER_CFLAGS $GSTREAMER_PLUGINS_BASE_CFLAGS" -LIBS="$LIBS \ - $GSTREAMER_LIBS $GSTREAMER_PLUGINS_BASE_LIBS - -lgstaudio-0.10 -lgstapp-0.10" +CFLAGS="$CFLAGS $GSTREAMER_CFLAGS" +LIBS="$LIBS $GSTREAMER_LIBS" AC_CHECK_FUNCS([gst_audio_info_from_caps]) CFLAGS=$mdw_SAVE_CFLAGS LIBS=$mdw_SAVE_LIBS @@ -475,13 +502,25 @@ LIBS=$mdw_SAVE_LIBS # 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])]) @@ -562,7 +601,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. @@ -573,10 +612,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 @@ -584,7 +629,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 @@ -910,6 +958,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