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: linux-ha by andrew from
([email protected])
2. Linux-HA CVS: linux-ha by andrew from
([email protected])
3. Linux-HA CVS: linux-ha by andrew from
([email protected])
4. Linux-HA CVS: linux-ha by zhenh from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 23 May 2006 12:50:48 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
configure.in
Log Message:
Tweak pretty_cc to work on suse10.1
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.518
retrieving revision 1.519
diff -u -3 -r1.518 -r1.519
--- configure.in 20 May 2006 11:36:12 -0000 1.518
+++ configure.in 23 May 2006 18:50:47 -0000 1.519
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.518 $) dnl cvs revision
+AC_REVISION($Revision: 1.519 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -2526,9 +2526,10 @@
QUIET_MAKE_OPTS=""
if test x"${enable_pretty}" = "xyes"; then
enable_quiet="yes"
- PRETTY_CC="`dirname ${install_sh}`/tools/ccdv"
+ echo "install_sh: ${install_sh}"
+ PRETTY_CC="`pwd`/tools/ccdv"
dnl It would be nice if this was rebuilt when needed too...
- (cd `dirname ${install_sh}`/tools ; gcc -o ccdv ccdv.c )
+ gcc -o `pwd`/tools/ccdv ${srcdir}/tools/ccdv.c
CC="\$(PRETTY_CC) ${CC}"
fi
if test "x${enable_quiet}" = "xyes"; then
------------------------------
Message: 2
Date: Tue, 23 May 2006 12:58:27 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
configure.in
Log Message:
Fix for compilation on suse10.1
(No idea why lmb hasn't run into this problem as well)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.519
retrieving revision 1.520
diff -u -3 -r1.519 -r1.520
--- configure.in 23 May 2006 18:50:47 -0000 1.519
+++ configure.in 23 May 2006 18:58:26 -0000 1.520
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.519 $) dnl cvs revision
+AC_REVISION($Revision: 1.520 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -347,6 +347,14 @@
dnl We use this in the RPM specfile...
AC_SUBST(ac_configure_args)
+dnl Heartbeat does not appear to compile on SuSE 10.1 unless this macro is
+dnl present (mkdir_p is undefined and make install/dist/rpm refuse to
+dnl function).
+dnl Apologies in advance if this macro is not present in older versions
+dnl of libtool. If someone runs into this, let andrew know and we'll
+dnl try and work something out.
+AM_PROG_MKDIR_P
+
dnl *************************************************************************
PATH="$PATH:/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin"
export PATH
------------------------------
Message: 3
Date: Tue, 23 May 2006 14:36:30 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
configure.in
Log Message:
Tips for new players...
1) Dont use reserved autofoo words for your new configure options
2) Dont put two calls to AM_INIT_AUTOMAKE() in configure.in
EVEN IF ONLY ONE WOULD GET CALLED.
People found doing either of the above should purchase a large sword for their
self defence.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.520
retrieving revision 1.521
diff -u -3 -r1.520 -r1.521
--- configure.in 23 May 2006 18:58:26 -0000 1.520
+++ configure.in 23 May 2006 20:36:29 -0000 1.521
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.520 $) dnl cvs revision
+AC_REVISION($Revision: 1.521 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -18,17 +18,16 @@
AM_CONFIG_HEADER(linux-ha/config.h include/ha_config.h)
ALL_LINGUAS="en fr"
-AC_ARG_WITH(pkgversion,
- [ --with-pkgversion=name Override package version (if you're a
packager needing to pretend) ],
- [ PKGVERSION="$withval" ],
- [ PKGVERSION="" ],
+AC_ARG_WITH(hapkgversion,
+ [ --with-hapkgversion=name Override package version (if you're a
packager needing to pretend) ],
+ [ HAPKGVERSION="$withval" ],
+ [ HAPKGVERSION="" ],
)
-if test x"$PKGVERSION" != x; then
- AM_INIT_AUTOMAKE(heartbeat, $PKGVERSION)
-else
- AM_INIT_AUTOMAKE(heartbeat, 2.0.6)
+if test x"$HAPKGVERSION" = x; then
+ HAPKGVERSION="2.0.6"
fi
+AM_INIT_AUTOMAKE(heartbeat, $HAPKGVERSION)
RPMREL=1
AC_SUBST(RPMREL)
@@ -347,14 +346,6 @@
dnl We use this in the RPM specfile...
AC_SUBST(ac_configure_args)
-dnl Heartbeat does not appear to compile on SuSE 10.1 unless this macro is
-dnl present (mkdir_p is undefined and make install/dist/rpm refuse to
-dnl function).
-dnl Apologies in advance if this macro is not present in older versions
-dnl of libtool. If someone runs into this, let andrew know and we'll
-dnl try and work something out.
-AM_PROG_MKDIR_P
-
dnl *************************************************************************
PATH="$PATH:/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin"
export PATH
------------------------------
Message: 4
Date: Wed, 24 May 2006 00:48:25 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
configure.in
Log Message:
when running the configure, the build directory may be empty, so we need create
the directory tools for ccdv which will be generated in next line
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.521
retrieving revision 1.522
diff -u -3 -r1.521 -r1.522
--- configure.in 23 May 2006 20:36:29 -0000 1.521
+++ configure.in 24 May 2006 06:48:24 -0000 1.522
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.521 $) dnl cvs revision
+AC_REVISION($Revision: 1.522 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -2528,6 +2528,7 @@
echo "install_sh: ${install_sh}"
PRETTY_CC="`pwd`/tools/ccdv"
dnl It would be nice if this was rebuilt when needed too...
+ mkdir `pwd`/tools/ 2>/dev/null
gcc -o `pwd`/tools/ccdv ${srcdir}/tools/ccdv.c
CC="\$(PRETTY_CC) ${CC}"
fi
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 30, Issue 73
********************************************
