aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2016-01-19 17:48:35 -0500
committerGlenn Morris2016-01-19 17:48:35 -0500
commit644e2fb73aa3968be573b2b1e0b491618f84d47b (patch)
tree7ab0b4e95925c716af24bf1921d02ce0c77f0316
parent11a0300d9f48cd6245fdf3f8576cda58c4bafb8a (diff)
downloademacs-644e2fb73aa3968be573b2b1e0b491618f84d47b.tar.gz
emacs-644e2fb73aa3968be573b2b1e0b491618f84d47b.zip
* configure.ac (HAVE_WEBKIT_OSR): Remove broken, duplicated gtk3 test.
-rw-r--r--configure.ac15
1 files changed, 6 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac
index 95f79ab8d4f..d3513ff4759 100644
--- a/configure.ac
+++ b/configure.ac
@@ -374,7 +374,7 @@ otherwise for the first of 'inotify' or 'gfile' that is usable.])
374 [with_file_notification=$with_features]) 374 [with_file_notification=$with_features])
375 375
376OPTION_DEFAULT_OFF([xwidgets], 376OPTION_DEFAULT_OFF([xwidgets],
377 [enable use of some gtk widgets in Emacs buffers]) 377 [enable use of some gtk widgets in Emacs buffers (requires gtk3)])
378 378
379## For the times when you want to build Emacs but don't have 379## For the times when you want to build Emacs but don't have
380## a suitable makeinfo, and can live without the manuals. 380## a suitable makeinfo, and can live without the manuals.
@@ -2583,12 +2583,9 @@ then
2583 WEBKIT_REQUIRED=1.4.0 2583 WEBKIT_REQUIRED=1.4.0
2584 WEBKIT_MODULES="webkitgtk-3.0 >= $WEBKIT_REQUIRED" 2584 WEBKIT_MODULES="webkitgtk-3.0 >= $WEBKIT_REQUIRED"
2585 2585
2586 if test "${with_gtk3}" = "yes"; then 2586 PKG_CHECK_MODULES(WEBKIT, $WEBKIT_MODULES, HAVE_WEBKIT=yes, HAVE_WEBKIT=no)
2587 PKG_CHECK_MODULES(WEBKIT, $WEBKIT_MODULES, HAVE_WEBKIT=yes, HAVE_WEBKIT=no) 2587 if test $HAVE_WEBKIT = yes; then
2588 if test $HAVE_WEBKIT = yes; then 2588 AC_DEFINE([HAVE_WEBKIT_OSR], 1, [Define to 1 if you have webkit_osr support.])
2589 AC_DEFINE([HAVE_WEBKIT_OSR], 1,
2590 [Define to 1 if you have webkit_osr support.])
2591 fi
2592 fi 2589 fi
2593 2590
2594 GIR_REQUIRED=1.32.1 2591 GIR_REQUIRED=1.32.1
@@ -5306,8 +5303,8 @@ AS_ECHO([" Does Emacs use -lXaw3d? ${HAVE_XAW3D
5306 Does Emacs directly use zlib? ${HAVE_ZLIB} 5303 Does Emacs directly use zlib? ${HAVE_ZLIB}
5307 Does Emacs have dynamic modules support? ${HAVE_MODULES} 5304 Does Emacs have dynamic modules support? ${HAVE_MODULES}
5308 Does Emacs use toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS} 5305 Does Emacs use toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}
5309 Does Emacs support Xwidgets? ${HAVE_XWIDGETS} 5306 Does Emacs support Xwidgets (requires gtk3)? ${HAVE_XWIDGETS}
5310 Does xwidgets support webkit(requires gtk3)? ${HAVE_WEBKIT} 5307 Does xwidgets support webkit? ${HAVE_WEBKIT}
5311 Does xwidgets support gobject introspection? ${HAVE_GIR} 5308 Does xwidgets support gobject introspection? ${HAVE_GIR}
5312"]) 5309"])
5313 5310