diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-08-03 03:28:01 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-08-03 03:28:01 +0000 |
| commit | e937da932f616015befffbf3340b1f3c4a34dc1f (patch) | |
| tree | 551a17a70c9bf9df16bf7918b1209c0ad042940f | |
| parent | 999bc86206564f0adda375076e834465ef97e5f5 (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-- | xcomposite.pc.in | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index ba58747..f9e69e1 100644 --- a/configure.ac +++ b/configure.ac @@ -51,9 +51,9 @@ if test "$VERSION" = "" ; then VERSION=$PACKAGE_VERSION; fi COMPOSITEEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] -PKG_CHECK_MODULES(DEP, [compositeproto >= $COMPOSITEEXT_VERSION] x11 xfixes xext) -AC_SUBST(DEP_CFLAGS) -AC_SUBST(DEP_LIBS) +PKG_CHECK_MODULES(XCOMPOSITE, [compositeproto >= $COMPOSITEEXT_VERSION] x11 xfixes xext) +AC_SUBST(XCOMPOSITE_CFLAGS) +AC_SUBST(XCOMPOSITE_LIBS) XORG_RELEASE_VERSION diff --git a/src/Makefile.am b/src/Makefile.am index 9af6083..2e5abde 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,7 +21,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -AM_CFLAGS = $(DEP_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include +AM_CFLAGS = $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include lib_LTLIBRARIES = libXcomposite.la @@ -29,7 +29,7 @@ libXcomposite_la_SOURCES = \ xcompositeint.h \ Xcomposite.c -libXcomposite_la_LIBADD = $(XCOMPOSITE_LIBS) $(X_LIBS) $(DEP_LIBS) +libXcomposite_la_LIBADD = $(XCOMPOSITE_LIBS) $(X_LIBS) $(XCOMPOSITE_LIBS) libXcomposite_la_LDFLAGS = -version-number 1:0:0 -no-undefined diff --git a/xcomposite.pc.in b/xcomposite.pc.in index 2e51c29..0f63312 100644 --- a/xcomposite.pc.in +++ b/xcomposite.pc.in @@ -6,5 +6,5 @@ includedir=@includedir@ Name: Xcomposite Description: X Composite Library Version: @PACKAGE_VERSION@ -Cflags: -I${includedir} @DEP_CFLAGS@ -Libs: -L${libdir} -lXcomposite @DEP_LIBS@ +Cflags: -I${includedir} @XCOMPOSITE_CFLAGS@ +Libs: -L${libdir} -lXcomposite @XCOMPOSITE_LIBS@ |