From 3b9835b5bb6b9ccfbfbb357312d41f267c1ac0bb Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Mon, 18 Oct 1999 19:11:35 +0000 Subject: [PATCH] Use AM_PATH_GLIB instead of glib-config directly 1999-10-18 Havoc Pennington * configure.in: Use AM_PATH_GLIB instead of glib-config directly * src/Makefile.am: Re-enable testpixbuf with GTK_CFLAGS/GTK_LIBS --- gdk-pixbuf/ChangeLog | 6 ++++++ gdk-pixbuf/Makefile.am | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index e720f19355..e1a37347f4 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,9 @@ +1999-10-18 Havoc Pennington + + * configure.in: Use AM_PATH_GLIB instead of glib-config directly + + * src/Makefile.am: Re-enable testpixbuf with GTK_CFLAGS/GTK_LIBS + 1999-10-18 Havoc Pennington * Makefile.am (SUBDIRS): Remove "macros" diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index 25dcf9f00c..89bab3e840 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -29,14 +29,14 @@ libexec_LTLIBRARIES = \ $(XPM_LIB) \ $(TIFF_LIB) -noinst_PROGRAMS = # testpixbuf +noinst_PROGRAMS = testpixbuf DEPS = libgdk_pixbuf.la -INCLUDES = $(GLIB_CFLAGS) $(LIBART_CFLAGS) +INCLUDES = $(GLIB_CFLAGS) $(LIBART_CFLAGS) $(GTK_CFLAGS) AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\"" LDADDS = libgdk_pixbuf.la $(LIBART_LIBS) $(GLIB_LIBS) -testpixbuf_LDADD = $(LDADDS) +testpixbuf_LDADD = $(LDADDS) $(GTK_LIBS) # # The GdkPixBuf library