diff -ru mugshot-1.1.24.orig/configure.ac mugshot-1.1.24/configure.ac
--- mugshot-1.1.24.orig/configure.ac	2006-11-09 13:16:43.339908368 -0500
+++ mugshot-1.1.24/configure.ac	2006-11-09 15:01:30.944047248 -0500
@@ -286,6 +286,15 @@
 ##
 ## Checks for Firefox build environment
 ##
+AC_ARG_ENABLE(firefox,
+	AC_HELP_STRING([--enable-firefox],
+		       [Build a Firefox extension [[default=yes]]]),
+	[case "${enableval}" in
+	  yes) firefox=true ;;
+	  no)  firefox=false ;;
+	  *)   AC_MSG_ERROR(bad value ${enableval} for --enable-firefox) ;;
+	 esac],[firefox=true])
+AM_CONDITIONAL(USE_FIREFOX, test "x$firefox" = xtrue)
 AC_ARG_WITH(gecko_sdk, 
 	AC_HELP_STRING([--with-gecko-sdk=DIR],
 		       [Path to Gecko SDK]))
@@ -302,6 +311,8 @@
 have_full_gecko=false
 sdk_includes_nspr=false
 
+if test "x$firefox" = xtrue ; then
+
 if test "x$with_gecko_sdk" != x -a "x$with_gecko_sdk" != xyes -a "x$with_gecko_sdk" != xno ; then
    GECKO_IDLDIR="$with_gecko_sdk/idl"
    GECKO_INCLUDEDIR="$with_gecko_sdk/include"
@@ -418,6 +429,10 @@
 # we use some private interfaces
 LIBHIPPOFIREFOX_LIBS="$LIBHIPPOFIREFOX_LIBS $NSPR_LIBS"
 
+else
+    AM_CONDITIONAL(HAVE_FULL_GECKO, false)
+fi
+
 #### define absolute path to srcdir for debugging-only code
 ABSOLUTE_TOP_SRCDIR=`cd ${srcdir} && pwd`
 AC_DEFINE_UNQUOTED(ABSOLUTE_TOP_SRCDIR, "$ABSOLUTE_TOP_SRCDIR", [full path to srcdir])
@@ -435,16 +450,17 @@
 
         prefix:                   ${prefix}
         compiler:                 ${CC}
+	build Firefox extension:  ${firefox}
 	xpidl:			  ${XPIDL}
 	Gecko includes:		  ${GECKO_INCLUDEDIR}
 	Gecko idl files:	  ${GECKO_IDLDIR}
 	Full Gecko:	  	  ${have_full_gecko}
-        LIBHIPPO_CFLAGS:          ${LIBHIPPO_CFLAGS}
-        MUGSHOT_CFLAGS:           ${MUGSHOT_CFLAGS}
-        LIBHIPPO_LIBS:            ${LIBHIPPO_LIBS}
-        MUGSHOT_LIBS:             ${MUGSHOT_LIBS}
+	LIBHIPPO_CFLAGS:          ${LIBHIPPO_CFLAGS}
+	MUGSHOT_CFLAGS:           ${MUGSHOT_CFLAGS}
+	LIBHIPPO_LIBS:            ${LIBHIPPO_LIBS}
+	MUGSHOT_LIBS:             ${MUGSHOT_LIBS}
 
-        Now type 'make' to build $PACKAGE
+	Now type 'make' to build $PACKAGE
 "
 
 if "$warn_about_curl_version" ; then
diff -ru mugshot-1.1.24.orig/Makefile.am mugshot-1.1.24/Makefile.am
--- mugshot-1.1.24.orig/Makefile.am	2006-11-09 13:16:43.354906088 -0500
+++ mugshot-1.1.24/Makefile.am	2006-11-09 15:15:54.183814856 -0500
@@ -34,8 +34,13 @@
 	  rmdir $(BUILT_SRC_DIR) ;		\
 	fi
 
+if USE_FIREFOX
 dist-hook: libhippo-dist-hook libhippoipc-dist-hook libhippofirefox-dist-hook mugshot-dist-hook
 .PHONY: libhippo-dist-hook libhippoipc-dist-hook libhippofirefox-dist-hook mugshot-dist-hook
+else
+dist-hook: libhippo-dist-hook libhippoipc-dist-hook mugshot-dist-hook
+.PHONY: libhippo-dist-hook libhippoipc-dist-hook mugshot-dist-hook
+endif
 
 # These are added to using += in the included files
 bin_PROGRAMS = 
diff -ru mugshot-1.1.24.orig/Makefile-libhippofirefox.am mugshot-1.1.24/Makefile-libhippofirefox.am
--- mugshot-1.1.24.orig/Makefile-libhippofirefox.am	2006-11-09 13:16:43.354906088 -0500
+++ mugshot-1.1.24/Makefile-libhippofirefox.am	2006-11-09 15:21:09.895819336 -0500
@@ -1,3 +1,4 @@
+if USE_FIREFOX
 FIREFOX_SRCDIR = $(COMMONSRCDIR)/firefox
 GECKO_PRIVATE_INCLUDEDIR=$(FIREFOX_SRCDIR)/gecko-private/include
 
@@ -158,3 +159,4 @@
 	cp $(GECKO_PRIVATE_IDL_FILES) $(distdir)/common-dist/firefox/gecko-private/idl
 	mkdir $(distdir)/common-dist/firefox/gecko-private/include
 	cp $(GECKO_PRIVATE_INCLUDE_FILES) $(distdir)/common-dist/firefox/gecko-private/include
+endif