diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-08-03 03:28:00 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-08-03 03:28:00 +0000 |
| commit | d0080f2f901247d12b78f90c747d543a1c96c8ab (patch) | |
| tree | 1e79eba10dde71794681f9c3c290cfbc58a7e882 | |
| parent | 2581b891b58754e29a2af759c3ca277bf5a06d97 (diff) | |
Do PKG_CHECK_MODULES on a unique token instead of on "DEP", so builds with
a global configure cache don't get confused.
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | xscrnsaver.pc.in | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 37b2ef8..7c6b8fa 100644 --- a/configure.ac +++ b/configure.ac @@ -34,10 +34,10 @@ AC_PROG_CC AC_PROG_LIBTOOL # Check for dependencies -PKG_CHECK_MODULES(DEP, x11 xext xextproto scrnsaverproto) +PKG_CHECK_MODULES(XSCRNSAVER, x11 xext xextproto scrnsaverproto) -AC_SUBST(DEP_CFLAGS) -AC_SUBST(DEP_LIBS) +AC_SUBST(XSCRNSAVER_CFLAGS) +AC_SUBST(XSCRNSAVER_LIBS) XORG_RELEASE_VERSION diff --git a/src/Makefile.am b/src/Makefile.am index ef54571..f23a7ba 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,10 +1,10 @@ -AM_CFLAGS = $(DEP_CFLAGS) +AM_CFLAGS = $(XSCRNSAVER_CFLAGS) lib_LTLIBRARIES = libXScrnSaver.la libXScrnSaver_la_SOURCES = \ XScrnSaver.c -libXScrnSaver_la_LIBADD = $(DEP_LIBS) +libXScrnSaver_la_LIBADD = $(XSCRNSAVER_LIBS) libXScrnSaver_la_LDFLAGS = -version-info 7:0:0 -no-undefined diff --git a/xscrnsaver.pc.in b/xscrnsaver.pc.in index 55104ac..1c0148d 100644 --- a/xscrnsaver.pc.in +++ b/xscrnsaver.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: XScrnSaver Description: The XScrnSaver Library Version: @PACKAGE_VERSION@ -Cflags: -I${includedir} @DEP_CFLAGS@ -Libs: -L${libdir} -lXScrnSaver @DEP_LIBS@ +Cflags: -I${includedir} @XSCRNSAVER_CFLAGS@ +Libs: -L${libdir} -lXScrnSaver @XSCRNSAVER_LIBS@ |