1 diff -urN aa/blam-1.6.0/configure.in blam-1.6.0/configure.in
2 --- blam-1.6.0.orig/configure.in 2004-10-23 15:12:46.000000000 +0200
3 +++ blam-1.6.0/configure.in 2004-11-01 19:44:12.709044680 +0100
8 - AC_HELP_STRING([--with-mozilla@<:@=mozilla|firefox|thunderbird@:>@],
9 - [Whether to use mozilla, firefox or thunderbird gtkmozembed (default: mozilla)]),
10 + AC_HELP_STRING([--with-mozilla@<:@=xulrunner|mozilla|firefox|thunderbird@:>@],
11 + [Whether to use xulrunner, mozilla, firefox or thunderbird gtkmozembed (default: xulrunner)]),
14 dnl try to autodetect: if mozilla exists, use it, else try firefox, then thunderbird
15 if test "x$MOZILLA" = "x"; then
16 - if pkg-config --exists mozilla-gtkmozembed; then
17 + if pkg-config --exists xulrunner-gtkmozembed; then
19 + elif pkg-config --exists mozilla-gtkmozembed; then
21 elif pkg-config --exists firefox-gtkmozembed; then
25 AC_MSG_ERROR([no mozilla installation found])
27 -elif test "x$with_mozilla" != "xmozilla" -a "x$with_mozilla" != "xfirefox" -a "x$with_mozilla" != "xthunderbird"; then
28 +elif test "x$with_mozilla" != "xxulrunner" -a "x$with_mozilla" != "xmozilla" -a "x$with_mozilla" != "xfirefox" -a "x$with_mozilla" != "xthunderbird"; then
29 AC_MSG_ERROR([unknown mozilla name ($MOZILLA)])
33 AC_MSG_RESULT([$MOZILLA])
36 +xulrunner) min_version=1.8 flavour=toolkit ;;
37 mozilla) min_version=1.7 flavour=mozilla ;;
38 firefox) min_version=0.10 flavour=toolkit ;;
39 thunderbird) min_version=0.8 flavour=toolkit ;;
41 MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-gtkmozembed`"
42 AC_SUBST(MOZILLA_INCLUDE_ROOT)
44 -MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $MOZILLA-gtkmozembed`"
45 +MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $MOZILLA-plugin`"
46 AC_SUBST(MOZILLA_HOME)
48 MOZILLA_PREFIX="`$PKG_CONFIG --variable=prefix $MOZILLA-gtkmozembed`"