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 | e83a8d3f9816605106a496c89f9e9ccfae3e4f4c (patch) | |
| tree | 2ed72112152aa6feb4fb47ad9ecfc9d4b8e6e939 | |
| parent | d8980cb7b6df64cf92c5b660f838497296dbb0bb (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 414b166..69bcf63 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,8 +24,8 @@ XINITDIR = $(libdir)/X11/xinit bin_PROGRAMS = xinit bin_SCRIPTS = startx -xinit_CFLAGS = $(DEP_CFLAGS) -DXINITDIR=\"$(XINITDIR)\" -DBINDIR=\"$(bindir)\" -xinit_LDADD = $(DEP_LIBS) +xinit_CFLAGS = $(XINIT_CFLAGS) -DXINITDIR=\"$(XINITDIR)\" -DBINDIR=\"$(bindir)\" +xinit_LDADD = $(XINIT_LIBS) xinit_SOURCES = \ xinit.c diff --git a/configure.ac b/configure.ac index 005654a..62d8de1 100644 --- a/configure.ac +++ b/configure.ac @@ -36,8 +36,8 @@ AC_PROG_INSTALL AC_PATH_PROG(SED,sed) # Checks for pkg-config packages -PKG_CHECK_MODULES(DEP, x11) -AC_SUBST(DEP_CFLAGS) -AC_SUBST(DEP_LIBS) +PKG_CHECK_MODULES(XINIT, x11) +AC_SUBST(XINIT_CFLAGS) +AC_SUBST(XINIT_LIBS) AC_OUTPUT([Makefile]) |