mirror of
https://gitlab.freedesktop.org/xorg/lib/libxcursor.git
synced 2026-05-05 18:07:59 +02:00
Do PKG_CHECK_MODULES on a unique token instead of on "DEP", so builds with
a global configure cache don't get confused.
This commit is contained in:
parent
af4b88bba2
commit
7a5e360179
3 changed files with 7 additions and 7 deletions
|
|
@ -41,10 +41,10 @@ AC_PROG_CC
|
|||
AC_PROG_LIBTOOL
|
||||
|
||||
# Check for X
|
||||
PKG_CHECK_MODULES(DEP, xrender >= 0.8.2 xfixes x11)
|
||||
PKG_CHECK_MODULES(XCURSOR, xrender >= 0.8.2 xfixes x11)
|
||||
|
||||
AC_SUBST(DEP_CFLAGS)
|
||||
AC_SUBST(DEP_LIBS)
|
||||
AC_SUBST(XCURSOR_CFLAGS)
|
||||
AC_SUBST(XCURSOR_LIBS)
|
||||
|
||||
XORG_RELEASE_VERSION
|
||||
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@ lib_LTLIBRARIES = libXcursor.la
|
|||
|
||||
libXcursor_la_SOURCES = xcursorint.h cursor.c display.c file.c library.c xlib.c
|
||||
|
||||
libXcursor_la_LIBADD = $(DEP_LIBS)
|
||||
AM_CFLAGS = $(DEP_CFLAGS)
|
||||
libXcursor_la_LIBADD = $(XCURSOR_LIBS)
|
||||
AM_CFLAGS = $(XCURSOR_CFLAGS)
|
||||
|
||||
INCLUDES = -I$(top_srcdir)/include/X11/Xcursor
|
||||
|
||||
|
|
|
|||
|
|
@ -7,5 +7,5 @@ Name: Xcursor
|
|||
Description: X Cursor Library
|
||||
Version: @VERSION@
|
||||
Requires: xrender
|
||||
Cflags: -I${includedir} @DEP_CFLAGS@
|
||||
Libs: -L${libdir} -lXcursor @DEP_LIBS@
|
||||
Cflags: -I${includedir} @XCURSOR_CFLAGS@
|
||||
Libs: -L${libdir} -lXcursor @XCURSOR_LIBS@
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue