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

Explicitly link against Xrender. (#327538, Christophe Belle)

Browse Source 
2006-01-19  Matthias Clasen  <mclasen@redhat.com>

	* configure.in: Explicitly link against Xrender.
	(#327538, Christophe Belle)
This commit is contained in:
Matthias Clasen 2006-01-20 04:57:45 +00:00 committed by Matthias Clasen
parent 6f98f222d3
commit 1b1f8aea52
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2006-01-19 Matthias Clasen <mclasen@redhat.com> 2006-01-19 Matthias Clasen <mclasen@redhat.com>
* configure.in: Explicitly link against Xrender.
(#327538, Christophe Belle)
* gdk/x11/gdkprivate-x11.h (XID_FONT_BIT): * gdk/x11/gdkprivate-x11.h (XID_FONT_BIT):
* gdk/x11/gdkfont-x11.c: * gdk/x11/gdkfont-x11.c:
* gdk/x11/gdkxid.c: Use an unused high bit in the * gdk/x11/gdkxid.c: Use an unused high bit in the

3
ChangeLog.pre-2-10
View File

@ -1,5 +1,8 @@
2006-01-19 Matthias Clasen <mclasen@redhat.com> 2006-01-19 Matthias Clasen <mclasen@redhat.com>
* configure.in: Explicitly link against Xrender.
(#327538, Christophe Belle)
* gdk/x11/gdkprivate-x11.h (XID_FONT_BIT): * gdk/x11/gdkprivate-x11.h (XID_FONT_BIT):
* gdk/x11/gdkfont-x11.c: * gdk/x11/gdkfont-x11.c:
* gdk/x11/gdkxid.c: Use an unused high bit in the * gdk/x11/gdkxid.c: Use an unused high bit in the

14
configure.in
View File

@ -1045,11 +1045,11 @@ if test "x$gdktarget" = "xx11"; then
# #
# Check for basic X packages; we use pkg-config if available # Check for basic X packages; we use pkg-config if available
# #
if $PKG_CONFIG --exists x11 xext; then if $PKG_CONFIG --exists x11 xext xrender; then
have_base_x_pc=true have_base_x_pc=true
X_PACKAGES="$X_PACKAGES x11 xext" X_PACKAGES="$X_PACKAGES x11 xext xrender"
x_libs="`pkg-config --libs x11 xext`" x_libs="`pkg-config --libs x11 xext xrender`"
X_CFLAGS="`pkg-config --cflags x11 xext`" X_CFLAGS="`pkg-config --cflags x11 xext xrender`"
# Strip out any .la files that pkg-config might give us (this happens # Strip out any .la files that pkg-config might give us (this happens
# with -uninstalled.pc files) # with -uninstalled.pc files)
@ -1071,11 +1071,11 @@ if test "x$gdktarget" = "xx11"; then
fi fi
x_cflags="$X_CFLAGS" x_cflags="$X_CFLAGS"
x_libs_for_checks="$X_LIBS -lXext -lX11 $X_EXTRA_LIBS" x_libs_for_checks="$X_LIBS -lXext -lXrender -lX11 $X_EXTRA_LIBS"
GDK_PIXBUF_XLIB_EXTRA_CFLAGS="$x_cflags" GDK_PIXBUF_XLIB_EXTRA_CFLAGS="$x_cflags"
GDK_PIXBUF_XLIB_EXTRA_LIBS="$X_LIBS -lX11 $X_EXTRA_LIBS" GDK_PIXBUF_XLIB_EXTRA_LIBS="$X_LIBS -lX11 $X_EXTRA_LIBS"
GTK_DEP_LIBS_FOR_X="$X_LIBS -lX11 $X_EXTRA_LIBS" GTK_DEP_LIBS_FOR_X="$X_LIBS -lXrender -lX11 $X_EXTRA_LIBS"
fi fi
# Extra libraries found during checks (-lXinerama, etc), not from pkg-config. # Extra libraries found during checks (-lXinerama, etc), not from pkg-config.
@ -1094,6 +1094,8 @@ if test "x$gdktarget" = "xx11"; then
AC_MSG_ERROR([*** libX11 not found. Check 'config.log' for more details.])) AC_MSG_ERROR([*** libX11 not found. Check 'config.log' for more details.]))
AC_CHECK_FUNC(XextFindDisplay, :, AC_CHECK_FUNC(XextFindDisplay, :,
AC_MSG_ERROR([*** libXext not found. Check 'config.log' for more details.])) AC_MSG_ERROR([*** libXext not found. Check 'config.log' for more details.]))
AC_CHECK_FUNC(XRenderQueryExtension, :,
AC_MSG_ERROR([*** libXrender not found. Check 'config.log' for more details.]))
# Check for xReply # Check for xReply