diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-08-03 03:28:01 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-08-03 03:28:01 +0000 |
| commit | 7a5e36017905a3b7fe70362dc9712654c816c6a5 (patch) | |
| tree | e9b8a4aa88b321b2fb14da856e68e9aacd229dd2 | |
| parent | af4b88bba232af55484e8b82ce8abab6013e985e (diff) | |
Do PKG_CHECK_MODULES on a unique token instead of on "DEP", so builds with
a global configure cache don't get confused.
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | xcursor.pc.in | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 8f3019b..4930dec 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/src/Makefile.am b/src/Makefile.am index 6cf9551..aff4521 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 diff --git a/xcursor.pc.in b/xcursor.pc.in index dd943c8..f3cadf0 100644 --- a/xcursor.pc.in +++ b/xcursor.pc.in @@ -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@ |