diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-01-20 15:28:30 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-01-20 15:28:45 -0800 |
| commit | 871c8b1b96c1cffb84d30dddd484663a0c94818f (patch) | |
| tree | 655962afb5dc3502fd3947e36d6202215c195401 /configure.ac | |
| parent | 9d7265ba1a3f93e107a88c3fc4b76557e36192b5 (diff) | |
| download | emacs-871c8b1b96c1cffb84d30dddd484663a0c94818f.tar.gz | |
No need to configure gobject-introspection
It wasn’t needed for the recently-installed xwidget_mvp code; see:
http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01154.html
* configure.ac (DOES_XWIDGETS_USE_GIR, GIR_REQUIRED, GIR_MODULES):
(HAVE_GIR):
* src/Makefile.in (GIR_LIBS, GIR_CFLAGS):
Remove. All uses removed.
* configure.ac (emacs_config_features): Don’t worry about GIR.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index aac3cf28099..b5e6b77c713 100644 --- a/configure.ac +++ b/configure.ac @@ -2569,7 +2569,6 @@ fi dnl Enable xwidgets if GTK3 and WebKitGTK+ are available. HAVE_XWIDGETS=no XWIDGETS_OBJ= -DOES_XWIDGETS_USE_GIR= if test "$with_xwidgets" != "no"; then test "$USE_GTK_TOOLKIT" = "GTK3" && test "$window_system" != "none" || AC_MSG_ERROR([xwidgets requested but gtk3 not used.]) @@ -2583,15 +2582,6 @@ if test "$with_xwidgets" != "no"; then XWIDGETS_OBJ=xwidget.o AC_DEFINE([HAVE_XWIDGETS], 1, [Define to 1 if you have xwidgets support.]) - - GIR_REQUIRED=1.32.1 - GIR_MODULES="gobject-introspection-1.0 >= $GIR_REQUIRED" - EMACS_CHECK_MODULES([GIR], [$GIR_MODULES]) - if test $HAVE_GIR = yes; then - AC_DEFINE([HAVE_GIR], 1, [Define to 1 if you have GIR support.]) - fi - DOES_XWIDGETS_USE_GIR="\ - Does Xwidgets use gobject introspection? $HAVE_GIR" fi AC_SUBST(XWIDGETS_OBJ) @@ -5251,7 +5241,7 @@ emacs_config_features= for opt in XAW3D XPM JPEG TIFF GIF PNG RSVG CAIRO IMAGEMAGICK SOUND GPM DBUS \ GCONF GSETTINGS NOTIFY ACL LIBSELINUX GNUTLS LIBXML2 FREETYPE M17N_FLT \ LIBOTF XFT ZLIB TOOLKIT_SCROLL_BARS X_TOOLKIT X11 NS MODULES \ - XWIDGETS GIR; do + XWIDGETS; do case $opt in NOTIFY|ACL) eval val=\${${opt}_SUMMARY} ;; @@ -5302,7 +5292,7 @@ AS_ECHO([" Does Emacs use -lXaw3d? ${HAVE_XAW3D Does Emacs have dynamic modules support? ${HAVE_MODULES} Does Emacs use toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS} Does Emacs support Xwidgets (requires gtk3)? ${HAVE_XWIDGETS} -${DOES_XWIDGETS_USE_GIR}"]) +"]) if test -n "${EMACSDATA}"; then AS_ECHO([" Environment variable EMACSDATA set to: $EMACSDATA"]) |