aboutsummaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap648
1 files changed, 316 insertions, 332 deletions
diff --git a/bootstrap b/bootstrap
index a48ce60..21aecef 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,115 +1,71 @@
#! /bin/sh
-# Bootstrap this package from CVS.
+# Bootstrap this package from checked-out sources.
-# Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2003-2008 Free Software Foundation, Inc.
-# This program is free software; you can redistribute it and/or modify
+# Dico 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, or (at your option)
-# any later version.
+# 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,
+# Dico 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with Dico. If not, see <http://www.gnu.org/licenses/>.
-# Written by Paul Eggert and Sergey Poznyakoff.
+# Written by Paul Eggert.
nl='
'
# Ensure file names are sorted consistently across platforms.
-# Also, ensure diagnostics are in English, e.g., "wget --help" below.
LC_ALL=C
export LC_ALL
+local_gl_dir=gl
+
+# Temporary directory names.
+bt='._bootmp'
+bt_regex=`echo "$bt"| sed 's/\./[.]/g'`
+bt2=${bt}2
+
usage() {
echo >&2 "\
Usage: $0 [OPTION]...
Bootstrap this package from the checked-out sources.
Options:
- --paxutils-srcdir=DIRNAME Specify the local directory where paxutils
- sources reside. Use this if you already
- have paxutils sources on your machine, and
- do not want to waste your bandwidth dowloading
- them again.
--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.
+ --paxutils-srcdir=DIRNAME Specify the local directory where paxutils
+ sources reside. Use this if you already
+ have paxutils sources on your machine, and
do not want to waste your bandwidth dowloading
them again.
--copy Copy files instead of creating symbolic links.
--force Attempt to bootstrap even if the sources seem
not to have been checked out.
--skip-po Do not download po files.
- --update-po Update po files and exit.
- --cvs-user=USERNAME Set the CVS username to be used when accessing
- the paxutils repository.
If the file bootstrap.conf exists in the current working directory, its
contents are read as shell variables to configure the bootstrap.
-Local defaults can be provided by placing the file \`.bootstrap' in the
-current working directory. The file is read after bootstrap.conf, comments
-and empty lines are removed, shell variables expanded and the result is
-prepended to the command line options.
-
Running without arguments will suffice in most cases.
"
}
-checkout() {
- if [ ! -d $1 ]; then
- echo "$0: getting $1 files..."
-
- case $1 in
- paxutils)
- case ${CVS_AUTH-pserver} in
- pserver)
- CVS_PREFIX=':pserver:anonymous@';;
- ssh)
- CVS_PREFIX="$CVS_USER${CVS_USER+@}";;
- *)
- echo "$0: $CVS_AUTH: Unknown CVS access method" >&2
- exit 1;;
- esac
-
- case $CVS_RSH in
- '') CVS_RSH=ssh; export CVS_RSH;;
- esac
-
- CVSURL=${CVS_PREFIX}cvs.savannah.gnu.org:/cvsroot/"$1"
- ;;
-
- gnulib)
- CVSURL=:pserver:anonymous@pserver.git.sv.gnu.org:/gnulib.git
- ;;
-
- esac
-
- trap "cleanup $1" 1 2 13 15
-
- cvs -z3 -q -d $CVSURL co $1 || cleanup $1
-
- trap - 1 2 13 15
- fi
-}
-
-cleanup() {
- status=$?
- rm -fr $1
- exit $status
-}
-
# Configuration.
+# Name of the Makefile.am
+gnulib_mk=gnulib.mk
+
# List of gnulib modules needed.
gnulib_modules=
@@ -126,9 +82,10 @@ po_download_command_format=\
extract_package_name='
/^AC_INIT(/{
- /.*,.*,.*,/{
+ /.*,.*,.*, */{
s///
s/[][]//g
+ s/)$//
p
q
}
@@ -141,19 +98,28 @@ extract_package_name='
}
'
package=`sed -n "$extract_package_name" configure.ac` || exit
+gnulib_name=lib$package
+
+build_aux=build-aux
+source_base=lib
+m4_base=m4
+doc_base=doc
+tests_base=tests
# Extra files from gnulib, which override files from other sources.
-gnulib_extra_files='
- build-aux/announce-gen
- build-aux/install-sh
- build-aux/missing
- build-aux/mdate-sh
- build-aux/texinfo.tex
- build-aux/depcomp
- build-aux/config.guess
- build-aux/config.sub
+gnulib_extra_files="
+ $build_aux/install-sh
+ $build_aux/missing
+ $build_aux/mdate-sh
+ $build_aux/texinfo.tex
+ $build_aux/depcomp
+ $build_aux/config.guess
+ $build_aux/config.sub
doc/INSTALL
-'
+"
+
+# Additional gnulib-tool options to use. Use "\newline" to break lines.
+gnulib_tool_option_extras=
# Other locale categories that need message catalogs.
EXTRA_LOCALE_CATEGORIES=
@@ -165,23 +131,32 @@ XGETTEXT_OPTIONS='\\\
--flag=error:3:c-format --flag=error_at_line:5:c-format\\\
'
+# Package bug report address for gettext files
+MSGID_BUGS_ADDRESS=bug-$package@gnu.org
+
# Files we don't want to import.
excluded_files=
# File that should exist in the top directory of a checked out hierarchy,
# but not in a distribution tarball.
-CVS_only_file=README-cvs
+checkout_only_file=README-hacking
# Whether to use copies instead of symlinks.
copy=false
+# Set this to '.cvsignore .gitignore' in bootstrap.conf if you want
+# those files to be generated in directories like lib/, m4/, and po/.
+# Or set it to 'auto' to make this script select which to use based
+# on which version control system (if any) is used in the source directory.
+vc_ignore=auto
+
# Override the default configuration, if necessary.
test -r bootstrap.conf && . ./bootstrap.conf
-# Read local configuration file
-if [ -r .bootstrap ]; then
- echo "$0: Reading configuration file .bootstrap"
- eval set -- "`sed 's/#.*$//;/^$/d' .bootstrap | tr '\n' ' '` $*"
+if test "$vc_ignore" = auto; then
+ vc_ignore=
+ test -d .git && vc_ignore=.gitignore
+ test -d CVS && vc_ignore="$vc_ignore .cvsignore"
fi
# Translate configuration into internal form.
@@ -194,20 +169,14 @@ do
--help)
usage
exit;;
- --paxutils-srcdir=*)
- PAXUTILS_SRCDIR=`expr "$option" : '--paxutils-srcdir=\(.*\)'`;;
--gnulib-srcdir=*)
GNULIB_SRCDIR=`expr "$option" : '--gnulib-srcdir=\(.*\)'`;;
- --cvs-user=*)
- CVS_USER=`expr "$option" : '--cvs-user=\(.*\)'`;;
- --skip-po | --no-po) # --no-po is for compatibility with 'tar' tradition.
- DOWNLOAD_PO=skip;;
- --update-po=*)
- DOWNLOAD_PO=`expr "$option" : '--update-po=\(.*\)'`;;
- --update-po)
- DOWNLOAD_PO=only;;
+ --paxutils-srcdir=*)
+ PAXUTILS_SRCDIR=`expr "$option" : '--paxutils-srcdir=\(.*\)'`;;
+ --skip-po)
+ SKIP_PO=t;;
--force)
- CVS_only_file=;;
+ checkout_only_file=;;
--copy)
copy=true;;
*)
@@ -216,12 +185,88 @@ do
esac
done
-if test -n "$CVS_only_file" && test ! -r "$CVS_only_file"; then
+if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then
echo "$0: Bootstrapping from a non-checked-out distribution is risky." >&2
exit 1
fi
-echo "$0: Bootstrapping CVS $package..."
+# If $STR is not already on a line by itself in $FILE, insert it,
+# sorting the new contents of the file and replacing $FILE with the result.
+insert_sorted_if_absent() {
+ file=$1
+ str=$2
+ test -f $file || touch $file
+ echo "$str" | sort -u - $file | cmp -s - $file \
+ || echo "$str" | sort -u - $file -o $file \
+ || exit 1
+}
+
+# Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac.
+found_aux_dir=no
+grep '^[ ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \
+ >/dev/null && found_aux_dir=yes
+grep '^[ ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \
+ >/dev/null && found_aux_dir=yes
+if test $found_aux_dir = no; then
+ echo "$0: expected line not found in configure.ac. Add the following:" >&2
+ echo " AC_CONFIG_AUX_DIR([$build_aux])" >&2
+ exit 1
+fi
+
+# If $build_aux doesn't exist, create it now, otherwise some bits
+# below will malfunction. If creating it, also mark it as ignored.
+if test ! -d $build_aux; then
+ mkdir $build_aux
+ for dot_ig in x $vc_ignore; do
+ test $dot_ig = x && continue
+ insert_sorted_if_absent $dot_ig $build_aux
+ done
+fi
+
+echo "$0: Bootstrapping from checked-out $package sources..."
+
+cleanup_dir() {
+ status=$?
+ rm -fr "$1"
+ exit $status
+}
+
+# Get gnulib files.
+
+case ${GNULIB_SRCDIR--} in
+-)
+ if [ ! -d gnulib ]; then
+ echo "$0: getting gnulib files..."
+
+ trap "cleanup_dir gnulib" 1 2 13 15
+
+ git clone --depth 2 git://git.sv.gnu.org/gnulib ||
+ cleanup_dir gnulib
+
+ trap - 1 2 13 15
+ fi
+ GNULIB_SRCDIR=gnulib
+esac
+
+gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
+<$gnulib_tool || exit
+
+# Get paxutils files.
+
+case ${PAXUTILS_SRCDIR--} in
+-)
+ if [ ! -d paxutils ]; then
+ echo "$0: getting gnulib files..."
+
+ trap "cleanup_dir paxutils" 1 2 13 15
+
+ git clone --depth 2 git://git.sv.gnu.org/paxutils ||
+ cleanup_dir paxutils
+
+ trap - 1 2 13 15
+ fi
+ PAXUTILS_SRCDIR=paxutils
+esac
# Get translations.
@@ -265,112 +310,41 @@ update_po_files() {
done
}
-case $DOWNLOAD_PO in
-'skip')
- ;;
+case $SKIP_PO in
'')
if test -d po; then
update_po_files po $package || exit
fi
- ;;
-'only')
- if test -d po; then
- update_po_files po $package || exit
- fi
- exit
- ;;
-esac
-
-# Get paxutils files.
-case ${PAXUTILS_SRCDIR--} in
--) checkout paxutils
- PAXUTILS_SRCDIR=paxutils
+ if test -d runtime-po; then
+ update_po_files runtime-po $package-runtime || exit
+ fi;;
esac
-if [ -r $PAXUTILS_SRCDIR/gnulib.modules ]; then
- gnulib_modules=`
- (echo "$gnulib_modules"; grep '^[^#]' $PAXUTILS_SRCDIR/gnulib.modules) |
- sort -u
- `
-fi
-
-ignore_file_list=
-cleanup_ifl() {
- test -n "$ignore_file_list" && rm -f $ignore_file_list
-}
-
-trap 'cleanup_ifl' 1 2 3 15
-
-# ignorefile DIR FILE
-# add FILE to the temporary ignorelist in the directory DIR
-ignorefile() {
- file=$1/.ignore.$$
- shift
- for f in $*
- do
- echo "$f" >> $file
- if `echo $ignore_list | grep -qv $file`; then
- ignore_file_list="$ignore_file_list
-$file"
- fi
- done
-}
+symlink_to_dir()
+{
+ src=$1/$2
+ dst=${3-$2}
-flush_cvsignore() {
- dir=$1
- shift
- (test -r $dir/.ignore.$$ && cat $dir/.ignore.$$
- test -r $dir/.cvsignore && cat $dir/.cvsignore
- for file in $*
- do
- echo $file
- done) | sort -u > $dir/.cvsignore.$$ && mv $dir/.cvsignore.$$ $dir/.cvsignore
-}
+ test -f "$src" && {
-# copy_files srcdir dstdir
-copy_files() {
- for file in `cat $1/DISTFILES`
- do
- case $file in
- "#*") continue;;
- esac
- dst=`echo $file | sed 's^.*/^^'`
- if [ $# -eq 3 ]; then
- case $dst in
- ${3}*) ;;
- *) dst=${3}$dst;;
- esac
+ # If the destination directory doesn't exist, create it.
+ # This is required at least for "lib/uniwidth/cjk.h".
+ dst_dir=`dirname "$dst"`
+ if ! test -d "$dst_dir"; then
+ mkdir -p "$dst_dir"
+
+ # If we've just created a directory like lib/uniwidth,
+ # tell version control system(s) it's ignorable.
+ # FIXME: for now, this does only one level
+ parent=`dirname "$dst_dir"`
+ for dot_ig in x $vc_ignore; do
+ test $dot_ig = x && continue
+ ig=$parent/$dot_ig
+ insert_sorted_if_absent $ig `echo "$dst_dir"|sed 's,.*/,,'`
+ done
fi
- echo "$0: Copying file $1/$file to $2/$dst"
- cp -p $1/$file $2/$dst
- ignorefile $2 $dst
- done
-}
-
-# Get gnulib files.
-
-case ${GNULIB_SRCDIR--} in
--)
- checkout gnulib
- GNULIB_SRCDIR=gnulib
-esac
-
-gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
-<$gnulib_tool || exit
-ensure_dir_exists()
-{
- d=`dirname $dst`
- test -d "$d" || mkdir -p -- "$d"
-}
-
-symlink_to_gnulib()
-{
- src=$GNULIB_SRCDIR/$1
- dst=${2-$1}
-
- test -f "$src" && {
if $copy; then
{
test ! -h "$dst" || {
@@ -381,7 +355,6 @@ symlink_to_gnulib()
test -f "$dst" &&
cmp -s "$src" "$dst" || {
echo "$0: cp -fp $src $dst" &&
- ensure_dir_exists $dst &&
cp -fp "$src" "$dst"
}
else
@@ -404,7 +377,6 @@ symlink_to_gnulib()
esac
echo "$0: ln -fs $dot_dots$src $dst" &&
- ensure_dir_exists $dst &&
ln -fs "$dot_dots$src" "$dst"
}
fi
@@ -417,7 +389,9 @@ cp_mark_as_generated()
cp_dst=$2
if cmp -s "$cp_src" "$GNULIB_SRCDIR/$cp_dst"; then
- symlink_to_gnulib "$cp_dst"
+ symlink_to_dir "$GNULIB_SRCDIR" "$cp_dst"
+ elif cmp -s "$cp_src" "$local_gl_dir/$cp_dst"; then
+ symlink_to_dir $local_gl_dir "$cp_dst"
else
case $cp_dst in
*.[ch]) c1='/* '; c2=' */';;
@@ -426,10 +400,16 @@ cp_mark_as_generated()
*) c1= ; c2= ;;
esac
+ # If the destination directory doesn't exist, create it.
+ # This is required at least for "lib/uniwidth/cjk.h".
+ dst_dir=`dirname "$cp_dst"`
+ test -d "$dst_dir" || mkdir -p "$dst_dir"
+
if test -z "$c1"; then
cmp -s "$cp_src" "$cp_dst" || {
echo "$0: cp -f $cp_src $cp_dst" &&
- cp -f "$cp_src" "$cp_dst"
+ rm -f "$cp_dst" &&
+ sed "s!$bt_regex/!!g" "$cp_src" > "$cp_dst"
}
else
# Copy the file first to get proper permissions if it
@@ -438,7 +418,7 @@ cp_mark_as_generated()
(
echo "$c1-*- buffer-read-only: t -*- vi: set ro:$c2" &&
echo "${c1}DO NOT EDIT! GENERATED AUTOMATICALLY!$c2" &&
- cat "$cp_src"
+ sed "s!$bt_regex/!!g" "$cp_src"
) > $cp_dst-t &&
if cmp -s "$cp_dst-t" "$cp_dst"; then
rm -f "$cp_dst-t"
@@ -458,7 +438,9 @@ version_controlled_file() {
grep -F "/$file/" $dir/CVS/Entries 2>/dev/null |
grep '^/[^/]*/[0-9]' > /dev/null && found=yes
elif test -d .git; then
- git-rm -n "$dir/$file" > /dev/null 2>&1 && found=yes
+ git rm -n "$dir/$file" > /dev/null 2>&1 && found=yes
+ elif test -d .svn; then
+ svn log -r HEAD "$dir/$file" > /dev/null 2>&1 && found=yes
else
echo "$0: no version control for $dir/$file?" >&2
fi
@@ -469,18 +451,22 @@ slurp() {
for dir in . `(cd $1 && find * -type d -print)`; do
copied=
sep=
- for file in `ls $1/$dir`; do
+ for file in `ls -a $1/$dir`; do
+ case $file in
+ .|..) continue;;
+ .*) continue;; # FIXME: should all file names starting with "." be ignored?
+ esac
test -d $1/$dir/$file && continue
for excluded_file in $excluded_files; do
test "$dir/$file" = "$excluded_file" && continue 2
done
if test $file = Makefile.am; then
- copied=$copied${sep}gnulib.mk; sep=$nl
- remove_intl='/^[^#].*\/intl/s/^/#/;'"s,/$bt,,g"
- sed "$remove_intl" $1/$dir/$file | cmp -s - $dir/gnulib.mk || {
- echo "$0: Copying $1/$dir/$file to $dir/gnulib.mk ..." &&
- rm -f $dir/gnulib.mk &&
- sed "$remove_intl" $1/$dir/$file >$dir/gnulib.mk
+ copied=$copied${sep}$gnulib_mk; sep=$nl
+ remove_intl='/^[^#].*\/intl/s/^/#/;'"s!$bt_regex/!!g"
+ sed "$remove_intl" $1/$dir/$file | cmp -s - $dir/$gnulib_mk || {
+ echo "$0: Copying $1/$dir/$file to $dir/$gnulib_mk ..." &&
+ rm -f $dir/$gnulib_mk &&
+ sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk
}
elif { test "${2+set}" = set && test -r $2/$dir/$file; } ||
version_controlled_file $dir $file; then
@@ -504,181 +490,179 @@ slurp() {
fi || exit
done
- if test -n "$copied"; then
- copied="Makefile
-Makefile.in
-$copied"
- if test -d CVS; then
- dot_ig=.cvsignore
- else
- dor_ig=.gitignore
- fi
-
+ for dot_ig in x $vc_ignore; do
+ test $dot_ig = x && continue
ig=$dir/$dot_ig
- if [ -f $dir/.ignore.$$ ]; then
- tfile=$dir/.ignore.$$
- else
- tfile=
+ if test -n "$copied"; then
+ insert_sorted_if_absent $ig "$copied"
+ # If an ignored file name ends with .in.h, then also add
+ # the name with just ".h". Many gnulib headers are generated,
+ # e.g., stdint.in.h -> stdint.h, dirent.in.h ->..., etc.
+ # Likewise for .gperf -> .h, .y -> .c, and .sin -> .sed
+ f=`echo "$copied"|sed 's/\.in\.h$/.h/;s/\.sin$/.sed/;s/\.y$/.c/;s/\.gperf$/.h/'`
+ insert_sorted_if_absent $ig "$f"
+
+ # For files like sys_stat.in.h and sys_time.in.h, record as
+ # ignorable the directory we might eventually create: sys/.
+ f=`echo "$copied"|sed 's/sys_.*\.in\.h$/sys/'`
+ insert_sorted_if_absent $ig "$f"
fi
- if test -f $ig; then
- echo "$copied" | sort -u - $ig | cmp -s - $ig ||
- echo "$copied" | sort -u - $ig $tfile -o $ig
- else
- copied="$dot_ig
-$copied"
- if [ "$dir" = "po" ]; then
- copied="LINGUAS
-Makevars
-POTFILES
-*.mo
-*.gmo
-*.po
-remove-potcdate.sed
-stamp-po
-$package.pot
-$copied"
- fi
- echo "$copied" | sort -u - $tfile -o $ig
- fi || exit
- fi
+ done
done
}
+# Import from paxutils
+echo "$0: Importing paxutils files"
+
+for dir in m4 doc rmt paxlib lib:paxlib tests; do
+ srcdir=${dir%:*}
+ dstdir=${dir##*:}
+ test -d $dstdir || mkdir $dstdir || exit
+ for file in `cat "${PAXUTILS_SRCDIR}/$srcdir/DISTFILES"`; do
+ if test "$srcdir/$file" = "rmt/Makefile.am"; then
+ cat ${PAXUTILS_SRCDIR}/$srcdir/$file | \
+ sed 's,/lib/configmake\.h,/gnu/configmake.h,g
+ /^LDADD *=/c\
+LDADD = ../paxlib/libpax.a ../gnu/libgnu.a @INTLLIBS@
+
+ /^INCLUDES *=/{s,/lib,/gnu,g;s,$, -I$(top_srcdir)/paxlib,}' > $dstdir/$file
+ echo "$0: cp ${PAXUTILS_SRCDIR}/$srcdir/$file $dstdir/$file # with edits"
+ else
+ symlink_to_dir ${PAXUTILS_SRCDIR}/$srcdir $file $dstdir || exit
+ fi
+ done
+done
-# Create boot temporary directories to import from gnulib and gettext.
+echo "$0: Creating m4/paxutils.m4"
+(echo "# This file is generated automatically. Please, do not edit."
+ echo "#"
+ echo "AC_DEFUN([${package}_PAXUTILS],["
+ cat ${PAXUTILS_SRCDIR}/m4/DISTFILES | sed '/^#/d;s/\(.*\)\.m4/pu_\1/' | tr a-z A-Z
+ echo "])") > ./m4/paxutils.m4
-bt='.#bootmp'
-bt2=${bt}2
+gnulib_modules=`(echo $gnulib_modules; grep '^[^#]' ${PAXUTILS_SRCDIR}/gnulib.modules)|sort|uniq`
+
+# Create boot temporary directories to import from gnulib and gettext.
rm -fr $bt $bt2 &&
mkdir $bt $bt2 || exit
# Import from gnulib.
-test -d build-aux || {
- echo "$0: mkdir build-aux ..." &&
- mkdir build-aux
-} || exit
gnulib_tool_options="\
--import\
--no-changelog\
- --aux-dir $bt/build-aux\
- --doc-base $bt/doc\
- --lib lib$package\
- --m4-base $bt/m4/\
- --source-base $bt/lib/\
- --tests-base $bt/tests\
- --local-dir gl\
+ --aux-dir $bt/$build_aux\
+ --doc-base $bt/$doc_base\
+ --lib $gnulib_name\
+ --m4-base $bt/$m4_base/\
+ --source-base $bt/$source_base/\
+ --tests-base $bt/$tests_base\
+ --local-dir $local_gl_dir\
+ $gnulib_tool_option_extras\
"
echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
$gnulib_tool $gnulib_tool_options --import $gnulib_modules &&
slurp $bt || exit
for file in $gnulib_files; do
- symlink_to_gnulib $file || exit
+ symlink_to_dir "$GNULIB_SRCDIR" $file || exit
done
-
# Import from gettext.
+with_gettext=yes
+grep '^[ ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \
+ with_gettext=no
-echo "$0: (cd $bt2; autopoint) ..."
-cp configure.ac $bt2 &&
-(cd $bt2 && autopoint && rm configure.ac) &&
-slurp $bt2 $bt || exit
-
-rm -fr $bt $bt2 || exit
-
-# Import from paxutils
-copy_files ${PAXUTILS_SRCDIR}/m4 m4
-echo "$0: Creating m4/paxutils.m4"
-(echo "# This file is generated automatically. Please, do not edit."
- echo "#"
- echo "AC_DEFUN([${package}_PAXUTILS],["
- cat ${PAXUTILS_SRCDIR}/m4/DISTFILES | sed '/^#/d;s/\(.*\)\.m4/pu_\1/' | tr a-z A-Z
- echo "])") > ./m4/paxutils.m4
-update_cvsignore m4 paxutils.m4
+if test $with_gettext = yes; then
+ echo "$0: (cd $bt2; autopoint) ..."
+ cp configure.ac $bt2 &&
+ (cd $bt2 && autopoint && rm configure.ac) &&
+ slurp $bt2 $bt || exit
-if [ -d rmt ]; then
- :
-else
- mkdir rmt
+ rm -fr $bt $bt2 || exit
fi
-for dir in doc rmt lib tests
-do
- copy_files ${PAXUTILS_SRCDIR}/$dir $dir
-done
-
-copy_files ${PAXUTILS_SRCDIR}/paxlib lib pax
+# Coreutils is unusual in that it generates some of its test-related
+# Makefile.am files. That must be done before invoking automake.
+mam_template=tests/Makefile.am.in
+if test -f $mam_template; then
+ PERL=perl
+ for tool in cut head join pr sort tac tail test tr uniq wc; do
+ m=tests/$tool/Makefile.am
+ t=${m}t
+ rm -f $m $t
+ sed -n '1,/^##test-files-begin/p' $mam_template > $t
+ echo "x = $tool" >> $t
+ srcdir=tests/$tool
+ $PERL -I$srcdir -w -- tests/mk-script $srcdir --list >> $t
+ sed -n '/^##test-files-end/,$p' $mam_template >> $t
+ chmod -w $t
+ mv $t $m
+ done
+fi
-echo "$0: Creating lib/system.c"
-m4 -DMODE=C sysdep.m4 mingw.m4 > lib/system.c
-echo "$0: Creating lib/system.h"
-m4 -DMODE=H sysdep.m4 mingw.m4 >> lib/system.h
-ignorefile lib system.c system.h
-echo "$0: Creating m4/sysdep.m4"
-m4 -DMODE=AC sysdep.m4 mingw.m4 > m4/sysdep.m4
-ignorefile m4 sysdep.m4
-
-echo "$0: Flushing .cvsignore files"
-ignorefile lib .cvsignore .deps
-for dir in m4 lib
-do
- flush_cvsignore $dir
-done
+# Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
+# gnulib-populated directories. Such .m4 files would cause aclocal to fail.
+# The following requires GNU find 4.2.3 or newer. Considering the usual
+# portability constraints of this script, that may seem a very demanding
+# requirement, but it should be ok. Ignore any failure, which is fine,
+# since this is only a convenience to help developers avoid the relatively
+# unusual case in which a symlinked-to .m4 file is git-removed from gnulib
+# between successive runs of this script.
+find "$m4_base" "$source_base" \
+ -depth \( -name '*.m4' -o -name '*.[ch]' \) \
+ -type l -xtype l -delete > /dev/null 2>&1
# Reconfigure, getting other files.
-for command in \
- 'aclocal --force -I m4' \
- 'autoconf --force' \
- 'autoheader --force' \
- 'automake --add-missing --copy --force-missing';
-do
- echo "$0: $command ..."
- $command || exit
-done
+echo "$0: autoreconf --force --install --symlink ..."
+autoreconf --force --install --symlink
+# FIXME: A kludge to avoid unnecessary data in the distribution.
+test -d libltdl/config && rm -rf libltdl/config
+test -d libltdl/m4 && rm -rf libltdl/m4
# Get some extra files from gnulib, overriding existing files.
-
for file in $gnulib_extra_files; do
case $file in
*/INSTALL) dst=INSTALL;;
+ build-aux/*) dst=$build_aux/`expr "$file" : 'build-aux/\(.*\)'`;;
*) dst=$file;;
esac
- symlink_to_gnulib $file $dst || exit
+ symlink_to_dir "$GNULIB_SRCDIR" $file $dst || exit
done
-
-# Create gettext configuration.
-echo "$0: Creating po/Makevars from po/Makevars.template ..."
-rm -f po/Makevars
-sed '
- /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/
- /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/
- /^XGETTEXT_OPTIONS *=/{
- s/$/ \\/
- a\
- '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
- }
-' po/Makevars.template >po/Makevars
-
-if test -d runtime-po; then
- # Similarly for runtime-po/Makevars, but not quite the same.
- rm -f runtime-po/Makevars
+if test $with_gettext = yes; then
+ # Create gettext configuration.
+ echo "$0: Creating po/Makevars from po/Makevars.template ..."
+ rm -f po/Makevars
sed '
- /^DOMAIN *=.*/s/=.*/= '"$package"'-runtime/
- /^subdir *=.*/s/=.*/= runtime-po/
- /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/
+ /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/
+ /^MSGID_BUGS_ADDRESS *=/s/=.*/= '"$MSGID_BUGS_ADDRESS"'/
/^XGETTEXT_OPTIONS *=/{
s/$/ \\/
a\
- '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
+ '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
}
- ' <po/Makevars.template >runtime-po/Makevars
+ ' po/Makevars.template >po/Makevars
+
+ if test -d runtime-po; then
+ # Similarly for runtime-po/Makevars, but not quite the same.
+ rm -f runtime-po/Makevars
+ sed '
+ /^DOMAIN *=.*/s/=.*/= '"$package"'-runtime/
+ /^subdir *=.*/s/=.*/= runtime-po/
+ /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/
+ /^XGETTEXT_OPTIONS *=/{
+ s/$/ \\/
+ a\
+ '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
+ }
+ ' <po/Makevars.template >runtime-po/Makevars
- # Copy identical files from po to runtime-po.
- (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po)
+ # Copy identical files from po to runtime-po.
+ (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po)
+ fi
fi
-cleanup_ifl
+
echo "$0: done. Now you can run './configure'."

Return to:

Send suggestions and report system problems to the System administrator.