search for: 5179623

...force * bootstrap: Invoke autopoint with --force, to avoid warning about existing build-aux/config.rpath. * autogen.sh: Invoke autoreconf with --force, too. --- autogen.sh | 2 +- bootstrap | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/autogen.sh b/autogen.sh index 5179623..f2e128f 100755 --- a/autogen.sh +++ b/autogen.sh @@ -33,7 +33,7 @@ else fi mkdir -p daemon/m4 -autoreconf -i +autoreconf -i -f CONFIGUREDIR=. diff --git a/bootstrap b/bootstrap index 2eba6a7..85afda8 100755 --- a/bootstrap +++ b/bootstrap @@ -29,7 +29,7 @@ GNULIB_SRCDIR=.gnulib ls po/*.po 2...

...of automake, and if found, dumb-down our usage of AM_INIT_AUTOMAKE to exclude the offending option. --- autogen.sh | 9 +++++++++ configure.ac | 2 +- daemon/configure.ac | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/autogen.sh b/autogen.sh index 5179623..25cf94e 100755 --- a/autogen.sh +++ b/autogen.sh @@ -32,6 +32,15 @@ else ./bootstrap && echo "$t" > $curr_status fi +# In order to accommodate versions of automake that are older than 1.11 +# remove options that we find useful but that would otherwise not be recognized....

...ngeLog automatically from the gitlog. dist-hook: - ./gitlog-to-changelog > ChangeLog + $(top_srcdir)/build-aux/gitlog-to-changelog > ChangeLog cp ChangeLog $(distdir)/ChangeLog # Update the list of translatable files in po/POTFILES.in. diff --git a/autogen.sh b/autogen.sh index ba4612c..5179623 100755 --- a/autogen.sh +++ b/autogen.sh @@ -21,6 +21,17 @@ set -e set -v +# Ensure that whenever we pull in a gnulib update or otherwise change to a +# different version (i.e., when switching branches), we also rerun ./bootstrap. +curr_status=.git-module-status +t=$(git submodule status) +if te...