diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-08-03 03:28:03 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-08-03 03:28:03 +0000 |
| commit | c0414eb4d8c710fac94ea32bc47031e1855c6fdb (patch) | |
| tree | 29d22a72b1311daef4e101b0a4c8b1b68bd73e67 | |
| parent | e51544b67812183184becaf6cd2ba907483bcea7 (diff) | |
| download | xorg-lib-libdmx-c0414eb4d8c710fac94ea32bc47031e1855c6fdb.tar.gz | |
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-- | dmx.pc.in | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index f1a88f7..d4793c9 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 dmxproto) +PKG_CHECK_MODULES(DMX, x11 xext xextproto dmxproto) -AC_SUBST(DEP_CFLAGS) -AC_SUBST(DEP_LIBS) +AC_SUBST(DMX_CFLAGS) +AC_SUBST(DMX_LIBS) XORG_RELEASE_VERSION @@ -6,6 +6,6 @@ includedir=@includedir@ Name: dmx Description: The dmx Library Version: @PACKAGE_VERSION@ -Cflags: -I${includedir} @DEP_CFLAGS@ -Libs: -L${libdir} -ldmx @DEP_LIBS@ +Cflags: -I${includedir} @DMX_CFLAGS@ +Libs: -L${libdir} -ldmx @DMX_LIBS@ diff --git a/src/Makefile.am b/src/Makefile.am index 37b7db5..5d1823e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,8 +3,8 @@ lib_LTLIBRARIES = libdmx.la libdmx_la_SOURCES = \ dmx.c -libdmx_la_LIBADD = $(DEP_LIBS) +libdmx_la_LIBADD = $(DMX_LIBS) libdmx_la_LDFLAGS = -version-number 1:0:0 -no-undefined -AM_CFLAGS = $(DEP_CFLAGS) +AM_CFLAGS = $(DMX_CFLAGS) |