Send Linux-ha-cvs mailing list submissions to
[email protected]
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: lib by sunjd from ([email protected])
2. Linux-HA CVS: linux-ha by sunjd from
([email protected])
3. Linux-HA CVS: linux-ha by davidlee from
([email protected])
4. Linux-HA CVS: linux-ha by davidlee from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 22 Dec 2005 02:59:01 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/mgmt
Modified Files:
Makefile.am
Log Message:
Use multiple target rule
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/mgmt/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Makefile.am 22 Dec 2005 07:36:36 -0000 1.7
+++ Makefile.am 22 Dec 2005 09:59:00 -0000 1.8
@@ -53,11 +53,8 @@
halib_SCRIPTS = pymgmt.py
-pymgmt_wrap.c : pymgmt.i
- $(SWIG) -python -o $@ $^
-
-pymgmt.py: pymgmt.i
- echo a dummy rule
+pymgmt_wrap.c pymgmt.py: pymgmt.i
+ $(SWIG) -python $^
install-exec-local:
$(mkinstalldirs) $(DESTDIR)$(mgmtdir)
------------------------------
Message: 2
Date: Thu, 22 Dec 2005 03:02:29 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
heartbeat.spec.in
Log Message:
remove the redundant item
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat.spec.in,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -3 -r1.155 -r1.156
--- heartbeat.spec.in 22 Dec 2005 07:35:01 -0000 1.155
+++ heartbeat.spec.in 22 Dec 2005 10:02:29 -0000 1.156
@@ -1,4 +1,4 @@
-# $Id: heartbeat.spec.in,v 1.155 2005/12/22 07:35:01 sunjd Exp $
+# $Id: heartbeat.spec.in,v 1.156 2005/12/22 10:02:29 sunjd Exp $
# Workaround for a change in RPM 4.1.x; needs proper fixing soon!
##%define _unpackaged_files_terminate_build 0
@@ -1056,7 +1056,6 @@
@libdir@/libmgmtclient.*
@libdir@/libmgmtcommon.*
@libdir@/libmgmttls.*
- @libdir@/heartbeat/pymgmt.py
/etc/pam.d/mgmtd
/usr/share/locale/zh_CN/LC_MESSAGES/haclient.zh_CN.mo
%endif
------------------------------
Message: 3
Date: Thu, 22 Dec 2005 05:22:40 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
configure.in
Log Message:
Setting "ECHO*" must be near end, otherwise it interferes with
the output of AC_MSG*() macros (both direct invocations, and
indirect such as AC_MSG_HEADER).
Tidy up uses of "echo" (ECHO*), deprecated by autoconf, to
recommended forms, e.g. "AC_MSG_NOTICE()".
A few related (linguistic/cosmetic) tidy-ups.
------------------------------
Message: 4
Date: Thu, 22 Dec 2005 07:49:57 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
configure.in
Log Message:
Rev 1.481 had switched the default of "--enable-mgmt" from "no" to "try".
But configure wasn't testing for GNU/TLS, which "mgmt" requires.
So it was now attempting, and failing, to build on systems lacking it.
1. Test for "gnutls/gnutls.h".
2. Script already complex; the above would have made it even more so.
Simplify structure, taking advantage of "WarnMissingThing" macro.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.483
retrieving revision 1.484
diff -u -3 -r1.483 -r1.484
--- configure.in 22 Dec 2005 12:22:39 -0000 1.483
+++ configure.in 22 Dec 2005 14:49:56 -0000 1.484
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.483 $) dnl cvs revision
+AC_REVISION($Revision: 1.484 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -2226,41 +2226,38 @@
[ --enable-mgmt Compile the management tool. [default=try]],
[], [enable_mgmt=try])
-MGMT_ENABLED=0
-if test "x${enable_mgmt}" = "xyes" || test "x${enable_mgmt}" = "xtry"; then
+if test "x${enable_mgmt}" != "xno"; then
MGMT_ENABLED=1
- python_headers_found="yes"
+ if test "x${enable_mgmt}" = "xtry"; then
+ MISSING_FN="WarnMissingThing"
+ else
+ MISSING_FN="FatalMissingThing"
+ fi
PYTHON_HEADER_DIR="python${PYTHON_VERSION}"
- AC_CHECK_HEADER($PYTHON_HEADER_DIR/Python.h, ,
[python_headers_found="no"],)
- pam_headers_found="yes"
- AC_CHECK_HEADER(security/pam_appl.h, , [pam_headers_found="no"],)
-fi
-if test x${python_headers_found} != "xyes"; then
- if test "x${enable_mgmt}" = "xyes"; then
- FatalMissingThing "Python.h" "You need python-devel package for
" \
- "building the GUI managment module"
- elif test "x${enable_mgmt}" = "xtry"; then
- AC_MSG_WARN([Did not find Python.h, so disabling the building
of the GUI
- managment module. You need python-devel package for
- building the GUI managment module.])
- enable_mgmt=no
+ AC_CHECK_HEADER($PYTHON_HEADER_DIR/Python.h,
+ [python_headers_found="yes"],[python_headers_found="no"])
+ if test "x${python_headers_found}" = "xno"; then
+ $MISSING_FN "$PYTHON_HEADER_DIR/Python.h" \
+ "The GUI managment module needs the python-devel package"
+ enable_mgmt="no"
MGMT_ENABLED=0
- fi
- PYTHON_HEADER_DIR=
-fi
-AC_SUBST(PYTHON_HEADER_DIR)
+ fi
-if test x${pam_headers_found} != "xyes"; then
- if test "x${enable_mgmt}" = "xyes"; then
- FatalMissingThing "pam_appl.h" "You need pam-devel package for
" \
- "building the GUI managment module"
- elif test "x${enable_mgmt}" = "xtry"; then
- AC_MSG_WARN([Did not find pam_appl.h, so disabling the building
of the GUI
- managment module. You need pam-devel package for
- building the GUI managment module.])
- enable_mgmt=no
+ AC_CHECK_HEADER(security/pam_appl.h)
+ if test "$ac_cv_header_security_pam_appl_h" = "no"; then
+ $MISSING_FN "security/pam_appl.h" \
+ "The GUI managment module needs the pam-devel package"
+ enable_mgmt="no"
MGMT_ENABLED=0
- fi
+ fi
+
+ AC_CHECK_HEADER(gnutls/gnutls.h)
+ if test "$ac_cv_header_gnutls_gnutls_h" = "no"; then
+ $MISSING_FN "gnutls/gnutls.h" \
+ "The GUI managment module needs GNU/TLS"
+ enable_mgmt="no"
+ MGMT_ENABLED=0
+ fi
fi
AC_SUBST(MGMT_ENABLED)
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 25, Issue 63
********************************************
