qpid-cpp-link.patch

   1 --- qpidc-0.16/src/Makefile.am.orig     2012-07-29 21:53:42.627886119 +0200
   2 +++ qpidc-0.16/src/Makefile.am  2012-07-30 18:58:29.098034802 +0200
   3 @@ -337,6 +337,7 @@
   4    -lboost_program_options \
   5    -lboost_filesystem \
   6    -luuid \
   7 +  -lpthread \
   8    $(LIB_DLOPEN) \
   9    $(LIB_CLOCK_GETTIME)
  10
  11 @@ -526,7 +527,7 @@
  12  QPIDCOMMON_VERSION_INFO = 2:0:0
  13  libqpidcommon_la_LDFLAGS=-version-info $(QPIDCOMMON_VERSION_INFO)
  14
  15 -libqpidbroker_la_LIBADD = libqpidcommon.la
  16 +libqpidbroker_la_LIBADD = libqpidcommon.la -lpthread
  17  libqpidbroker_la_SOURCES = \
  18    $(mgen_broker_cpp) \
  19    $(posix_broker_src) \
  20 --- qpidc-0.16/configure.ac.orig        2012-04-12 22:13:46.000000000 +0200
  21 +++ qpidc-0.16/configure.ac     2012-07-31 21:04:30.774091602 +0200
  22 @@ -259,7 +259,6 @@
  23  # Check for optional cluster requirements.
  24  tmp_LIBS=$LIBS
  25  tmp_LDFLAGS=$LDFLAGS
  26 -LDFLAGS="$LDFLAGS -L/usr/lib/openais -L/usr/lib64/openais -L/usr/lib/corosync -L/usr/lib64/corosync"
  27  AC_CHECK_LIB([cpg],[cpg_local_get],[have_libcpg=yes],)
  28  AC_CHECK_HEADERS([openais/cpg.h corosync/cpg.h],[have_cpg_h=yes],)
  29  AC_ARG_WITH([cpg],
  30 @@ -532,8 +532,8 @@
  31  LIBS=$gl_saved_libs
  32
  33  SOCKLIBS=""
  34 -AC_CHECK_LIB([socket],[socket],[SOCKET_LIB="-lsocket"],[SOCKET_LIB=""],[])
  35 -AC_CHECK_LIB([nsl],[getipnodebyname],[NSL_LIB="-lnsl"],[NSL_LIB=""],[])
  36 +AC_CHECK_FUNC([socket], [SOCKET_LIB=""], [AC_CHECK_LIB([socket],[socket],[SOCKET_LIB="-lsocket"],[SOCKET_LIB=""],[])])
  37 +AC_CHECK_FUNC([getipnodebyname], [NSL_LIB=""], [AC_CHECK_LIB([nsl],[getipnodebyname],[NSL_LIB="-lnsl"],[NSL_LIB=""],[])])
  38  SOCKLIBS="$SOCKET_LIB $NSL_LIB"
  39  AC_SUBST([SOCKLIBS])
  40