aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2016-01-20 11:06:01 -0800
committerPaul Eggert2016-01-20 11:06:35 -0800
commit2388fa74982a9146e4bcefc75004ec9d7241c505 (patch)
tree77818707711ddc4e467dc0e6ae141c01636d6811 /src
parent65575c24aaad9bedf6b84cc062cc03fbe4dd1315 (diff)
downloademacs-2388fa74982a9146e4bcefc75004ec9d7241c505.tar.gz
emacs-2388fa74982a9146e4bcefc75004ec9d7241c505.zip
Port to platforms with gtk3 but not webkitgtk3
I ran into this problem on my Fedora 23 installation; Emacs configured but did not build when --with-xwidgets was specified. * configure.ac (HAVE_WEBKIT, HAVE_GIR): Omit unnecessary initializations. (DOES_XWIDGETS_USE_GIR): New var. If --with-xwidgets is specified, report an error if not doable, to be consistent with the other --with options. Require webkitgtk3 to use Xwidgets, as the Xwidgets code does not work at all without webkitgtk3. Simplify use of EMACS_CHECK_MODULES. Output message about gobject introspection only if xwidgets are used. * etc/NEWS: Users need webkitgtk3, not merely webkit. * src/xwidget.c (syms_of_xwidget): Don’t worry about HAVE_WEBKIT_OSR, since this file is no longer compiled if webkitgtk3 is not available.
Diffstat (limited to 'src')
-rw-r--r--src/xwidget.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/xwidget.c b/src/xwidget.c
index 88cdb941c4c..f8e13cd4522 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -1077,12 +1077,10 @@ syms_of_xwidget (void)
1077 defsubr (&Sxwidget_query_on_exit_flag); 1077 defsubr (&Sxwidget_query_on_exit_flag);
1078 defsubr (&Sset_xwidget_query_on_exit_flag); 1078 defsubr (&Sset_xwidget_query_on_exit_flag);
1079 1079
1080#ifdef HAVE_WEBKIT_OSR
1081 defsubr (&Sxwidget_webkit_goto_uri); 1080 defsubr (&Sxwidget_webkit_goto_uri);
1082 defsubr (&Sxwidget_webkit_execute_script); 1081 defsubr (&Sxwidget_webkit_execute_script);
1083 defsubr (&Sxwidget_webkit_get_title); 1082 defsubr (&Sxwidget_webkit_get_title);
1084 DEFSYM (Qwebkit_osr, "webkit-osr"); 1083 DEFSYM (Qwebkit_osr, "webkit-osr");
1085#endif
1086 1084
1087 defsubr (&Sxwidget_size_request); 1085 defsubr (&Sxwidget_size_request);
1088 defsubr (&Sdelete_xwidget_view); 1086 defsubr (&Sdelete_xwidget_view);