[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r116992: Link to glib-using libraries when checking
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] trunk r116992: Link to glib-using libraries when checking for glib. |
Date: |
Sat, 19 Apr 2014 17:45:23 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116992
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17289
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2014-04-19 10:45:20 -0700
message:
Link to glib-using libraries when checking for glib.
* configure.ac (XGSELOBJ): Include GTK_LIBS, RSVG_LIBS, etc.
when testing whether Glib is linked in. Similarly for CFLAGS.
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
configure.ac
configure.in-20091113204419-o5vbwnq5f7feedwu-783
=== modified file 'ChangeLog'
--- a/ChangeLog 2014-04-17 06:40:25 +0000
+++ b/ChangeLog 2014-04-19 17:45:20 +0000
@@ -1,3 +1,9 @@
+2014-04-19 Paul Eggert <address@hidden>
+
+ Link to glib-using libraries when checking for glib (Bug#17289).
+ * configure.ac (XGSELOBJ): Include GTK_LIBS, RSVG_LIBS, etc.
+ when testing whether Glib is linked in. Similarly for CFLAGS.
+
2014-04-17 Paul Eggert <address@hidden>
* GNUmakefile: Speed up 'make bootstrap' in fresh checkout.
=== modified file 'configure.ac'
--- a/configure.ac 2014-04-16 19:43:46 +0000
+++ b/configure.ac 2014-04-19 17:45:20 +0000
@@ -3806,11 +3806,12 @@
AC_CHECK_FUNCS(snprintf)
-dnl Check this late. It depends on what other libraries (lrsvg, Gtk+ etc)
-dnl Emacs uses.
+dnl Check this late, since it depends on $GTK_CFLAGS etc.
XGSELOBJ=
OLDCFLAGS="$CFLAGS"
OLDLIBS="$LIBS"
+CFLAGS="$CFLAGS $GTK_CFLAGS $RSVG_CFLAGS $DBUS_CFLAGS $SETTINGS_CFLAGS"
+LIBS="$LIBS $GTK_LIBS $RSVG_LIBS $DBUS_LIBS $SETTINGS_LIBS"
CFLAGS="$CFLAGS $GFILENOTIFY_CFLAGS"
LIBS="$LIBS $GFILENOTIFY_LIBS"
AC_MSG_CHECKING([whether GLib is linked in])
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r116992: Link to glib-using libraries when checking for glib.,
Paul Eggert <=