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 | 48705342fa31bd2a1e1310b06964640608391f17 (patch) | |
| tree | d5b1fce79fe46d5ede5c7cfed84cb91e61b86599 | |
| parent | 6e87009164f1af1bd1019f961837919c8e222114 (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 | 8 | ||||
| -rw-r--r-- | lbxutil.pc.in | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index edad913..22c41b6 100644 --- a/configure.ac +++ b/configure.ac @@ -45,13 +45,13 @@ AC_PROG_CC AC_PROG_LIBTOOL # Check for X -PKG_CHECK_MODULES(DEP, xextproto) +PKG_CHECK_MODULES(LBXUTIL, xextproto) -AC_CHECK_LIB(z,deflate,[DEP_LIBS="${DEP_LIBS} -lz"], +AC_CHECK_LIB(z,deflate,[LBXUTIL_LIBS="${LBXUTIL_LIBS} -lz"], AC_MSG_ERROR([zlib is required to build liblbxutil])) -AC_SUBST(DEP_CFLAGS) -AC_SUBST(DEP_LIBS) +AC_SUBST(LBXUTIL_CFLAGS) +AC_SUBST(LBXUTIL_LIBS) # Check fixesext configuration, strip extra digits from package version to # find the required protocol version diff --git a/lbxutil.pc.in b/lbxutil.pc.in index a8ce8f8..8388f03 100644 --- a/lbxutil.pc.in +++ b/lbxutil.pc.in @@ -6,5 +6,5 @@ includedir=@includedir@ Name: lbxutil Description: LBX Utilities Version: @PACKAGE_VERSION@ -Cflags: -I${includedir} @DEP_CFLAGS@ -Libs: -L${libdir} -llbxutil @DEP_LIBS@ +Cflags: -I${includedir} @LBXUTIL_CFLAGS@ +Libs: -L${libdir} -llbxutil @LBXUTIL_LIBS@ diff --git a/src/Makefile.am b/src/Makefile.am index 5bd7573..c0e2322 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,9 +24,9 @@ liblbxutil_la_SOURCES = \ $(srcdir)/image/lbxbwcodes.h \ $(srcdir)/delta/lbxdelta.c -liblbxutil_la_LIBADD = @DEP_LIBS@ +liblbxutil_la_LIBADD = @LBXUTIL_LIBS@ -INCLUDES = @DEP_CFLAGS@ +INCLUDES = @LBXUTIL_CFLAGS@ g3states.h: mkg3states ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h |