From 2e699f7ab6f66ff451d4911a1f1413286eb477f2 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 18 Jun 2005 11:03:17 +0000 Subject: Use $FULL_GNOME_DEPS here explicitly, as it de facto is a superset of it. 2005-06-18 Tor Lillqvist * configure.in (EXTRA_GNOME dependencies): Use $FULL_GNOME_DEPS here explicitly, as it de facto is a superset of it. In the makefiles thus no need to use both EXTRA_GNOME_CFLAGS and GNOME_FULL_CFLAGS, EXTRA_GNOME_CFLAGS is enough. (Ditto for _LIBS.) svn path=/trunk/; revision=29531 --- ChangeLog | 6 ++++++ configure.in | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f0aaecda21..649e569ec8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2005-06-18 Tor Lillqvist + * configure.in (EXTRA_GNOME dependencies): Use $FULL_GNOME_DEPS + here explicitly, as it de facto is a superset of it. In the + makefiles thus no need to use both EXTRA_GNOME_CFLAGS and + GNOME_FULL_CFLAGS, EXTRA_GNOME_CFLAGS is enough. (Ditto for + _LIBS.) + * win32/Makefile.am (EXTRA_DIST): Fix typo. Add libetable and libetext. diff --git a/configure.in b/configure.in index 86e4f155af..6f1c15bf74 100644 --- a/configure.in +++ b/configure.in @@ -1263,7 +1263,7 @@ AC_CHECK_HEADERS(libgnomeui/gnome-icon-lookup.h) AC_CHECK_HEADERS(libgnomeui/gnome-thumbnail.h) CPPFLAGS="$CPPFLAGS_save" -PKG_CHECK_MODULES(EXTRA_GNOME, libgnomeprint-2.2 >= 2.2.0 libgnomeprintui-2.2 >= 2.2.1 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 >= 2.2.0.2 libxml-2.0) +PKG_CHECK_MODULES(EXTRA_GNOME, libgnomeprint-2.2 >= 2.2.0 libgnomeprintui-2.2 >= 2.2.1 $FULL_GNOME_DEPS) AC_SUBST(EXTRA_GNOME_LIBS) AC_SUBST(EXTRA_GNOME_CFLAGS) -- cgit v1.2.3