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 | 4306b9835f9015c38f8d5ec19526c8555a1b84cf (patch) | |
| tree | cd2cd2f324886b6cf80fe8a0359a30f65ca28522 | |
| parent | 24aa28a9dad24944a006c4038c35f6302b5ea3b0 (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-- | xinerama.pc.in | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 18b44fb..3fe708d 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 panoramixproto) +PKG_CHECK_MODULES(XINERAMA, x11 xext xextproto panoramixproto) -AC_SUBST(DEP_CFLAGS) -AC_SUBST(DEP_LIBS) +AC_SUBST(XINERAMA_CFLAGS) +AC_SUBST(XINERAMA_LIBS) XORG_RELEASE_VERSION diff --git a/src/Makefile.am b/src/Makefile.am index 7fa4c31..60158fa 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,9 +1,9 @@ -AM_CFLAGS = $(DEP_CFLAGS) +AM_CFLAGS = $(XINERAMA_CFLAGS) lib_LTLIBRARIES = libXinerama.la libXinerama_la_SOURCES = \ Xinerama.c -libXinerama_la_LIBADD = $(DEP_LIBS) +libXinerama_la_LIBADD = $(XINERAMA_LIBS) libXinerama_la_LDFLAGS = -version-number 1:0:0 -no-undefined diff --git a/xinerama.pc.in b/xinerama.pc.in index 3d12859..5fe10fd 100644 --- a/xinerama.pc.in +++ b/xinerama.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: Xinerama Description: The Xinerama Library Version: @PACKAGE_VERSION@ -Cflags: -I${includedir} @DEP_CFLAGS@ -Libs: -L${libdir} -lXinerama @DEP_LIBS@ +Cflags: -I${includedir} @XINERAMA_CFLAGS@ +Libs: -L${libdir} -lXinerama @XINERAMA_LIBS@ |