diff -r c0f37eff7ea6 config/autoconf.mk.in
--- a/config/autoconf.mk.in	Tue Sep 02 13:32:27 2008 -0700
+++ b/config/autoconf.mk.in	Tue Sep 02 20:28:15 2008 -0400
@@ -622,9 +622,8 @@ WINCE		= @WINCE@
 
 MOZ_DISTRIBUTION_ID = @MOZ_DISTRIBUTION_ID@
 
-NS_HILDON	= @NS_HILDON@
 NS_OSSO 	= @NS_OSSO@
-
+MOZ_WIDGET_GTK_MAEMO = @MOZ_WIDGET_GTK_MAEMO@ 
 
 MACOS_SDK_DIR	= @MACOS_SDK_DIR@
 NEXT_ROOT	= @NEXT_ROOT@
diff -r c0f37eff7ea6 configure.in
--- a/configure.in	Tue Sep 02 13:32:27 2008 -0700
+++ b/configure.in	Tue Sep 02 20:28:15 2008 -0400
@@ -6084,13 +6084,13 @@ AC_SUBST(JS_ULTRASPARC_OPTS)
 AC_SUBST(JS_ULTRASPARC_OPTS)
 
 dnl ========================================================
-dnl = Hildon and OSSO checks
-dnl ========================================================
-PKG_CHECK_MODULES(LIBHILONMIME,libhildonmime,
-                  NS_HILDON=1,
-                  NS_HILDON=)
-if test $NS_HILDON; then
-   AC_DEFINE(NS_HILDON)
+dnl = Maemo Gtk (Hildon) and OSSO checks
+dnl ========================================================
+PKG_CHECK_MODULES(LIBHILDONMIME,libhildonmime,
+                  MOZ_WIDGET_GTK_MAEMO=1,
+                  MOZ_WIDGET_GTK_MAEMO=)
+if test $MOZ_WIDGET_GTK_MAEMO; then
+   AC_DEFINE(MOZ_WIDGET_GTK_MAEMO)
 fi
 
 PKG_CHECK_MODULES(LIBOSSO,libosso,
@@ -7829,7 +7829,7 @@ AC_SUBST(MOZ_GFX_TOOLKIT)
 AC_SUBST(MOZ_GFX_TOOLKIT)
 AC_SUBST(MOZ_UPDATE_XTERM)
 AC_SUBST(MINIMO)
-AC_SUBST(NS_HILDON)
+AC_SUBST(MOZ_WIDGET_GTK_MAEMO)
 AC_SUBST(NS_OSSO)
 AC_SUBST(MOZ_AUTH_EXTENSION)
 AC_SUBST(MOZ_MATHML)