From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 20 Jul 2018 10:44:20 +0000 (+0100)
Subject: configure.ac, debian/rules: Use `sensible-browser' by default.
X-Git-Tag: 5.2~19
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/9db4c365d579ae79d0d14fca218d61573d2f7379

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

Use this rather than `x-www-browser' because the former can be
influenced by individual users by setting `BROWSER', while the latter
uses a symlink set by the system administrator and ignores individual
user preferences.
---

diff --git a/configure.ac b/configure.ac
index 3b0429f..023aa9d 100644
--- 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
-  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
diff --git a/debian/rules b/debian/rules
index 435f6e2..3e75989 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ export LC_ALL		 = C.UTF-8
 
 cgiexecdir		 = /usr/lib/cgi-bin
 httpdir			 = /var/www
-browser			 = x-www-browser
+browser			 = sensible-browser
 
 override_dh_auto_configure:
 	[ -f configure ] || ./autogen.sh