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 | 8699c1dff957252e54466f41ed9fe3fe1d1bea16 (patch) | |
| tree | 58cbc7e5f2d57c76e26318990a40e13047714cf1 | |
| parent | 4690351c2e2a53c7f5a5d6729ee401c140825f70 (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-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | xtrap.pc.in | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index e54872b..9b2eab4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -AM_CFLAGS = $(DEP_CFLAGS) +AM_CFLAGS = $(XTRAP_CFLAGS) SUBDIRS = src diff --git a/configure.ac b/configure.ac index fa27080..2435eaa 100644 --- a/configure.ac +++ b/configure.ac @@ -36,9 +36,9 @@ AC_PROG_CC AC_PROG_LIBTOOL # Check for dependencies -PKG_CHECK_MODULES(DEP, x11 xt trapproto xext xextproto) -AC_SUBST(DEP_CFLAGS) -AC_SUBST(DEP_LIBS) +PKG_CHECK_MODULES(XTRAP, x11 xt trapproto xext xextproto) +AC_SUBST(XTRAP_CFLAGS) +AC_SUBST(XTRAP_LIBS) XORG_RELEASE_VERSION diff --git a/src/Makefile.am b/src/Makefile.am index 52eb022..99f47aa 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,8 +10,8 @@ libXTrap_la_SOURCES = \ XETrapInit.c \ XEWrappers.c -AM_CFLAGS = @DEP_CFLAGS@ +AM_CFLAGS = @XTRAP_CFLAGS@ -libXTrap_la_LIBADD = @DEP_LIBS@ +libXTrap_la_LIBADD = @XTRAP_LIBS@ libXTrap_la_LDFLAGS = -version-number 6:4:0 -no-undefined diff --git a/xtrap.pc.in b/xtrap.pc.in index a3a3e8e..1d8801e 100644 --- a/xtrap.pc.in +++ b/xtrap.pc.in @@ -6,5 +6,5 @@ includedir=@includedir@ Name: XTrap Description: X Trap Library Version: @PACKAGE_VERSION@ -Cflags: -I${includedir} @DEP_CFLAGS@ -Libs: -L${libdir} -lXTrap @DEP_LIBS@ +Cflags: -I${includedir} @XTRAP_CFLAGS@ +Libs: -L${libdir} -lXTrap @XTRAP_LIBS@ |