From 1e5e3e1f6f1979358d3f83dc63fd3290ad3584d6 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@nwnk.net>
Date: Wed, 3 Aug 2005 05:07:06 +0000
Subject: More unique PKG_CHECK_MODULES tokens

---
 Makefile.am  | 28 ++++++++++++++--------------
 configure.ac |  6 +++---
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c5711ff..869a182 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,8 +33,8 @@ bin_PROGRAMS = \
 # 
 # xtrapchar
 #
-xtrapchar_CFLAGS = $(XTRAP_CFLAGS)
-xtrapchar_LDADD = $(XTRAP_LIBS)
+xtrapchar_CFLAGS = $(XTRAP_APP_CFLAGS)
+xtrapchar_LDADD = $(XTRAP_APP_LIBS)
 
 xtrapchar_SOURCES = \
         xtrapchar.c \
@@ -46,8 +46,8 @@ xtrapchar_SOURCES = \
 #
 # xtrapin
 # 
-xtrapin_CFLAGS = $(XTRAP_CFLAGS) -D_BSD_SOURCE
-xtrapin_LDADD = $(XTRAP_LIBS)
+xtrapin_CFLAGS = $(XTRAP_APP_CFLAGS) -D_BSD_SOURCE
+xtrapin_LDADD = $(XTRAP_APP_LIBS)
 
 xtrapin_SOURCES = \
 	xtrapin.c \
@@ -57,8 +57,8 @@ xtrapin_SOURCES = \
 #
 # xtrapout
 #
-xtrapout_CFLAGS = $(XTRAP_CFLAGS) -D_BSD_SOURCE
-xtrapout_LDADD = $(XTRAP_LIBS)
+xtrapout_CFLAGS = $(XTRAP_APP_CFLAGS) -D_BSD_SOURCE
+xtrapout_LDADD = $(XTRAP_APP_LIBS)
 
 xtrapout_SOURCES = \
 	xtrapout.c \
@@ -68,8 +68,8 @@ xtrapout_SOURCES = \
 #
 # xtrapproto
 #
-xtrapproto_CFLAGS = $(XTRAP_CFLAGS)
-xtrapproto_LDADD = $(XTRAP_LIBS)
+xtrapproto_CFLAGS = $(XTRAP_APP_CFLAGS)
+xtrapproto_LDADD = $(XTRAP_APP_LIBS)
 
 xtrapproto_SOURCES = \
 	xtrapproto.c
@@ -77,8 +77,8 @@ xtrapproto_SOURCES = \
 #
 # xtrapreset
 #
-xtrapreset_CFLAGS = $(XTRAP_CFLAGS)
-xtrapreset_LDADD = $(XTRAP_LIBS)
+xtrapreset_CFLAGS = $(XTRAP_APP_CFLAGS)
+xtrapreset_LDADD = $(XTRAP_APP_LIBS)
 
 xtrapreset_SOURCES = \
 	xtrapreset.c
@@ -86,8 +86,8 @@ xtrapreset_SOURCES = \
 #
 # xtrapstats
 #
-xtrapstats_CFLAGS = $(XTRAP_CFLAGS)
-xtrapstats_LDADD = $(XTRAP_LIBS)
+xtrapstats_CFLAGS = $(XTRAP_APP_CFLAGS)
+xtrapstats_LDADD = $(XTRAP_APP_LIBS)
 
 xtrapstats_SOURCES = \
 	xtrapstats.c
@@ -95,8 +95,8 @@ xtrapstats_SOURCES = \
 #
 # xtrapinfo
 #
-xtrapinfo_CFLAGS = $(XTRAP_CFLAGS)
-xtrapinfo_LDADD = $(XTRAP_LIBS)
+xtrapinfo_CFLAGS = $(XTRAP_APP_CFLAGS)
+xtrapinfo_LDADD = $(XTRAP_APP_LIBS)
 
 xtrapinfo_SOURCES = \
 	xtrapinfo.c \
diff --git a/configure.ac b/configure.ac
index f82f1ec..15c57e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,9 +32,9 @@ AC_PROG_CC
 AC_PROG_INSTALL
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XTRAP, x11 xtrap)
-AC_SUBST(XTRAP_CFLAGS)
-AC_SUBST(XTRAP_LIBS)
+PKG_CHECK_MODULES(XTRAP_APP, x11 xtrap)
+AC_SUBST(XTRAP_APP_CFLAGS)
+AC_SUBST(XTRAP_APP_LIBS)
 
 XORG_RELEASE_VERSION
 
-- 
cgit v1.2.3