# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-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])
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
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 ;;
*) AC_MSG_ERROR([unrecognized GStreamer version]) ;;
esac
PKG_CHECK_MODULES([GSTREAMER],
- [gstreamer-$v gstreamer-app-$v gstreamer-audio-$v],
+ [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
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])])
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.
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
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
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