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 | fd1e75a518952bd6a5a432a037650474b45d6f15 (patch) | |
| tree | 28f97284224f99d2063d960780b004cca0fde1cb | |
| parent | da2f699f9f2e51eb57508230be679a6ed7fa6644 (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 | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index b0d8686..be003f9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,8 +21,8 @@ bin_PROGRAMS = xvidtune -xvidtune_CFLAGS = $(DEP_CFLAGS) -xvidtune_LDADD = $(DEP_LIBS) +xvidtune_CFLAGS = $(XVIDTUNE_CFLAGS) +xvidtune_LDADD = $(XVIDTUNE_LIBS) xvidtune_SOURCES = \ xvidtune.c diff --git a/configure.ac b/configure.ac index 324b18f..da42203 100644 --- a/configure.ac +++ b/configure.ac @@ -36,14 +36,14 @@ AC_PATH_PROGS(RAWCPP, [cpp], [$(CPP)], # Checks for pkg-config packages XAW_CHECK_XPRINT_SUPPORT(XAW) -PKG_CHECK_MODULES(DEP, xxf86vm) +PKG_CHECK_MODULES(XVIDTUNE, xxf86vm) -DEP_CFLAGS="$DEP_CFLAGS $XAW_CFLAGS" -DEP_LIBS="$DEP_LIBS $XAW_LIBS" +XVIDTUNE_CFLAGS="$DEP_CFLAGS $XAW_CFLAGS" +XVIDTUNE_LIBS="$DEP_LIBS $XAW_LIBS" -echo $DEP_LIBS +echo $XVIDTUNE_LIBS -AC_SUBST(DEP_CFLAGS) -AC_SUBST(DEP_LIBS) +AC_SUBST(XVIDTUNE_CFLAGS) +AC_SUBST(XVIDTUNE_LIBS) AC_OUTPUT([Makefile]) |