summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2010-10-24 23:37:47 +0100
committerColin Watson <cjwatson@debian.org>2010-10-24 23:37:47 +0100
commit7314b92d6304c6c7ec8c4164f38a267b0cdc7596 (patch)
tree7bbb6c0eba7a3ecaa139cdf0cbbe08aa1fad6bf4 /tools
parent266eb29c888911c0cee3d6732218a9db4537cd5c (diff)
Allow building with an external libpipeline.
* configure.ac: Add --with-external-pipeline option. * lib/Makefile.am (libman_la_CPPFLAGS): Add $(libpipeline_CFLAGS). (libman_la_SOURCES): Include pipeline.c and pipeline.h only conditionally. (libman_la_LDFLAGS): Add $(libpipeline_LIBS). * src/Makefile.am (AM_CPPFLAGS): Add $(libpipeline_CFLAGS). * NEWS: Document this.
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile.in5
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 2ead2a1a..6df435d9 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -741,6 +741,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PO4A = @PO4A@
POSUB = @POSUB@
PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
@@ -953,6 +956,8 @@ infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+libpipeline_CFLAGS = @libpipeline_CFLAGS@
+libpipeline_LIBS = @libpipeline_LIBS@
localedir = @localedir@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@