diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2009-07-16 17:18:09 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2009-07-16 17:18:09 +0000 |
| commit | de26c0cc60254b41b80bd2898779d2ad17c3e4ff (patch) | |
| tree | 260eda36507d4a2896d27625610059678dec67ce /cpp/configure.ac | |
| parent | 2263213d7dfa3aaba38360144f7b098fd0a96bee (diff) | |
| download | qpid-python-de26c0cc60254b41b80bd2898779d2ad17c3e4ff.tar.gz | |
Minor configure.ac cleanup to remove unneeded openais definitions when no openais is in use.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@794759 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/configure.ac')
| -rw-r--r-- | cpp/configure.ac | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cpp/configure.ac b/cpp/configure.ac index 4ee94d27dd..8ce66cf743 100644 --- a/cpp/configure.ac +++ b/cpp/configure.ac @@ -253,6 +253,7 @@ AC_CHECK_HEADERS([boost/shared_ptr.hpp uuid/uuid.h],, # Check for optional cluster requirements. tmp_LIBS=$LIBS +tmp_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -L/usr/lib/openais -L/usr/lib64/openais -L/usr/lib/corosync -L/usr/lib64/corosync" AC_CHECK_LIB([cpg],[cpg_local_get],[have_libcpg=yes],) AC_CHECK_HEADERS([openais/cpg.h corosync/cpg.h],[have_cpg_h=yes],) @@ -272,6 +273,8 @@ AC_ARG_WITH([cpg], ] ) AM_CONDITIONAL([HAVE_LIBCPG], [test x$with_cpg = xyes]) +# Clean up unnceccassary flags if we don't use clustering +AS_IF([test ! x$with_cpg = xyes], [LDFLAGS=$tmp_LDFLAGS]) AC_CHECK_LIB([cman],[cman_is_quorate],have_libcman=yes,) AC_CHECK_HEADERS([libcman.h],have_libcman_h=yes,) |