--- blam-1.8.3/configure.in.firefox 2006-11-17 01:06:40.000000000 +0100 +++ blam-1.8.3/configure.in 2006-11-29 20:04:46.000000000 +0100 @@ -78,16 +78,16 @@ MOZILLA= AC_ARG_WITH([mozilla], - AC_HELP_STRING([--with-mozilla@<:@=mozilla|firefox|thunderbird|xulrunner|seamonkey@:>@], - [Whether to use mozilla, firefox, thunderbird, xulrunner or seamonkey gtkmozembed (default: mozilla)]), + AC_HELP_STRING([--with-mozilla@<:@=mozilla|mozilla-firefox|thunderbird|xulrunner|seamonkey@:>@], + [Whether to use mozilla, mozilla-firefox, thunderbird, xulrunner or seamonkey gtkmozembed (default: mozilla)]), [MOZILLA="$withval"]) -dnl try to autodetect: if mozilla exists, use it, else try firefox, then thunderbird, then the rest +dnl try to autodetect: if mozilla exists, use it, else try mozilla-firefox, then thunderbird, then the rest if test "x$MOZILLA" = "x"; then if pkg-config --exists mozilla-gtkmozembed; then MOZILLA=mozilla - elif pkg-config --exists firefox-gtkmozembed; then - MOZILLA=firefox + elif pkg-config --exists mozilla-firefox-gtkmozembed; then + MOZILLA=mozilla-firefox elif pkg-config --exists thunderbird-gtkmozembed; then MOZILLA=thunderbird elif pkg-config --exists xulrunner-gtkmozembed; then @@ -97,7 +97,7 @@ else AC_MSG_ERROR([no mozilla installation found]) fi -elif test "x$with_mozilla" != "xmozilla" -a "x$with_mozilla" != "xfirefox" -a "x$with_mozilla" != "xthunderbird"-a "x$with_mozilla" != "xxulrunner"-a "x$with_mozilla" != "xseamonkey"; then +elif test "x$with_mozilla" != "xmozilla" -a "x$with_mozilla" != "xmozilla-firefox" -a "x$with_mozilla" != "xthunderbird"-a "x$with_mozilla" != "xxulrunner"-a "x$with_mozilla" != "xseamonkey"; then AC_MSG_ERROR([unknown mozilla name ($MOZILLA)]) fi @@ -107,7 +107,7 @@ case "$MOZILLA" in mozilla) min_version=1.7 flavour=mozilla ;; -firefox) min_version=0.10 flavour=toolkit ;; +mozilla-firefox) min_version=0.10 flavour=toolkit ;; thunderbird) min_version=0.8 flavour=toolkit ;; xulrunner) min_version=1.8 flavour=toolkit ;; seamonkey) min_version=1.0 flavour=mozilla ;;