diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,5 +1,11 @@ 2005-06-18 Tor Lillqvist <tml@novell.com> + * 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) |