the following proposed patch for stable 3.1, refactors the logic used to do
a bootstrap so that it will always use the config.guess and config.sub scripts
from automake at bootstrap time, overriding possible obsoleted files from
libtool that could be pulled otherwise.
it simplifies the logic by removing the use of autoreconf and reformats the
scripts to remove obsolete logic of extra spaces.
this proposal contains changes from r1400 to r1403 and has been tested in a
default install for CentOS 4.6 to generate a working package that can be used
for DragonFlyBSD.
Carlo
---
Index: libmetrics/bootstrap
===================================================================
--- libmetrics/bootstrap (revision 1403)
+++ libmetrics/bootstrap (working copy)
@@ -1,18 +1,17 @@
#!/bin/sh
-# $Id: bootstrap 388 2004-11-18 02:24:06Z massie $
-if [ -d ../autotools ]; then
- PATH=../autotools/bin:${PATH}
-fi
+# $Id$
#echo "Running make distclean"
#make distclean
-echo "Running aclocal" &&
-aclocal &&
-echo "Running autoheader" &&
-autoheader &&
-echo "Running libtoolize" &&
-mkdir -p build && libtoolize --copy &&
+echo "Running aclocal" &&
+aclocal &&
+echo "Running autoheader" &&
+autoheader &&
+echo "Creating build" &&
+mkdir -p build &&
echo "Running automake" &&
-automake --add-missing --copy &&
+automake --add-missing --copy 2>/dev/null
+echo "Running libtoolize" &&
+libtoolize --automake --copy && automake --add-missing --copy &&
echo "Running autoconf" &&
autoconf &&
echo
Index: bootstrap
===================================================================
--- bootstrap (revision 1403)
+++ bootstrap (working copy)
@@ -1,15 +1,6 @@
#!/bin/sh
# $Id$
-if [ -x /usr/bin/autoreconf ]; then {
echo "Bootstrapping libmetrics"
-cd libmetrics && autoreconf --verbose --install --make
-cd ..
-
-echo "Create distribution timestamp"
-touch Makefile.am
-autoreconf --verbose --install --make
-} else {
-echo "Bootstrapping libmetrics"
cd libmetrics && ./bootstrap
cd ..
@@ -19,13 +10,14 @@
aclocal &&
echo "Running autoheader" &&
autoheader &&
-echo "Running libtoolize"&&
-mkdir -p build && libtoolize --copy
+echo "Creating build" &&
+mkdir -p build &&
echo "Running automake" &&
-automake --add-missing --copy &&
+automake --add-missing --copy 2>/dev/null
+echo "Running libtoolize" &&
+libtoolize --automake --copy && automake --add-missing --copy &&
echo "Running autoconf" &&
autoconf
-}; fi
echo &&
echo "To begin installation, run \"./configure\" now"
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Ganglia-developers mailing list
Ganglia-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ganglia-developers
