diff options
| author | Keith Packard <keithp@keithp.com> | 2005-07-08 05:02:01 +0000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2005-07-08 05:02:01 +0000 |
| commit | b5a724c201e0881fcb22738560597e333c39ba12 (patch) | |
| tree | affcc79b2c61bd7cffa1d30861395885a6807c1b | |
| parent | 45b0f06f132347e5eaabbc5ff294bc9016de75dd (diff) | |
Make sure XFIXES appears in LIBS line, fix up other pkg-config usage.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | xcursor.pc.in | 8 |
4 files changed, 14 insertions, 14 deletions
@@ -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 diff --git a/configure.ac b/configure.ac index a5bee39..bd6526a 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/src/Makefile.am b/src/Makefile.am index 1c8a6e4..1bb8857 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 diff --git a/xcursor.pc.in b/xcursor.pc.in index c39fce7..dd943c8 100644 --- a/xcursor.pc.in +++ b/xcursor.pc.in @@ -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@ |