Add support for building gtk widget as part of mozilla builds.

allmakefiles.sh

@@ -327,6 +327,7 @@ webshell/src/Makefile
 webshell/tests/Makefile
 webshell/tests/viewer/Makefile
 webshell/tests/viewer/public/Makefile
+webshell/embed/Makefile
 widget/Makefile
 widget/public/Makefile
 widget/src/Makefile

config/autoconf.mk.in

@@ -53,6 +53,9 @@ STANDALONE_IMAGE_LIB = @STANDALONE_IMAGE_LIB@
 
 USE_STRING2 = @USE_STRING2@
 
+MOZ_ENABLE_GTK_MOZILLA     = @MOZ_ENABLE_GTK_MOZILLA@
+MOZ_BUILD_ROOT             = @MOZ_BUILD_ROOT@
+
 MOZ_NATIVE_ZLIB	= @SYSTEM_ZLIB@
 MOZ_NATIVE_JPEG	= @SYSTEM_JPEG@
 MOZ_NATIVE_PNG	= @SYSTEM_PNG@

configure.in

@@ -1269,6 +1269,19 @@ MOZ_ARG_ENABLE_BOOL(brprof,
   MOZ_BRPROF=1
   AC_DEFINE(MOZ_BRPROF))
 
+dnl ========================================================
+dnl =
+dnl = GtkMozilla support
+dnl = 
+dnl ========================================================
+MOZ_ENABLE_GTK_MOZILLA=
+
+MOZ_ARG_ENABLE_BOOL(gtk-mozilla,
+[  --enable-gtk-mozilla           Enable building of GtkMozilla GTK+ widget],
+  MOZ_ENABLE_GTK_MOZILLA=1 MOZ_BUILD_ROOT=`pwd`)
+dnl ========================================================
+
+
 dnl ========================================================
 dnl =
 dnl = Compiler Options
@@ -1583,6 +1596,8 @@ AC_SUBST(FULL_STATIC_BUILD)
 AC_SUBST(NO_UNIX_LDAP)
 AC_SUBST(BUILD_XPIDL)
 AC_SUBST(BUILD_IDLC)
+AC_SUBST(MOZ_ENABLE_GTK_MOZILLA)
+AC_SUBST(MOZ_BUILD_ROOT)
 
 dnl system JPEG support
 dnl ========================================================

webshell/Makefile.in

@@ -24,4 +24,8 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS		= public src tests
 
+ifdef MOZ_ENABLE_GTK_MOZILLA
+DIRS        += embed
+endif
+
 include $(topsrcdir)/config/rules.mk

webshell/embed/Makefile.in

@@ -0,0 +1,44 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+##
+## This does not work, cause GtkMozilla does not use the mozilla build
+## system.
+##
+## ifdef MOZ_ENABLE_GTK_MOZILLA
+## DIRS		+= gtk
+## endif
+
+all:: export libs install
+export::
+libs::
+depend::
+
+install::
+	@cd gtk ; ./configure --prefix=$(MOZ_BUILD_ROOT)/dist --with-mozilla=$(MOZ_BUILD_ROOT) ; $(MAKE) ; cd ..
+
+clobber::
+	@cd gtk ; $(MAKE) clean ; cd ..
+
+include $(topsrcdir)/config/rules.mk