mirror of https://github.com/c-ares/c-ares.git
autotools cleanup (#372)
* remove: install-sh mkinstalldirs They're generated when needed, no need to store in it. * buildconf: remove custom logic with autoreconf Fix By: Daniel Stenberg (@bagder)pull/376/head
parent
a88f01e2fd
commit
5f6840ab8a
3 changed files with 2 additions and 984 deletions
@ -1,297 +1,4 @@ |
||||
#!/bin/sh |
||||
|
||||
#-------------------------------------------------------------------------- |
||||
# die prints argument string to stdout and exits this shell script. |
||||
# |
||||
die(){ |
||||
echo "buildconf: $@" |
||||
exit 1 |
||||
} |
||||
|
||||
#-------------------------------------------------------------------------- |
||||
# findtool works as 'which' but we use a different name to make it more |
||||
# obvious we aren't using 'which'! ;-) |
||||
# |
||||
findtool(){ |
||||
file="$1" |
||||
|
||||
if { echo "$file" | grep "/" >/dev/null 2>&1; } then |
||||
# when file is given with a path check it first |
||||
if test -f "$file"; then |
||||
echo "$file" |
||||
return |
||||
fi |
||||
fi |
||||
|
||||
old_IFS=$IFS; IFS=':' |
||||
for path in $PATH |
||||
do |
||||
IFS=$old_IFS |
||||
# echo "checks for $file in $path" >&2 |
||||
if test -f "$path/$file"; then |
||||
echo "$path/$file" |
||||
return |
||||
fi |
||||
done |
||||
IFS=$old_IFS |
||||
} |
||||
|
||||
#-------------------------------------------------------------------------- |
||||
# removethis() removes all files and subdirectories with the given name, |
||||
# inside and below the current subdirectory at invocation time. |
||||
# |
||||
removethis(){ |
||||
if test "$#" = "1"; then |
||||
find . -depth -name $1 -print > buildconf.tmp.$$ |
||||
while read fdname |
||||
do |
||||
if test -f "$fdname"; then |
||||
rm -f "$fdname" |
||||
elif test -d "$fdname"; then |
||||
rm -f -r "$fdname" |
||||
fi |
||||
done < buildconf.tmp.$$ |
||||
rm -f buildconf.tmp.$$ |
||||
fi |
||||
} |
||||
|
||||
#-------------------------------------------------------------------------- |
||||
# Ensure that buildconf runs from the subdirectory where configure.ac lives |
||||
# |
||||
if test ! -f configure.ac || |
||||
test ! -f src/lib/ares_init.c || |
||||
test ! -f m4/cares-functions.m4; then |
||||
echo "Can not run buildconf from outside of c-ares source subdirectory!" |
||||
echo "Change to the subdirectory where buildconf is found, and try again." |
||||
exit 1 |
||||
fi |
||||
|
||||
#-------------------------------------------------------------------------- |
||||
# GNU libtool preliminary check |
||||
# |
||||
want_lt_major=1 |
||||
want_lt_minor=4 |
||||
want_lt_patch=2 |
||||
want_lt_version=1.4.2 |
||||
|
||||
# This approach that tries 'glibtoolize first is intended for systems that |
||||
# have GNU libtool named as 'glibtoolize' and libtoolize not being GNU's. |
||||
|
||||
libtoolize=`findtool glibtoolize 2>/dev/null` |
||||
if test ! -x "$libtoolize"; then |
||||
libtoolize=`findtool ${LIBTOOLIZE:-libtoolize}` |
||||
fi |
||||
if test -z "$libtoolize"; then |
||||
echo "buildconf: libtoolize not found." |
||||
echo " You need GNU libtoolize $want_lt_version or newer installed." |
||||
exit 1 |
||||
fi |
||||
|
||||
lt_pver=`$libtoolize --version 2>/dev/null|head -n 1` |
||||
lt_qver=`echo $lt_pver|sed -e "s/([^)]*)//g" -e "s/^[^0-9]*//g"` |
||||
lt_version=`echo $lt_qver|sed -e "s/[- ].*//" -e "s/\([a-z]*\)$//"` |
||||
if test -z "$lt_version"; then |
||||
echo "buildconf: libtoolize not found." |
||||
echo " You need GNU libtoolize $want_lt_version or newer installed." |
||||
exit 1 |
||||
fi |
||||
old_IFS=$IFS; IFS='.'; set $lt_version; IFS=$old_IFS |
||||
lt_major=$1 |
||||
lt_minor=$2 |
||||
lt_patch=$3 |
||||
|
||||
if test -z "$lt_major"; then |
||||
lt_status="bad" |
||||
elif test "$lt_major" -gt "$want_lt_major"; then |
||||
lt_status="good" |
||||
elif test "$lt_major" -lt "$want_lt_major"; then |
||||
lt_status="bad" |
||||
elif test -z "$lt_minor"; then |
||||
lt_status="bad" |
||||
elif test "$lt_minor" -gt "$want_lt_minor"; then |
||||
lt_status="good" |
||||
elif test "$lt_minor" -lt "$want_lt_minor"; then |
||||
lt_status="bad" |
||||
elif test -z "$lt_patch"; then |
||||
lt_status="bad" |
||||
elif test "$lt_patch" -gt "$want_lt_patch"; then |
||||
lt_status="good" |
||||
elif test "$lt_patch" -lt "$want_lt_patch"; then |
||||
lt_status="bad" |
||||
else |
||||
lt_status="good" |
||||
fi |
||||
if test "$lt_status" != "good"; then |
||||
echo "buildconf: libtoolize version $lt_version found." |
||||
echo " You need GNU libtoolize $want_lt_version or newer installed." |
||||
exit 1 |
||||
fi |
||||
|
||||
#-------------------------------------------------------------------------- |
||||
# perl check |
||||
# |
||||
PERL=`findtool ${PERL:-perl}` |
||||
if test -z "$PERL"; then |
||||
echo "buildconf: perl not found" |
||||
exit 1 |
||||
fi |
||||
|
||||
#-------------------------------------------------------------------------- |
||||
# Remove files generated on previous buildconf/configure run. |
||||
# |
||||
for fname in .deps \ |
||||
.libs \ |
||||
*.la \ |
||||
*.lo \ |
||||
*.a \ |
||||
*.o \ |
||||
Makefile \ |
||||
Makefile.in \ |
||||
aclocal.m4 \ |
||||
aclocal.m4.bak \ |
||||
ares_build.h \ |
||||
ares_config.h \ |
||||
ares_config.h.in \ |
||||
autom4te.cache \ |
||||
compile \ |
||||
config.guess \ |
||||
config.log \ |
||||
config.lt \ |
||||
config.status \ |
||||
config.sub \ |
||||
configure \ |
||||
depcomp \ |
||||
libcares.pc \ |
||||
libtool \ |
||||
libtool.m4 \ |
||||
libtool.m4.tmp \ |
||||
ltmain.sh \ |
||||
ltoptions.m4 \ |
||||
ltsugar.m4 \ |
||||
ltversion.m4 \ |
||||
lt~obsolete.m4 \ |
||||
missing \ |
||||
stamp-h1 \ |
||||
stamp-h2 ; do |
||||
removethis "$fname" |
||||
done |
||||
|
||||
#-------------------------------------------------------------------------- |
||||
# run the correct scripts now |
||||
# |
||||
|
||||
echo "buildconf: running libtoolize" |
||||
${libtoolize} --copy --automake --force || die "libtoolize command failed" |
||||
|
||||
# When using libtool 1.5.X (X < 26) we copy libtool.m4 to our local m4 |
||||
# subdirectory and this local copy is patched to fix some warnings that |
||||
# are triggered when running aclocal and using autoconf 2.62 or later. |
||||
|
||||
if test "$lt_major" = "1" && test "$lt_minor" = "5"; then |
||||
if test -z "$lt_patch" || test "$lt_patch" -lt "26"; then |
||||
echo "buildconf: copying libtool.m4 to local m4 subdir" |
||||
ac_dir=`${ACLOCAL:-aclocal} --print-ac-dir` |
||||
if test -f $ac_dir/libtool.m4; then |
||||
cp -f $ac_dir/libtool.m4 m4/libtool.m4 |
||||
else |
||||
echo "buildconf: $ac_dir/libtool.m4 not found" |
||||
fi |
||||
if test -f m4/libtool.m4; then |
||||
echo "buildconf: renaming some variables in local m4/libtool.m4" |
||||
$PERL -i.tmp -pe \ |
||||
's/lt_prog_compiler_pic_works/lt_cv_prog_compiler_pic_works/g; \ |
||||
s/lt_prog_compiler_static_works/lt_cv_prog_compiler_static_works/g;' \ |
||||
m4/libtool.m4 |
||||
rm -f m4/libtool.m4.tmp |
||||
fi |
||||
fi |
||||
fi |
||||
|
||||
if test -f m4/libtool.m4; then |
||||
echo "buildconf: converting all mv to mv -f in local m4/libtool.m4" |
||||
$PERL -i.tmp -pe 's/\bmv +([^-\s])/mv -f $1/g' m4/libtool.m4 |
||||
rm -f m4/libtool.m4.tmp |
||||
fi |
||||
|
||||
echo "buildconf: running aclocal" |
||||
${ACLOCAL:-aclocal} -I m4 $ACLOCAL_FLAGS || die "aclocal command failed" |
||||
|
||||
echo "buildconf: converting all mv to mv -f in local aclocal.m4" |
||||
$PERL -i.bak -pe 's/\bmv +([^-\s])/mv -f $1/g' aclocal.m4 |
||||
|
||||
echo "buildconf: running autoheader" |
||||
${AUTOHEADER:-autoheader} || die "autoheader command failed" |
||||
|
||||
echo "buildconf: running autoconf" |
||||
${AUTOCONF:-autoconf} || die "autoconf command failed" |
||||
|
||||
echo "buildconf: running automake" |
||||
${AUTOMAKE:-automake} --add-missing --copy || die "automake command failed" |
||||
|
||||
#-------------------------------------------------------------------------- |
||||
# GNU libtool complementary check |
||||
# |
||||
# Depending on the libtool and automake versions being used, config.guess |
||||
# might not be installed in the subdirectory until automake has finished. |
||||
# So we can not attempt to use it until this very last buildconf stage. |
||||
# |
||||
if test ! -f ./config.guess; then |
||||
echo "buildconf: config.guess not found" |
||||
else |
||||
buildhost=`./config.guess 2>/dev/null|head -n 1` |
||||
case $buildhost in |
||||
*-*-darwin*) |
||||
need_lt_major=1 |
||||
need_lt_minor=5 |
||||
need_lt_patch=26 |
||||
need_lt_check="yes" |
||||
;; |
||||
*-*-hpux*) |
||||
need_lt_major=1 |
||||
need_lt_minor=5 |
||||
need_lt_patch=24 |
||||
need_lt_check="yes" |
||||
;; |
||||
esac |
||||
if test ! -z "$need_lt_check"; then |
||||
if test -z "$lt_major"; then |
||||
lt_status="bad" |
||||
elif test "$lt_major" -gt "$need_lt_major"; then |
||||
lt_status="good" |
||||
elif test "$lt_major" -lt "$need_lt_major"; then |
||||
lt_status="bad" |
||||
elif test -z "$lt_minor"; then |
||||
lt_status="bad" |
||||
elif test "$lt_minor" -gt "$need_lt_minor"; then |
||||
lt_status="good" |
||||
elif test "$lt_minor" -lt "$need_lt_minor"; then |
||||
lt_status="bad" |
||||
elif test -z "$lt_patch"; then |
||||
lt_status="bad" |
||||
elif test "$lt_patch" -gt "$need_lt_patch"; then |
||||
lt_status="good" |
||||
elif test "$lt_patch" -lt "$need_lt_patch"; then |
||||
lt_status="bad" |
||||
else |
||||
lt_status="good" |
||||
fi |
||||
if test "$lt_status" != "good"; then |
||||
need_lt_version="$need_lt_major.$need_lt_minor.$need_lt_patch" |
||||
echo "buildconf: libtool version $lt_version found." |
||||
echo " $buildhost requires GNU libtool $need_lt_version or newer installed." |
||||
rm -f configure |
||||
exit 1 |
||||
fi |
||||
fi |
||||
fi |
||||
|
||||
#-------------------------------------------------------------------------- |
||||
# Finished successfully. |
||||
# |
||||
echo "buildconf: OK" |
||||
|
||||
if test -f "test/buildconf"; then |
||||
cd test && ./buildconf |
||||
fi |
||||
|
||||
exit 0 |
||||
echo "*** Do not use buildconf. Instead, just use: autoreconf -fi" >&2 |
||||
exec ${AUTORECONF:-autoreconf} -fi "${@}" |
||||
|
@ -1,527 +0,0 @@ |
||||
#!/bin/sh |
||||
# install - install a program, script, or datafile |
||||
|
||||
scriptversion=2011-11-20.07; # UTC |
||||
|
||||
# This originates from X11R5 (mit/util/scripts/install.sh), which was |
||||
# later released in X11R6 (xc/config/util/install.sh) with the |
||||
# following copyright and license. |
||||
# |
||||
# Copyright (C) 1994 X Consortium |
||||
# |
||||
# Permission is hereby granted, free of charge, to any person obtaining a copy |
||||
# of this software and associated documentation files (the "Software"), to |
||||
# deal in the Software without restriction, including without limitation the |
||||
# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or |
||||
# sell copies of the Software, and to permit persons to whom the Software is |
||||
# furnished to do so, subject to the following conditions: |
||||
# |
||||
# The above copyright notice and this permission notice shall be included in |
||||
# all copies or substantial portions of the Software. |
||||
# |
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
||||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
||||
# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN |
||||
# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- |
||||
# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
||||
# |
||||
# Except as contained in this notice, the name of the X Consortium shall not |
||||
# be used in advertising or otherwise to promote the sale, use or other deal- |
||||
# ings in this Software without prior written authorization from the X Consor- |
||||
# tium. |
||||
# |
||||
# |
||||
# FSF changes to this file are in the public domain. |
||||
# |
||||
# Calling this script install-sh is preferred over install.sh, to prevent |
||||
# 'make' implicit rules from creating a file called install from it |
||||
# when there is no Makefile. |
||||
# |
||||
# This script is compatible with the BSD install script, but was written |
||||
# from scratch. |
||||
|
||||
nl=' |
||||
' |
||||
IFS=" "" $nl" |
||||
|
||||
# set DOITPROG to echo to test this script |
||||
|
||||
# Don't use :- since 4.3BSD and earlier shells don't like it. |
||||
doit=${DOITPROG-} |
||||
if test -z "$doit"; then |
||||
doit_exec=exec |
||||
else |
||||
doit_exec=$doit |
||||
fi |
||||
|
||||
# Put in absolute file names if you don't have them in your path; |
||||
# or use environment vars. |
||||
|
||||
chgrpprog=${CHGRPPROG-chgrp} |
||||
chmodprog=${CHMODPROG-chmod} |
||||
chownprog=${CHOWNPROG-chown} |
||||
cmpprog=${CMPPROG-cmp} |
||||
cpprog=${CPPROG-cp} |
||||
mkdirprog=${MKDIRPROG-mkdir} |
||||
mvprog=${MVPROG-mv} |
||||
rmprog=${RMPROG-rm} |
||||
stripprog=${STRIPPROG-strip} |
||||
|
||||
posix_glob='?' |
||||
initialize_posix_glob=' |
||||
test "$posix_glob" != "?" || { |
||||
if (set -f) 2>/dev/null; then |
||||
posix_glob= |
||||
else |
||||
posix_glob=: |
||||
fi |
||||
} |
||||
' |
||||
|
||||
posix_mkdir= |
||||
|
||||
# Desired mode of installed file. |
||||
mode=0755 |
||||
|
||||
chgrpcmd= |
||||
chmodcmd=$chmodprog |
||||
chowncmd= |
||||
mvcmd=$mvprog |
||||
rmcmd="$rmprog -f" |
||||
stripcmd= |
||||
|
||||
src= |
||||
dst= |
||||
dir_arg= |
||||
dst_arg= |
||||
|
||||
copy_on_change=false |
||||
no_target_directory= |
||||
|
||||
usage="\ |
||||
Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE |
||||
or: $0 [OPTION]... SRCFILES... DIRECTORY |
||||
or: $0 [OPTION]... -t DIRECTORY SRCFILES... |
||||
or: $0 [OPTION]... -d DIRECTORIES... |
||||
|
||||
In the 1st form, copy SRCFILE to DSTFILE. |
||||
In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. |
||||
In the 4th, create DIRECTORIES. |
||||
|
||||
Options: |
||||
--help display this help and exit. |
||||
--version display version info and exit. |
||||
|
||||
-c (ignored) |
||||
-C install only if different (preserve the last data modification time) |
||||
-d create directories instead of installing files. |
||||
-g GROUP $chgrpprog installed files to GROUP. |
||||
-m MODE $chmodprog installed files to MODE. |
||||
-o USER $chownprog installed files to USER. |
||||
-s $stripprog installed files. |
||||
-t DIRECTORY install into DIRECTORY. |
||||
-T report an error if DSTFILE is a directory. |
||||
|
||||
Environment variables override the default commands: |
||||
CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG |
||||
RMPROG STRIPPROG |
||||
" |
||||
|
||||
while test $# -ne 0; do |
||||
case $1 in |
||||
-c) ;; |
||||
|
||||
-C) copy_on_change=true;; |
||||
|
||||
-d) dir_arg=true;; |
||||
|
||||
-g) chgrpcmd="$chgrpprog $2" |
||||
shift;; |
||||
|
||||
--help) echo "$usage"; exit $?;; |
||||
|
||||
-m) mode=$2 |
||||
case $mode in |
||||
*' '* | *' '* | *' |
||||
'* | *'*'* | *'?'* | *'['*) |
||||
echo "$0: invalid mode: $mode" >&2 |
||||
exit 1;; |
||||
esac |
||||
shift;; |
||||
|
||||
-o) chowncmd="$chownprog $2" |
||||
shift;; |
||||
|
||||
-s) stripcmd=$stripprog;; |
||||
|
||||
-t) dst_arg=$2 |
||||
# Protect names problematic for 'test' and other utilities. |
||||
case $dst_arg in |
||||
-* | [=\(\)!]) dst_arg=./$dst_arg;; |
||||
esac |
||||
shift;; |
||||
|
||||
-T) no_target_directory=true;; |
||||
|
||||
--version) echo "$0 $scriptversion"; exit $?;; |
||||
|
||||
--) shift |
||||
break;; |
||||
|
||||
-*) echo "$0: invalid option: $1" >&2 |
||||
exit 1;; |
||||
|
||||
*) break;; |
||||
esac |
||||
shift |
||||
done |
||||
|
||||
if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then |
||||
# When -d is used, all remaining arguments are directories to create. |
||||
# When -t is used, the destination is already specified. |
||||
# Otherwise, the last argument is the destination. Remove it from $@. |
||||
for arg |
||||
do |
||||
if test -n "$dst_arg"; then |
||||
# $@ is not empty: it contains at least $arg. |
||||
set fnord "$@" "$dst_arg" |
||||
shift # fnord |
||||
fi |
||||
shift # arg |
||||
dst_arg=$arg |
||||
# Protect names problematic for 'test' and other utilities. |
||||
case $dst_arg in |
||||
-* | [=\(\)!]) dst_arg=./$dst_arg;; |
||||
esac |
||||
done |
||||
fi |
||||
|
||||
if test $# -eq 0; then |
||||
if test -z "$dir_arg"; then |
||||
echo "$0: no input file specified." >&2 |
||||
exit 1 |
||||
fi |
||||
# It's OK to call 'install-sh -d' without argument. |
||||
# This can happen when creating conditional directories. |
||||
exit 0 |
||||
fi |
||||
|
||||
if test -z "$dir_arg"; then |
||||
do_exit='(exit $ret); exit $ret' |
||||
trap "ret=129; $do_exit" 1 |
||||
trap "ret=130; $do_exit" 2 |
||||
trap "ret=141; $do_exit" 13 |
||||
trap "ret=143; $do_exit" 15 |
||||
|
||||
# Set umask so as not to create temps with too-generous modes. |
||||
# However, 'strip' requires both read and write access to temps. |
||||
case $mode in |
||||
# Optimize common cases. |
||||
*644) cp_umask=133;; |
||||
*755) cp_umask=22;; |
||||
|
||||
*[0-7]) |
||||
if test -z "$stripcmd"; then |
||||
u_plus_rw= |
||||
else |
||||
u_plus_rw='% 200' |
||||
fi |
||||
cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; |
||||
*) |
||||
if test -z "$stripcmd"; then |
||||
u_plus_rw= |
||||
else |
||||
u_plus_rw=,u+rw |
||||
fi |
||||
cp_umask=$mode$u_plus_rw;; |
||||
esac |
||||
fi |
||||
|
||||
for src |
||||
do |
||||
# Protect names problematic for 'test' and other utilities. |
||||
case $src in |
||||
-* | [=\(\)!]) src=./$src;; |
||||
esac |
||||
|
||||
if test -n "$dir_arg"; then |
||||
dst=$src |
||||
dstdir=$dst |
||||
test -d "$dstdir" |
||||
dstdir_status=$? |
||||
else |
||||
|
||||
# Waiting for this to be detected by the "$cpprog $src $dsttmp" command |
||||
# might cause directories to be created, which would be especially bad |
||||
# if $src (and thus $dsttmp) contains '*'. |
||||
if test ! -f "$src" && test ! -d "$src"; then |
||||
echo "$0: $src does not exist." >&2 |
||||
exit 1 |
||||
fi |
||||
|
||||
if test -z "$dst_arg"; then |
||||
echo "$0: no destination specified." >&2 |
||||
exit 1 |
||||
fi |
||||
dst=$dst_arg |
||||
|
||||
# If destination is a directory, append the input filename; won't work |
||||
# if double slashes aren't ignored. |
||||
if test -d "$dst"; then |
||||
if test -n "$no_target_directory"; then |
||||
echo "$0: $dst_arg: Is a directory" >&2 |
||||
exit 1 |
||||
fi |
||||
dstdir=$dst |
||||
dst=$dstdir/`basename "$src"` |
||||
dstdir_status=0 |
||||
else |
||||
# Prefer dirname, but fall back on a substitute if dirname fails. |
||||
dstdir=` |
||||
(dirname "$dst") 2>/dev/null || |
||||
expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
||||
X"$dst" : 'X\(//\)[^/]' \| \ |
||||
X"$dst" : 'X\(//\)$' \| \ |
||||
X"$dst" : 'X\(/\)' \| . 2>/dev/null || |
||||
echo X"$dst" | |
||||
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ |
||||
s//\1/ |
||||
q |
||||
} |
||||
/^X\(\/\/\)[^/].*/{ |
||||
s//\1/ |
||||
q |
||||
} |
||||
/^X\(\/\/\)$/{ |
||||
s//\1/ |
||||
q |
||||
} |
||||
/^X\(\/\).*/{ |
||||
s//\1/ |
||||
q |
||||
} |
||||
s/.*/./; q' |
||||
` |
||||
|
||||
test -d "$dstdir" |
||||
dstdir_status=$? |
||||
fi |
||||
fi |
||||
|
||||
obsolete_mkdir_used=false |
||||
|
||||
if test $dstdir_status != 0; then |
||||
case $posix_mkdir in |
||||
'') |
||||
# Create intermediate dirs using mode 755 as modified by the umask. |
||||
# This is like FreeBSD 'install' as of 1997-10-28. |
||||
umask=`umask` |
||||
case $stripcmd.$umask in |
||||
# Optimize common cases. |
||||
*[2367][2367]) mkdir_umask=$umask;; |
||||
.*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; |
||||
|
||||
*[0-7]) |
||||
mkdir_umask=`expr $umask + 22 \ |
||||
- $umask % 100 % 40 + $umask % 20 \ |
||||
- $umask % 10 % 4 + $umask % 2 |
||||
`;; |
||||
*) mkdir_umask=$umask,go-w;; |
||||
esac |
||||
|
||||
# With -d, create the new directory with the user-specified mode. |
||||
# Otherwise, rely on $mkdir_umask. |
||||
if test -n "$dir_arg"; then |
||||
mkdir_mode=-m$mode |
||||
else |
||||
mkdir_mode= |
||||
fi |
||||
|
||||
posix_mkdir=false |
||||
case $umask in |
||||
*[123567][0-7][0-7]) |
||||
# POSIX mkdir -p sets u+wx bits regardless of umask, which |
||||
# is incompatible with FreeBSD 'install' when (umask & 300) != 0. |
||||
;; |
||||
*) |
||||
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ |
||||
trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 |
||||
|
||||
if (umask $mkdir_umask && |
||||
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 |
||||
then |
||||
if test -z "$dir_arg" || { |
||||
# Check for POSIX incompatibilities with -m. |
||||
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or |
||||
# other-writable bit of parent directory when it shouldn't. |
||||
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory. |
||||
ls_ld_tmpdir=`ls -ld "$tmpdir"` |
||||
case $ls_ld_tmpdir in |
||||
d????-?r-*) different_mode=700;; |
||||
d????-?--*) different_mode=755;; |
||||
*) false;; |
||||
esac && |
||||
$mkdirprog -m$different_mode -p -- "$tmpdir" && { |
||||
ls_ld_tmpdir_1=`ls -ld "$tmpdir"` |
||||
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" |
||||
} |
||||
} |
||||
then posix_mkdir=: |
||||
fi |
||||
rmdir "$tmpdir/d" "$tmpdir" |
||||
else |
||||
# Remove any dirs left behind by ancient mkdir implementations. |
||||
rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null |
||||
fi |
||||
trap '' 0;; |
||||
esac;; |
||||
esac |
||||
|
||||
if |
||||
$posix_mkdir && ( |
||||
umask $mkdir_umask && |
||||
$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" |
||||
) |
||||
then : |
||||
else |
||||
|
||||
# The umask is ridiculous, or mkdir does not conform to POSIX, |
||||
# or it failed possibly due to a race condition. Create the |
||||
# directory the slow way, step by step, checking for races as we go. |
||||
|
||||
case $dstdir in |
||||
/*) prefix='/';; |
||||
[-=\(\)!]*) prefix='./';; |
||||
*) prefix='';; |
||||
esac |
||||
|
||||
eval "$initialize_posix_glob" |
||||
|
||||
oIFS=$IFS |
||||
IFS=/ |
||||
$posix_glob set -f |
||||
set fnord $dstdir |
||||
shift |
||||
$posix_glob set +f |
||||
IFS=$oIFS |
||||
|
||||
prefixes= |
||||
|
||||
for d |
||||
do |
||||
test X"$d" = X && continue |
||||
|
||||
prefix=$prefix$d |
||||
if test -d "$prefix"; then |
||||
prefixes= |
||||
else |
||||
if $posix_mkdir; then |
||||
(umask=$mkdir_umask && |
||||
$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break |
||||
# Don't fail if two instances are running concurrently. |
||||
test -d "$prefix" || exit 1 |
||||
else |
||||
case $prefix in |
||||
*\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; |
||||
*) qprefix=$prefix;; |
||||
esac |
||||
prefixes="$prefixes '$qprefix'" |
||||
fi |
||||
fi |
||||
prefix=$prefix/ |
||||
done |
||||
|
||||
if test -n "$prefixes"; then |
||||
# Don't fail if two instances are running concurrently. |
||||
(umask $mkdir_umask && |
||||
eval "\$doit_exec \$mkdirprog $prefixes") || |
||||
test -d "$dstdir" || exit 1 |
||||
obsolete_mkdir_used=true |
||||
fi |
||||
fi |
||||
fi |
||||
|
||||
if test -n "$dir_arg"; then |
||||
{ test -z "$chowncmd" || $doit $chowncmd "$dst"; } && |
||||
{ test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && |
||||
{ test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || |
||||
test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 |
||||
else |
||||
|
||||
# Make a couple of temp file names in the proper directory. |
||||
dsttmp=$dstdir/_inst.$$_ |
||||
rmtmp=$dstdir/_rm.$$_ |
||||
|
||||
# Trap to clean up those temp files at exit. |
||||
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 |
||||
|
||||
# Copy the file name to the temp name. |
||||
(umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && |
||||
|
||||
# and set any options; do chmod last to preserve setuid bits. |
||||
# |
||||
# If any of these fail, we abort the whole thing. If we want to |
||||
# ignore errors from any of these, just make sure not to ignore |
||||
# errors from the above "$doit $cpprog $src $dsttmp" command. |
||||
# |
||||
{ test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && |
||||
{ test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && |
||||
{ test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && |
||||
{ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && |
||||
|
||||
# If -C, don't bother to copy if it wouldn't change the file. |
||||
if $copy_on_change && |
||||
old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && |
||||
new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && |
||||
|
||||
eval "$initialize_posix_glob" && |
||||
$posix_glob set -f && |
||||
set X $old && old=:$2:$4:$5:$6 && |
||||
set X $new && new=:$2:$4:$5:$6 && |
||||
$posix_glob set +f && |
||||
|
||||
test "$old" = "$new" && |
||||
$cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 |
||||
then |
||||
rm -f "$dsttmp" |
||||
else |
||||
# Rename the file to the real destination. |
||||
$doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || |
||||
|
||||
# The rename failed, perhaps because mv can't rename something else |
||||
# to itself, or perhaps because mv is so ancient that it does not |
||||
# support -f. |
||||
{ |
||||
# Now remove or move aside any old file at destination location. |
||||
# We try this two ways since rm can't unlink itself on some |
||||
# systems and the destination file might be busy for other |
||||
# reasons. In this case, the final cleanup might fail but the new |
||||
# file should still install successfully. |
||||
{ |
||||
test ! -f "$dst" || |
||||
$doit $rmcmd -f "$dst" 2>/dev/null || |
||||
{ $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && |
||||
{ $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } |
||||
} || |
||||
{ echo "$0: cannot unlink or rename $dst" >&2 |
||||
(exit 1); exit 1 |
||||
} |
||||
} && |
||||
|
||||
# Now rename the file to the real destination. |
||||
$doit $mvcmd "$dsttmp" "$dst" |
||||
} |
||||
fi || exit 1 |
||||
|
||||
trap '' 0 |
||||
fi |
||||
done |
||||
|
||||
# Local variables: |
||||
# eval: (add-hook 'write-file-hooks 'time-stamp) |
||||
# time-stamp-start: "scriptversion=" |
||||
# time-stamp-format: "%:y-%02m-%02d.%02H" |
||||
# time-stamp-time-zone: "UTC" |
||||
# time-stamp-end: "; # UTC" |
||||
# End: |
@ -1,162 +0,0 @@ |
||||
#! /bin/sh |
||||
# mkinstalldirs --- make directory hierarchy |
||||
|
||||
scriptversion=2009-04-28.21; # UTC |
||||
|
||||
# Original author: Noah Friedman <friedman@prep.ai.mit.edu> |
||||
# Created: 1993-05-16 |
||||
# Public domain. |
||||
# |
||||
# This file is maintained in Automake, please report |
||||
# bugs to <bug-automake@gnu.org> or send patches to |
||||
# <automake-patches@gnu.org>. |
||||
|
||||
nl=' |
||||
' |
||||
IFS=" "" $nl" |
||||
errstatus=0 |
||||
dirmode= |
||||
|
||||
usage="\ |
||||
Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... |
||||
|
||||
Create each directory DIR (with mode MODE, if specified), including all |
||||
leading file name components. |
||||
|
||||
Report bugs to <bug-automake@gnu.org>." |
||||
|
||||
# process command line arguments |
||||
while test $# -gt 0 ; do |
||||
case $1 in |
||||
-h | --help | --h*) # -h for help |
||||
echo "$usage" |
||||
exit $? |
||||
;; |
||||
-m) # -m PERM arg |
||||
shift |
||||
test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } |
||||
dirmode=$1 |
||||
shift |
||||
;; |
||||
--version) |
||||
echo "$0 $scriptversion" |
||||
exit $? |
||||
;; |
||||
--) # stop option processing |
||||
shift |
||||
break |
||||
;; |
||||
-*) # unknown option |
||||
echo "$usage" 1>&2 |
||||
exit 1 |
||||
;; |
||||
*) # first non-opt arg |
||||
break |
||||
;; |
||||
esac |
||||
done |
||||
|
||||
for file |
||||
do |
||||
if test -d "$file"; then |
||||
shift |
||||
else |
||||
break |
||||
fi |
||||
done |
||||
|
||||
case $# in |
||||
0) exit 0 ;; |
||||
esac |
||||
|
||||
# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and |
||||
# mkdir -p a/c at the same time, both will detect that a is missing, |
||||
# one will create a, then the other will try to create a and die with |
||||
# a "File exists" error. This is a problem when calling mkinstalldirs |
||||
# from a parallel make. We use --version in the probe to restrict |
||||
# ourselves to GNU mkdir, which is thread-safe. |
||||
case $dirmode in |
||||
'') |
||||
if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then |
||||
echo "mkdir -p -- $*" |
||||
exec mkdir -p -- "$@" |
||||
else |
||||
# On NextStep and OpenStep, the 'mkdir' command does not |
||||
# recognize any option. It will interpret all options as |
||||
# directories to create, and then abort because '.' already |
||||
# exists. |
||||
test -d ./-p && rmdir ./-p |
||||
test -d ./--version && rmdir ./--version |
||||
fi |
||||
;; |
||||
*) |
||||
if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && |
||||
test ! -d ./--version; then |
||||
echo "mkdir -m $dirmode -p -- $*" |
||||
exec mkdir -m "$dirmode" -p -- "$@" |
||||
else |
||||
# Clean up after NextStep and OpenStep mkdir. |
||||
for d in ./-m ./-p ./--version "./$dirmode"; |
||||
do |
||||
test -d $d && rmdir $d |
||||
done |
||||
fi |
||||
;; |
||||
esac |
||||
|
||||
for file |
||||
do |
||||
case $file in |
||||
/*) pathcomp=/ ;; |
||||
*) pathcomp= ;; |
||||
esac |
||||
oIFS=$IFS |
||||
IFS=/ |
||||
set fnord $file |
||||
shift |
||||
IFS=$oIFS |
||||
|
||||
for d |
||||
do |
||||
test "x$d" = x && continue |
||||
|
||||
pathcomp=$pathcomp$d |
||||
case $pathcomp in |
||||
-*) pathcomp=./$pathcomp ;; |
||||
esac |
||||
|
||||
if test ! -d "$pathcomp"; then |
||||
echo "mkdir $pathcomp" |
||||
|
||||
mkdir "$pathcomp" || lasterr=$? |
||||
|
||||
if test ! -d "$pathcomp"; then |
||||
errstatus=$lasterr |
||||
else |
||||
if test ! -z "$dirmode"; then |
||||
echo "chmod $dirmode $pathcomp" |
||||
lasterr= |
||||
chmod "$dirmode" "$pathcomp" || lasterr=$? |
||||
|
||||
if test ! -z "$lasterr"; then |
||||
errstatus=$lasterr |
||||
fi |
||||
fi |
||||
fi |
||||
fi |
||||
|
||||
pathcomp=$pathcomp/ |
||||
done |
||||
done |
||||
|
||||
exit $errstatus |
||||
|
||||
# Local Variables: |
||||
# mode: shell-script |
||||
# sh-indentation: 2 |
||||
# eval: (add-hook 'write-file-hooks 'time-stamp) |
||||
# time-stamp-start: "scriptversion=" |
||||
# time-stamp-format: "%:y-%02m-%02d.%02H" |
||||
# time-stamp-time-zone: "UTC" |
||||
# time-stamp-end: "; # UTC" |
||||
# End: |
Loading…
Reference in new issue