Commit e937da93 authored by Adam Jackson's avatar Adam Jackson 🎧
Browse files

Do PKG_CHECK_MODULES on a unique token instead of on "DEP", so builds with

    a global configure cache don't get confused.
parent 999bc862
......@@ -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
......
......@@ -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
......
......@@ -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@
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment