diff options
| author | Tor Lillqvist <tml@novell.com> | 2007-07-03 16:58:42 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2007-07-03 16:58:42 +0000 |
| commit | ccd3694e7538f7d11ea549bfaf0999f92a2cea4e (patch) | |
| tree | a0a2fc5fa53ce81218949ed594a268c25e8bfc5f /configure.in | |
| parent | 73f609d519a056c70fafe2fae970e5bbd6a5bda7 (diff) | |
| download | gtk+-ccd3694e7538f7d11ea549bfaf0999f92a2cea4e.tar.gz | |
Handle GDK_PIXBUF_EXTRA_LIBS like GDK_EXTRA_LIBS, i.e. clear it if
2007-07-03 Tor Lillqvist <tml@novell.com>
* configure.in: Handle GDK_PIXBUF_EXTRA_LIBS like GDK_EXTRA_LIBS,
i.e. clear it if enable_explicit_deps isn't on. If we build with
--with-included-loaders and --enable-explicit-deps=no we don't
want -ltiff -ljpeg etc in the gdk-pixbuf-2.0.pc file.
svn path=/trunk/; revision=18361
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/configure.in b/configure.in index 710fdc1085..8e7bfe0133 100644 --- a/configure.in +++ b/configure.in @@ -1053,13 +1053,6 @@ GDK_PIXBUF_EXTRA_CFLAGS= GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS" -AC_SUBST(GDK_PIXBUF_PACKAGES) -AC_SUBST(GDK_PIXBUF_EXTRA_LIBS) -AC_SUBST(GDK_PIXBUF_EXTRA_CFLAGS) -AC_SUBST(GDK_PIXBUF_DEP_LIBS) -AC_SUBST(GDK_PIXBUF_DEP_CFLAGS) - - ######################################## # Windowing system checks ######################################## @@ -1530,6 +1523,16 @@ ATK_PREFIX="`$PKG_CONFIG --variable=prefix atk`" PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`" CAIRO_PREFIX="`pkg-config --variable=prefix cairo`" +if test $enable_explicit_deps != yes ; then + GDK_PIXBUF_EXTRA_LIBS= +fi + +AC_SUBST(GDK_PIXBUF_PACKAGES) +AC_SUBST(GDK_PIXBUF_EXTRA_LIBS) +AC_SUBST(GDK_PIXBUF_EXTRA_CFLAGS) +AC_SUBST(GDK_PIXBUF_DEP_LIBS) +AC_SUBST(GDK_PIXBUF_DEP_CFLAGS) + AC_SUBST(GTK_PACKAGES) AC_SUBST(GTK_EXTRA_LIBS) AC_SUBST(GTK_EXTRA_CFLAGS) |