galeon r8965 - in trunk: . mozilla

[philipl svn gnome org]

Author: philipl
Date: Fri Jul  4 19:13:26 2008
New Revision: 8965
URL: http://svn.gnome.org/viewvc/galeon?rev=8965&view=rev

Log:
2008-07-04  Philip Langdale  <philipl alumni utexas net>

	* configure.in: Remove xpcomglue configure flag. This
	is obsolete now that we have proper pkgconfig support
	for xulrunner 1.9



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/mozilla/ContentHandler.cpp

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Jul  4 19:13:26 2008
@@ -276,13 +276,6 @@
 #  MOZILLA_COMPONENT_LIBS="$MOZILLA_COMPONENT_LIBS -lxul"
 #fi
 
-AC_ARG_ENABLE(libxpcomglue_s,
-	[  --enable-libxpcomglue_s Enable linking with libxpcomglue_s (needed for trunk builds)],,
-	enable_libxpcomglue_s=no)
-if test "x$enable_libxpcomglue_s" = "xyes"; then
-  MOZILLA_COMPONENT_LIBS="$MOZILLA_COMPONENT_LIBS -lxpcomglue_s"
-fi
-
 AC_SUBST(MOZILLA_COMPONENT_CFLAGS)
 AC_SUBST(MOZILLA_COMPONENT_LIBS)
 

Modified: trunk/mozilla/ContentHandler.cpp
==============================================================================
--- trunk/mozilla/ContentHandler.cpp	(original)
+++ trunk/mozilla/ContentHandler.cpp	Fri Jul  4 19:13:26 2008
@@ -298,7 +298,7 @@
 						   nsISupports *aWindowContext,
 						   const PRUnichar *aDefaultFile,
 						   const PRUnichar *aSuggestedFileExtension,
-#ifdef HAVE_NSINSIHELPERAPPLAUNCHERDIALOG_FORCEPROMPT
+#ifdef HAVE_NSIHELPERAPPLAUNCHERDIALOG_FORCEPROMPT
 						   PRBool aForcePrompt,
 #endif
 						   nsILocalFile **_retval)
@@ -309,7 +309,7 @@
 	GtkWidget *parentWindow = GaleonUtils::FindGtkParent (parentDOMWindow);
 
 	/* Get the directory to use for downloading into */
-#ifdef HAVE_NSINSIHELPERAPPLAUNCHERDIALOG_FORCEPROMPT
+#ifdef HAVE_NSIHELPERAPPLAUNCHERDIALOG_FORCEPROMPT
 	if (!eel_gconf_get_boolean (CONF_DOWNLOADING_ASK_DIR) && !aForcePrompt)
 #else
 	if (!eel_gconf_get_boolean (CONF_DOWNLOADING_ASK_DIR))