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 3b0429f35ac3dc5ce4014e9ef113f7c60d177451..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
-  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 435f6e28b3702764e58ebd17f79e18751ce05e46..3e75989edb09d58d9986e1ed9e91195c5f1ab0f5 100755 (executable)
--- 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