diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-08-03 03:28:02 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-08-03 03:28:02 +0000 |
| commit | 6578854789201d229f20ae560d4b7051e9402c84 (patch) | |
| tree | cab38091376f307cedc18c537b1a72fa6a2f6a0b | |
| parent | aa10e9ef0425286da35fb3312dd6df31066c627a (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-- | xtst.pc.in | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 97bb54d..6b0f90a 100644 --- a/configure.ac +++ b/configure.ac @@ -34,10 +34,10 @@ AC_PROG_CC AC_PROG_LIBTOOL # Check for dependencies -PKG_CHECK_MODULES(DEP, x11 xext recordproto xextproto) +PKG_CHECK_MODULES(XTST, x11 xext recordproto xextproto) -AC_SUBST(DEP_CFLAGS) -AC_SUBST(DEP_LIBS) +AC_SUBST(XTST_CFLAGS) +AC_SUBST(XTST_LIBS) XORG_RELEASE_VERSION diff --git a/src/Makefile.am b/src/Makefile.am index 5077818..a3759b2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,7 +4,7 @@ libXtst_la_SOURCES = \ XRecord.c \ XTest.c -libXtst_la_LIBADD = @DEP_LIBS@ -AM_CFLAGS = @DEP_CFLAGS@ +libXtst_la_LIBADD = @XTST_LIBS@ +AM_CFLAGS = @XTST_CFLAGS@ libXtst_la_LDFLAGS = -version-number 6:1:0 -no-undefined @@ -6,6 +6,6 @@ includedir=@includedir@ Name: Xtst Description: The Xtst Library Version: @PACKAGE_VERSION@ -Cflags: -I${includedir} @DEP_CFLAGS@ -Libs: -L${libdir} -lXtst @DEP_LIBS@ +Cflags: -I${includedir} @XTST_CFLAGS@ +Libs: -L${libdir} -lXtst @XTST_LIBS@ |