diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-07-20 19:31:57 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-07-20 19:31:57 +0000 |
| commit | 34cd161f5947b4dc185356bc65653717f56ced00 (patch) | |
| tree | 8f17ce878b8b7e33df5b82bdf15a9cc97e1d74b4 | |
| parent | 8335e5fa471e25675c6a369ec2348883953fcdd0 (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 | 4 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 3efb072..c886771 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,8 +21,8 @@ bin_PROGRAMS = xkbcomp -AM_CFLAGS = $(DEP_CFLAGS) -xkbcomp_LDADD = $(DEP_LIBS) +AM_CFLAGS = $(XKBCOMP_CFLAGS) +xkbcomp_LDADD = $(XKBCOMP_LIBS) xkbcomp_SOURCES = \ action.c \ diff --git a/configure.ac b/configure.ac index cff6988..4fc35e9 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 xkbfile) -AC_SUBST(DEP_CFLAGS) -AC_SUBST(DEP_LIBS) +PKG_CHECK_MODULES(XKBCOMP, x11 xkbfile) +AC_SUBST(XKBCOMP_CFLAGS) +AC_SUBST(XKBCOMP_LIBS) AC_OUTPUT([Makefile]) |