git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/gmapR@123972 bc3139a8-67e5-0310-9ffc-ced21a209358
Michael Lawrence authored on 14/11/2016 21:54:30
| ... | ... |
@@ -9,7 +9,7 @@ Description: GSNAP and GMAP are a pair of tools to align short-read |
| 9 | 9 |
methods to work with GMAP and GSNAP from within R. In addition, |
| 10 | 10 |
it provides methods to tally alignment results on a |
| 11 | 11 |
per-nucleotide basis using the bam_tally tool. |
| 12 |
-Version: 1.17.0 |
|
| 12 |
+Version: 1.17.1 |
|
| 13 | 13 |
Depends: R (>= 2.15.0), methods, GenomeInfoDb (>= 1.1.3), |
| 14 | 14 |
GenomicRanges (>= 1.17.12), Rsamtools (>= 1.17.8) |
| 15 | 15 |
Imports: S4Vectors (>= 0.9.25), IRanges, |
| ... | ... |
@@ -50,8 +50,7 @@ gstruct/Makefile: gstruct/configure ${R_SRC_DIR}/samtools
|
| 50 | 50 |
--prefix=${PREFIX} --includedir=${GSTRUCT_INCLUDE_DIR} \
|
| 51 | 51 |
--libdir=${PREFIX}/${LIBnn} \
|
| 52 | 52 |
--with-samtools-lib=${R_SRC_DIR}/samtools \
|
| 53 |
- --disable-binaries \ |
|
| 54 |
- --disable-maintainer-mode |
|
| 53 |
+ --disable-binaries |
|
| 55 | 54 |
## does not appear to be a true dependency yet |
| 56 | 55 |
## --with-gmap=${PREFIX}/bin
|
| 57 | 56 |
|
| ... | ... |
@@ -86,7 +86,9 @@ R_Bamtally_iit (SEXP bamreader_R, SEXP genome_dir_R, SEXP db_R, |
| 86 | 86 |
maximum_nhits, need_concordant_p, |
| 87 | 87 |
need_unique_p, need_primary_p, |
| 88 | 88 |
ignore_duplicates_p, |
| 89 |
- min_depth, variant_strands, ignore_query_Ns_p, |
|
| 89 |
+ min_depth, variant_strands, |
|
| 90 |
+ /* TODO: variant_pct */ 0, |
|
| 91 |
+ ignore_query_Ns_p, |
|
| 90 | 92 |
print_indels_p, blocksize, verbosep, |
| 91 | 93 |
/*readlevel_p*/false, max_softclip, |
| 92 | 94 |
print_cycles_p, |
| ... | ... |
@@ -12,8 +12,8 @@ without warranty of any kind. |
| 12 | 12 |
Basic Installation |
| 13 | 13 |
================== |
| 14 | 14 |
|
| 15 |
- Briefly, the shell commands `./configure; make; make install' should |
|
| 16 |
-configure, build, and install this package. The following |
|
| 15 |
+ Briefly, the shell command `./configure && make && make install' |
|
| 16 |
+should configure, build, and install this package. The following |
|
| 17 | 17 |
more-detailed instructions are generic; see the `README' file for |
| 18 | 18 |
instructions specific to this package. Some packages provide this |
| 19 | 19 |
`INSTALL' file but do not implement all of the features documented |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 |
-# Makefile.in generated by automake 1.14 from Makefile.am. |
|
| 1 |
+# Makefile.in generated by automake 1.15 from Makefile.am. |
|
| 2 | 2 |
# @configure_input@ |
| 3 | 3 |
|
| 4 |
-# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
|
| 4 |
+# Copyright (C) 1994-2014 Free Software Foundation, Inc. |
|
| 5 | 5 |
|
| 6 | 6 |
# This Makefile.in is free software; the Free Software Foundation |
| 7 | 7 |
# gives unlimited permission to copy and/or distribute it, |
| ... | ... |
@@ -14,7 +14,17 @@ |
| 14 | 14 |
|
| 15 | 15 |
@SET_MAKE@ |
| 16 | 16 |
VPATH = @srcdir@ |
| 17 |
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
|
| 17 |
+am__is_gnu_make = { \
|
|
| 18 |
+ if test -z '$(MAKELEVEL)'; then \ |
|
| 19 |
+ false; \ |
|
| 20 |
+ elif test -n '$(MAKE_HOST)'; then \ |
|
| 21 |
+ true; \ |
|
| 22 |
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ |
|
| 23 |
+ true; \ |
|
| 24 |
+ else \ |
|
| 25 |
+ false; \ |
|
| 26 |
+ fi; \ |
|
| 27 |
+} |
|
| 18 | 28 |
am__make_running_with_option = \ |
| 19 | 29 |
case $${target_option-} in \
|
| 20 | 30 |
?) ;; \ |
| ... | ... |
@@ -79,16 +89,6 @@ build_triplet = @build@ |
| 79 | 89 |
host_triplet = @host@ |
| 80 | 90 |
target_triplet = @target@ |
| 81 | 91 |
subdir = . |
| 82 |
-DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ |
|
| 83 |
- $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ |
|
| 84 |
- $(top_srcdir)/configure $(am__configure_deps) \ |
|
| 85 |
- $(top_srcdir)/lib/gstruct.pc.in COPYING config/compile \ |
|
| 86 |
- config/config.guess config/config.sub config/depcomp \ |
|
| 87 |
- config/install-sh config/missing config/ltmain.sh \ |
|
| 88 |
- $(top_srcdir)/config/compile $(top_srcdir)/config/config.guess \ |
|
| 89 |
- $(top_srcdir)/config/config.sub \ |
|
| 90 |
- $(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \ |
|
| 91 |
- $(top_srcdir)/config/missing |
|
| 92 | 92 |
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
| 93 | 93 |
am__aclocal_m4_deps = $(top_srcdir)/config/acx_mmap_fixed.m4 \ |
| 94 | 94 |
$(top_srcdir)/config/acx_mmap_variable.m4 \ |
| ... | ... |
@@ -112,6 +112,8 @@ am__aclocal_m4_deps = $(top_srcdir)/config/acx_mmap_fixed.m4 \ |
| 112 | 112 |
$(top_srcdir)/configure.ac |
| 113 | 113 |
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
| 114 | 114 |
$(ACLOCAL_M4) |
| 115 |
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ |
|
| 116 |
+ $(am__configure_deps) $(am__DIST_COMMON) |
|
| 115 | 117 |
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
| 116 | 118 |
configure.lineno config.status.lineno |
| 117 | 119 |
mkinstalldirs = $(install_sh) -d |
| ... | ... |
@@ -174,6 +176,14 @@ ETAGS = etags |
| 174 | 176 |
CTAGS = ctags |
| 175 | 177 |
CSCOPE = cscope |
| 176 | 178 |
DIST_SUBDIRS = $(SUBDIRS) |
| 179 |
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/compile \ |
|
| 180 |
+ $(top_srcdir)/config/config.guess \ |
|
| 181 |
+ $(top_srcdir)/config/config.sub \ |
|
| 182 |
+ $(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \ |
|
| 183 |
+ $(top_srcdir)/config/missing $(top_srcdir)/lib/gstruct.pc.in \ |
|
| 184 |
+ AUTHORS COPYING ChangeLog INSTALL NEWS README config/compile \ |
|
| 185 |
+ config/config.guess config/config.sub config/install-sh \ |
|
| 186 |
+ config/ltmain.sh config/missing |
|
| 177 | 187 |
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
| 178 | 188 |
distdir = $(PACKAGE)-$(VERSION) |
| 179 | 189 |
top_distdir = $(distdir) |
| ... | ... |
@@ -266,7 +276,7 @@ LIBTOOL = @LIBTOOL@ |
| 266 | 276 |
LIPO = @LIPO@ |
| 267 | 277 |
LN_S = @LN_S@ |
| 268 | 278 |
LTLIBOBJS = @LTLIBOBJS@ |
| 269 |
-MAINT = @MAINT@ |
|
| 279 |
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ |
|
| 270 | 280 |
MAKEINFO = @MAKEINFO@ |
| 271 | 281 |
MANIFEST_TOOL = @MANIFEST_TOOL@ |
| 272 | 282 |
MKDIR_P = @MKDIR_P@ |
| ... | ... |
@@ -376,7 +386,7 @@ all: all-recursive |
| 376 | 386 |
.SUFFIXES: |
| 377 | 387 |
am--refresh: Makefile |
| 378 | 388 |
@: |
| 379 |
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
|
| 389 |
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
|
| 380 | 390 |
@for dep in $?; do \ |
| 381 | 391 |
case '$(am__configure_deps)' in \ |
| 382 | 392 |
*$$dep*) \ |
| ... | ... |
@@ -389,7 +399,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi |
| 389 | 399 |
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ |
| 390 | 400 |
$(am__cd) $(top_srcdir) && \ |
| 391 | 401 |
$(AUTOMAKE) --gnu Makefile |
| 392 |
-.PRECIOUS: Makefile |
|
| 393 | 402 |
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
| 394 | 403 |
@case '$?' in \ |
| 395 | 404 |
*config.status*) \ |
| ... | ... |
@@ -403,9 +412,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
| 403 | 412 |
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
| 404 | 413 |
$(SHELL) ./config.status --recheck |
| 405 | 414 |
|
| 406 |
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) |
|
| 415 |
+$(top_srcdir)/configure: $(am__configure_deps) |
|
| 407 | 416 |
$(am__cd) $(srcdir) && $(AUTOCONF) |
| 408 |
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
|
| 417 |
+$(ACLOCAL_M4): $(am__aclocal_m4_deps) |
|
| 409 | 418 |
$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) |
| 410 | 419 |
$(am__aclocal_m4_deps): |
| 411 | 420 |
lib/gstruct-${LIBGSTRUCT_API_VERSION}.pc: $(top_builddir)/config.status $(top_srcdir)/lib/gstruct.pc.in
|
| ... | ... |
@@ -610,15 +619,15 @@ dist-xz: distdir |
| 610 | 619 |
$(am__post_remove_distdir) |
| 611 | 620 |
|
| 612 | 621 |
dist-tarZ: distdir |
| 613 |
- @echo WARNING: "Support for shar distribution archives is" \ |
|
| 614 |
- "deprecated." >&2 |
|
| 622 |
+ @echo WARNING: "Support for distribution archives compressed with" \ |
|
| 623 |
+ "legacy program 'compress' is deprecated." >&2 |
|
| 615 | 624 |
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2 |
| 616 | 625 |
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z |
| 617 | 626 |
$(am__post_remove_distdir) |
| 618 | 627 |
|
| 619 | 628 |
dist-shar: distdir |
| 620 |
- @echo WARNING: "Support for distribution archives compressed with" \ |
|
| 621 |
- "legacy program 'compress' is deprecated." >&2 |
|
| 629 |
+ @echo WARNING: "Support for shar distribution archives is" \ |
|
| 630 |
+ "deprecated." >&2 |
|
| 622 | 631 |
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2 |
| 623 | 632 |
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz |
| 624 | 633 |
$(am__post_remove_distdir) |
| ... | ... |
@@ -654,16 +663,17 @@ distcheck: dist |
| 654 | 663 |
esac |
| 655 | 664 |
chmod -R a-w $(distdir) |
| 656 | 665 |
chmod u+w $(distdir) |
| 657 |
- mkdir $(distdir)/_build $(distdir)/_inst |
|
| 666 |
+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst |
|
| 658 | 667 |
chmod a-w $(distdir) |
| 659 | 668 |
test -d $(distdir)/_build || exit 0; \ |
| 660 | 669 |
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ |
| 661 | 670 |
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
|
| 662 | 671 |
&& am__cwd=`pwd` \ |
| 663 |
- && $(am__cd) $(distdir)/_build \ |
|
| 664 |
- && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
|
| 672 |
+ && $(am__cd) $(distdir)/_build/sub \ |
|
| 673 |
+ && ../../configure \ |
|
| 665 | 674 |
$(AM_DISTCHECK_CONFIGURE_FLAGS) \ |
| 666 | 675 |
$(DISTCHECK_CONFIGURE_FLAGS) \ |
| 676 |
+ --srcdir=../.. --prefix="$$dc_install_base" \ |
|
| 667 | 677 |
&& $(MAKE) $(AM_MAKEFLAGS) \ |
| 668 | 678 |
&& $(MAKE) $(AM_MAKEFLAGS) dvi \ |
| 669 | 679 |
&& $(MAKE) $(AM_MAKEFLAGS) check \ |
| ... | ... |
@@ -841,6 +851,8 @@ uninstall-am: |
| 841 | 851 |
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
| 842 | 852 |
tags tags-am uninstall uninstall-am |
| 843 | 853 |
|
| 854 |
+.PRECIOUS: Makefile |
|
| 855 |
+ |
|
| 844 | 856 |
|
| 845 | 857 |
install-data-local: |
| 846 | 858 |
# $(mkinstalldirs) $(GMAPDB) |
| ... | ... |
@@ -1,6 +1,6 @@ |
| 1 |
-# generated automatically by aclocal 1.14 -*- Autoconf -*- |
|
| 1 |
+# generated automatically by aclocal 1.15 -*- Autoconf -*- |
|
| 2 | 2 |
|
| 3 |
-# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
|
| 3 |
+# Copyright (C) 1996-2014 Free Software Foundation, Inc. |
|
| 4 | 4 |
|
| 5 | 5 |
# This file is free software; the Free Software Foundation |
| 6 | 6 |
# gives unlimited permission to copy and/or distribute it, |
| ... | ... |
@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to. |
| 20 | 20 |
If you have problems, you may need to regenerate the build system entirely. |
| 21 | 21 |
To do so, use the procedure documented by the package, typically 'autoreconf'.])]) |
| 22 | 22 |
|
| 23 |
-# Copyright (C) 2002-2013 Free Software Foundation, Inc. |
|
| 23 |
+# Copyright (C) 2002-2014 Free Software Foundation, Inc. |
|
| 24 | 24 |
# |
| 25 | 25 |
# This file is free software; the Free Software Foundation |
| 26 | 26 |
# gives unlimited permission to copy and/or distribute it, |
| ... | ... |
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) |
| 32 | 32 |
# generated from the m4 files accompanying Automake X.Y. |
| 33 | 33 |
# (This private macro should not be called outside this file.) |
| 34 | 34 |
AC_DEFUN([AM_AUTOMAKE_VERSION], |
| 35 |
-[am__api_version='1.14' |
|
| 35 |
+[am__api_version='1.15' |
|
| 36 | 36 |
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
| 37 | 37 |
dnl require some minimum version. Point them to the right macro. |
| 38 |
-m4_if([$1], [1.14], [], |
|
| 38 |
+m4_if([$1], [1.15], [], |
|
| 39 | 39 |
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
| 40 | 40 |
]) |
| 41 | 41 |
|
| ... | ... |
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) |
| 51 | 51 |
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
| 52 | 52 |
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
| 53 | 53 |
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
| 54 |
-[AM_AUTOMAKE_VERSION([1.14])dnl |
|
| 54 |
+[AM_AUTOMAKE_VERSION([1.15])dnl |
|
| 55 | 55 |
m4_ifndef([AC_AUTOCONF_VERSION], |
| 56 | 56 |
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
| 57 | 57 |
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
| 58 | 58 |
|
| 59 | 59 |
# AM_AUX_DIR_EXPAND -*- Autoconf -*- |
| 60 | 60 |
|
| 61 |
-# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
|
| 61 |
+# Copyright (C) 2001-2014 Free Software Foundation, Inc. |
|
| 62 | 62 |
# |
| 63 | 63 |
# This file is free software; the Free Software Foundation |
| 64 | 64 |
# gives unlimited permission to copy and/or distribute it, |
| ... | ... |
@@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
| 103 | 103 |
# configured tree to be moved without reconfiguration. |
| 104 | 104 |
|
| 105 | 105 |
AC_DEFUN([AM_AUX_DIR_EXPAND], |
| 106 |
-[dnl Rely on autoconf to set up CDPATH properly. |
|
| 107 |
-AC_PREREQ([2.50])dnl |
|
| 108 |
-# expand $ac_aux_dir to an absolute path |
|
| 109 |
-am_aux_dir=`cd $ac_aux_dir && pwd` |
|
| 106 |
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl |
|
| 107 |
+# Expand $ac_aux_dir to an absolute path. |
|
| 108 |
+am_aux_dir=`cd "$ac_aux_dir" && pwd` |
|
| 110 | 109 |
]) |
| 111 | 110 |
|
| 112 | 111 |
# AM_CONDITIONAL -*- Autoconf -*- |
| 113 | 112 |
|
| 114 |
-# Copyright (C) 1997-2013 Free Software Foundation, Inc. |
|
| 113 |
+# Copyright (C) 1997-2014 Free Software Foundation, Inc. |
|
| 115 | 114 |
# |
| 116 | 115 |
# This file is free software; the Free Software Foundation |
| 117 | 116 |
# gives unlimited permission to copy and/or distribute it, |
| ... | ... |
@@ -142,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE( |
| 142 | 141 |
Usually this means the macro was only invoked conditionally.]]) |
| 143 | 142 |
fi])]) |
| 144 | 143 |
|
| 145 |
-# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
|
| 144 |
+# Copyright (C) 1999-2014 Free Software Foundation, Inc. |
|
| 146 | 145 |
# |
| 147 | 146 |
# This file is free software; the Free Software Foundation |
| 148 | 147 |
# gives unlimited permission to copy and/or distribute it, |
| ... | ... |
@@ -333,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl |
| 333 | 332 |
|
| 334 | 333 |
# Generate code to set up dependency tracking. -*- Autoconf -*- |
| 335 | 334 |
|
| 336 |
-# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
|
| 335 |
+# Copyright (C) 1999-2014 Free Software Foundation, Inc. |
|
| 337 | 336 |
# |
| 338 | 337 |
# This file is free software; the Free Software Foundation |
| 339 | 338 |
# gives unlimited permission to copy and/or distribute it, |
| ... | ... |
@@ -409,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], |
| 409 | 408 |
|
| 410 | 409 |
# Do all the work for Automake. -*- Autoconf -*- |
| 411 | 410 |
|
| 412 |
-# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
|
| 411 |
+# Copyright (C) 1996-2014 Free Software Foundation, Inc. |
|
| 413 | 412 |
# |
| 414 | 413 |
# This file is free software; the Free Software Foundation |
| 415 | 414 |
# gives unlimited permission to copy and/or distribute it, |
| ... | ... |
@@ -499,8 +498,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl |
| 499 | 498 |
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> |
| 500 | 499 |
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> |
| 501 | 500 |
AC_SUBST([mkdir_p], ['$(MKDIR_P)']) |
| 502 |
-# We need awk for the "check" target. The system "awk" is bad on |
|
| 503 |
-# some platforms. |
|
| 501 |
+# We need awk for the "check" target (and possibly the TAP driver). The |
|
| 502 |
+# system "awk" is bad on some platforms. |
|
| 504 | 503 |
AC_REQUIRE([AC_PROG_AWK])dnl |
| 505 | 504 |
AC_REQUIRE([AC_PROG_MAKE_SET])dnl |
| 506 | 505 |
AC_REQUIRE([AM_SET_LEADING_DOT])dnl |
| ... | ... |
@@ -573,7 +572,11 @@ to "yes", and re-run configure. |
| 573 | 572 |
END |
| 574 | 573 |
AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) |
| 575 | 574 |
fi |
| 576 |
-fi]) |
|
| 575 |
+fi |
|
| 576 |
+dnl The trailing newline in this macro's definition is deliberate, for |
|
| 577 |
+dnl backward compatibility and to allow trailing 'dnl'-style comments |
|
| 578 |
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. |
|
| 579 |
+]) |
|
| 577 | 580 |
|
| 578 | 581 |
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not |
| 579 | 582 |
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further |
| ... | ... |
@@ -602,7 +605,7 @@ for _am_header in $config_headers :; do |
| 602 | 605 |
done |
| 603 | 606 |
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
| 604 | 607 |
|
| 605 |
-# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
|
| 608 |
+# Copyright (C) 2001-2014 Free Software Foundation, Inc. |
|
| 606 | 609 |
# |
| 607 | 610 |
# This file is free software; the Free Software Foundation |
| 608 | 611 |
# gives unlimited permission to copy and/or distribute it, |
| ... | ... |
@@ -613,7 +616,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co |
| 613 | 616 |
# Define $install_sh. |
| 614 | 617 |
AC_DEFUN([AM_PROG_INSTALL_SH], |
| 615 | 618 |
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
| 616 |
-if test x"${install_sh}" != xset; then
|
|
| 619 |
+if test x"${install_sh+set}" != xset; then
|
|
| 617 | 620 |
case $am_aux_dir in |
| 618 | 621 |
*\ * | *\ *) |
| 619 | 622 |
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
|
| ... | ... |
@@ -623,7 +626,7 @@ if test x"${install_sh}" != xset; then
|
| 623 | 626 |
fi |
| 624 | 627 |
AC_SUBST([install_sh])]) |
| 625 | 628 |
|
| 626 |
-# Copyright (C) 2003-2013 Free Software Foundation, Inc. |
|
| 629 |
+# Copyright (C) 2003-2014 Free Software Foundation, Inc. |
|
| 627 | 630 |
# |
| 628 | 631 |
# This file is free software; the Free Software Foundation |
| 629 | 632 |
# gives unlimited permission to copy and/or distribute it, |
| ... | ... |
@@ -642,45 +645,9 @@ fi |
| 642 | 645 |
rmdir .tst 2>/dev/null |
| 643 | 646 |
AC_SUBST([am__leading_dot])]) |
| 644 | 647 |
|
| 645 |
-# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- |
|
| 646 |
-# From Jim Meyering |
|
| 647 |
- |
|
| 648 |
-# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
|
| 649 |
-# |
|
| 650 |
-# This file is free software; the Free Software Foundation |
|
| 651 |
-# gives unlimited permission to copy and/or distribute it, |
|
| 652 |
-# with or without modifications, as long as this notice is preserved. |
|
| 653 |
- |
|
| 654 |
-# AM_MAINTAINER_MODE([DEFAULT-MODE]) |
|
| 655 |
-# ---------------------------------- |
|
| 656 |
-# Control maintainer-specific portions of Makefiles. |
|
| 657 |
-# Default is to disable them, unless 'enable' is passed literally. |
|
| 658 |
-# For symmetry, 'disable' may be passed as well. Anyway, the user |
|
| 659 |
-# can override the default with the --enable/--disable switch. |
|
| 660 |
-AC_DEFUN([AM_MAINTAINER_MODE], |
|
| 661 |
-[m4_case(m4_default([$1], [disable]), |
|
| 662 |
- [enable], [m4_define([am_maintainer_other], [disable])], |
|
| 663 |
- [disable], [m4_define([am_maintainer_other], [enable])], |
|
| 664 |
- [m4_define([am_maintainer_other], [enable]) |
|
| 665 |
- m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) |
|
| 666 |
-AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) |
|
| 667 |
- dnl maintainer-mode's default is 'disable' unless 'enable' is passed |
|
| 668 |
- AC_ARG_ENABLE([maintainer-mode], |
|
| 669 |
- [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], |
|
| 670 |
- am_maintainer_other[ make rules and dependencies not useful |
|
| 671 |
- (and sometimes confusing) to the casual installer])], |
|
| 672 |
- [USE_MAINTAINER_MODE=$enableval], |
|
| 673 |
- [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) |
|
| 674 |
- AC_MSG_RESULT([$USE_MAINTAINER_MODE]) |
|
| 675 |
- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) |
|
| 676 |
- MAINT=$MAINTAINER_MODE_TRUE |
|
| 677 |
- AC_SUBST([MAINT])dnl |
|
| 678 |
-] |
|
| 679 |
-) |
|
| 680 |
- |
|
| 681 | 648 |
# Check to see how 'make' treats includes. -*- Autoconf -*- |
| 682 | 649 |
|
| 683 |
-# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
|
| 650 |
+# Copyright (C) 2001-2014 Free Software Foundation, Inc. |
|
| 684 | 651 |
# |
| 685 | 652 |
# This file is free software; the Free Software Foundation |
| 686 | 653 |
# gives unlimited permission to copy and/or distribute it, |
| ... | ... |
@@ -730,7 +697,7 @@ rm -f confinc confmf |
| 730 | 697 |
|
| 731 | 698 |
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
| 732 | 699 |
|
| 733 |
-# Copyright (C) 1997-2013 Free Software Foundation, Inc. |
|
| 700 |
+# Copyright (C) 1997-2014 Free Software Foundation, Inc. |
|
| 734 | 701 |
# |
| 735 | 702 |
# This file is free software; the Free Software Foundation |
| 736 | 703 |
# gives unlimited permission to copy and/or distribute it, |
| ... | ... |
@@ -769,7 +736,7 @@ fi |
| 769 | 736 |
|
| 770 | 737 |
# Helper functions for option handling. -*- Autoconf -*- |
| 771 | 738 |
|
| 772 |
-# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
|
| 739 |
+# Copyright (C) 2001-2014 Free Software Foundation, Inc. |
|
| 773 | 740 |
# |
| 774 | 741 |
# This file is free software; the Free Software Foundation |
| 775 | 742 |
# gives unlimited permission to copy and/or distribute it, |
| ... | ... |
@@ -798,7 +765,7 @@ AC_DEFUN([_AM_SET_OPTIONS], |
| 798 | 765 |
AC_DEFUN([_AM_IF_OPTION], |
| 799 | 766 |
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) |
| 800 | 767 |
|
| 801 |
-# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
|
| 768 |
+# Copyright (C) 1999-2014 Free Software Foundation, Inc. |
|
| 802 | 769 |
# |
| 803 | 770 |
# This file is free software; the Free Software Foundation |
| 804 | 771 |
# gives unlimited permission to copy and/or distribute it, |
| ... | ... |
@@ -845,7 +812,7 @@ AC_LANG_POP([C])]) |
| 845 | 812 |
# For backward compatibility. |
| 846 | 813 |
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) |
| 847 | 814 |
|
| 848 |
-# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
|
| 815 |
+# Copyright (C) 2001-2014 Free Software Foundation, Inc. |
|
| 849 | 816 |
# |
| 850 | 817 |
# This file is free software; the Free Software Foundation |
| 851 | 818 |
# gives unlimited permission to copy and/or distribute it, |
| ... | ... |
@@ -864,7 +831,7 @@ AC_DEFUN([AM_RUN_LOG], |
| 864 | 831 |
|
| 865 | 832 |
# Check to make sure that the build environment is sane. -*- Autoconf -*- |
| 866 | 833 |
|
| 867 |
-# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
|
| 834 |
+# Copyright (C) 1996-2014 Free Software Foundation, Inc. |
|
| 868 | 835 |
# |
| 869 | 836 |
# This file is free software; the Free Software Foundation |
| 870 | 837 |
# gives unlimited permission to copy and/or distribute it, |
| ... | ... |
@@ -945,7 +912,7 @@ AC_CONFIG_COMMANDS_PRE( |
| 945 | 912 |
rm -f conftest.file |
| 946 | 913 |
]) |
| 947 | 914 |
|
| 948 |
-# Copyright (C) 2009-2013 Free Software Foundation, Inc. |
|
| 915 |
+# Copyright (C) 2009-2014 Free Software Foundation, Inc. |
|
| 949 | 916 |
# |
| 950 | 917 |
# This file is free software; the Free Software Foundation |
| 951 | 918 |
# gives unlimited permission to copy and/or distribute it, |
| ... | ... |
@@ -1005,7 +972,7 @@ AC_SUBST([AM_BACKSLASH])dnl |
| 1005 | 972 |
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl |
| 1006 | 973 |
]) |
| 1007 | 974 |
|
| 1008 |
-# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
|
| 975 |
+# Copyright (C) 2001-2014 Free Software Foundation, Inc. |
|
| 1009 | 976 |
# |
| 1010 | 977 |
# This file is free software; the Free Software Foundation |
| 1011 | 978 |
# gives unlimited permission to copy and/or distribute it, |
| ... | ... |
@@ -1033,7 +1000,7 @@ fi |
| 1033 | 1000 |
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
| 1034 | 1001 |
AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
| 1035 | 1002 |
|
| 1036 |
-# Copyright (C) 2006-2013 Free Software Foundation, Inc. |
|
| 1003 |
+# Copyright (C) 2006-2014 Free Software Foundation, Inc. |
|
| 1037 | 1004 |
# |
| 1038 | 1005 |
# This file is free software; the Free Software Foundation |
| 1039 | 1006 |
# gives unlimited permission to copy and/or distribute it, |
| ... | ... |
@@ -1052,7 +1019,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) |
| 1052 | 1019 |
|
| 1053 | 1020 |
# Check how to create a tarball. -*- Autoconf -*- |
| 1054 | 1021 |
|
| 1055 |
-# Copyright (C) 2004-2013 Free Software Foundation, Inc. |
|
| 1022 |
+# Copyright (C) 2004-2014 Free Software Foundation, Inc. |
|
| 1056 | 1023 |
# |
| 1057 | 1024 |
# This file is free software; the Free Software Foundation |
| 1058 | 1025 |
# gives unlimited permission to copy and/or distribute it, |
| ... | ... |
@@ -3,7 +3,7 @@ |
| 3 | 3 |
|
| 4 | 4 |
scriptversion=2012-10-14.11; # UTC |
| 5 | 5 |
|
| 6 |
-# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
|
| 6 |
+# Copyright (C) 1999-2014 Free Software Foundation, Inc. |
|
| 7 | 7 |
# Written by Tom Tromey <tromey@cygnus.com>. |
| 8 | 8 |
# |
| 9 | 9 |
# This program is free software; you can redistribute it and/or modify |
| ... | ... |
@@ -1,8 +1,8 @@ |
| 1 | 1 |
#! /bin/sh |
| 2 | 2 |
# Attempt to guess a canonical system name. |
| 3 |
-# Copyright 1992-2013 Free Software Foundation, Inc. |
|
| 3 |
+# Copyright 1992-2014 Free Software Foundation, Inc. |
|
| 4 | 4 |
|
| 5 |
-timestamp='2013-06-10' |
|
| 5 |
+timestamp='2014-11-04' |
|
| 6 | 6 |
|
| 7 | 7 |
# This file is free software; you can redistribute it and/or modify it |
| 8 | 8 |
# under the terms of the GNU General Public License as published by |
| ... | ... |
@@ -24,12 +24,12 @@ timestamp='2013-06-10' |
| 24 | 24 |
# program. This Exception is an additional permission under section 7 |
| 25 | 25 |
# of the GNU General Public License, version 3 ("GPLv3").
|
| 26 | 26 |
# |
| 27 |
-# Originally written by Per Bothner. |
|
| 27 |
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. |
|
| 28 | 28 |
# |
| 29 | 29 |
# You can get the latest version of this script from: |
| 30 | 30 |
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD |
| 31 | 31 |
# |
| 32 |
-# Please send patches with a ChangeLog entry to config-patches@gnu.org. |
|
| 32 |
+# Please send patches to <config-patches@gnu.org>. |
|
| 33 | 33 |
|
| 34 | 34 |
|
| 35 | 35 |
me=`echo "$0" | sed -e 's,.*/,,'` |
| ... | ... |
@@ -50,7 +50,7 @@ version="\ |
| 50 | 50 |
GNU config.guess ($timestamp) |
| 51 | 51 |
|
| 52 | 52 |
Originally written by Per Bothner. |
| 53 |
-Copyright 1992-2013 Free Software Foundation, Inc. |
|
| 53 |
+Copyright 1992-2014 Free Software Foundation, Inc. |
|
| 54 | 54 |
|
| 55 | 55 |
This is free software; see the source for copying conditions. There is NO |
| 56 | 56 |
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
| ... | ... |
@@ -149,7 +149,7 @@ Linux|GNU|GNU/*) |
| 149 | 149 |
LIBC=gnu |
| 150 | 150 |
#endif |
| 151 | 151 |
EOF |
| 152 |
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` |
|
| 152 |
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` |
|
| 153 | 153 |
;; |
| 154 | 154 |
esac |
| 155 | 155 |
|
| ... | ... |
@@ -579,8 +579,9 @@ EOF |
| 579 | 579 |
else |
| 580 | 580 |
IBM_ARCH=powerpc |
| 581 | 581 |
fi |
| 582 |
- if [ -x /usr/bin/oslevel ] ; then |
|
| 583 |
- IBM_REV=`/usr/bin/oslevel` |
|
| 582 |
+ if [ -x /usr/bin/lslpp ] ; then |
|
| 583 |
+ IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | |
|
| 584 |
+ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
|
|
| 584 | 585 |
else |
| 585 | 586 |
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
|
| 586 | 587 |
fi |
| ... | ... |
@@ -826,7 +827,7 @@ EOF |
| 826 | 827 |
*:MINGW*:*) |
| 827 | 828 |
echo ${UNAME_MACHINE}-pc-mingw32
|
| 828 | 829 |
exit ;; |
| 829 |
- i*:MSYS*:*) |
|
| 830 |
+ *:MSYS*:*) |
|
| 830 | 831 |
echo ${UNAME_MACHINE}-pc-msys
|
| 831 | 832 |
exit ;; |
| 832 | 833 |
i*:windows32*:*) |
| ... | ... |
@@ -969,10 +970,10 @@ EOF |
| 969 | 970 |
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` |
| 970 | 971 |
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
|
| 971 | 972 |
;; |
| 972 |
- or1k:Linux:*:*) |
|
| 973 |
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
|
| 973 |
+ openrisc*:Linux:*:*) |
|
| 974 |
+ echo or1k-unknown-linux-${LIBC}
|
|
| 974 | 975 |
exit ;; |
| 975 |
- or32:Linux:*:*) |
|
| 976 |
+ or32:Linux:*:* | or1k*:Linux:*:*) |
|
| 976 | 977 |
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
| 977 | 978 |
exit ;; |
| 978 | 979 |
padre:Linux:*:*) |
| ... | ... |
@@ -1260,16 +1261,26 @@ EOF |
| 1260 | 1261 |
if test "$UNAME_PROCESSOR" = unknown ; then |
| 1261 | 1262 |
UNAME_PROCESSOR=powerpc |
| 1262 | 1263 |
fi |
| 1263 |
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then |
|
| 1264 |
- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ |
|
| 1265 |
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ |
|
| 1266 |
- grep IS_64BIT_ARCH >/dev/null |
|
| 1267 |
- then |
|
| 1268 |
- case $UNAME_PROCESSOR in |
|
| 1269 |
- i386) UNAME_PROCESSOR=x86_64 ;; |
|
| 1270 |
- powerpc) UNAME_PROCESSOR=powerpc64 ;; |
|
| 1271 |
- esac |
|
| 1264 |
+ if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then |
|
| 1265 |
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then |
|
| 1266 |
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ |
|
| 1267 |
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ |
|
| 1268 |
+ grep IS_64BIT_ARCH >/dev/null |
|
| 1269 |
+ then |
|
| 1270 |
+ case $UNAME_PROCESSOR in |
|
| 1271 |
+ i386) UNAME_PROCESSOR=x86_64 ;; |
|
| 1272 |
+ powerpc) UNAME_PROCESSOR=powerpc64 ;; |
|
| 1273 |
+ esac |
|
| 1274 |
+ fi |
|
| 1272 | 1275 |
fi |
| 1276 |
+ elif test "$UNAME_PROCESSOR" = i386 ; then |
|
| 1277 |
+ # Avoid executing cc on OS X 10.9, as it ships with a stub |
|
| 1278 |
+ # that puts up a graphical alert prompting to install |
|
| 1279 |
+ # developer tools. Any system running Mac OS X 10.7 or |
|
| 1280 |
+ # later (Darwin 11 and later) is required to have a 64-bit |
|
| 1281 |
+ # processor. This is not true of the ARM version of Darwin |
|
| 1282 |
+ # that Apple uses in portable devices. |
|
| 1283 |
+ UNAME_PROCESSOR=x86_64 |
|
| 1273 | 1284 |
fi |
| 1274 | 1285 |
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
|
| 1275 | 1286 |
exit ;; |
| ... | ... |
@@ -1361,154 +1372,6 @@ EOF |
| 1361 | 1372 |
exit ;; |
| 1362 | 1373 |
esac |
| 1363 | 1374 |
|
| 1364 |
-eval $set_cc_for_build |
|
| 1365 |
-cat >$dummy.c <<EOF |
|
| 1366 |
-#ifdef _SEQUENT_ |
|
| 1367 |
-# include <sys/types.h> |
|
| 1368 |
-# include <sys/utsname.h> |
|
| 1369 |
-#endif |
|
| 1370 |
-main () |
|
| 1371 |
-{
|
|
| 1372 |
-#if defined (sony) |
|
| 1373 |
-#if defined (MIPSEB) |
|
| 1374 |
- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, |
|
| 1375 |
- I don't know.... */ |
|
| 1376 |
- printf ("mips-sony-bsd\n"); exit (0);
|
|
| 1377 |
-#else |
|
| 1378 |
-#include <sys/param.h> |
|
| 1379 |
- printf ("m68k-sony-newsos%s\n",
|
|
| 1380 |
-#ifdef NEWSOS4 |
|
| 1381 |
- "4" |
|
| 1382 |
-#else |
|
| 1383 |
- "" |
|
| 1384 |
-#endif |
|
| 1385 |
- ); exit (0); |
|
| 1386 |
-#endif |
|
| 1387 |
-#endif |
|
| 1388 |
- |
|
| 1389 |
-#if defined (__arm) && defined (__acorn) && defined (__unix) |
|
| 1390 |
- printf ("arm-acorn-riscix\n"); exit (0);
|
|
| 1391 |
-#endif |
|
| 1392 |
- |
|
| 1393 |
-#if defined (hp300) && !defined (hpux) |
|
| 1394 |
- printf ("m68k-hp-bsd\n"); exit (0);
|
|
| 1395 |
-#endif |
|
| 1396 |
- |
|
| 1397 |
-#if defined (NeXT) |
|
| 1398 |
-#if !defined (__ARCHITECTURE__) |
|
| 1399 |
-#define __ARCHITECTURE__ "m68k" |
|
| 1400 |
-#endif |
|
| 1401 |
- int version; |
|
| 1402 |
- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; |
|
| 1403 |
- if (version < 4) |
|
| 1404 |
- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
|
|
| 1405 |
- else |
|
| 1406 |
- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
|
|
| 1407 |
- exit (0); |
|
| 1408 |
-#endif |
|
| 1409 |
- |
|
| 1410 |
-#if defined (MULTIMAX) || defined (n16) |
|
| 1411 |
-#if defined (UMAXV) |
|
| 1412 |
- printf ("ns32k-encore-sysv\n"); exit (0);
|
|
| 1413 |
-#else |
|
| 1414 |
-#if defined (CMU) |
|
| 1415 |
- printf ("ns32k-encore-mach\n"); exit (0);
|
|
| 1416 |
-#else |
|
| 1417 |
- printf ("ns32k-encore-bsd\n"); exit (0);
|
|
| 1418 |
-#endif |
|
| 1419 |
-#endif |
|
| 1420 |
-#endif |
|
| 1421 |
- |
|
| 1422 |
-#if defined (__386BSD__) |
|
| 1423 |
- printf ("i386-pc-bsd\n"); exit (0);
|
|
| 1424 |
-#endif |
|
| 1425 |
- |
|
| 1426 |
-#if defined (sequent) |
|
| 1427 |
-#if defined (i386) |
|
| 1428 |
- printf ("i386-sequent-dynix\n"); exit (0);
|
|
| 1429 |
-#endif |
|
| 1430 |
-#if defined (ns32000) |
|
| 1431 |
- printf ("ns32k-sequent-dynix\n"); exit (0);
|
|
| 1432 |
-#endif |
|
| 1433 |
-#endif |
|
| 1434 |
- |
|
| 1435 |
-#if defined (_SEQUENT_) |
|
| 1436 |
- struct utsname un; |
|
| 1437 |
- |
|
| 1438 |
- uname(&un); |
|
| 1439 |
- |
|
| 1440 |
- if (strncmp(un.version, "V2", 2) == 0) {
|
|
| 1441 |
- printf ("i386-sequent-ptx2\n"); exit (0);
|
|
| 1442 |
- } |
|
| 1443 |
- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
|
|
| 1444 |
- printf ("i386-sequent-ptx1\n"); exit (0);
|
|
| 1445 |
- } |
|
| 1446 |
- printf ("i386-sequent-ptx\n"); exit (0);
|
|
| 1447 |
- |
|
| 1448 |
-#endif |
|
| 1449 |
- |
|
| 1450 |
-#if defined (vax) |
|
| 1451 |
-# if !defined (ultrix) |
|
| 1452 |
-# include <sys/param.h> |
|
| 1453 |
-# if defined (BSD) |
|
| 1454 |
-# if BSD == 43 |
|
| 1455 |
- printf ("vax-dec-bsd4.3\n"); exit (0);
|
|
| 1456 |
-# else |
|
| 1457 |
-# if BSD == 199006 |
|
| 1458 |
- printf ("vax-dec-bsd4.3reno\n"); exit (0);
|
|
| 1459 |
-# else |
|
| 1460 |
- printf ("vax-dec-bsd\n"); exit (0);
|
|
| 1461 |
-# endif |
|
| 1462 |
-# endif |
|
| 1463 |
-# else |
|
| 1464 |
- printf ("vax-dec-bsd\n"); exit (0);
|
|
| 1465 |
-# endif |
|
| 1466 |
-# else |
|
| 1467 |
- printf ("vax-dec-ultrix\n"); exit (0);
|
|
| 1468 |
-# endif |
|
| 1469 |
-#endif |
|
| 1470 |
- |
|
| 1471 |
-#if defined (alliant) && defined (i860) |
|
| 1472 |
- printf ("i860-alliant-bsd\n"); exit (0);
|
|
| 1473 |
-#endif |
|
| 1474 |
- |
|
| 1475 |
- exit (1); |
|
| 1476 |
-} |
|
| 1477 |
-EOF |
|
| 1478 |
- |
|
| 1479 |
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && |
|
| 1480 |
- { echo "$SYSTEM_NAME"; exit; }
|
|
| 1481 |
- |
|
| 1482 |
-# Apollos put the system type in the environment. |
|
| 1483 |
- |
|
| 1484 |
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
|
|
| 1485 |
- |
|
| 1486 |
-# Convex versions that predate uname can use getsysinfo(1) |
|
| 1487 |
- |
|
| 1488 |
-if [ -x /usr/convex/getsysinfo ] |
|
| 1489 |
-then |
|
| 1490 |
- case `getsysinfo -f cpu_type` in |
|
| 1491 |
- c1*) |
|
| 1492 |
- echo c1-convex-bsd |
|
| 1493 |
- exit ;; |
|
| 1494 |
- c2*) |
|
| 1495 |
- if getsysinfo -f scalar_acc |
|
| 1496 |
- then echo c32-convex-bsd |
|
| 1497 |
- else echo c2-convex-bsd |
|
| 1498 |
- fi |
|
| 1499 |
- exit ;; |
|
| 1500 |
- c34*) |
|
| 1501 |
- echo c34-convex-bsd |
|
| 1502 |
- exit ;; |
|
| 1503 |
- c38*) |
|
| 1504 |
- echo c38-convex-bsd |
|
| 1505 |
- exit ;; |
|
| 1506 |
- c4*) |
|
| 1507 |
- echo c4-convex-bsd |
|
| 1508 |
- exit ;; |
|
| 1509 |
- esac |
|
| 1510 |
-fi |
|
| 1511 |
- |
|
| 1512 | 1375 |
cat >&2 <<EOF |
| 1513 | 1376 |
$0: unable to guess system type |
| 1514 | 1377 |
|
| ... | ... |
@@ -1,8 +1,8 @@ |
| 1 | 1 |
#! /bin/sh |
| 2 | 2 |
# Configuration validation subroutine script. |
| 3 |
-# Copyright 1992-2013 Free Software Foundation, Inc. |
|
| 3 |
+# Copyright 1992-2014 Free Software Foundation, Inc. |
|
| 4 | 4 |
|
| 5 |
-timestamp='2013-04-24' |
|
| 5 |
+timestamp='2014-12-03' |
|
| 6 | 6 |
|
| 7 | 7 |
# This file is free software; you can redistribute it and/or modify it |
| 8 | 8 |
# under the terms of the GNU General Public License as published by |
| ... | ... |
@@ -25,7 +25,7 @@ timestamp='2013-04-24' |
| 25 | 25 |
# of the GNU General Public License, version 3 ("GPLv3").
|
| 26 | 26 |
|
| 27 | 27 |
|
| 28 |
-# Please send patches with a ChangeLog entry to config-patches@gnu.org. |
|
| 28 |
+# Please send patches to <config-patches@gnu.org>. |
|
| 29 | 29 |
# |
| 30 | 30 |
# Configuration subroutine to validate and canonicalize a configuration type. |
| 31 | 31 |
# Supply the specified configuration type as an argument. |
| ... | ... |
@@ -68,7 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>." |
| 68 | 68 |
version="\ |
| 69 | 69 |
GNU config.sub ($timestamp) |
| 70 | 70 |
|
| 71 |
-Copyright 1992-2013 Free Software Foundation, Inc. |
|
| 71 |
+Copyright 1992-2014 Free Software Foundation, Inc. |
|
| 72 | 72 |
|
| 73 | 73 |
This is free software; see the source for copying conditions. There is NO |
| 74 | 74 |
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
| ... | ... |
@@ -257,7 +257,7 @@ case $basic_machine in |
| 257 | 257 |
| avr | avr32 \ |
| 258 | 258 |
| be32 | be64 \ |
| 259 | 259 |
| bfin \ |
| 260 |
- | c4x | clipper \ |
|
| 260 |
+ | c4x | c8051 | clipper \ |
|
| 261 | 261 |
| d10v | d30v | dlx | dsp16xx \ |
| 262 | 262 |
| epiphany \ |
| 263 | 263 |
| fido | fr30 | frv \ |
| ... | ... |
@@ -265,6 +265,7 @@ case $basic_machine in |
| 265 | 265 |
| hexagon \ |
| 266 | 266 |
| i370 | i860 | i960 | ia64 \ |
| 267 | 267 |
| ip2k | iq2000 \ |
| 268 |
+ | k1om \ |
|
| 268 | 269 |
| le32 | le64 \ |
| 269 | 270 |
| lm32 \ |
| 270 | 271 |
| m32c | m32r | m32rle | m68000 | m68k | m88k \ |
| ... | ... |
@@ -282,8 +283,10 @@ case $basic_machine in |
| 282 | 283 |
| mips64vr5900 | mips64vr5900el \ |
| 283 | 284 |
| mipsisa32 | mipsisa32el \ |
| 284 | 285 |
| mipsisa32r2 | mipsisa32r2el \ |
| 286 |
+ | mipsisa32r6 | mipsisa32r6el \ |
|
| 285 | 287 |
| mipsisa64 | mipsisa64el \ |
| 286 | 288 |
| mipsisa64r2 | mipsisa64r2el \ |
| 289 |
+ | mipsisa64r6 | mipsisa64r6el \ |
|
| 287 | 290 |
| mipsisa64sb1 | mipsisa64sb1el \ |
| 288 | 291 |
| mipsisa64sr71k | mipsisa64sr71kel \ |
| 289 | 292 |
| mipsr5900 | mipsr5900el \ |
| ... | ... |
@@ -295,11 +298,11 @@ case $basic_machine in |
| 295 | 298 |
| nds32 | nds32le | nds32be \ |
| 296 | 299 |
| nios | nios2 | nios2eb | nios2el \ |
| 297 | 300 |
| ns16k | ns32k \ |
| 298 |
- | open8 \ |
|
| 299 |
- | or1k | or32 \ |
|
| 301 |
+ | open8 | or1k | or1knd | or32 \ |
|
| 300 | 302 |
| pdp10 | pdp11 | pj | pjl \ |
| 301 | 303 |
| powerpc | powerpc64 | powerpc64le | powerpcle \ |
| 302 | 304 |
| pyramid \ |
| 305 |
+ | riscv32 | riscv64 \ |
|
| 303 | 306 |
| rl78 | rx \ |
| 304 | 307 |
| score \ |
| 305 | 308 |
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ |
| ... | ... |
@@ -310,6 +313,7 @@ case $basic_machine in |
| 310 | 313 |
| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ |
| 311 | 314 |
| ubicom32 \ |
| 312 | 315 |
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ |
| 316 |
+ | visium \ |
|
| 313 | 317 |
| we32k \ |
| 314 | 318 |
| x86 | xc16x | xstormy16 | xtensa \ |
| 315 | 319 |
| z8k | z80) |
| ... | ... |
@@ -324,7 +328,10 @@ case $basic_machine in |
| 324 | 328 |
c6x) |
| 325 | 329 |
basic_machine=tic6x-unknown |
| 326 | 330 |
;; |
| 327 |
- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) |
|
| 331 |
+ leon|leon[3-9]) |
|
| 332 |
+ basic_machine=sparc-$basic_machine |
|
| 333 |
+ ;; |
|
| 334 |
+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) |
|
| 328 | 335 |
basic_machine=$basic_machine-unknown |
| 329 | 336 |
os=-none |
| 330 | 337 |
;; |
| ... | ... |
@@ -372,7 +379,7 @@ case $basic_machine in |
| 372 | 379 |
| be32-* | be64-* \ |
| 373 | 380 |
| bfin-* | bs2000-* \ |
| 374 | 381 |
| c[123]* | c30-* | [cjt]90-* | c4x-* \ |
| 375 |
- | clipper-* | craynv-* | cydra-* \ |
|
| 382 |
+ | c8051-* | clipper-* | craynv-* | cydra-* \ |
|
| 376 | 383 |
| d10v-* | d30v-* | dlx-* \ |
| 377 | 384 |
| elxsi-* \ |
| 378 | 385 |
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ |
| ... | ... |
@@ -381,6 +388,7 @@ case $basic_machine in |
| 381 | 388 |
| hexagon-* \ |
| 382 | 389 |
| i*86-* | i860-* | i960-* | ia64-* \ |
| 383 | 390 |
| ip2k-* | iq2000-* \ |
| 391 |
+ | k1om-* \ |
|
| 384 | 392 |
| le32-* | le64-* \ |
| 385 | 393 |
| lm32-* \ |
| 386 | 394 |
| m32c-* | m32r-* | m32rle-* \ |
| ... | ... |
@@ -400,8 +408,10 @@ case $basic_machine in |
| 400 | 408 |
| mips64vr5900-* | mips64vr5900el-* \ |
| 401 | 409 |
| mipsisa32-* | mipsisa32el-* \ |
| 402 | 410 |
| mipsisa32r2-* | mipsisa32r2el-* \ |
| 411 |
+ | mipsisa32r6-* | mipsisa32r6el-* \ |
|
| 403 | 412 |
| mipsisa64-* | mipsisa64el-* \ |
| 404 | 413 |
| mipsisa64r2-* | mipsisa64r2el-* \ |
| 414 |
+ | mipsisa64r6-* | mipsisa64r6el-* \ |
|
| 405 | 415 |
| mipsisa64sb1-* | mipsisa64sb1el-* \ |
| 406 | 416 |
| mipsisa64sr71k-* | mipsisa64sr71kel-* \ |
| 407 | 417 |
| mipsr5900-* | mipsr5900el-* \ |
| ... | ... |
@@ -413,6 +423,7 @@ case $basic_machine in |
| 413 | 423 |
| nios-* | nios2-* | nios2eb-* | nios2el-* \ |
| 414 | 424 |
| none-* | np1-* | ns16k-* | ns32k-* \ |
| 415 | 425 |
| open8-* \ |
| 426 |
+ | or1k*-* \ |
|
| 416 | 427 |
| orion-* \ |
| 417 | 428 |
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ |
| 418 | 429 |
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ |
| ... | ... |
@@ -430,6 +441,7 @@ case $basic_machine in |
| 430 | 441 |
| ubicom32-* \ |
| 431 | 442 |
| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ |
| 432 | 443 |
| vax-* \ |
| 444 |
+ | visium-* \ |
|
| 433 | 445 |
| we32k-* \ |
| 434 | 446 |
| x86-* | x86_64-* | xc16x-* | xps100-* \ |
| 435 | 447 |
| xstormy16-* | xtensa*-* \ |
| ... | ... |
@@ -767,6 +779,9 @@ case $basic_machine in |
| 767 | 779 |
basic_machine=m68k-isi |
| 768 | 780 |
os=-sysv |
| 769 | 781 |
;; |
| 782 |
+ leon-*|leon[3-9]-*) |
|
| 783 |
+ basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` |
|
| 784 |
+ ;; |
|
| 770 | 785 |
m68knommu) |
| 771 | 786 |
basic_machine=m68k-unknown |
| 772 | 787 |
os=-linux |
| ... | ... |
@@ -794,7 +809,7 @@ case $basic_machine in |
| 794 | 809 |
os=-mingw64 |
| 795 | 810 |
;; |
| 796 | 811 |
mingw32) |
| 797 |
- basic_machine=i386-pc |
|
| 812 |
+ basic_machine=i686-pc |
|
| 798 | 813 |
os=-mingw32 |
| 799 | 814 |
;; |
| 800 | 815 |
mingw32ce) |
| ... | ... |
@@ -822,6 +837,10 @@ case $basic_machine in |
| 822 | 837 |
basic_machine=powerpc-unknown |
| 823 | 838 |
os=-morphos |
| 824 | 839 |
;; |
| 840 |
+ moxiebox) |
|
| 841 |
+ basic_machine=moxie-unknown |
|
| 842 |
+ os=-moxiebox |
|
| 843 |
+ ;; |
|
| 825 | 844 |
msdos) |
| 826 | 845 |
basic_machine=i386-pc |
| 827 | 846 |
os=-msdos |
| ... | ... |
@@ -830,7 +849,7 @@ case $basic_machine in |
| 830 | 849 |
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` |
| 831 | 850 |
;; |
| 832 | 851 |
msys) |
| 833 |
- basic_machine=i386-pc |
|
| 852 |
+ basic_machine=i686-pc |
|
| 834 | 853 |
os=-msys |
| 835 | 854 |
;; |
| 836 | 855 |
mvs) |
| ... | ... |
@@ -1367,14 +1386,14 @@ case $os in |
| 1367 | 1386 |
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
| 1368 | 1387 |
| -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ |
| 1369 | 1388 |
| -linux-newlib* | -linux-musl* | -linux-uclibc* \ |
| 1370 |
- | -uxpv* | -beos* | -mpeix* | -udk* \ |
|
| 1389 |
+ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ |
|
| 1371 | 1390 |
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
| 1372 | 1391 |
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
| 1373 | 1392 |
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ |
| 1374 | 1393 |
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ |
| 1375 | 1394 |
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ |
| 1376 | 1395 |
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ |
| 1377 |
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) |
|
| 1396 |
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) |
|
| 1378 | 1397 |
# Remember, each alternative MUST END IN *, to match a version number. |
| 1379 | 1398 |
;; |
| 1380 | 1399 |
-qnx*) |
| ... | ... |
@@ -1546,6 +1565,9 @@ case $basic_machine in |
| 1546 | 1565 |
c4x-* | tic4x-*) |
| 1547 | 1566 |
os=-coff |
| 1548 | 1567 |
;; |
| 1568 |
+ c8051-*) |
|
| 1569 |
+ os=-elf |
|
| 1570 |
+ ;; |
|
| 1549 | 1571 |
hexagon-*) |
| 1550 | 1572 |
os=-elf |
| 1551 | 1573 |
;; |
| ... | ... |
@@ -1589,9 +1611,6 @@ case $basic_machine in |
| 1589 | 1611 |
mips*-*) |
| 1590 | 1612 |
os=-elf |
| 1591 | 1613 |
;; |
| 1592 |
- or1k-*) |
|
| 1593 |
- os=-elf |
|
| 1594 |
- ;; |
|
| 1595 | 1614 |
or32-*) |
| 1596 | 1615 |
os=-coff |
| 1597 | 1616 |
;; |
| ... | ... |
@@ -3,7 +3,7 @@ |
| 3 | 3 |
|
| 4 | 4 |
scriptversion=2013-05-30.07; # UTC |
| 5 | 5 |
|
| 6 |
-# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
|
| 6 |
+# Copyright (C) 1999-2014 Free Software Foundation, Inc. |
|
| 7 | 7 |
|
| 8 | 8 |
# This program is free software; you can redistribute it and/or modify |
| 9 | 9 |
# it under the terms of the GNU General Public License as published by |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
#!/bin/sh |
| 2 | 2 |
# install - install a program, script, or datafile |
| 3 | 3 |
|
| 4 |
-scriptversion=2011-11-20.07; # UTC |
|
| 4 |
+scriptversion=2013-12-25.23; # UTC |
|
| 5 | 5 |
|
| 6 | 6 |
# This originates from X11R5 (mit/util/scripts/install.sh), which was |
| 7 | 7 |
# later released in X11R6 (xc/config/util/install.sh) with the |
| ... | ... |
@@ -41,19 +41,15 @@ scriptversion=2011-11-20.07; # UTC |
| 41 | 41 |
# This script is compatible with the BSD install script, but was written |
| 42 | 42 |
# from scratch. |
| 43 | 43 |
|
| 44 |
+tab=' ' |
|
| 44 | 45 |
nl=' |
| 45 | 46 |
' |
| 46 |
-IFS=" "" $nl" |
|
| 47 |
+IFS=" $tab$nl" |
|
| 47 | 48 |
|
| 48 |
-# set DOITPROG to echo to test this script |
|
| 49 |
+# Set DOITPROG to "echo" to test this script. |
|
| 49 | 50 |
|
| 50 |
-# Don't use :- since 4.3BSD and earlier shells don't like it. |
|
| 51 | 51 |
doit=${DOITPROG-}
|
| 52 |
-if test -z "$doit"; then |
|
| 53 |
- doit_exec=exec |
|
| 54 |
-else |
|
| 55 |
- doit_exec=$doit |
|
| 56 |
-fi |
|
| 52 |
+doit_exec=${doit:-exec}
|
|
| 57 | 53 |
|
| 58 | 54 |
# Put in absolute file names if you don't have them in your path; |
| 59 | 55 |
# or use environment vars. |
| ... | ... |
@@ -68,17 +64,6 @@ mvprog=${MVPROG-mv}
|
| 68 | 64 |
rmprog=${RMPROG-rm}
|
| 69 | 65 |
stripprog=${STRIPPROG-strip}
|
| 70 | 66 |
|
| 71 |
-posix_glob='?' |
|
| 72 |
-initialize_posix_glob=' |
|
| 73 |
- test "$posix_glob" != "?" || {
|
|
| 74 |
- if (set -f) 2>/dev/null; then |
|
| 75 |
- posix_glob= |
|
| 76 |
- else |
|
| 77 |
- posix_glob=: |
|
| 78 |
- fi |
|
| 79 |
- } |
|
| 80 |
-' |
|
| 81 |
- |
|
| 82 | 67 |
posix_mkdir= |
| 83 | 68 |
|
| 84 | 69 |
# Desired mode of installed file. |
| ... | ... |
@@ -97,7 +82,7 @@ dir_arg= |
| 97 | 82 |
dst_arg= |
| 98 | 83 |
|
| 99 | 84 |
copy_on_change=false |
| 100 |
-no_target_directory= |
|
| 85 |
+is_target_a_directory=possibly |
|
| 101 | 86 |
|
| 102 | 87 |
usage="\ |
| 103 | 88 |
Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE |
| ... | ... |
@@ -137,46 +122,57 @@ while test $# -ne 0; do |
| 137 | 122 |
-d) dir_arg=true;; |
| 138 | 123 |
|
| 139 | 124 |
-g) chgrpcmd="$chgrpprog $2" |
| 140 |
- shift;; |
|
| 125 |
+ shift;; |
|
| 141 | 126 |
|
| 142 | 127 |
--help) echo "$usage"; exit $?;; |
| 143 | 128 |
|
| 144 | 129 |
-m) mode=$2 |
| 145 |
- case $mode in |
|
| 146 |
- *' '* | *' '* | *' |
|
| 147 |
-'* | *'*'* | *'?'* | *'['*) |
|
| 148 |
- echo "$0: invalid mode: $mode" >&2 |
|
| 149 |
- exit 1;; |
|
| 150 |
- esac |
|
| 151 |
- shift;; |
|
| 130 |
+ case $mode in |
|
| 131 |
+ *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) |
|
| 132 |
+ echo "$0: invalid mode: $mode" >&2 |
|
| 133 |
+ exit 1;; |
|
| 134 |
+ esac |
|
| 135 |
+ shift;; |
|
| 152 | 136 |
|
| 153 | 137 |
-o) chowncmd="$chownprog $2" |
| 154 |
- shift;; |
|
| 138 |
+ shift;; |
|
| 155 | 139 |
|
| 156 | 140 |
-s) stripcmd=$stripprog;; |
| 157 | 141 |
|
| 158 |
- -t) dst_arg=$2 |
|
| 159 |
- # Protect names problematic for 'test' and other utilities. |
|
| 160 |
- case $dst_arg in |
|
| 161 |
- -* | [=\(\)!]) dst_arg=./$dst_arg;; |
|
| 162 |
- esac |
|
| 163 |
- shift;; |
|
| 142 |
+ -t) |
|
| 143 |
+ is_target_a_directory=always |
|
| 144 |
+ dst_arg=$2 |
|
| 145 |
+ # Protect names problematic for 'test' and other utilities. |
|
| 146 |
+ case $dst_arg in |
|
| 147 |
+ -* | [=\(\)!]) dst_arg=./$dst_arg;; |
|
| 148 |
+ esac |
|
| 149 |
+ shift;; |
|
| 164 | 150 |
|
| 165 |
- -T) no_target_directory=true;; |
|
| 151 |
+ -T) is_target_a_directory=never;; |
|
| 166 | 152 |
|
| 167 | 153 |
--version) echo "$0 $scriptversion"; exit $?;; |
| 168 | 154 |
|
| 169 |
- --) shift |
|
| 170 |
- break;; |
|
| 155 |
+ --) shift |
|
| 156 |
+ break;; |
|
| 171 | 157 |
|
| 172 |
- -*) echo "$0: invalid option: $1" >&2 |
|
| 173 |
- exit 1;; |
|
| 158 |
+ -*) echo "$0: invalid option: $1" >&2 |
|
| 159 |
+ exit 1;; |
|
| 174 | 160 |
|
| 175 | 161 |
*) break;; |
| 176 | 162 |
esac |
| 177 | 163 |
shift |
| 178 | 164 |
done |
| 179 | 165 |
|
| 166 |
+# We allow the use of options -d and -T together, by making -d |
|
| 167 |
+# take the precedence; this is for compatibility with GNU install. |
|
| 168 |
+ |
|
| 169 |
+if test -n "$dir_arg"; then |
|
| 170 |
+ if test -n "$dst_arg"; then |
|
| 171 |
+ echo "$0: target directory not allowed when installing a directory." >&2 |
|
| 172 |
+ exit 1 |
|
| 173 |
+ fi |
|
| 174 |
+fi |
|
| 175 |
+ |
|
| 180 | 176 |
if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then |
| 181 | 177 |
# When -d is used, all remaining arguments are directories to create. |
| 182 | 178 |
# When -t is used, the destination is already specified. |
| ... | ... |
@@ -207,6 +203,15 @@ if test $# -eq 0; then |
| 207 | 203 |
exit 0 |
| 208 | 204 |
fi |
| 209 | 205 |
|
| 206 |
+if test -z "$dir_arg"; then |
|
| 207 |
+ if test $# -gt 1 || test "$is_target_a_directory" = always; then |
|
| 208 |
+ if test ! -d "$dst_arg"; then |
|
| 209 |
+ echo "$0: $dst_arg: Is not a directory." >&2 |
|
| 210 |
+ exit 1 |
|
| 211 |
+ fi |
|
| 212 |
+ fi |
|
| 213 |
+fi |
|
| 214 |
+ |
|
| 210 | 215 |
if test -z "$dir_arg"; then |
| 211 | 216 |
do_exit='(exit $ret); exit $ret' |
| 212 | 217 |
trap "ret=129; $do_exit" 1 |
| ... | ... |
@@ -223,16 +228,16 @@ if test -z "$dir_arg"; then |
| 223 | 228 |
|
| 224 | 229 |
*[0-7]) |
| 225 | 230 |
if test -z "$stripcmd"; then |
| 226 |
- u_plus_rw= |
|
| 231 |
+ u_plus_rw= |
|
| 227 | 232 |
else |
| 228 |
- u_plus_rw='% 200' |
|
| 233 |
+ u_plus_rw='% 200' |
|
| 229 | 234 |
fi |
| 230 | 235 |
cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
|
| 231 | 236 |
*) |
| 232 | 237 |
if test -z "$stripcmd"; then |
| 233 |
- u_plus_rw= |
|
| 238 |
+ u_plus_rw= |
|
| 234 | 239 |
else |
| 235 |
- u_plus_rw=,u+rw |
|
| 240 |
+ u_plus_rw=,u+rw |
|
| 236 | 241 |
fi |
| 237 | 242 |
cp_umask=$mode$u_plus_rw;; |
| 238 | 243 |
esac |
| ... | ... |
@@ -269,41 +274,15 @@ do |
| 269 | 274 |
# If destination is a directory, append the input filename; won't work |
| 270 | 275 |
# if double slashes aren't ignored. |
| 271 | 276 |
if test -d "$dst"; then |
| 272 |
- if test -n "$no_target_directory"; then |
|
| 273 |
- echo "$0: $dst_arg: Is a directory" >&2 |
|
| 274 |
- exit 1 |
|
| 277 |
+ if test "$is_target_a_directory" = never; then |
|
| 278 |
+ echo "$0: $dst_arg: Is a directory" >&2 |
|
| 279 |
+ exit 1 |
|
| 275 | 280 |
fi |
| 276 | 281 |
dstdir=$dst |
| 277 | 282 |
dst=$dstdir/`basename "$src"` |
| 278 | 283 |
dstdir_status=0 |
| 279 | 284 |
else |
| 280 |
- # Prefer dirname, but fall back on a substitute if dirname fails. |
|
| 281 |
- dstdir=` |
|
| 282 |
- (dirname "$dst") 2>/dev/null || |
|
| 283 |
- expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
|
| 284 |
- X"$dst" : 'X\(//\)[^/]' \| \ |
|
| 285 |
- X"$dst" : 'X\(//\)$' \| \ |
|
| 286 |
- X"$dst" : 'X\(/\)' \| . 2>/dev/null || |
|
| 287 |
- echo X"$dst" | |
|
| 288 |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
| 289 |
- s//\1/ |
|
| 290 |
- q |
|
| 291 |
- } |
|
| 292 |
- /^X\(\/\/\)[^/].*/{
|
|
| 293 |
- s//\1/ |
|
| 294 |
- q |
|
| 295 |
- } |
|
| 296 |
- /^X\(\/\/\)$/{
|
|
| 297 |
- s//\1/ |
|
| 298 |
- q |
|
| 299 |
- } |
|
| 300 |
- /^X\(\/\).*/{
|
|
| 301 |
- s//\1/ |
|
| 302 |
- q |
|
| 303 |
- } |
|
| 304 |
- s/.*/./; q' |
|
| 305 |
- ` |
|
| 306 |
- |
|
| 285 |
+ dstdir=`dirname "$dst"` |
|
| 307 | 286 |
test -d "$dstdir" |
| 308 | 287 |
dstdir_status=$? |
| 309 | 288 |
fi |
| ... | ... |
@@ -314,74 +293,74 @@ do |
| 314 | 293 |
if test $dstdir_status != 0; then |
| 315 | 294 |
case $posix_mkdir in |
| 316 | 295 |
'') |
| 317 |
- # Create intermediate dirs using mode 755 as modified by the umask. |
|
| 318 |
- # This is like FreeBSD 'install' as of 1997-10-28. |
|
| 319 |
- umask=`umask` |
|
| 320 |
- case $stripcmd.$umask in |
|
| 321 |
- # Optimize common cases. |
|
| 322 |
- *[2367][2367]) mkdir_umask=$umask;; |
|
| 323 |
- .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; |
|
| 324 |
- |
|
| 325 |
- *[0-7]) |
|
| 326 |
- mkdir_umask=`expr $umask + 22 \ |
|
| 327 |
- - $umask % 100 % 40 + $umask % 20 \ |
|
| 328 |
- - $umask % 10 % 4 + $umask % 2 |
|
| 329 |
- `;; |
|
| 330 |
- *) mkdir_umask=$umask,go-w;; |
|
| 331 |
- esac |
|
| 332 |
- |
|
| 333 |
- # With -d, create the new directory with the user-specified mode. |
|
| 334 |
- # Otherwise, rely on $mkdir_umask. |
|
| 335 |
- if test -n "$dir_arg"; then |
|
| 336 |
- mkdir_mode=-m$mode |
|
| 337 |
- else |
|
| 338 |
- mkdir_mode= |
|
| 339 |
- fi |
|
| 340 |
- |
|
| 341 |
- posix_mkdir=false |
|
| 342 |
- case $umask in |
|
| 343 |
- *[123567][0-7][0-7]) |
|
| 344 |
- # POSIX mkdir -p sets u+wx bits regardless of umask, which |
|
| 345 |
- # is incompatible with FreeBSD 'install' when (umask & 300) != 0. |
|
| 346 |
- ;; |
|
| 347 |
- *) |
|
| 348 |
- tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
|
|
| 349 |
- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 |
|
| 350 |
- |
|
| 351 |
- if (umask $mkdir_umask && |
|
| 352 |
- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 |
|
| 353 |
- then |
|
| 354 |
- if test -z "$dir_arg" || {
|
|
| 355 |
- # Check for POSIX incompatibilities with -m. |
|
| 356 |
- # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or |
|
| 357 |
- # other-writable bit of parent directory when it shouldn't. |
|
| 358 |
- # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. |
|
| 359 |
- ls_ld_tmpdir=`ls -ld "$tmpdir"` |
|
| 360 |
- case $ls_ld_tmpdir in |
|
| 361 |
- d????-?r-*) different_mode=700;; |
|
| 362 |
- d????-?--*) different_mode=755;; |
|
| 363 |
- *) false;; |
|
| 364 |
- esac && |
|
| 365 |
- $mkdirprog -m$different_mode -p -- "$tmpdir" && {
|
|
| 366 |
- ls_ld_tmpdir_1=`ls -ld "$tmpdir"` |
|
| 367 |
- test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" |
|
| 368 |
- } |
|
| 369 |
- } |
|
| 370 |
- then posix_mkdir=: |
|
| 371 |
- fi |
|
| 372 |
- rmdir "$tmpdir/d" "$tmpdir" |
|
| 373 |
- else |
|
| 374 |
- # Remove any dirs left behind by ancient mkdir implementations. |
|
| 375 |
- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null |
|
| 376 |
- fi |
|
| 377 |
- trap '' 0;; |
|
| 378 |
- esac;; |
|
| 296 |
+ # Create intermediate dirs using mode 755 as modified by the umask. |
|
| 297 |
+ # This is like FreeBSD 'install' as of 1997-10-28. |
|
| 298 |
+ umask=`umask` |
|
| 299 |
+ case $stripcmd.$umask in |
|
| 300 |
+ # Optimize common cases. |
|
| 301 |
+ *[2367][2367]) mkdir_umask=$umask;; |
|
| 302 |
+ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; |
|
| 303 |
+ |
|
| 304 |
+ *[0-7]) |
|
| 305 |
+ mkdir_umask=`expr $umask + 22 \ |
|
| 306 |
+ - $umask % 100 % 40 + $umask % 20 \ |
|
| 307 |
+ - $umask % 10 % 4 + $umask % 2 |
|
| 308 |
+ `;; |
|
| 309 |
+ *) mkdir_umask=$umask,go-w;; |
|
| 310 |
+ esac |
|
| 311 |
+ |
|
| 312 |
+ # With -d, create the new directory with the user-specified mode. |
|
| 313 |
+ # Otherwise, rely on $mkdir_umask. |
|
| 314 |
+ if test -n "$dir_arg"; then |
|
| 315 |
+ mkdir_mode=-m$mode |
|
| 316 |
+ else |
|
| 317 |
+ mkdir_mode= |
|
| 318 |
+ fi |
|
| 319 |
+ |
|
| 320 |
+ posix_mkdir=false |
|
| 321 |
+ case $umask in |
|
| 322 |
+ *[123567][0-7][0-7]) |
|
| 323 |
+ # POSIX mkdir -p sets u+wx bits regardless of umask, which |
|
| 324 |
+ # is incompatible with FreeBSD 'install' when (umask & 300) != 0. |
|
| 325 |
+ ;; |
|
| 326 |
+ *) |
|
| 327 |
+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
|
|
| 328 |
+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 |
|
| 329 |
+ |
|
| 330 |
+ if (umask $mkdir_umask && |
|
| 331 |
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 |
|
| 332 |
+ then |
|
| 333 |
+ if test -z "$dir_arg" || {
|
|
| 334 |
+ # Check for POSIX incompatibilities with -m. |
|
| 335 |
+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or |
|
| 336 |
+ # other-writable bit of parent directory when it shouldn't. |
|
| 337 |
+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. |
|
| 338 |
+ ls_ld_tmpdir=`ls -ld "$tmpdir"` |
|
| 339 |
+ case $ls_ld_tmpdir in |
|
| 340 |
+ d????-?r-*) different_mode=700;; |
|
| 341 |
+ d????-?--*) different_mode=755;; |
|
| 342 |
+ *) false;; |
|
| 343 |
+ esac && |
|
| 344 |
+ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
|
|
| 345 |
+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"` |
|
| 346 |
+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" |
|
| 347 |
+ } |
|
| 348 |
+ } |
|
| 349 |
+ then posix_mkdir=: |
|
| 350 |
+ fi |
|
| 351 |
+ rmdir "$tmpdir/d" "$tmpdir" |
|
| 352 |
+ else |
|
| 353 |
+ # Remove any dirs left behind by ancient mkdir implementations. |
|
| 354 |
+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null |
|
| 355 |
+ fi |
|
| 356 |
+ trap '' 0;; |
|
| 357 |
+ esac;; |
|
| 379 | 358 |
esac |
| 380 | 359 |
|
| 381 | 360 |
if |
| 382 | 361 |
$posix_mkdir && ( |
| 383 |
- umask $mkdir_umask && |
|
| 384 |
- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" |
|
| 362 |
+ umask $mkdir_umask && |
|
| 363 |
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" |
|
| 385 | 364 |
) |
| 386 | 365 |
then : |
| 387 | 366 |
else |
| ... | ... |
@@ -391,53 +370,51 @@ do |
| 391 | 370 |
# directory the slow way, step by step, checking for races as we go. |
| 392 | 371 |
|
| 393 | 372 |
case $dstdir in |
| 394 |
- /*) prefix='/';; |
|
| 395 |
- [-=\(\)!]*) prefix='./';; |
|
| 396 |
- *) prefix='';; |
|
| 373 |
+ /*) prefix='/';; |
|
| 374 |
+ [-=\(\)!]*) prefix='./';; |
|
| 375 |
+ *) prefix='';; |
|
| 397 | 376 |
esac |
| 398 | 377 |
|
| 399 |
- eval "$initialize_posix_glob" |
|
| 400 |
- |
|
| 401 | 378 |
oIFS=$IFS |
| 402 | 379 |
IFS=/ |
| 403 |
- $posix_glob set -f |
|
| 380 |
+ set -f |
|
| 404 | 381 |
set fnord $dstdir |
| 405 | 382 |
shift |
| 406 |
- $posix_glob set +f |
|
| 383 |
+ set +f |
|
| 407 | 384 |
IFS=$oIFS |
| 408 | 385 |
|
| 409 | 386 |
prefixes= |
| 410 | 387 |
|
| 411 | 388 |
for d |
| 412 | 389 |
do |
| 413 |
- test X"$d" = X && continue |
|
| 414 |
- |
|
| 415 |
- prefix=$prefix$d |
|
| 416 |
- if test -d "$prefix"; then |
|
| 417 |
- prefixes= |
|
| 418 |
- else |
|
| 419 |
- if $posix_mkdir; then |
|
| 420 |
- (umask=$mkdir_umask && |
|
| 421 |
- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break |
|
| 422 |
- # Don't fail if two instances are running concurrently. |
|
| 423 |
- test -d "$prefix" || exit 1 |
|
| 424 |
- else |
|
| 425 |
- case $prefix in |
|
| 426 |
- *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; |
|
| 427 |
- *) qprefix=$prefix;; |
|
| 428 |
- esac |
|
| 429 |
- prefixes="$prefixes '$qprefix'" |
|
| 430 |
- fi |
|
| 431 |
- fi |
|
| 432 |
- prefix=$prefix/ |
|
| 390 |
+ test X"$d" = X && continue |
|
| 391 |
+ |
|
| 392 |
+ prefix=$prefix$d |
|
| 393 |
+ if test -d "$prefix"; then |
|
| 394 |
+ prefixes= |
|
| 395 |
+ else |
|
| 396 |
+ if $posix_mkdir; then |
|
| 397 |
+ (umask=$mkdir_umask && |
|
| 398 |
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break |
|
| 399 |
+ # Don't fail if two instances are running concurrently. |
|
| 400 |
+ test -d "$prefix" || exit 1 |
|
| 401 |
+ else |
|
| 402 |
+ case $prefix in |
|
| 403 |
+ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; |
|
| 404 |
+ *) qprefix=$prefix;; |
|
| 405 |
+ esac |
|
| 406 |
+ prefixes="$prefixes '$qprefix'" |
|
| 407 |
+ fi |
|
| 408 |
+ fi |
|
| 409 |
+ prefix=$prefix/ |
|
| 433 | 410 |
done |
| 434 | 411 |
|
| 435 | 412 |
if test -n "$prefixes"; then |
| 436 |
- # Don't fail if two instances are running concurrently. |
|
| 437 |
- (umask $mkdir_umask && |
|
| 438 |
- eval "\$doit_exec \$mkdirprog $prefixes") || |
|
| 439 |
- test -d "$dstdir" || exit 1 |
|
| 440 |
- obsolete_mkdir_used=true |
|
| 413 |
+ # Don't fail if two instances are running concurrently. |
|
| 414 |
+ (umask $mkdir_umask && |
|
| 415 |
+ eval "\$doit_exec \$mkdirprog $prefixes") || |
|
| 416 |
+ test -d "$dstdir" || exit 1 |
|
| 417 |
+ obsolete_mkdir_used=true |
|
| 441 | 418 |
fi |
| 442 | 419 |
fi |
| 443 | 420 |
fi |
| ... | ... |
@@ -472,15 +449,12 @@ do |
| 472 | 449 |
|
| 473 | 450 |
# If -C, don't bother to copy if it wouldn't change the file. |
| 474 |