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 | f174f5b3d13aedc5b5c05e703b2d1c2ba654a9ce (patch) | |
| tree | cbea09193eaa17c92725b89999cdbe5af6be90e5 | |
| parent | 8ccaeea6df06f764de4a6ddcfb2a0c53c5e7e3c1 (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-- | xprintutil.pc.in | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index e20ae6c..c272128 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) +PKG_CHECK_MODULES(XPRINTUTIL, x11 xp) -AC_SUBST(DEP_CFLAGS) -AC_SUBST(DEP_LIBS) +AC_SUBST(XPRINTUTIL_CFLAGS) +AC_SUBST(XPRINTUTIL_LIBS) XORG_RELEASE_VERSION diff --git a/src/Makefile.am b/src/Makefile.am index d4c1e0a..068fbc7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,8 +7,8 @@ libXprintUtil_la_SOURCES = \ INCLUDES = -I$(top_srcdir)/include/X11/XprintUtil -libXprintUtil_la_LIBADD = @DEP_LIBS@ -AM_CFLAGS = @DEP_CFLAGS@ +libXprintUtil_la_LIBADD = @XPRINTUTIL_LIBS@ +AM_CFLAGS = @XPRINTUTIL_CFLAGS@ libXprintUtil_la_LDFLAGS = -version-number 1:0:0 -no-undefined diff --git a/xprintutil.pc.in b/xprintutil.pc.in index b33a079..aab138a 100644 --- a/xprintutil.pc.in +++ b/xprintutil.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: XprintUtil Description: The XprintUtil Library Version: @PACKAGE_VERSION@ -Cflags: -I${includedir} @DEP_CFLAGS@ -Libs: -L${libdir} -lXprintUtil @DEP_LIBS@ +Cflags: -I${includedir} @XPRINTUTIL_CFLAGS@ +Libs: -L${libdir} -lXprintUtil @XPRINTUTIL_LIBS@ |