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 | bc34a489531d1a71857a5d68e4c256d1dacb89ae (patch) | |
| tree | 0f6776d0480cf20c4f2d59a6163c326e58be1c3c | |
| parent | 45bb17c155ce80c817e29144e960b02596ed7214 (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-- | xv.pc.in | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 63c1903..63adc0d 100644 --- a/configure.ac +++ b/configure.ac @@ -33,10 +33,10 @@ AC_PROG_CC AC_PROG_LIBTOOL # Check for dependencies -PKG_CHECK_MODULES(DEP, x11 xext xextproto videoproto) +PKG_CHECK_MODULES(XV, x11 xext xextproto videoproto) -AC_SUBST(DEP_CFLAGS) -AC_SUBST(DEP_LIBS) +AC_SUBST(XV_CFLAGS) +AC_SUBST(XV_LIBS) XORG_RELEASE_VERSION diff --git a/src/Makefile.am b/src/Makefile.am index 0d2e64a..a877aa7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,7 +4,7 @@ libXv_la_SOURCES = \ Xv.c \ Xvlibint.h -libXv_la_LIBADD = @DEP_LIBS@ -AM_CFLAGS = @DEP_CFLAGS@ -I$(top_srcdir)/include +libXv_la_LIBADD = @XV_LIBS@ +AM_CFLAGS = @XV_CFLAGS@ -I$(top_srcdir)/include libXv_la_LDFLAGS = -version-number 1:0:0 -no-undefined @@ -6,6 +6,6 @@ includedir=@includedir@ Name: Xv Description: The Xv Library Version: @PACKAGE_VERSION@ -Cflags: -I${includedir} @DEP_CFLAGS@ -Libs: -L${libdir} -lXv @DEP_LIBS@ +Cflags: -I${includedir} @XV_CFLAGS@ +Libs: -L${libdir} -lXv @XV_LIBS@ |