diff options
| author | Alan Conway <aconway@apache.org> | 2008-02-25 21:56:03 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2008-02-25 21:56:03 +0000 |
| commit | 1a8807f7219689eaa1fcf8ce1bd96de9fe287b95 (patch) | |
| tree | 8c7d3c98274f2f7308a057d62953c3fc4890c47d /cpp | |
| parent | 07eb942a521e951581e7a0d4558e08e4b29b6057 (diff) | |
| download | qpid-python-1a8807f7219689eaa1fcf8ce1bd96de9fe287b95.tar.gz | |
Fix build problem if openais is installed but openais-devel is not.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@631014 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/configure.ac | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/cpp/configure.ac b/cpp/configure.ac index 3d68ed7890..90ff0933fb 100644 --- a/cpp/configure.ac +++ b/cpp/configure.ac @@ -139,7 +139,6 @@ AC_CHECK_HEADERS([boost/shared_ptr.hpp uuid/uuid.h],, AC_MSG_ERROR([Missing required header files.])) # Check for optional CPG requirement. -save_ldflags=$LDFLAGS LDFLAGS="$LDFLAGS -L/usr/lib/openais -L/usr/lib64/openais" AC_ARG_WITH([cpg], @@ -157,15 +156,13 @@ AC_ARG_WITH([cpg], esac], [ # not specified - enable if libs/headers available. with_CPG=yes - AC_CHECK_LIB([cpg],[cpg_initialize],,[with_CPG=no]) AC_CHECK_HEADERS([openais/cpg.h],,[with_CPG=no]) + AC_CHECK_LIB([cpg],[cpg_initialize],,[with_CPG=no]) ] ) AM_CONDITIONAL([CPG], [test x$with_CPG = xyes]) if test x$with_CPG = xyes; then CPPFLAGS+=" -DCPG" -else - LDFLAGS=$save_ldflags fi # Files to generate |
