configure.ac, debian/rules: Use `sensible-browser' by default.

[disorder] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9a6bf70c6373743a6a4aad70a836d3ac6c1b5f9e..023aa9de37c35f15f77eb1a1d68213fc4b0fc718 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -196,7 +196,7 @@ AC_ARG_WITH([browser],
 
 AC_CACHE_CHECK([default HTML viewer],[rjk_cv_browser],[
   rjk_cv_browser=UNKNOWN
 
 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
     if type $candidate >/dev/null 2>&1; then
       rjk_cv_browser="$candidate"
       break


@@ -455,6 +455,7 @@ AH_TEMPLATE([HAVE_GSTREAMER_0_10],
 AH_TEMPLATE([HAVE_GSTREAMER_1_0],
     [Define if building against GStreamer 1.0])
 
 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 ;;
 for i in $want_gstreamer; do
   case $i in
     0.10) v=0.10 V=0_10 ;;


@@ -462,10 +463,11 @@ for i in $want_gstreamer; do
     *) AC_MSG_ERROR([unrecognized GStreamer version]) ;;
   esac
   PKG_CHECK_MODULES([GSTREAMER],
     *) 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])
       [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
 
   break
 done
 


@@ -503,9 +505,18 @@ LIBS=$mdw_SAVE_LIBS
 AC_CHECK_LIB(gcrypt, gcry_md_open,
              [AC_SUBST(LIBGCRYPT,[-lgcrypt])],
             [missing_libraries="$missing_libraries libgcrypt"])
 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])])
 if test $want_alsa = yes; then
   AC_CHECK_LIB([asound], [snd_pcm_open],
                [AC_SUBST(LIBASOUND,[-lasound])])


@@ -586,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 \
   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.
 # 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.


@@ -597,10 +608,16 @@ if test $want_server = yes; then
 fi
 AC_CHECK_HEADERS([dlfcn.h gcrypt.h \
                 getopt.h iconv.h langinfo.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"
 ])
                 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_CHECK_HEADERS([samplerate.h])
 
 if test ! -z "$missing_headers"; then


@@ -608,7 +625,10 @@ if test ! -z "$missing_headers"; then
 fi
 
 # We require that libpcre support UTF-8
 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
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST


@@ -934,6 +954,16 @@ AC_CONFIG_FILES([Makefile
                 tests/Makefile])
 AC_OUTPUT
 
                 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 $GCC = yes && test "$gcc_werror" = ''; then
   AC_MSG_WARN([building without -Werror])
 fi