projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup after gl_FUNC_READLINK, for gl_FUNC_SYMLINK test
[gnulib.git]
/
build-aux
/
bootstrap
diff --git
a/build-aux/bootstrap
b/build-aux/bootstrap
index
48cc10e
..
7781446
100755
(executable)
--- a/
build-aux/bootstrap
+++ b/
build-aux/bootstrap
@@
-2,7
+2,7
@@
# Bootstrap this package from checked-out sources.
# Bootstrap this package from checked-out sources.
-# Copyright (C) 2003-20
09
Free Software Foundation, Inc.
+# Copyright (C) 2003-20
10
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
# 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
@@
-70,6
+70,10
@@
gnulib_modules=
# Any gnulib files needed that are not in modules.
gnulib_files=
# Any gnulib files needed that are not in modules.
gnulib_files=
+# A function to be called after everything else in this script.
+# Override it via your own definition in bootstrap.conf.
+bootstrap_epilogue() { :; }
+
# The command to download all .po files for a specified domain into
# a specified directory. Fill in the first %s is the domain name, and
# the second with the destination directory. Use rsync's -L and -r
# The command to download all .po files for a specified domain into
# a specified directory. Fill in the first %s is the domain name, and
# the second with the destination directory. Use rsync's -L and -r
@@
-310,10
+314,20
@@
get_version() {
$app --version >/dev/null 2>&1 || return 1
$app --version 2>&1 |
$app --version >/dev/null 2>&1 || return 1
$app --version 2>&1 |
- sed -n 's/[^0-9.]*\([0-9]\{1,\}\.[.a-z0-9-]*\).*/\1/p
+ sed -n '# extract version within line
+ s/.*[v ]\{1,\}\([0-9]\{1,\}\.[.a-z0-9-]*\).*/\1/
+ t done
+
+ # extract version at start of line
+ s/^\([0-9]\{1,\}\.[.a-z0-9-]*\).*/\1/
t done
t done
+
d
d
+
:done
:done
+ #the following essentially does s/5.005/5.5/
+ s/\.0*\([1-9]\)/.\1/g
+ p
q'
}
q'
}
@@
-413,7
+427,7
@@
case ${GNULIB_SRCDIR--} in
git_modules_config submodule.gnulib.url >/dev/null; then
git submodule init
GNULIB_SRCDIR=`cd $GNULIB_SRCDIR && pwd`
git_modules_config submodule.gnulib.url >/dev/null; then
git submodule init
GNULIB_SRCDIR=`cd $GNULIB_SRCDIR && pwd`
- git
config --replace-all submodule.gnulib.url $GNULIB_SRCDIR
+ git
_modules_
config --replace-all submodule.gnulib.url $GNULIB_SRCDIR
echo "$0: getting gnulib files..."
git submodule update || exit $?
GNULIB_SRCDIR=gnulib
echo "$0: getting gnulib files..."
git submodule update || exit $?
GNULIB_SRCDIR=gnulib
@@
-800,6
+814,8
@@
if test $with_gettext = yes; then
fi
fi
fi
fi
+bootstrap_epilogue
+
echo "$0: done. Now you can run './configure'."
# Local Variables:
echo "$0: done. Now you can run './configure'."
# Local Variables: