diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-08-03 03:28:02 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-08-03 03:28:02 +0000 |
| commit | f5d69379f4941ba016c323fc790564d4f15dcd8b (patch) | |
| tree | 6edaf737b3fc9230ae923eeb436abfcf6dfb444d | |
| parent | 78abff3efba4b018c497dabbf6ba7027c7ee9b2c (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-- | xprintapputil.pc.in | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 0cff07a..c3fb9dc 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 xp xprintutil) +PKG_CHECK_MODULES(XPRINTAPPUTIL, x11 xp xprintutil) -AC_SUBST(DEP_CFLAGS) -AC_SUBST(DEP_LIBS) +AC_SUBST(XPRINTAPPUTIL_CFLAGS) +AC_SUBST(XPRINTAPPUTIL_LIBS) XORG_RELEASE_VERSION diff --git a/src/Makefile.am b/src/Makefile.am index 687e856..494ea40 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,8 +6,8 @@ libXprintAppUtil_la_SOURCES = \ INCLUDES = -I$(top_srcdir)/include -libXprintAppUtil_la_LIBADD = @DEP_LIBS@ -AM_CFLAGS = @DEP_CFLAGS@ +libXprintAppUtil_la_LIBADD = @XPRINTAPPUTIL_LIBS@ +AM_CFLAGS = @XPRINTAPPUTIL_CFLAGS@ libXprintAppUtil_la_LDFLAGS = -version-number 1:0:0 -no-undefined diff --git a/xprintapputil.pc.in b/xprintapputil.pc.in index 9b8f294..c9a7450 100644 --- a/xprintapputil.pc.in +++ b/xprintapputil.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: XprintAppUtil Description: The XprintAppUtil Library Version: @PACKAGE_VERSION@ -Cflags: -I${includedir} @DEP_CFLAGS@ -Libs: -L${libdir} -lXprintAppUtil @DEP_LIBS@ +Cflags: -I${includedir} @XPRINTAPPUTIL_CFLAGS@ +Libs: -L${libdir} -lXprintAppUtil @XPRINTAPPUTIL_LIBS@ |