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 msoffen from
([email protected])
2. Linux-HA CVS: linux-ha by msoffen from
([email protected])
3. Linux-HA CVS: linux-ha by msoffen from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Fri, 28 Apr 2006 12:57:58 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by msoffen from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : msoffen
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
bootstrap
Log Message:
Changed to use variables for program names - to support FreeBSD port names
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/bootstrap,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- bootstrap 21 Oct 2005 07:21:42 -0000 1.23
+++ bootstrap 28 Apr 2006 18:57:57 -0000 1.24
@@ -22,6 +22,24 @@
# Run this to generate all the initial makefiles, etc.
+testProgram()
+{
+ if [ -z "$1" ]
+ then
+ return 0;
+ fi
+
+ cmd=""
+ arch=`uname -s`
+ if [ "$arch" = "Linux" ]
+ then
+ cmd="$1 --version </dev/null >/dev/null 2>&1"
+ else
+ cmd="which -s $1"
+ fi
+
+}
+
srcdir=`dirname $0`
CONFIG=$srcdir/configure
if
@@ -51,26 +69,65 @@
RC=0
-gnu="ftp://ftp.gnu.org/pub/gnu/";
-libtool_name="libtool";
-arch=`uname -s`
-if [ "$arch" = "Darwin" ]
+gnu="ftp://ftp.gnu.org/pub/gnu";
+
+# Check for Autoconf
+pkg="autoconf"
+URL=$gnu/$pkg/
+for command in autoconf autoconf213 autoconf253 autoconf259
+do
+ testProgram $command
+ if
+ $cmd >/dev/null 2>&1
+ then
+ : OK $pkg is installed
+ autoconf=$command
+ autoheader=`echo "$autoconf" | sed -e 's/autoconf/autoheader/'`
+ autom4te=`echo "$autoconf" | sed -e 's/autoconf/autmo4te/'`
+ autoreconf=`echo "$autoconf" | sed -e 's/autoconf/autoreconf/'`
+ autoscan=`echo "$autoconf" | sed -e 's/autoconf/autoscan/'`
+ autoupdate=`echo "$autoconf" | sed -e 's/autoconf/autoupdate/'`
+ ifnames=`echo "$autoconf" | sed -e 's/autoconf/ifnames/'`
+ fi
+done
+
+# Check to see if we got a valid command.
+if
+ $autoconf --version </dev/null >/dev/null 2>&1
then
- libtool_name="glibtool";
+ echo "Autoconf package $autoconf found."
+else
+ RC=$?
+ cat <<-!EOF >&2
+
+ You must have $pkg installed to compile the linux-ha package.
+ Download the appropriate package for your system,
+ or get the source tarball at: $URL
+ !EOF
fi
-for command in autoconf automake libtoolize
+
+# Check for automake
+pkg="automake"
+URL=$gnu/$pkg/
+for command in automake automake14 automake15 automake19
do
- pkg=$command
- case $command in
- libtoolize) pkg=libtool; command=$libtool_name;;
- libtool) command=$libtool_name;;
- esac
- URL=$gnu/$pkg/
- if
- $command --version </dev/null >/dev/null 2>&1
+ testProgram $command
+ if
+ $cmd >/dev/null 2>&1
then
: OK $pkg is installed
- else
+ automake=$command
+ aclocal=`echo "$automake" | sed -e 's/automake/aclocal/'`
+
+ fi
+done
+
+# Check to see if we got a valid command.
+if
+ $automake --version </dev/null >/dev/null 2>&1
+then
+ echo "Automake package $automake found."
+else
RC=$?
cat <<-!EOF >&2
@@ -78,9 +135,38 @@
Download the appropriate package for your system,
or get the source tarball at: $URL
!EOF
+fi
+
+# Check for Libtool
+pkg="libtool"
+for command in libtool libtool14 libtool15 glibtool
+do
+ URL=$gnu/$pkg/
+ testProgram $command
+ if
+ $cmd >/dev/null 2>&1
+ then
+ : OK $pkg is installed
+ libtool=$command
+ libtoolize=`echo "$libtool" | sed -e 's/libtool/libtoolize/'`
fi
done
+# Check to see if we got a valid command.
+if
+ $libtool --version </dev/null >/dev/null 2>&1
+then
+ echo "Libtool package $libtool found."
+else
+ RC=$?
+ cat <<-!EOF >&2
+
+ You must have $pkg installed to compile the linux-ha package.
+ Download the appropriate package for your system,
+ or get the source tarball at: $URL
+ !EOF
+fi
+
case $RC in
0) ;;
*) exit $RC;;
@@ -104,7 +190,7 @@
read x; echo "$x"
}
-AC_version=`autoconf --version | oneline | sed -e 's%^[^0-9]*%%'`
+AC_version=`$autoconf --version | oneline | sed -e 's%^[^0-9]*%%'`
AC_majvers=`echo "$AC_version" | sed 's%\..*%%'`
AC_minvers=`echo "$AC_version" | sed 's%^.*\.%%'`
AC_minnum=`echo "$AC_minvers" | sed 's%[^0-9].*%%'`
@@ -138,7 +224,7 @@
fi
-LT_version=`$libtool_name --version | oneline | sed -e 's%^[^0-9]*%%' -e s'%
.*%%'`
+LT_version=`$libtool --version | oneline | sed -e 's%^[^0-9]*%%' -e s'% .*%%'`
LT_majvers=`echo "$LT_version" | sed -e 's%\..*%%'`
LT_minvers=`echo "$LT_version" | sed -e 's%^[^.]*\.%%' `
LT_minnum=`echo "$LT_minvers" | sed -e 's%[^0-9].*%%'`
@@ -146,35 +232,38 @@
if
[ $LT_majvers -lt 1 -o $LT_minnum -lt 4 ]
then
- echo "Minimum version of libtool is 1.4. You have $LT_version installed."
+ echo "Minimum version of ol is 1.4. You have $LT_version installed."
exit 1
fi
-echo aclocal $ACLOCAL_FLAGS
-aclocal $ACLOCAL_FLAGS
+echo $aclocal $ACLOCAL_FLAGS
+$aclocal $ACLOCAL_FLAGS
if
- echo autoheader --version < /dev/null > /dev/null 2>&1
- autoheader --version < /dev/null > /dev/null 2>&1
+ echo $autoheader --version < /dev/null > /dev/null 2>&1
+ $autoheader --version < /dev/null > /dev/null 2>&1
then
- echo autoheader
- autoheader
+ echo $autoheader
+ $autoheader
fi
rm -rf libltdl libltdl.tar
-echo libtoolize --ltdl --force --copy
-libtoolize --ltdl --force --copy
+echo $libtoolize --ltdl --force --copy
+$libtoolize --ltdl --force --copy
+
+echo $aclocal $ACLOCAL_FLAGS
+$aclocal $ACLOCAL_FLAGS
# Emulate the old --ltdl-tar option...
# If the libltdl directory is required we will unpack it later
tar -cf libltdl.tar libltdl
rm -rf libltdl
-echo automake --add-missing --include-deps --copy
-automake --add-missing --include-deps --copy
+echo $automake --add-missing --include-deps --copy
+$automake --add-missing --include-deps --copy
-echo autoconf
-autoconf
+echo $autoconf
+$autoconf
test -f libtool.m4 || touch libtool.m4
test -f ltdl.m4 || touch ltdl.m4
------------------------------
Message: 2
Date: Fri, 28 Apr 2006 12:59:18 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by msoffen from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : msoffen
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
ConfigureMe
Log Message:
Changed the default statedir from /usr/local/var to /var
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ConfigureMe,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- ConfigureMe 27 Mar 2006 03:12:25 -0000 1.50
+++ ConfigureMe 28 Apr 2006 18:59:17 -0000 1.51
@@ -116,22 +116,22 @@
}
ConfigureFreeBSD() {
- FLAGS="--prefix=/usr/local --sysconfdir=/usr/local/etc
--localstatedir=/usr/local/var"
+ FLAGS="--prefix=/usr/local --sysconfdir=/usr/local/etc --localstatedir=/var"
CFENV="FreeBSD"
}
ConfigureOpenBSD() {
- FLAGS="--disable-ldirectord --prefix=/usr/local --sysconfdir=/usr/local/etc
--localstatedir=/usr/local/var"
+ FLAGS="--disable-ldirectord --prefix=/usr/local --sysconfdir=/usr/local/etc
--localstatedir=/var"
CFENV="OpenBSD"
}
ConfigureNetBSD() {
- FLAGS="--disable-ldirectord --prefix=/usr/local --sysconfdir=/usr/local/etc
--localstatedir=/usr/local/var"
+ FLAGS="--disable-ldirectord --prefix=/usr/local --sysconfdir=/usr/local/etc
--localstatedir=/var"
CFENV="NetBSD"
}
ConfigureGenericBSD() {
- FLAGS="--disable-ldirectord --prefix=/usr/local --sysconfdir=/usr/local/etc
--localstatedir=/usr/local/var"
+ FLAGS="--disable-ldirectord --prefix=/usr/local --sysconfdir=/usr/local/etc
--localstatedir=/var"
CFENV="Generic BSD"
}
------------------------------
Message: 3
Date: Fri, 28 Apr 2006 13:01:36 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by msoffen from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : msoffen
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
configure.in
Log Message:
Changed from looking for just glibtool and libtool to check for the FreeBSD
port names
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.508
retrieving revision 1.509
diff -u -3 -r1.508 -r1.509
--- configure.in 27 Apr 2006 14:07:12 -0000 1.508
+++ configure.in 28 Apr 2006 19:01:36 -0000 1.509
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.508 $) dnl cvs revision
+AC_REVISION($Revision: 1.509 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -318,8 +318,8 @@
AC_PROG_LIBTOOL
dnl Replacing AC_PROG_LIBTOOL with AC_CHECK_PROG because LIBTOOL
dnl was NOT being expanded all the time thus causing things to fail.
-AC_CHECK_PROGS(LIBTOOL, glibtool libtool)
-AC_MSG_CHECKING(for glibtool or libtool)
+AC_CHECK_PROGS(LIBTOOL, glibtool libtool libtool15 libtool13)
+AC_MSG_CHECKING(for glibtool or libtool*)
if test x"${LIBTOOL}" = x""; then
FatalMissingThing "libtool" "You need libtool to build heartbeat." \
"You can get the source from ftp://www.gnu.org/pub/gnu/"; \
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 29, Issue 146
*********************************************
