fdo-mirrors/xorg-libxcursor
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/lib/libxcursor.git synced 2026-05-04 21:08:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make sure XFIXES appears in LIBS line, fix up other pkg-config usage.

Browse source
This commit is contained in:
Keith Packard 2005-07-08 05:02:01 +00:00
parent 45b0f06f13
commit b5a724c201
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2005-07-07 Keith Packard <keithp@keithp.com>
* configure.ac:
* src/Makefile.am:
* xcursor.pc.in:
Make sure XFIXES appears in LIBS line, fix up
other pkg-config usage.
Wed Jun 8 16:43:45 2005 Søren Sandmann <sandmann@redhat.com>
* configure.ac: Remove all the "not found with pkgconfig" stuff

10
configure.ac
View file

@ -57,14 +57,10 @@ AC_PROG_CC
AC_PROG_LIBTOOL
# Check for X
PKG_CHECK_MODULES(XRENDER, x11 xrender >= 0.8.2)
PKG_CHECK_MODULES(XFIXES, xfixes, [AC_DEFINE_UNQUOTED(HAVE_XFIXES, 1, [Define to 1 if you have Xfixes])])
PKG_CHECK_MODULES(DEP, xrender >= 0.8.2 xfixes x11)
AC_SUBST(X_CFLAGS)
AC_SUBST(X_LIBS)
AC_SUBST(XRENDER_LIBS)
AC_SUBST(XRENDER_CFLAGS)
AC_SUBST(DEP_CFLAGS)
AC_SUBST(DEP_LIBS)
AC_OUTPUT([Makefile
src/Makefile

2
src/Makefile.am
View file

@ -3,7 +3,7 @@ lib_LTLIBRARIES = libXcursor.la
libXcursor_la_SOURCES = xcursorint.h cursor.c display.c file.c library.c xlib.c
libXcursor_la_LIBADD = $(XRENDER_LIBS) $(XFIXES_LIBS) $(X_LIBS)
libXcursor_la_CFLAGS = $(XRENDER_CFLAGS) $(XFIXES_CFLAGS) $(X_CFLAGS)
AM__CFLAGS = $(XRENDER_CFLAGS) $(XFIXES_CFLAGS) $(X_CFLAGS)
INCLUDES = -I$(top_srcdir)/include/X11/Xcursor

8
xcursor.pc.in
View file

@ -2,14 +2,10 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
xrenderlibs=@XRENDER_LIBS@
xrendercflags=@XRENDER_CFLAGS@
xlibs=@X_LIBS@
xcflags=@X_CFLAGS@
Name: Xcursor
Description: X Cursor Library
Version: @VERSION@
Requires: xrender
Cflags: -I${includedir} ${xrendercflags} ${xcflags}
Libs: -L${libdir} -lXcursor ${xrenderlibs} ${xlibs}
Cflags: -I${includedir} @DEP_CFLAGS@
Libs: -L${libdir} -lXcursor @DEP_LIBS@