diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-07-20 19:31:50 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-07-20 19:31:50 +0000 |
| commit | 5273d6fadca1eb3aca9d406a81b80aba9c32bb6a (patch) | |
| tree | 5b870ee705f4403f36c03273e871c2b4bb9c1515 | |
| parent | e04d3454c2e7b0390ccf61d9f6e0ca3d2a04dfb6 (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 295a497..2e32408 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,8 +21,8 @@ bin_PROGRAMS = setxkbmap -setxkbmap_CFLAGS = $(DEP_CFLAGS) -D__XKBDEFRULES__='"xorg"' -setxkbmap_LDADD = $(DEP_LIBS) +setxkbmap_CFLAGS = $(SETXKBMAP_CFLAGS) -D__XKBDEFRULES__='"xorg"' +setxkbmap_LDADD = $(SETXKBMAP_LIBS) setxkbmap_SOURCES = \ setxkbmap.c diff --git a/configure.ac b/configure.ac index d8379b3..c3a1b49 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, xkbfile x11) -AC_SUBST(DEP_CFLAGS) -AC_SUBST(DEP_LIBS) +PKG_CHECK_MODULES(SETXKBMAP, xkbfile x11) +AC_SUBST(SETXKBMAP_CFLAGS) +AC_SUBST(SETXKBMAP_LIBS) AC_OUTPUT([Makefile]) |