Author: kpvdr Date: 2009-04-29 15:59:11 -0400 (Wed, 29 Apr 2009) New Revision: 3348 Removed: store/trunk/cpp/tests/cluster/ Modified: store/trunk/cpp/configure.ac store/trunk/cpp/tests/Makefile.am Log: Rolling back recent cluster tests until build difficulties can be resolved for rpm-based tests Modified: store/trunk/cpp/configure.ac =================================================================== --- store/trunk/cpp/configure.ac 2009-04-29 18:52:33 UTC (rev 3347) +++ store/trunk/cpp/configure.ac 2009-04-29 19:59:11 UTC (rev 3348) @@ -87,8 +87,8 @@ AC_MSG_ERROR([$QPID_DIR does not appear to be a valid qpid checkout.]) test -d $QPID_DIR/python -a -d $QPID_DIR/specs || \ AC_MSG_ERROR([$QPID_DIR does not have python and specs directories.]) - QPID_LIBS="$QPID_SRC/libqpidbroker.la $QPID_SRC/libqpidclient.la $QPID_SRC/libqpidcommon.la" - QPID_CXXFLAGS="-I$QPID_SRC -I${QPID_SRC}/gen -I${QPID_SRC}/tests" + QPID_LIBS="$QPID_SRC/libqpidbroker.la $QPID_SRC/libqpidcommon.la" + QPID_CXXFLAGS="-I$QPID_SRC -I${QPID_SRC}/gen" else fail=0 AC_CHECK_HEADERS([qpid/broker/MessageStore.h], , [fail=1]) @@ -179,56 +179,12 @@ AC_CHECK_PROG([RPMLINT], [rpmlint], [rpmlint]) AM_CONDITIONAL([HAS_RPMLINT], [test -n "$RPMLINT"]) -# Check for optional cluster requirements. -tmp_LIBS=$LIBS -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], - [AS_HELP_STRING([--with-cpg], [Build with CPG support for clustering.])], - [case "${withval}" in - yes) # yes - require dependencies - test x$have_libcpg = xyes || AC_MSG_ERROR([libcpg not found, install openais-devel or corosync-devel]) - test x$have_cpg_h = xyes || AC_MSG_ERROR([cpg.h not found, install openais-devel or corosync-devel]) - with_cpg=yes - ;; - no) with_cpg=no ;; - *) AC_MSG_ERROR([Bad value ${withval} for --with-cpg option]) ;; - esac], - [ # not specified - use if present - test x$have_libcpg = xyes -a x$have_cpg_h = xyes && with_cpg=yes - ] -) -AM_CONDITIONAL([HAVE_LIBCPG], [test x$with_cpg = xyes]) - -AC_CHECK_LIB([cman],[cman_is_quorate],have_libcman=yes,) -AC_CHECK_HEADERS([libcman.h],have_libcman_h=yes,) -AC_ARG_WITH([libcman], - [AS_HELP_STRING([--with-libcman], [Integration with libcman quorum service.])], - [case "${withval}" in - yes) # yes - require dependencies - test x$have_libcman = xyes || AC_MSG_ERROR([libcman not found, install cman-devel or cmanlib-devel]) - test x$have_libcman_h = xyes || AC_MSG_ERROR([libcman.h not found, install cman-devel or cmanlib-devel]) - with_libcman=yes - ;; - no) with_libcman=no ;; - *) AC_MSG_ERROR([Bad value ${withval} for --with-libcman option]) ;; - esac], - [ # not specified - use if present and we're using with_cpg - test x$have_libcman = xyes -a x$have_libcman_h = xyes -a x$with_cpg = xyes && with_libcman=yes - ] -) -AM_CONDITIONAL([HAVE_LIBCMAN], [test x$with_libcman = xyes]) - -LIBS=$tmp_LIBS - # Also doxygen for documentation... AC_CHECK_PROG([do_doxygen], [doxygen], [yes]) AM_CONDITIONAL([DOXYGEN], [test x$do_doxygen = xyes]) AC_CONFIG_FILES([ Makefile - tests/cluster/Makefile tests/Makefile tests/jrnl/Makefile tests/jrnl/jtt/Makefile Modified: store/trunk/cpp/tests/Makefile.am =================================================================== --- store/trunk/cpp/tests/Makefile.am 2009-04-29 18:52:33 UTC (rev 3347) +++ store/trunk/cpp/tests/Makefile.am 2009-04-29 19:59:11 UTC (rev 3348) @@ -28,7 +28,7 @@ TMPDIR=$(abs_srcdir)/test_tmp -SUBDIRS = jrnl cluster . +SUBDIRS = jrnl . TESTS = \ SimpleTest \