summaryrefslogtreecommitdiff
path: root/cpp/options.mk
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2006-11-17 20:30:42 +0000
committerAlan Conway <aconway@apache.org>2006-11-17 20:30:42 +0000
commitd386f860a3404ec9735dab2730f8ed683446838c (patch)
tree2980f35a6add967ab376a08fad7cdef4acff5933 /cpp/options.mk
parentbf74286e6a5eba055fd8bf9410c325205b8595d5 (diff)
downloadqpid-python-d386f860a3404ec9735dab2730f8ed683446838c.tar.gz
Patch from Andrew Stitcher to fix APR #include using apr-config.
Fixed build problems with USE_APR= - builds OK but broker non-functional. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@476303 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/options.mk')
-rw-r--r--cpp/options.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/options.mk b/cpp/options.mk
index f624a397b3..351f4bdefd 100644
--- a/cpp/options.mk
+++ b/cpp/options.mk
@@ -36,12 +36,12 @@ endif
ifdef USE_APR
PLATFORM := apr
IGNORE := posix
-CXXFLAGS := $(CXXFLAGS) -DUSE_APR -I/usr/local/apr/include
+CXXFLAGS := $(CXXFLAGS) -DUSE_APR -I$(shell apr-1-config --includedir)
LDFLAGS := $(LDFLAGS) -L/usr/local/apr/lib -lapr-1
else
PLATFORM := posix
IGNORE := apr
-LDFLAGS := $(LDFLAGS) -lpthread -lrt
+LDFLAGS := $(LDFLAGS) -lpthread -lrt -ldl
endif
## Build directories.