зеркало из https://github.com/mozilla/pjs.git
remove the old webshell based gtk embedding widget from the build. also, add the new gtk embedding widget makefiles to allmakefiles.sh. r=leaf
This commit is contained in:
Родитель
a66c3f2998
Коммит
31f5ab0f46
|
@ -448,12 +448,6 @@ webshell/tests/viewer/unix/motif/Makefile
|
|||
webshell/tests/viewer/unix/qt/Makefile
|
||||
webshell/tests/viewer/unix/xlib/Makefile
|
||||
webshell/embed/Makefile
|
||||
webshell/embed/xlib/Makefile
|
||||
webshell/embed/xlib/gtk/Makefile
|
||||
webshell/embed/xlib/motif/Makefile
|
||||
webshell/embed/xlib/qt/Makefile
|
||||
webshell/embed/xlib/xt/Makefile
|
||||
webshell/embed/gtk/mozilla_config.mk
|
||||
widget/Makefile
|
||||
widget/public/Makefile
|
||||
widget/src/Makefile
|
||||
|
@ -641,6 +635,9 @@ embedding/browser/Makefile
|
|||
embedding/browser/build/Makefile
|
||||
embedding/browser/webBrowser/Makefile
|
||||
embedding/browser/setup/Makefile
|
||||
embedding/browser/gtk/Makefile
|
||||
embedding/browser/gtk/src/Makefile
|
||||
embedding/browser/gtk/tests/Makefile
|
||||
|
||||
# Security Makefiles
|
||||
security/Makefile
|
||||
|
|
|
@ -82,7 +82,6 @@ NS_MT_SUPPORTED = 1
|
|||
MOZ_POST_DSO_LIB_COMMAND = @MOZ_POST_DSO_LIB_COMMAND@
|
||||
MOZ_POST_PROGRAM_COMMAND = @MOZ_POST_PROGRAM_COMMAND@
|
||||
|
||||
MOZ_ENABLE_GTK_MOZILLA = @MOZ_ENABLE_GTK_MOZILLA@
|
||||
MOZ_BUILD_ROOT = @MOZ_BUILD_ROOT@
|
||||
|
||||
MOZ_GLE = @MOZ_GLE@
|
||||
|
|
26
configure.in
26
configure.in
|
@ -1123,20 +1123,6 @@ fi
|
|||
|
||||
MOZ_GTK_CFLAGS=$GTK_CFLAGS
|
||||
|
||||
dnl ========================================================
|
||||
dnl =
|
||||
dnl = GtkMozilla support
|
||||
dnl =
|
||||
dnl = On by default on linux whenever ENABLE_GTK is true
|
||||
dnl =
|
||||
dnl ========================================================
|
||||
case "$target" in
|
||||
*-linux*)
|
||||
MOZ_ENABLE_GTK_MOZILLA=1
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
fi
|
||||
dnl ========================================================
|
||||
dnl = =
|
||||
|
@ -2491,12 +2477,6 @@ dnl = End MOZ_MONOLITHIC_TOOLKIT hacks
|
|||
dnl =
|
||||
dnl ========================================================
|
||||
|
||||
|
||||
MOZ_ARG_DISABLE_BOOL(gtk-mozilla,
|
||||
[ --disable-gtk-mozilla Disable building of GtkMozilla GTK+ widget],
|
||||
MOZ_ENABLE_GTK_MOZILLA=)
|
||||
|
||||
|
||||
dnl ========================================================
|
||||
dnl =
|
||||
dnl = --diable-pic-dso-cflags
|
||||
|
@ -3070,7 +3050,6 @@ AC_SUBST(MOZ_USER_DIR)
|
|||
dnl AC_SUBST(MOZ_SMART_MAIL)
|
||||
AC_SUBST(FULL_STATIC_BUILD)
|
||||
AC_SUBST(BUILD_IDLC)
|
||||
AC_SUBST(MOZ_ENABLE_GTK_MOZILLA)
|
||||
AC_SUBST(USE_IMPLICIT_ARCHIVE)
|
||||
|
||||
AC_SUBST(MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS)
|
||||
|
@ -3655,8 +3634,3 @@ if test -z "$MOZ_NATIVE_NSPR" && test -n "$USE_NSPR_AUTOCONF"; then
|
|||
ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist"
|
||||
AC_OUTPUT_SUBDIRS(nsprpub)
|
||||
fi
|
||||
|
||||
if test "$MOZ_ENABLE_GTK_MOZILLA"; then
|
||||
ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --with-mozilla=$MOZ_BUILD_ROOT/dist --with-nspr-version=$NSPR_VERSION"
|
||||
AC_OUTPUT_SUBDIRS(webshell/embed/gtk)
|
||||
fi
|
||||
|
|
Загрузка…
Ссылка в новой задаче