[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 871c8b1: No need to configure gobject-introspecti
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] emacs-25 871c8b1: No need to configure gobject-introspection |
Date: |
Wed, 20 Jan 2016 23:28:48 +0000 |
branch: emacs-25
commit 871c8b1b96c1cffb84d30dddd484663a0c94818f
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
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.
---
configure.ac | 14 ++------------
src/Makefile.in | 6 ++----
2 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/configure.ac b/configure.ac
index aac3cf2..b5e6b77 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"])
diff --git a/src/Makefile.in b/src/Makefile.in
index 2b5ae30..4a52757 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -225,8 +225,6 @@ RSVG_CFLAGS= @RSVG_CFLAGS@
WEBKIT_LIBS= @WEBKIT_LIBS@
WEBKIT_CFLAGS= @WEBKIT_CFLAGS@
-GIR_LIBS= @GIR_LIBS@
-GIR_CFLAGS= @GIR_CFLAGS@
CAIRO_LIBS= @CAIRO_LIBS@
CAIRO_CFLAGS= @CAIRO_CFLAGS@
@@ -366,7 +364,7 @@ ALL_CFLAGS=-Demacs $(MYCPPFLAGS) -I. -I$(srcdir) \
$(GNUSTEP_CFLAGS) $(CFLAGS_SOUND) $(RSVG_CFLAGS) $(IMAGEMAGICK_CFLAGS) \
$(PNG_CFLAGS) $(LIBXML2_CFLAGS) $(DBUS_CFLAGS) \
$(XRANDR_CFLAGS) $(XINERAMA_CFLAGS) $(XFIXES_CFLAGS) \
- $(WEBKIT_CFLAGS) $(GIR_CFLAGS) \
+ $(WEBKIT_CFLAGS) \
$(SETTINGS_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) \
$(LIBOTF_CFLAGS) $(M17N_FLT_CFLAGS) $(DEPFLAGS) \
$(LIBGNUTLS_CFLAGS) $(GFILENOTIFY_CFLAGS) $(CAIRO_CFLAGS) \
@@ -477,7 +475,7 @@ lisp = $(addprefix ${lispsource}/,${shortlisp})
LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \
$(LIBX_OTHER) $(LIBSOUND) \
$(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_ACL) $(LIB_CLOCK_GETTIME) \
- $(WEBKIT_LIBS) $(GIR_LIBS) \
+ $(WEBKIT_LIBS) \
$(LIB_EACCESS) $(LIB_FDATASYNC) $(LIB_TIMER_TIME) $(DBUS_LIBS) \
$(LIB_EXECINFO) $(XRANDR_LIBS) $(XINERAMA_LIBS) $(XFIXES_LIBS) \
$(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) $(CAIRO_LIBS) \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 871c8b1: No need to configure gobject-introspection,
Paul Eggert <=