AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 02:40:11 +00:00
Code Issues Projects Releases Wiki Activity

Handle GDK_PIXBUF_EXTRA_LIBS like GDK_EXTRA_LIBS, i.e. clear it if

Browse Source 
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
This commit is contained in:
Tor Lillqvist 2007-07-03 16:58:42 +00:00 committed by Tor Lillqvist
parent 73f609d519
commit ccd3694e75
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
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.
2007-07-03 Tor Lillqvist <tml@novell.com> 2007-07-03 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkkeys-win32.c (gdk_keymap_have_bidi_layouts): * gdk/win32/gdkkeys-win32.c (gdk_keymap_have_bidi_layouts):

17
configure.in
View File

@ -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_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" 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 # Windowing system checks
######################################## ########################################
@ -1530,6 +1523,16 @@ ATK_PREFIX="`$PKG_CONFIG --variable=prefix atk`"
PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`" PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`"
CAIRO_PREFIX="`pkg-config --variable=prefix cairo`" 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_PACKAGES)
AC_SUBST(GTK_EXTRA_LIBS) AC_SUBST(GTK_EXTRA_LIBS)
AC_SUBST(GTK_EXTRA_CFLAGS) AC_SUBST(GTK_EXTRA_CFLAGS)