- enhanced link patch to kill -L/usr/{lib,lib64}/{corosync,openais}

- fixed configure/make glue typo

diff --git a/qpid-cpp-link.patch b/qpid-cpp-link.patch
index dc42f2d4c3277ef17edc20812ccf68482486f638..6c8bef74d9367659176b59f28bcc56206d4221ac 100644 (file)
--- a/qpid-cpp-link.patch
+++ b/qpid-cpp-link.patch
@@ -19,6 +19,14 @@
    $(posix_broker_src) \
 --- qpidc-0.16/configure.ac.orig       2012-04-12 22:13:46.000000000 +0200
 +++ qpidc-0.16/configure.ac    2012-07-31 21:04:30.774091602 +0200
+@@ -259,7 +259,6 @@
+ # 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],)
+ AC_ARG_WITH([cpg],  
 @@ -532,8 +532,8 @@
  LIBS=$gl_saved_libs
  

diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index 0b0db3b4d913e4732e3721795f84599efbd1d898..ead12fb5273fc2096893d0181d910e42c4f047a6 100644 (file)
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -199,7 +199,7 @@ Wiązania języka Ruby do bibliotek Qpid/C++.
        %{?with_static_libs:--enable-static} \
        --with-cpg%{!?with_corosync:=no} \
        --with-cman%{!?with_cman:=no} \
-       --with-rdma%{!?with_rdma:=no} \
+       --with-rdma%{!?with_rdma:=no}
 %{__make}
 
 %install