Send Linux-ha-cvs mailing list submissions to linux-ha-cvs@lists.linux-ha.org
To subscribe or unsubscribe via the World Wide Web, visit http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs or, via email, send a message with subject or body 'help' to [EMAIL PROTECTED] You can reach the person managing the list at [EMAIL PROTECTED] When replying, please edit your Subject line so it is more specific than "Re: Contents of Linux-ha-cvs digest..." Today's Topics: 1. Linux-HA CVS: linux-ha by alan from (linux-ha-cvs@lists.linux-ha.org) 2. Linux-HA CVS: linux-ha by alan from (linux-ha-cvs@lists.linux-ha.org) 3. Linux-HA CVS: include by zhenh from (linux-ha-cvs@lists.linux-ha.org) ---------------------------------------------------------------------- Message: 1 Date: Thu, 11 May 2006 12:40:19 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by alan from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : alan Host : Module : linux-ha Dir : linux-ha Modified Files: configure.in ConfigureMe Log Message: Moved the detection and dealing with 64-bit libraries, etc. from ConfigureMe to configure This means that our .src.rpms will usable on either 32 or 64-bit platforms. Before, they weren't. =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v retrieving revision 1.512 retrieving revision 1.513 diff -u -3 -r1.512 -r1.513 --- configure.in 4 May 2006 15:59:05 -0000 1.512 +++ configure.in 11 May 2006 18:40:18 -0000 1.513 @@ -10,7 +10,7 @@ AC_INIT(heartbeat.spec.in) AC_CONFIG_AUX_DIR(.) -AC_REVISION($Revision: 1.512 $) dnl cvs revision +AC_REVISION($Revision: 1.513 $) dnl cvs revision AC_CANONICAL_HOST @@ -57,6 +57,22 @@ ;; esac +needs_64_bit_libs() { + case `uname -m` in + x86_64) + # Hmmm... Let's check for building from chrooted 32-bit environment... + case `file /bin/uname` in + *64-bit*|*x86-64*) true;; + *80?86*) false;; + *) true;; + esac + ;; + # FIXME. I don't think this is completely general enough. + s390*) true;; + *) false;; + esac +} + AC_SUBST(INIT_EXT) AC_SUBST(USE_MODULES) @@ -168,6 +184,7 @@ dnl Keep copy of original (default) localstatedir localstatedir_orig="$localstatedir" + exec_prefix=`var "$exec_prefix" "$prefix"` bindir=`var "$bindir" "$exec_prefix/bin"` sbindir=`var "$sbindir" "$exec_prefix/sbin"` @@ -183,6 +200,25 @@ mandir=`var "$mandir" "$exec_prefix/man"` docdir=${datadir}/doc/${HB_PKG}-${VERSION} +if + needs_64_bit_libs +then + case $libdir in + *64*) ;; + *) old=$libdir + libdir=$exec_prefix/lib64 + AC_MSG_WARN(overriding libdir from $old to $libdir) + ;; + esac + case $libexecdir in + *64*) ;; + *) old=$libexecdir + libexecdir=$exec_prefix/lib64 + AC_MSG_WARN(overriding libexecdir from $old to $libexecdir) + ;; + esac +fi + dnl The GNU conventions for installation directories don't always dnl sit well with this software. In particular, GNU's stated: dnl @@ -967,12 +1003,17 @@ if test "x${ac_cv_header_net_snmp_net_snmp_config_h}" = "xyes"; then AC_PATH_PROGS(SNMPCONFIG, net-snmp-config) if test "X${SNMPCONFIG}" = "X"; then - AC_MSG_RESULT(You need the net snmp development package to continue.) + AC_MSG_RESULT(You need the net_snmp development package to continue.) ENABLE_SNMP="no" else AC_MSG_CHECKING(for special snmp libraries) SNMPLIB=`net-snmp-config --libs` SNMPAGENTLIB=`net-snmp-config --agent-libs` + # KLUDGE!! + case $SNMPAGENTLIB in + *wrap*) ;; + *) SNMPAGENTLIB="$SNMPAGENTLIB -lwrap";; + esac AC_MSG_RESULT($SNMPLIB) fi elif test "x${ac_cv_header_ucd_snmp_snmp_h}" = "xyes"; then @@ -994,6 +1035,9 @@ ENABLE_SNMP="no" fi +if test "$ENABLE_SNMP" = "no" -a "x${enable_snmp_subagent}" = "xyes"; then + FatalMissingThing "SNMP Development package" "Missing SNMP development libraries and/or headers" "" "Install net-snmp-devel to enable SNMP features" +fi if test "$ENABLE_SNMP" = "no" -o "x${enable_snmp_subagent}" != "xyes"; then enable_snmp_subagent="no" RPM_ENABLE_SNMP_SUBAGENT="0" @@ -1007,7 +1051,7 @@ LIBS="$LIBS $@" AC_MSG_CHECKING(snmp libraries: $LIBS) AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], , - AC_MSG_ERROR(cannot link with requested libraries. Reported errors follow: + AC_MSG_ERROR(cannot link with requested libraries ($LIBS). Reported errors follow: $(cat conftest.err))) AC_MSG_RESULT(ok) LIBS="$OLDLIBS" =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/ConfigureMe,v retrieving revision 1.51 retrieving revision 1.52 diff -u -3 -r1.51 -r1.52 --- ConfigureMe 28 Apr 2006 18:59:17 -0000 1.51 +++ ConfigureMe 11 May 2006 18:40:18 -0000 1.52 @@ -95,19 +95,6 @@ fi CFENV="$distro" FLAGS="--prefix=/usr --sysconfdir=/etc --localstatedir=/var $DFLAGS" - case `uname -m` in - x86_64) - # Hmmm... Let's check for building from chrooted 32-bit environment... - case `file /bin/uname` in - *Intel*80?86*) ;; - *) FLAGS="$FLAGS --libexecdir=/usr/lib64 --libdir=/usr/lib64";; - esac - ;; -# FIXME. I don't think it's a general fixing. - s390*) - FLAGS="$FLAGS --libexecdir=/usr/lib64 --libdir=/usr/lib64";; - *) ;; - esac } ConfigureAIX() { @@ -289,7 +276,7 @@ cf|conf|configure) do_configure $FLAGS $@ ;; - bootstrap) + boot|bootstrap) rm -f ${pathtotop}/configure do_configure $FLAGS $@ ;; ------------------------------ Message: 2 Date: Thu, 11 May 2006 16:43:16 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by alan from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : alan Host : Module : linux-ha Dir : linux-ha Modified Files: configure.in Log Message: Upped the version number to 2.0.6 =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v retrieving revision 1.513 retrieving revision 1.514 diff -u -3 -r1.513 -r1.514 --- configure.in 11 May 2006 18:40:18 -0000 1.513 +++ configure.in 11 May 2006 22:43:15 -0000 1.514 @@ -10,14 +10,14 @@ AC_INIT(heartbeat.spec.in) AC_CONFIG_AUX_DIR(.) -AC_REVISION($Revision: 1.513 $) dnl cvs revision +AC_REVISION($Revision: 1.514 $) dnl cvs revision AC_CANONICAL_HOST dnl Where #defines go (e.g. `AC_CHECK_HEADERS' below) AM_CONFIG_HEADER(linux-ha/config.h include/ha_config.h) ALL_LINGUAS="en fr" -AM_INIT_AUTOMAKE(heartbeat, 2.0.5) +AM_INIT_AUTOMAKE(heartbeat, 2.0.6) RPMREL=1 AC_SUBST(RPMREL) HB_PKG=heartbeat ------------------------------ Message: 3 Date: Fri, 12 May 2006 00:32:11 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: include by zhenh from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : zhenh Host : Project : linux-ha Module : include Dir : linux-ha/include/mgmt Modified Files: mgmt_common.h Log Message: add default_resource_failure_stickiness parameter =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/include/mgmt/mgmt_common.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- mgmt_common.h 11 May 2006 06:25:43 -0000 1.8 +++ mgmt_common.h 12 May 2006 06:32:10 -0000 1.9 @@ -101,7 +101,8 @@ return: MSG_OK transition_idle_timeout symmetric_cluster(True|False) stonith_enabled(True|False) no_quorum_policy(freeze|stop|ignore) - default_resource_stickiness have_quorum(True|False) + default_resource_stickiness have_quorum(True|False) + default_resource_failure_stickiness or MSG_FAIL */ @@ -112,6 +113,7 @@ #define F_MGMT_NO_QUORUM_POLICY 4 #define F_MGMT_DEFAULT_RESOURCE_STICKINESS 5 #define F_MGMT_HAVE_QUORUM 6 +#define F_MGMT_RESOURCE_FAILURE_STICKINESS 7 /* ------------------------------ _______________________________________________ Linux-ha-cvs mailing list Linux-ha-cvs@lists.linux-ha.org http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs End of Linux-ha-cvs Digest, Vol 30, Issue 37 ********************************************