diff options
Diffstat (limited to 'bootstrap')
| -rwxr-xr-x | bootstrap | 35 |
1 files changed, 27 insertions, 8 deletions
diff --git a/bootstrap b/bootstrap index 1a5aff06dcc8..01e36d35cb8c 100755 --- a/bootstrap +++ b/bootstrap @@ -3,6 +3,8 @@ # This "bootstrap" script performs various pre-autoreconf actions # that are required after pulling fresh sources from the repository. # +# --force is supported and will be passed to autoreconf +# # NOTE: THE NTP VERSION NUMBER COMES FROM packageinfo.sh # # all other instances of it anywhere in the source base have propagated @@ -27,7 +29,7 @@ set -e -scripts/genver +scripts/genver || { echo scripts/genver failed ; exit 1; } # autoreconf says: # The environment variables AUTOCONF, AUTOHEADER, AUTOMAKE, ACLOCAL, @@ -78,9 +80,9 @@ prog_opt_files=`grep -l '^prog.name' $def_files` ## Non-AutoGen stuff -for i in autogen-version.def version.def +for i in autogen-version.def version.def version.texi do - cmp -s include/$i sntp/$i || cp -p include/$i sntp/$i + cmp -s include/$i sntp/$i || cp -fp include/$i sntp/$i done # touch the stuff generated by the opt files @@ -89,27 +91,44 @@ for f in ${prog_opt_files} do f=`echo $f | sed -e 's/-opts.def//'` l= + lh= for i in `ls -1 $f*` do case "$i" in *.c|*.h|*.1|*.texi|*.menu) l="$l $i" ;; + *.html) + lh="$lh $i" + ;; esac done - case "$l" in - '') ;; - *) touch $l + case "$l:$lh" in + ':') ;; + *) touch $l $lh ;; esac done ## EOAutoGen stuff +# Yacc/bison files ntp_parser.[ch] so we don't require the tool if +# ntp_parser.y hasn't been updated. At the same time, keyword-gen-utd +# and ntp_keyword.h which are derived from ntp_parser.h and +# keyword-gen.c. + +touch ntpd/ntp_parser.[ch] ntpd/keyword-gen-utd ntpd/ntp_keyword.h + cp bincheck.mf sntp/ +cp depsver.mf sntp/ -${AUTORECONF} -i -v +${AUTORECONF} -i -v --no-recursive "$@" +# DH: 20101120: We are back to a single copy of libopts, and +# once again it seems we need to run autoreconf in sntp after +# the top-level run to get a correct sntp/libopts/Makefile.in. +# To reduce redundancy, the top-level autoreconf uses --no-recursive. +# # HMS: 20060618: Now that we use separate copies of libopts # we should only need the previous line. # @@ -117,4 +136,4 @@ ${AUTORECONF} -i -v ## we get the correct srcdir path in sntp/libopts/Makefile.in #rm -rf sntp/autom4te.cache # -#(cd sntp && ${AUTORECONF} -i -v) +(cd sntp && ${AUTORECONF} -i -v "$@") |