diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-07-20 19:32:04 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-07-20 19:32:04 +0000 |
| commit | f642055e2b5daac1bbf0126468069f030296a8b4 (patch) | |
| tree | 64e47548c1b6b1811fc798987969de0297c86aed | |
| parent | c58aeba1927b1a984c50d2936e4bbc9d28f59218 (diff) | |
Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
configure cache, you cache it, and the cached value is probably wrong.
| -rw-r--r-- | Makefile.am | 28 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 17 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am index fc5c273..e7c971d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,8 +33,8 @@ bin_PROGRAMS = \ # # xtrapchar # -xtrapchar_CFLAGS = $(DEP_CFLAGS) -xtrapchar_LDADD = $(DEP_LIBS) +xtrapchar_CFLAGS = $(XTRAP_CFLAGS) +xtrapchar_LDADD = $(XTRAP_LIBS) xtrapchar_SOURCES = \ xtrapchar.c \ @@ -46,8 +46,8 @@ xtrapchar_SOURCES = \ # # xtrapin # -xtrapin_CFLAGS = $(DEP_CFLAGS) -D_BSD_SOURCE -xtrapin_LDADD = $(DEP_LIBS) +xtrapin_CFLAGS = $(XTRAP_CFLAGS) -D_BSD_SOURCE +xtrapin_LDADD = $(XTRAP_LIBS) xtrapin_SOURCES = \ xtrapin.c \ @@ -57,8 +57,8 @@ xtrapin_SOURCES = \ # # xtrapout # -xtrapout_CFLAGS = $(DEP_CFLAGS) -D_BSD_SOURCE -xtrapout_LDADD = $(DEP_LIBS) +xtrapout_CFLAGS = $(XTRAP_CFLAGS) -D_BSD_SOURCE +xtrapout_LDADD = $(XTRAP_LIBS) xtrapout_SOURCES = \ xtrapout.c \ @@ -68,8 +68,8 @@ xtrapout_SOURCES = \ # # xtrapproto # -xtrapproto_CFLAGS = $(DEP_CFLAGS) -xtrapproto_LDADD = $(DEP_LIBS) +xtrapproto_CFLAGS = $(XTRAP_CFLAGS) +xtrapproto_LDADD = $(XTRAP_LIBS) xtrapproto_SOURCES = \ xtrapproto.c @@ -77,8 +77,8 @@ xtrapproto_SOURCES = \ # # xtrapreset # -xtrapreset_CFLAGS = $(DEP_CFLAGS) -xtrapreset_LDADD = $(DEP_LIBS) +xtrapreset_CFLAGS = $(XTRAP_CFLAGS) +xtrapreset_LDADD = $(XTRAP_LIBS) xtrapreset_SOURCES = \ xtrapreset.c @@ -86,8 +86,8 @@ xtrapreset_SOURCES = \ # # xtrapstats # -xtrapstats_CFLAGS = $(DEP_CFLAGS) -xtrapstats_LDADD = $(DEP_LIBS) +xtrapstats_CFLAGS = $(XTRAP_CFLAGS) +xtrapstats_LDADD = $(XTRAP_LIBS) xtrapstats_SOURCES = \ xtrapstats.c @@ -95,8 +95,8 @@ xtrapstats_SOURCES = \ # # xtrapinfo # -xtrapinfo_CFLAGS = $(DEP_CFLAGS) -xtrapinfo_LDADD = $(DEP_LIBS) +xtrapinfo_CFLAGS = $(XTRAP_CFLAGS) +xtrapinfo_LDADD = $(XTRAP_LIBS) xtrapinfo_SOURCES = \ xtrapinfo.c \ diff --git a/configure.ac b/configure.ac index bbc43ac..d097eb4 100644 --- a/configure.ac +++ b/configure.ac @@ -32,8 +32,8 @@ AC_PROG_CC AC_PROG_INSTALL # Checks for pkg-config packages -PKG_CHECK_MODULES(DEP, x11 xtrap) -AC_SUBST(DEP_CFLAGS) -AC_SUBST(DEP_LIBS) +PKG_CHECK_MODULES(XTRAP, x11 xtrap) +AC_SUBST(XTRAP_CFLAGS) +AC_SUBST(XTRAP_LIBS) AC_OUTPUT([Makefile]) |