diff options
| author | Alan Conway <aconway@apache.org> | 2006-11-17 20:30:42 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2006-11-17 20:30:42 +0000 |
| commit | d6d523c5325aec2411f582b1249993f171748bf7 (patch) | |
| tree | 92b3ad3ef54134bc20c12ebf4dfc9b91c00eb347 /qpid/cpp/options.mk | |
| parent | 39afa34d1965ee3d97b8cc488ec33e46ea908699 (diff) | |
| download | qpid-python-d6d523c5325aec2411f582b1249993f171748bf7.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@476303 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/options.mk')
| -rw-r--r-- | qpid/cpp/options.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/options.mk b/qpid/cpp/options.mk index f624a397b3..351f4bdefd 100644 --- a/qpid/cpp/options.mk +++ b/qpid/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. |