From: Jim Meyering <[email protected]>
bootstrap: New file.
cfg.mk: New file: disable some failing syntax-checks, for now
.prev-version: New file.
* configure.ac: Use build-aux/.
Invoke gl_EARLY and gl_INIT.
(AC_CONFIG_FILES): Add gnulib/lib/Makefile and gnulib/tests/Makefile.
* Makefile.am (SUBDIRS): Add gnulib/lib and gnulib/tests.
* autogen.sh: Use aclocal -I gnulib/m4
* autogen.sh: do not create copies of installed scripts in "."
Doing that implies you have "." earlier than /usr/bin in PATH
which is a security risk. It's better not to put "." in your PATH
at all. If you must, put it at the end.
---
.prev-version | 1 +
Makefile.am | 3 +-
autogen.sh | 10 +-----
bootstrap | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
cfg.mk | 50 ++++++++++++++++++++++++++++++++++
configure.ac | 9 +++++-
6 files changed, 145 insertions(+), 10 deletions(-)
create mode 100644 .prev-version
create mode 100755 bootstrap
create mode 100644 cfg.mk
diff --git a/.prev-version b/.prev-version
new file mode 100644
index 0000000..08fec88
--- /dev/null
+++ b/.prev-version
@@ -0,0 +1 @@
+0.83
diff --git a/Makefile.am b/Makefile.am
index 5c93d2a..9616eb4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,7 +41,8 @@ dist_doc_DATA = LICENSE INSTALL README.devmap \
sysconf_DATA = conf/corosync.conf.example
-SUBDIRS = include lcr lib exec services tools test pkgconfig man
+SUBDIRS = gnulib/lib gnulib/tests include \
+ lcr lib exec services tools test pkgconfig man
# init
lint:
diff --git a/autogen.sh b/autogen.sh
index 27a6072..72cb864 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -101,20 +101,14 @@ elif [ -z $automake ]; then
exit 1
fi
-# Create local copies so that the incremental updates will work.
-rm -f ./autoconf ./automake ./autoheader
-ln -s `which $autoconf` ./autoconf
-ln -s `which $automake` ./automake
-ln -s `which $autoheader` ./autoheader
-
printf "$autoconf:\t"
$autoconf --version | head -n 1
printf "$automake:\t"
$automake --version | head -n 1
-echo $aclocal $ACLOCAL_FLAGS
-$aclocal $ACLOCAL_FLAGS
+echo aclocal -I gnulib/m4 $ACLOCAL_FLAGS
+aclocal -I gnulib/m4 $ACLOCAL_FLAGS
echo $autoheader
$autoheader
diff --git a/bootstrap b/bootstrap
new file mode 100755
index 0000000..3edcb50
--- /dev/null
+++ b/bootstrap
@@ -0,0 +1,82 @@
+#!/bin/sh
+# Run this after autogen.sh, to pull in all of the gnulib-related bits.
+# It's important to run *after* autogen.sh, since it updates some of
+# the same files autogen.sh does, yet those from gnulib are newer,
+# and match the tests. So if a gnulib bug has been fixed since the
+# snapshot taken for whatever gettext release you're using, yet you
+# run "make check" against the wrong version, the corresponding unit
+# test in gl-tests/ may well fail.
+
+usage() {
+ echo >&2 "\
+Usage: $0 [OPTION]...
+Bootstrap this package from the checked-out sources.
+
+Options:
+ --gnulib-srcdir=DIRNAME Specify the local directory where gnulib
+ sources reside. Use this if you already
+ have gnulib sources on your machine, and
+ do not want to waste your bandwidth downloading
+ them again.
+
+If the file bootstrap.conf exists in the current working directory, its
+contents are read as shell variables to configure the bootstrap.
+
+Running without arguments will suffice in most cases.
+"
+}
+
+for option
+do
+ case $option in
+ --help)
+ usage
+ exit;;
+ --gnulib-srcdir=*)
+ GNULIB_SRCDIR=`expr "$option" : '--gnulib-srcdir=\(.*\)'`;;
+ *)
+ echo >&2 "$0: $option: unknown option"
+ exit 1;;
+ esac
+done
+
+cleanup_gnulib() {
+ st=$?
+ rm -fr .gnulib
+ exit $st
+}
+
+case ${GNULIB_SRCDIR--} in
+-)
+ if [ ! -d .gnulib ]; then
+ echo "$0: getting gnulib files..."
+
+ trap cleanup_gnulib 1 2 13 15
+
+ git clone --depth 1 git://git.sv.gnu.org/gnulib .gnulib ||
+ cleanup_gnulib
+
+ trap - 1 2 13 15
+ fi
+ GNULIB_SRCDIR=.gnulib
+esac
+
+gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
+<$gnulib_tool || exit
+
+modules='
+useless-if-before-free
+maintainer-makefile
+manywarnings
+verify
+warnings
+'
+
+$gnulib_tool \
+ --no-vc-files \
+ --with-tests \
+ --aux-dir=build-aux \
+ --m4-base=gnulib/m4 \
+ --source-base=gnulib/lib \
+ --tests-base=gnulib/tests \
+ --import $modules
diff --git a/cfg.mk b/cfg.mk
new file mode 100644
index 0000000..741f8e9
--- /dev/null
+++ b/cfg.mk
@@ -0,0 +1,50 @@
+# Customize maint.mk -*- makefile -*-
+# Copyright (C) 2003-2009 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Use alpha.gnu.org for alpha and beta releases.
+# Use ftp.gnu.org for major releases.
+gnu_ftp_host-alpha = alpha.gnu.org
+gnu_ftp_host-beta = alpha.gnu.org
+gnu_ftp_host-major = ftp.gnu.org
+gnu_rel_host = $(gnu_ftp_host-$(RELEASE_TYPE))
+
+# Used in maint.mk's web-manual rule
+manual_title = corosync
+
+url_dir_list = \
+ ftp://$(gnu_rel_host)/not-applicable
+
+# The GnuPG ID of the key used to sign the tarballs.
+gpg_key_ID = B9AB9A16
+
+# Tests not to run as part of "make distcheck".
+local-checks-to-skip = \
+ sc_prohibit_atoi_atof \
+ sc_prohibit_strcmp \
+ sc_error_message_uppercase \
+ sc_error_message_period \
+ sc_file_system \
+ sc_useless_cpp_parens \
+ sc_program_name \
+ sc_space_tab
+
+# Tools used to bootstrap this package, used for "announcement".
+bootstrap-tools = autoconf,automake,gnulib
+
+# Now that we have better tests, make this the default.
+export VERBOSE = yes
+
+old_NEWS_hash = 8ed224902e335a80ec8340cd0d594d7f
diff --git a/configure.ac b/configure.ac
index ea8313c..2988086 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,11 +5,15 @@
AC_PREREQ([2.61])
AC_INIT([corosync], [trunk], [[email protected]])
+AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([lib/coroipcc.c])
AC_CONFIG_HEADER([include/corosync/config.h include/corosync/cs_config.h])
+gl_EARLY
+gl_INIT
+
AC_CANONICAL_HOST
AC_LANG([C])
@@ -117,7 +121,10 @@ AC_CONFIG_FILES([Makefile
pkgconfig/Makefile
services/Makefile
test/Makefile
- tools/Makefile])
+ tools/Makefile
+ gnulib/lib/Makefile
+ gnulib/tests/Makefile
+ ])
### Local business
--
1.6.3.1.135.g540c.dirty
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais
