diff options
| author | Paul Eggert | 2016-01-20 15:28:30 -0800 |
|---|---|---|
| committer | Paul Eggert | 2016-01-20 15:28:45 -0800 |
| commit | 871c8b1b96c1cffb84d30dddd484663a0c94818f (patch) | |
| tree | 655962afb5dc3502fd3947e36d6202215c195401 /src | |
| parent | 9d7265ba1a3f93e107a88c3fc4b76557e36192b5 (diff) | |
| download | emacs-871c8b1b96c1cffb84d30dddd484663a0c94818f.tar.gz emacs-871c8b1b96c1cffb84d30dddd484663a0c94818f.zip | |
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 'src')
| -rw-r--r-- | src/Makefile.in | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 2b5ae30a704..4a52757fec6 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -225,8 +225,6 @@ RSVG_CFLAGS= @RSVG_CFLAGS@ | |||
| 225 | WEBKIT_LIBS= @WEBKIT_LIBS@ | 225 | WEBKIT_LIBS= @WEBKIT_LIBS@ |
| 226 | WEBKIT_CFLAGS= @WEBKIT_CFLAGS@ | 226 | WEBKIT_CFLAGS= @WEBKIT_CFLAGS@ |
| 227 | 227 | ||
| 228 | GIR_LIBS= @GIR_LIBS@ | ||
| 229 | GIR_CFLAGS= @GIR_CFLAGS@ | ||
| 230 | CAIRO_LIBS= @CAIRO_LIBS@ | 228 | CAIRO_LIBS= @CAIRO_LIBS@ |
| 231 | CAIRO_CFLAGS= @CAIRO_CFLAGS@ | 229 | CAIRO_CFLAGS= @CAIRO_CFLAGS@ |
| 232 | 230 | ||
| @@ -366,7 +364,7 @@ ALL_CFLAGS=-Demacs $(MYCPPFLAGS) -I. -I$(srcdir) \ | |||
| 366 | $(GNUSTEP_CFLAGS) $(CFLAGS_SOUND) $(RSVG_CFLAGS) $(IMAGEMAGICK_CFLAGS) \ | 364 | $(GNUSTEP_CFLAGS) $(CFLAGS_SOUND) $(RSVG_CFLAGS) $(IMAGEMAGICK_CFLAGS) \ |
| 367 | $(PNG_CFLAGS) $(LIBXML2_CFLAGS) $(DBUS_CFLAGS) \ | 365 | $(PNG_CFLAGS) $(LIBXML2_CFLAGS) $(DBUS_CFLAGS) \ |
| 368 | $(XRANDR_CFLAGS) $(XINERAMA_CFLAGS) $(XFIXES_CFLAGS) \ | 366 | $(XRANDR_CFLAGS) $(XINERAMA_CFLAGS) $(XFIXES_CFLAGS) \ |
| 369 | $(WEBKIT_CFLAGS) $(GIR_CFLAGS) \ | 367 | $(WEBKIT_CFLAGS) \ |
| 370 | $(SETTINGS_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) \ | 368 | $(SETTINGS_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) \ |
| 371 | $(LIBOTF_CFLAGS) $(M17N_FLT_CFLAGS) $(DEPFLAGS) \ | 369 | $(LIBOTF_CFLAGS) $(M17N_FLT_CFLAGS) $(DEPFLAGS) \ |
| 372 | $(LIBGNUTLS_CFLAGS) $(GFILENOTIFY_CFLAGS) $(CAIRO_CFLAGS) \ | 370 | $(LIBGNUTLS_CFLAGS) $(GFILENOTIFY_CFLAGS) $(CAIRO_CFLAGS) \ |
| @@ -477,7 +475,7 @@ lisp = $(addprefix ${lispsource}/,${shortlisp}) | |||
| 477 | LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \ | 475 | LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \ |
| 478 | $(LIBX_OTHER) $(LIBSOUND) \ | 476 | $(LIBX_OTHER) $(LIBSOUND) \ |
| 479 | $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_ACL) $(LIB_CLOCK_GETTIME) \ | 477 | $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_ACL) $(LIB_CLOCK_GETTIME) \ |
| 480 | $(WEBKIT_LIBS) $(GIR_LIBS) \ | 478 | $(WEBKIT_LIBS) \ |
| 481 | $(LIB_EACCESS) $(LIB_FDATASYNC) $(LIB_TIMER_TIME) $(DBUS_LIBS) \ | 479 | $(LIB_EACCESS) $(LIB_FDATASYNC) $(LIB_TIMER_TIME) $(DBUS_LIBS) \ |
| 482 | $(LIB_EXECINFO) $(XRANDR_LIBS) $(XINERAMA_LIBS) $(XFIXES_LIBS) \ | 480 | $(LIB_EXECINFO) $(XRANDR_LIBS) $(XINERAMA_LIBS) $(XFIXES_LIBS) \ |
| 483 | $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) $(CAIRO_LIBS) \ | 481 | $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) $(CAIRO_LIBS) \ |