git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/gmapR@85510 bc3139a8-67e5-0310-9ffc-ced21a209358
... | ... |
@@ -10,7 +10,7 @@ Description: GSNAP and GMAP are a pair of tools to align short-read |
10 | 10 |
to work with GMAP and GSNAP from within R. In addition, it provides |
11 | 11 |
methods to tally alignment results on a per-nucleotide basis using |
12 | 12 |
the bam_tally tool. |
13 |
-Version: 1.5.3 |
|
13 |
+Version: 1.5.4 |
|
14 | 14 |
Depends: R (>= 2.15.0), methods, GenomicRanges |
15 | 15 |
Imports: IRanges, Rsamtools (>= 1.7.4), rtracklayer (>= 1.17.15), |
16 | 16 |
GenomicFeatures, Biostrings, VariantAnnotation (>= 1.9.4), tools, |
... | ... |
@@ -70,7 +70,8 @@ R_Bamtally_iit (SEXP bamreader_R, SEXP genome_dir_R, SEXP db_R, |
70 | 70 |
need_unique_p, need_primary_p, |
71 | 71 |
ignore_duplicates_p, |
72 | 72 |
min_depth, variant_strands, ignore_query_Ns_p, |
73 |
- print_indels_p, blocksize, verbosep); |
|
73 |
+ print_indels_p, blocksize, verbosep, |
|
74 |
+ /*readlevel_p*/false); |
|
74 | 75 |
IIT_free(&chromosome_iit); |
75 | 76 |
Genome_free(&genome); |
76 | 77 |
|
... | ... |
@@ -1,7 +1,7 @@ |
1 | 1 |
Installation Instructions |
2 | 2 |
************************* |
3 | 3 |
|
4 |
-Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation, |
|
4 |
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, |
|
5 | 5 |
Inc. |
6 | 6 |
|
7 | 7 |
Copying and distribution of this file, with or without modification, |
... | ... |
@@ -1,7 +1,7 @@ |
1 |
-# Makefile.in generated by automake 1.13.1 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.14 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 |
-# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
|
4 |
+# Copyright (C) 1994-2013 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,23 +14,51 @@ |
14 | 14 |
|
15 | 15 |
@SET_MAKE@ |
16 | 16 |
VPATH = @srcdir@ |
17 |
-am__make_dryrun = \ |
|
18 |
- { \ |
|
19 |
- am__dry=no; \ |
|
17 |
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
|
18 |
+am__make_running_with_option = \ |
|
19 |
+ case $${target_option-} in \ |
|
20 |
+ ?) ;; \ |
|
21 |
+ *) echo "am__make_running_with_option: internal error: invalid" \ |
|
22 |
+ "target option '$${target_option-}' specified" >&2; \ |
|
23 |
+ exit 1;; \ |
|
24 |
+ esac; \ |
|
25 |
+ has_opt=no; \ |
|
26 |
+ sane_makeflags=$$MAKEFLAGS; \ |
|
27 |
+ if $(am__is_gnu_make); then \ |
|
28 |
+ sane_makeflags=$$MFLAGS; \ |
|
29 |
+ else \ |
|
20 | 30 |
case $$MAKEFLAGS in \ |
21 | 31 |
*\\[\ \ ]*) \ |
22 |
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
|
23 |
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
|
24 |
- *) \ |
|
25 |
- for am__flg in $$MAKEFLAGS; do \ |
|
26 |
- case $$am__flg in \ |
|
27 |
- *=*|--*) ;; \ |
|
28 |
- *n*) am__dry=yes; break;; \ |
|
29 |
- esac; \ |
|
30 |
- done;; \ |
|
32 |
+ bs=\\; \ |
|
33 |
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
|
34 |
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
|
35 |
+ esac; \ |
|
36 |
+ fi; \ |
|
37 |
+ skip_next=no; \ |
|
38 |
+ strip_trailopt () \ |
|
39 |
+ { \ |
|
40 |
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
|
41 |
+ }; \ |
|
42 |
+ for flg in $$sane_makeflags; do \ |
|
43 |
+ test $$skip_next = yes && { skip_next=no; continue; }; \ |
|
44 |
+ case $$flg in \ |
|
45 |
+ *=*|--*) continue;; \ |
|
46 |
+ -*I) strip_trailopt 'I'; skip_next=yes;; \ |
|
47 |
+ -*I?*) strip_trailopt 'I';; \ |
|
48 |
+ -*O) strip_trailopt 'O'; skip_next=yes;; \ |
|
49 |
+ -*O?*) strip_trailopt 'O';; \ |
|
50 |
+ -*l) strip_trailopt 'l'; skip_next=yes;; \ |
|
51 |
+ -*l?*) strip_trailopt 'l';; \ |
|
52 |
+ -[dEDm]) skip_next=yes;; \ |
|
53 |
+ -[JT]) skip_next=yes;; \ |
|
31 | 54 |
esac; \ |
32 |
- test $$am__dry = yes; \ |
|
33 |
- } |
|
55 |
+ case $$flg in \ |
|
56 |
+ *$$target_option*) has_opt=yes; break;; \ |
|
57 |
+ esac; \ |
|
58 |
+ done; \ |
|
59 |
+ test $$has_opt = yes |
|
60 |
+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
|
61 |
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
|
34 | 62 |
pkgdatadir = $(datadir)/@PACKAGE@ |
35 | 63 |
pkgincludedir = $(includedir)/@PACKAGE@ |
36 | 64 |
pkglibdir = $(libdir)/@PACKAGE@ |
... | ... |
@@ -51,13 +79,13 @@ build_triplet = @build@ |
51 | 79 |
host_triplet = @host@ |
52 | 80 |
target_triplet = @target@ |
53 | 81 |
subdir = . |
54 |
-DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ |
|
82 |
+DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog COPYING \ |
|
55 | 83 |
$(srcdir)/Makefile.in $(srcdir)/Makefile.am \ |
56 | 84 |
$(top_srcdir)/configure $(am__configure_deps) \ |
57 |
- $(top_srcdir)/lib/gstruct.pc.in COPYING config/compile \ |
|
58 |
- config/config.guess config/config.sub config/depcomp \ |
|
59 |
- config/install-sh config/missing config/ltmain.sh \ |
|
60 |
- $(top_srcdir)/config/compile $(top_srcdir)/config/config.guess \ |
|
85 |
+ $(top_srcdir)/lib/gstruct.pc.in config/compile \ |
|
86 |
+ config/config.guess config/config.sub config/install-sh \ |
|
87 |
+ config/missing config/ltmain.sh $(top_srcdir)/config/compile \ |
|
88 |
+ $(top_srcdir)/config/config.guess \ |
|
61 | 89 |
$(top_srcdir)/config/config.sub \ |
62 | 90 |
$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \ |
63 | 91 |
$(top_srcdir)/config/missing |
... | ... |
@@ -231,7 +259,6 @@ LIBTOOL = @LIBTOOL@ |
231 | 259 |
LIPO = @LIPO@ |
232 | 260 |
LN_S = @LN_S@ |
233 | 261 |
LTLIBOBJS = @LTLIBOBJS@ |
234 |
-MAINT = @MAINT@ |
|
235 | 262 |
MAKEINFO = @MAKEINFO@ |
236 | 263 |
MANIFEST_TOOL = @MANIFEST_TOOL@ |
237 | 264 |
MKDIR_P = @MKDIR_P@ |
... | ... |
@@ -329,7 +356,7 @@ all: all-recursive |
329 | 356 |
.SUFFIXES: |
330 | 357 |
am--refresh: Makefile |
331 | 358 |
@: |
332 |
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
|
359 |
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
|
333 | 360 |
@for dep in $?; do \ |
334 | 361 |
case '$(am__configure_deps)' in \ |
335 | 362 |
*$$dep*) \ |
... | ... |
@@ -356,9 +383,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
356 | 383 |
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
357 | 384 |
$(SHELL) ./config.status --recheck |
358 | 385 |
|
359 |
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) |
|
386 |
+$(top_srcdir)/configure: $(am__configure_deps) |
|
360 | 387 |
$(am__cd) $(srcdir) && $(AUTOCONF) |
361 |
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
|
388 |
+$(ACLOCAL_M4): $(am__aclocal_m4_deps) |
|
362 | 389 |
$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) |
363 | 390 |
$(am__aclocal_m4_deps): |
364 | 391 |
lib/gstruct-${LIBGSTRUCT_API_VERSION}.pc: $(top_builddir)/config.status $(top_srcdir)/lib/gstruct.pc.in |
... | ... |
@@ -380,13 +407,12 @@ distclean-libtool: |
380 | 407 |
# (which will cause the Makefiles to be regenerated when you run 'make'); |
381 | 408 |
# (2) otherwise, pass the desired values on the 'make' command line. |
382 | 409 |
$(am__recursive_targets): |
383 |
- @fail= failcom='exit 1'; \ |
|
384 |
- for f in x $$MAKEFLAGS; do \ |
|
385 |
- case $$f in \ |
|
386 |
- *=* | --[!k]*);; \ |
|
387 |
- *k*) failcom='fail=yes';; \ |
|
388 |
- esac; \ |
|
389 |
- done; \ |
|
410 |
+ @fail=; \ |
|
411 |
+ if $(am__make_keepgoing); then \ |
|
412 |
+ failcom='fail=yes'; \ |
|
413 |
+ else \ |
|
414 |
+ failcom='exit 1'; \ |
|
415 |
+ fi; \ |
|
390 | 416 |
dot_seen=no; \ |
391 | 417 |
target=`echo $@ | sed s/-recursive//`; \ |
392 | 418 |
case "$@" in \ |
... | ... |
@@ -564,10 +590,16 @@ dist-xz: distdir |
564 | 590 |
$(am__post_remove_distdir) |
565 | 591 |
|
566 | 592 |
dist-tarZ: distdir |
593 |
+ @echo WARNING: "Support for shar distribution archives is" \ |
|
594 |
+ "deprecated." >&2 |
|
595 |
+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 |
|
567 | 596 |
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z |
568 | 597 |
$(am__post_remove_distdir) |
569 | 598 |
|
570 | 599 |
dist-shar: distdir |
600 |
+ @echo WARNING: "Support for distribution archives compressed with" \ |
|
601 |
+ "legacy program 'compress' is deprecated." >&2 |
|
602 |
+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 |
|
571 | 603 |
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz |
572 | 604 |
$(am__post_remove_distdir) |
573 | 605 |
|
... | ... |
@@ -1,6 +1,6 @@ |
1 |
-# generated automatically by aclocal 1.13.1 -*- Autoconf -*- |
|
1 |
+# generated automatically by aclocal 1.14 -*- Autoconf -*- |
|
2 | 2 |
|
3 |
-# Copyright (C) 1996-2012 Free Software Foundation, Inc. |
|
3 |
+# Copyright (C) 1996-2013 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, |
... | ... |
@@ -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.13' |
|
35 |
+[am__api_version='1.14' |
|
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.13.1], [], |
|
38 |
+m4_if([$1], [1.14], [], |
|
39 | 39 |
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
40 | 40 |
]) |
41 | 41 |
|
... | ... |
@@ -51,7 +51,7 @@ 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.13.1])dnl |
|
54 |
+[AM_AUTOMAKE_VERSION([1.14])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]))]) |
... | ... |
@@ -373,7 +373,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], |
373 | 373 |
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
374 | 374 |
test -z "$DEPDIR" && continue |
375 | 375 |
am__include=`sed -n 's/^am__include = //p' < "$mf"` |
376 |
- test -z "am__include" && continue |
|
376 |
+ test -z "$am__include" && continue |
|
377 | 377 |
am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
378 | 378 |
# Find all dependency output files, they are included files with |
379 | 379 |
# $(DEPDIR) in their names. We invoke sed twice because it is the |
... | ... |
@@ -418,6 +418,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], |
418 | 418 |
# This macro actually does too much. Some checks are only needed if |
419 | 419 |
# your package does certain things. But this isn't really a big deal. |
420 | 420 |
|
421 |
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. |
|
422 |
+m4_define([AC_PROG_CC], |
|
423 |
+m4_defn([AC_PROG_CC]) |
|
424 |
+[_AM_PROG_CC_C_O |
|
425 |
+]) |
|
426 |
+ |
|
421 | 427 |
# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) |
422 | 428 |
# AM_INIT_AUTOMAKE([OPTIONS]) |
423 | 429 |
# ----------------------------------------------- |
... | ... |
@@ -526,7 +532,48 @@ dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. |
526 | 532 |
AC_CONFIG_COMMANDS_PRE(dnl |
527 | 533 |
[m4_provide_if([_AM_COMPILER_EXEEXT], |
528 | 534 |
[AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl |
529 |
-]) |
|
535 |
+ |
|
536 |
+# POSIX will say in a future version that running "rm -f" with no argument |
|
537 |
+# is OK; and we want to be able to make that assumption in our Makefile |
|
538 |
+# recipes. So use an aggressive probe to check that the usage we want is |
|
539 |
+# actually supported "in the wild" to an acceptable degree. |
|
540 |
+# See automake bug#10828. |
|
541 |
+# To make any issue more visible, cause the running configure to be aborted |
|
542 |
+# by default if the 'rm' program in use doesn't match our expectations; the |
|
543 |
+# user can still override this though. |
|
544 |
+if rm -f && rm -fr && rm -rf; then : OK; else |
|
545 |
+ cat >&2 <<'END' |
|
546 |
+Oops! |
|
547 |
+ |
|
548 |
+Your 'rm' program seems unable to run without file operands specified |
|
549 |
+on the command line, even when the '-f' option is present. This is contrary |
|
550 |
+to the behaviour of most rm programs out there, and not conforming with |
|
551 |
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> |
|
552 |
+ |
|
553 |
+Please tell bug-automake@gnu.org about your system, including the value |
|
554 |
+of your $PATH and any error possibly output before this message. This |
|
555 |
+can help us improve future automake versions. |
|
556 |
+ |
|
557 |
+END |
|
558 |
+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then |
|
559 |
+ echo 'Configuration will proceed anyway, since you have set the' >&2 |
|
560 |
+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 |
|
561 |
+ echo >&2 |
|
562 |
+ else |
|
563 |
+ cat >&2 <<'END' |
|
564 |
+Aborting the configuration process, to ensure you take notice of the issue. |
|
565 |
+ |
|
566 |
+You can download and install GNU coreutils to get an 'rm' implementation |
|
567 |
+that behaves properly: <http://www.gnu.org/software/coreutils/>. |
|
568 |
+ |
|
569 |
+If you want to complete the configuration process using your problematic |
|
570 |
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM |
|
571 |
+to "yes", and re-run configure. |
|
572 |
+ |
|
573 |
+END |
|
574 |
+ AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) |
|
575 |
+ fi |
|
576 |
+fi]) |
|
530 | 577 |
|
531 | 578 |
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not |
532 | 579 |
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further |
... | ... |
@@ -534,7 +581,6 @@ dnl mangled by Autoconf and run in a shell conditional statement. |
534 | 581 |
m4_define([_AC_COMPILER_EXEEXT], |
535 | 582 |
m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) |
536 | 583 |
|
537 |
- |
|
538 | 584 |
# When config.status generates a header, we must update the stamp-h file. |
539 | 585 |
# This file resides in the same directory as the config header |
540 | 586 |
# that is generated. The stamp files are numbered to have different names. |
... | ... |
@@ -596,42 +642,6 @@ fi |
596 | 642 |
rmdir .tst 2>/dev/null |
597 | 643 |
AC_SUBST([am__leading_dot])]) |
598 | 644 |
|
599 |
-# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- |
|
600 |
-# From Jim Meyering |
|
601 |
- |
|
602 |
-# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
|
603 |
-# |
|
604 |
-# This file is free software; the Free Software Foundation |
|
605 |
-# gives unlimited permission to copy and/or distribute it, |
|
606 |
-# with or without modifications, as long as this notice is preserved. |
|
607 |
- |
|
608 |
-# AM_MAINTAINER_MODE([DEFAULT-MODE]) |
|
609 |
-# ---------------------------------- |
|
610 |
-# Control maintainer-specific portions of Makefiles. |
|
611 |
-# Default is to disable them, unless 'enable' is passed literally. |
|
612 |
-# For symmetry, 'disable' may be passed as well. Anyway, the user |
|
613 |
-# can override the default with the --enable/--disable switch. |
|
614 |
-AC_DEFUN([AM_MAINTAINER_MODE], |
|
615 |
-[m4_case(m4_default([$1], [disable]), |
|
616 |
- [enable], [m4_define([am_maintainer_other], [disable])], |
|
617 |
- [disable], [m4_define([am_maintainer_other], [enable])], |
|
618 |
- [m4_define([am_maintainer_other], [enable]) |
|
619 |
- m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) |
|
620 |
-AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) |
|
621 |
- dnl maintainer-mode's default is 'disable' unless 'enable' is passed |
|
622 |
- AC_ARG_ENABLE([maintainer-mode], |
|
623 |
- [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], |
|
624 |
- am_maintainer_other[ make rules and dependencies not useful |
|
625 |
- (and sometimes confusing) to the casual installer])], |
|
626 |
- [USE_MAINTAINER_MODE=$enableval], |
|
627 |
- [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) |
|
628 |
- AC_MSG_RESULT([$USE_MAINTAINER_MODE]) |
|
629 |
- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) |
|
630 |
- MAINT=$MAINTAINER_MODE_TRUE |
|
631 |
- AC_SUBST([MAINT])dnl |
|
632 |
-] |
|
633 |
-) |
|
634 |
- |
|
635 | 645 |
# Check to see how 'make' treats includes. -*- Autoconf -*- |
636 | 646 |
|
637 | 647 |
# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
... | ... |
@@ -682,38 +692,6 @@ AC_MSG_RESULT([$_am_result]) |
682 | 692 |
rm -f confinc confmf |
683 | 693 |
]) |
684 | 694 |
|
685 |
-# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
|
686 |
-# |
|
687 |
-# This file is free software; the Free Software Foundation |
|
688 |
-# gives unlimited permission to copy and/or distribute it, |
|
689 |
-# with or without modifications, as long as this notice is preserved. |
|
690 |
- |
|
691 |
-# AM_PROG_CC_C_O |
|
692 |
-# -------------- |
|
693 |
-# Like AC_PROG_CC_C_O, but changed for automake. |
|
694 |
-AC_DEFUN([AM_PROG_CC_C_O], |
|
695 |
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl |
|
696 |
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
|
697 |
-AC_REQUIRE_AUX_FILE([compile])dnl |
|
698 |
-# FIXME: we rely on the cache variable name because |
|
699 |
-# there is no other way. |
|
700 |
-set dummy $CC |
|
701 |
-am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` |
|
702 |
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o |
|
703 |
-if test "$am_t" != yes; then |
|
704 |
- # Losing compiler, so override with the script. |
|
705 |
- # FIXME: It is wrong to rewrite CC. |
|
706 |
- # But if we don't then we get into trouble of one sort or another. |
|
707 |
- # A longer-term fix would be to have automake use am__CC in this case, |
|
708 |
- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" |
|
709 |
- CC="$am_aux_dir/compile $CC" |
|
710 |
-fi |
|
711 |
-dnl Make sure AC_PROG_CC is never called again, or it will override our |
|
712 |
-dnl setting of CC. |
|
713 |
-m4_define([AC_PROG_CC], |
|
714 |
- [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) |
|
715 |
-]) |
|
716 |
- |
|
717 | 695 |
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
718 | 696 |
|
719 | 697 |
# Copyright (C) 1997-2013 Free Software Foundation, Inc. |
... | ... |
@@ -784,6 +762,70 @@ AC_DEFUN([_AM_SET_OPTIONS], |
784 | 762 |
AC_DEFUN([_AM_IF_OPTION], |
785 | 763 |
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) |
786 | 764 |
|
765 |
+# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
|
766 |
+# |
|
767 |
+# This file is free software; the Free Software Foundation |
|
768 |
+# gives unlimited permission to copy and/or distribute it, |
|
769 |
+# with or without modifications, as long as this notice is preserved. |
|
770 |
+ |
|
771 |
+# _AM_PROG_CC_C_O |
|
772 |
+# --------------- |
|
773 |
+# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC |
|
774 |
+# to automatically call this. |
|
775 |
+AC_DEFUN([_AM_PROG_CC_C_O], |
|
776 |
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
|
777 |
+AC_REQUIRE_AUX_FILE([compile])dnl |
|
778 |
+AC_LANG_PUSH([C])dnl |
|
779 |
+AC_CACHE_CHECK( |
|
780 |
+ [whether $CC understands -c and -o together], |
|
781 |
+ [am_cv_prog_cc_c_o], |
|
782 |
+ [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) |
|
783 |
+ # Make sure it works both with $CC and with simple cc. |
|
784 |
+ # Following AC_PROG_CC_C_O, we do the test twice because some |
|
785 |
+ # compilers refuse to overwrite an existing .o file with -o, |
|
786 |
+ # though they will create one. |
|
787 |
+ am_cv_prog_cc_c_o=yes |
|
788 |
+ for am_i in 1 2; do |
|
789 |
+ if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ |
|
790 |
+ && test -f conftest2.$ac_objext; then |
|
791 |
+ : OK |
|
792 |
+ else |
|
793 |
+ am_cv_prog_cc_c_o=no |
|
794 |
+ break |
|
795 |
+ fi |
|
796 |
+ done |
|
797 |
+ rm -f core conftest* |
|
798 |
+ unset am_i]) |
|
799 |
+if test "$am_cv_prog_cc_c_o" != yes; then |
|
800 |
+ # Losing compiler, so override with the script. |
|
801 |
+ # FIXME: It is wrong to rewrite CC. |
|
802 |
+ # But if we don't then we get into trouble of one sort or another. |
|
803 |
+ # A longer-term fix would be to have automake use am__CC in this case, |
|
804 |
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" |
|
805 |
+ CC="$am_aux_dir/compile $CC" |
|
806 |
+fi |
|
807 |
+AC_LANG_POP([C])]) |
|
808 |
+ |
|
809 |
+# For backward compatibility. |
|
810 |
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) |
|
811 |
+ |
|
812 |
+# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
|
813 |
+# |
|
814 |
+# This file is free software; the Free Software Foundation |
|
815 |
+# gives unlimited permission to copy and/or distribute it, |
|
816 |
+# with or without modifications, as long as this notice is preserved. |
|
817 |
+ |
|
818 |
+# AM_RUN_LOG(COMMAND) |
|
819 |
+# ------------------- |
|
820 |
+# Run COMMAND, save the exit status in ac_status, and log it. |
|
821 |
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) |
|
822 |
+AC_DEFUN([AM_RUN_LOG], |
|
823 |
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD |
|
824 |
+ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD |
|
825 |
+ ac_status=$? |
|
826 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
|
827 |
+ (exit $ac_status); }]) |
|
828 |
+ |
|
787 | 829 |
# Check to make sure that the build environment is sane. -*- Autoconf -*- |
788 | 830 |
|
789 | 831 |
# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
... | ... |
@@ -993,76 +1035,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) |
993 | 1035 |
# Substitute a variable $(am__untar) that extract such |
994 | 1036 |
# a tarball read from stdin. |
995 | 1037 |
# $(am__untar) < result.tar |
1038 |
+# |
|
996 | 1039 |
AC_DEFUN([_AM_PROG_TAR], |
997 | 1040 |
[# Always define AMTAR for backward compatibility. Yes, it's still used |
998 | 1041 |
# in the wild :-( We should find a proper way to deprecate it ... |
999 | 1042 |
AC_SUBST([AMTAR], ['$${TAR-tar}']) |
1000 |
-m4_if([$1], [v7], |
|
1001 |
- [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], |
|
1002 |
- [m4_case([$1], [ustar],, [pax],, |
|
1003 |
- [m4_fatal([Unknown tar format])]) |
|
1004 |
-AC_MSG_CHECKING([how to create a $1 tar archive]) |
|
1005 |
-# Loop over all known methods to create a tar archive until one works. |
|
1043 |
+ |
|
1044 |
+# We'll loop over all known methods to create a tar archive until one works. |
|
1006 | 1045 |
_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' |
1007 |
-_am_tools=${am_cv_prog_tar_$1-$_am_tools} |
|
1008 |
-# Do not fold the above two line into one, because Tru64 sh and |
|
1009 |
-# Solaris sh will not grok spaces in the rhs of '-'. |
|
1010 |
-for _am_tool in $_am_tools |
|
1011 |
-do |
|
1012 |
- case $_am_tool in |
|
1013 |
- gnutar) |
|
1014 |
- for _am_tar in tar gnutar gtar; |
|
1015 |
- do |
|
1016 |
- AM_RUN_LOG([$_am_tar --version]) && break |
|
1017 |
- done |
|
1018 |
- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' |
|
1019 |
- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' |
|
1020 |
- am__untar="$_am_tar -xf -" |
|
1021 |
- ;; |
|
1022 |
- plaintar) |
|
1023 |
- # Must skip GNU tar: if it does not support --format= it doesn't create |
|
1024 |
- # ustar tarball either. |
|
1025 |
- (tar --version) >/dev/null 2>&1 && continue |
|
1026 |
- am__tar='tar chf - "$$tardir"' |
|
1027 |
- am__tar_='tar chf - "$tardir"' |
|
1028 |
- am__untar='tar xf -' |
|
1029 |
- ;; |
|
1030 |
- pax) |
|
1031 |
- am__tar='pax -L -x $1 -w "$$tardir"' |
|
1032 |
- am__tar_='pax -L -x $1 -w "$tardir"' |
|
1033 |
- am__untar='pax -r' |
|
1034 |
- ;; |
|
1035 |
- cpio) |
|
1036 |
- am__tar='find "$$tardir" -print | cpio -o -H $1 -L' |
|
1037 |
- am__tar_='find "$tardir" -print | cpio -o -H $1 -L' |
|
1038 |
- am__untar='cpio -i -H $1 -d' |
|
1039 |
- ;; |
|
1040 |
- none) |
|
1041 |
- am__tar=false |
|
1042 |
- am__tar_=false |
|
1043 |
- am__untar=false |
|
1044 |
- ;; |
|
1045 |
- esac |
|
1046 | 1046 |
|
1047 |
- # If the value was cached, stop now. We just wanted to have am__tar |
|
1048 |
- # and am__untar set. |
|
1049 |
- test -n "${am_cv_prog_tar_$1}" && break |
|
1047 |
+m4_if([$1], [v7], |
|
1048 |
+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], |
|
1049 |
+ |
|
1050 |
+ [m4_case([$1], |
|
1051 |
+ [ustar], |
|
1052 |
+ [# The POSIX 1988 'ustar' format is defined with fixed-size fields. |
|
1053 |
+ # There is notably a 21 bits limit for the UID and the GID. In fact, |
|
1054 |
+ # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 |
|
1055 |
+ # and bug#13588). |
|
1056 |
+ am_max_uid=2097151 # 2^21 - 1 |
|
1057 |
+ am_max_gid=$am_max_uid |
|
1058 |
+ # The $UID and $GID variables are not portable, so we need to resort |
|
1059 |
+ # to the POSIX-mandated id(1) utility. Errors in the 'id' calls |
|
1060 |
+ # below are definitely unexpected, so allow the users to see them |
|
1061 |
+ # (that is, avoid stderr redirection). |
|
1062 |
+ am_uid=`id -u || echo unknown` |
|
1063 |
+ am_gid=`id -g || echo unknown` |
|
1064 |
+ AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) |
|
1065 |
+ if test $am_uid -le $am_max_uid; then |
|
1066 |
+ AC_MSG_RESULT([yes]) |
|
1067 |
+ else |
|
1068 |
+ AC_MSG_RESULT([no]) |
|
1069 |
+ _am_tools=none |
|
1070 |
+ fi |
|
1071 |
+ AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) |
|
1072 |
+ if test $am_gid -le $am_max_gid; then |
|
1073 |
+ AC_MSG_RESULT([yes]) |
|
1074 |
+ else |
|
1075 |
+ AC_MSG_RESULT([no]) |
|
1076 |
+ _am_tools=none |
|
1077 |
+ fi], |
|
1078 |
+ |
|
1079 |
+ [pax], |
|
1080 |
+ [], |
|
1081 |
+ |
|
1082 |
+ [m4_fatal([Unknown tar format])]) |
|
1083 |
+ |
|
1084 |
+ AC_MSG_CHECKING([how to create a $1 tar archive]) |
|
1085 |
+ |
|
1086 |
+ # Go ahead even if we have the value already cached. We do so because we |
|
1087 |
+ # need to set the values for the 'am__tar' and 'am__untar' variables. |
|
1088 |
+ _am_tools=${am_cv_prog_tar_$1-$_am_tools} |
|
1089 |
+ |
|
1090 |
+ for _am_tool in $_am_tools; do |
|
1091 |
+ case $_am_tool in |
|
1092 |
+ gnutar) |
|
1093 |
+ for _am_tar in tar gnutar gtar; do |
|
1094 |
+ AM_RUN_LOG([$_am_tar --version]) && break |
|
1095 |
+ done |
|
1096 |
+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' |
|
1097 |
+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' |
|
1098 |
+ am__untar="$_am_tar -xf -" |
|
1099 |
+ ;; |
|
1100 |
+ plaintar) |
|
1101 |
+ # Must skip GNU tar: if it does not support --format= it doesn't create |
|
1102 |
+ # ustar tarball either. |
|
1103 |
+ (tar --version) >/dev/null 2>&1 && continue |
|
1104 |
+ am__tar='tar chf - "$$tardir"' |
|
1105 |
+ am__tar_='tar chf - "$tardir"' |
|
1106 |
+ am__untar='tar xf -' |
|
1107 |
+ ;; |
|
1108 |
+ pax) |
|
1109 |
+ am__tar='pax -L -x $1 -w "$$tardir"' |
|
1110 |
+ am__tar_='pax -L -x $1 -w "$tardir"' |
|
1111 |
+ am__untar='pax -r' |
|
1112 |
+ ;; |
|
1113 |
+ cpio) |
|
1114 |
+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L' |
|
1115 |
+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L' |
|
1116 |
+ am__untar='cpio -i -H $1 -d' |
|
1117 |
+ ;; |
|
1118 |
+ none) |
|
1119 |
+ am__tar=false |
|
1120 |
+ am__tar_=false |
|
1121 |
+ am__untar=false |
|
1122 |
+ ;; |
|
1123 |
+ esac |
|
1050 | 1124 |
|
1051 |
- # tar/untar a dummy directory, and stop if the command works |
|
1052 |
- rm -rf conftest.dir |
|
1053 |
- mkdir conftest.dir |
|
1054 |
- echo GrepMe > conftest.dir/file |
|
1055 |
- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) |
|
1125 |
+ # If the value was cached, stop now. We just wanted to have am__tar |
|
1126 |
+ # and am__untar set. |
|
1127 |
+ test -n "${am_cv_prog_tar_$1}" && break |
|
1128 |
+ |
|
1129 |
+ # tar/untar a dummy directory, and stop if the command works. |
|
1130 |
+ rm -rf conftest.dir |
|
1131 |
+ mkdir conftest.dir |
|
1132 |
+ echo GrepMe > conftest.dir/file |
|
1133 |
+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) |
|
1134 |
+ rm -rf conftest.dir |
|
1135 |
+ if test -s conftest.tar; then |
|
1136 |
+ AM_RUN_LOG([$am__untar <conftest.tar]) |
|
1137 |
+ AM_RUN_LOG([cat conftest.dir/file]) |
|
1138 |
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break |
|
1139 |
+ fi |
|
1140 |
+ done |
|
1056 | 1141 |
rm -rf conftest.dir |
1057 |
- if test -s conftest.tar; then |
|
1058 |
- AM_RUN_LOG([$am__untar <conftest.tar]) |
|
1059 |
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break |
|
1060 |
- fi |
|
1061 |
-done |
|
1062 |
-rm -rf conftest.dir |
|
1063 | 1142 |
|
1064 |
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) |
|
1065 |
-AC_MSG_RESULT([$am_cv_prog_tar_$1])]) |
|
1143 |
+ AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) |
|
1144 |
+ AC_MSG_RESULT([$am_cv_prog_tar_$1])]) |
|
1145 |
+ |
|
1066 | 1146 |
AC_SUBST([am__tar]) |
1067 | 1147 |
AC_SUBST([am__untar]) |
1068 | 1148 |
]) # _AM_PROG_TAR |
... | ... |
@@ -1,10 +1,8 @@ |
1 | 1 |
#! /bin/sh |
2 | 2 |
# Attempt to guess a canonical system name. |
3 |
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
|
4 |
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
|
5 |
-# 2011, 2012, 2013 Free Software Foundation, Inc. |
|
3 |
+# Copyright 1992-2013 Free Software Foundation, Inc. |
|
6 | 4 |
|
7 |
-timestamp='2012-12-30' |
|
5 |
+timestamp='2013-05-16' |
|
8 | 6 |
|
9 | 7 |
# This file is free software; you can redistribute it and/or modify it |
10 | 8 |
# under the terms of the GNU General Public License as published by |
... | ... |
@@ -52,9 +50,7 @@ version="\ |
52 | 50 |
GNU config.guess ($timestamp) |
53 | 51 |
|
54 | 52 |
Originally written by Per Bothner. |
55 |
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
|
56 |
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, |
|
57 |
-2012, 2013 Free Software Foundation, Inc. |
|
53 |
+Copyright 1992-2013 Free Software Foundation, Inc. |
|
58 | 54 |
|
59 | 55 |
This is free software; see the source for copying conditions. There is NO |
60 | 56 |
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
... | ... |
@@ -137,22 +133,20 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown |
137 | 133 |
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown |
138 | 134 |
|
139 | 135 |
case "${UNAME_SYSTEM}" in |
140 |
-Linux|GNU/*) |
|
136 |
+Linux|GNU|GNU/*) |
|
137 |
+ # If the system lacks a compiler, then just pick glibc. |
|
138 |
+ # We could probably try harder. |
|
139 |
+ LIBC=gnu |
|
140 |
+ |
|
141 | 141 |
eval $set_cc_for_build |
142 | 142 |
cat <<-EOF > $dummy.c |
143 | 143 |
#include <features.h> |
144 |
- #ifdef __UCLIBC__ |
|
145 |
- # ifdef __UCLIBC_CONFIG_VERSION__ |
|
146 |
- LIBC=uclibc __UCLIBC_CONFIG_VERSION__ |
|
147 |
- # else |
|
144 |
+ #if defined(__UCLIBC__) |
|
148 | 145 |
LIBC=uclibc |
149 |
- # endif |
|
150 |
- #else |
|
151 |
- # ifdef __dietlibc__ |
|
146 |
+ #elif defined(__dietlibc__) |
|
152 | 147 |
LIBC=dietlibc |
153 |
- # else |
|
148 |
+ #else |
|
154 | 149 |
LIBC=gnu |
155 |
- # endif |
|
156 | 150 |
#endif |
157 | 151 |
EOF |
158 | 152 |
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` |
... | ... |
@@ -910,6 +904,9 @@ EOF |
910 | 904 |
if test "$?" = 0 ; then LIBC="gnulibc1" ; fi |
911 | 905 |
echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
912 | 906 |
exit ;; |
907 |
+ arc:Linux:*:* | arceb:Linux:*:*) |
|
908 |
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
|
909 |
+ exit ;; |
|
913 | 910 |
arm*:Linux:*:*) |
914 | 911 |
eval $set_cc_for_build |
915 | 912 |
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
... | ... |
@@ -972,6 +969,9 @@ EOF |
972 | 969 |
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` |
973 | 970 |
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } |
974 | 971 |
;; |
972 |
+ or1k:Linux:*:*) |
|
973 |
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
|
974 |
+ exit ;; |
|
975 | 975 |
or32:Linux:*:*) |
976 | 976 |
echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
977 | 977 |
exit ;; |
... | ... |
@@ -996,7 +996,7 @@ EOF |
996 | 996 |
echo powerpc-unknown-linux-${LIBC} |
997 | 997 |
exit ;; |
998 | 998 |
s390:Linux:*:* | s390x:Linux:*:*) |
999 |
- echo ${UNAME_MACHINE}-ibm-linux |
|
999 |
+ echo ${UNAME_MACHINE}-ibm-linux-${LIBC} |
|
1000 | 1000 |
exit ;; |
1001 | 1001 |
sh64*:Linux:*:*) |
1002 | 1002 |
echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
... | ... |
@@ -1250,19 +1250,21 @@ EOF |
1250 | 1250 |
exit ;; |
1251 | 1251 |
*:Darwin:*:*) |
1252 | 1252 |
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown |
1253 |
- case $UNAME_PROCESSOR in |
|
1254 |
- i386) |
|
1255 |
- eval $set_cc_for_build |
|
1256 |
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then |
|
1257 |
- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ |
|
1258 |
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ |
|
1259 |
- grep IS_64BIT_ARCH >/dev/null |
|
1260 |
- then |
|
1261 |
- UNAME_PROCESSOR="x86_64" |
|
1262 |
- fi |
|
1263 |
- fi ;; |
|
1264 |
- unknown) UNAME_PROCESSOR=powerpc ;; |
|
1265 |
- esac |
|
1253 |
+ eval $set_cc_for_build |
|
1254 |
+ if test "$UNAME_PROCESSOR" = unknown ; then |
|
1255 |
+ UNAME_PROCESSOR=powerpc |
|
1256 |
+ fi |
|
1257 |
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then |
|
1258 |
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ |
|
1259 |
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ |
|
1260 |
+ grep IS_64BIT_ARCH >/dev/null |
|
1261 |
+ then |
|
1262 |
+ case $UNAME_PROCESSOR in |
|
1263 |
+ i386) UNAME_PROCESSOR=x86_64 ;; |
|
1264 |
+ powerpc) UNAME_PROCESSOR=powerpc64 ;; |
|
1265 |
+ esac |
|
1266 |
+ fi |
|
1267 |
+ fi |
|
1266 | 1268 |
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} |
1267 | 1269 |
exit ;; |
1268 | 1270 |
*:procnto*:*:* | *:QNX:[0123456789]*:*) |
... | ... |
@@ -1,10 +1,8 @@ |
1 | 1 |
#! /bin/sh |
2 | 2 |
# Configuration validation subroutine script. |
3 |
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
|
4 |
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
|
5 |
-# 2011, 2012, 2013 Free Software Foundation, Inc. |
|
3 |
+# Copyright 1992-2013 Free Software Foundation, Inc. |
|
6 | 4 |
|
7 |
-timestamp='2013-01-11' |
|
5 |
+timestamp='2013-04-24' |
|
8 | 6 |
|
9 | 7 |
# This file is free software; you can redistribute it and/or modify it |
10 | 8 |
# under the terms of the GNU General Public License as published by |
... | ... |
@@ -70,9 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>." |
70 | 68 |
version="\ |
71 | 69 |
GNU config.sub ($timestamp) |
72 | 70 |
|
73 |
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
|
74 |
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, |
|
75 |
-2012, 2013 Free Software Foundation, Inc. |
|
71 |
+Copyright 1992-2013 Free Software Foundation, Inc. |
|
76 | 72 |
|
77 | 73 |
This is free software; see the source for copying conditions. There is NO |
78 | 74 |
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
... | ... |
@@ -256,7 +252,7 @@ case $basic_machine in |
256 | 252 |
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ |
257 | 253 |
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ |
258 | 254 |
| am33_2.0 \ |
259 |
- | arc \ |
|
255 |
+ | arc | arceb \ |
|
260 | 256 |
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ |
261 | 257 |
| avr | avr32 \ |
262 | 258 |
| be32 | be64 \ |
... | ... |
@@ -297,10 +293,10 @@ case $basic_machine in |
297 | 293 |
| mt \ |
298 | 294 |
| msp430 \ |
299 | 295 |
| nds32 | nds32le | nds32be \ |
300 |
- | nios | nios2 \ |
|
296 |
+ | nios | nios2 | nios2eb | nios2el \ |
|
301 | 297 |
| ns16k | ns32k \ |
302 | 298 |
| open8 \ |
303 |
- | or32 \ |
|
299 |
+ | or1k | or32 \ |
|
304 | 300 |
| pdp10 | pdp11 | pj | pjl \ |
305 | 301 |
| powerpc | powerpc64 | powerpc64le | powerpcle \ |
306 | 302 |
| pyramid \ |
... | ... |
@@ -370,7 +366,7 @@ case $basic_machine in |
370 | 366 |
| aarch64-* | aarch64_be-* \ |
371 | 367 |
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ |
372 | 368 |
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ |
373 |
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ |
|
369 |
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ |
|
374 | 370 |
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \ |
375 | 371 |
| avr-* | avr32-* \ |
376 | 372 |
| be32-* | be64-* \ |
... | ... |
@@ -414,7 +410,7 @@ case $basic_machine in |
414 | 410 |
| mt-* \ |
415 | 411 |
| msp430-* \ |
416 | 412 |
| nds32-* | nds32le-* | nds32be-* \ |
417 |
- | nios-* | nios2-* \ |
|
413 |
+ | nios-* | nios2-* | nios2eb-* | nios2el-* \ |
|
418 | 414 |
| none-* | np1-* | ns16k-* | ns32k-* \ |
419 | 415 |
| open8-* \ |
420 | 416 |
| orion-* \ |
... | ... |
@@ -1611,6 +1607,9 @@ case $basic_machine in |
1611 | 1607 |
mips*-*) |
1612 | 1608 |
os=-elf |
1613 | 1609 |
;; |
1610 |
+ or1k-*) |
|
1611 |
+ os=-elf |
|
1612 |
+ ;; |
|
1614 | 1613 |
or32-*) |
1615 | 1614 |
os=-coff |
1616 | 1615 |
;; |
... | ... |
@@ -1,7 +1,7 @@ |
1 | 1 |
#! /bin/sh |
2 | 2 |
# depcomp - compile a program generating dependencies as side-effects |
3 | 3 |
|
4 |
-scriptversion=2012-10-18.11; # UTC |
|
4 |
+scriptversion=2013-05-30.07; # UTC |
|
5 | 5 |
|
6 | 6 |
# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
7 | 7 |
|
... | ... |
@@ -552,6 +552,7 @@ $ { |
552 | 552 |
G |
553 | 553 |
p |
554 | 554 |
}' >> "$depfile" |
555 |
+ echo >> "$depfile" # make sure the fragment doesn't end with a backslash |
|
555 | 556 |
rm -f "$tmpdepfile" |
556 | 557 |
;; |
557 | 558 |
|
... | ... |
@@ -1,6 +1,6 @@ |
1 | 1 |
#! /bin/sh |
2 | 2 |
# Guess values for system-dependent variables and create Makefiles. |
3 |
-# Generated by GNU Autoconf 2.69 for gstruct 2013-09-12. |
|
3 |
+# Generated by GNU Autoconf 2.69 for gstruct 2013-11-15. |
|
4 | 4 |
# |
5 | 5 |
# Report bugs to <Thomas Wu <twu@gene.com>>. |
6 | 6 |
# |
... | ... |
@@ -590,8 +590,8 @@ MAKEFLAGS= |
590 | 590 |
# Identity of this package. |
591 | 591 |
PACKAGE_NAME='gstruct' |
592 | 592 |
PACKAGE_TARNAME='gstruct' |
593 |
-PACKAGE_VERSION='2013-09-12' |
|
594 |
-PACKAGE_STRING='gstruct 2013-09-12' |
|
593 |
+PACKAGE_VERSION='2013-11-15' |
|
594 |
+PACKAGE_STRING='gstruct 2013-11-15' |
|
595 | 595 |
PACKAGE_BUGREPORT='Thomas Wu <twu@gene.com>' |
596 | 596 |
PACKAGE_URL='' |
597 | 597 |
|
... | ... |
@@ -684,9 +684,6 @@ MAINTAINER_FALSE |
684 | 684 |
MAINTAINER_TRUE |
685 | 685 |
FULLDIST_FALSE |
686 | 686 |
FULLDIST_TRUE |
687 |
-MAINT |
|
688 |
-MAINTAINER_MODE_FALSE |
|
689 |
-MAINTAINER_MODE_TRUE |
|
690 | 687 |
AM_BACKSLASH |
691 | 688 |
AM_DEFAULT_VERBOSITY |
692 | 689 |
AM_DEFAULT_V |
... | ... |
@@ -789,7 +786,6 @@ enable_option_checking |
789 | 786 |
enable_largefile |
790 | 787 |
enable_dependency_tracking |
791 | 788 |
enable_silent_rules |
792 |
-enable_maintainer_mode |
|
793 | 789 |
enable_fulldist |
794 | 790 |
enable_maintainer |
795 | 791 |
enable_static_linking |
... | ... |
@@ -1355,7 +1351,7 @@ if test "$ac_init_help" = "long"; then |
1355 | 1351 |
# Omit some internal or obsolete options to make the list less imposing. |
1356 | 1352 |
# This message is too long to be a string in the A/UX 3.1 sh. |
1357 | 1353 |
cat <<_ACEOF |
1358 |
-\`configure' configures gstruct 2013-09-12 to adapt to many kinds of systems. |
|
1354 |
+\`configure' configures gstruct 2013-11-15 to adapt to many kinds of systems. |
|
1359 | 1355 |
|
1360 | 1356 |
Usage: $0 [OPTION]... [VAR=VALUE]... |
1361 | 1357 |
|
... | ... |
@@ -1426,7 +1422,7 @@ fi |
1426 | 1422 |
|
1427 | 1423 |
if test -n "$ac_init_help"; then |
1428 | 1424 |
case $ac_init_help in |
1429 |
- short | recursive ) echo "Configuration of gstruct 2013-09-12:";; |
|
1425 |
+ short | recursive ) echo "Configuration of gstruct 2013-11-15:";; |
|
1430 | 1426 |
esac |
1431 | 1427 |
cat <<\_ACEOF |
1432 | 1428 |
|
... | ... |
@@ -1441,9 +1437,6 @@ Optional Features: |
1441 | 1437 |
speeds up one-time build |
1442 | 1438 |
--enable-silent-rules less verbose build output (undo: "make V=1") |
1443 | 1439 |
--disable-silent-rules verbose build output (undo: "make V=0") |
1444 |
- --disable-maintainer-mode |
|
1445 |
- disable make rules and dependencies not useful (and |
|
1446 |
- sometimes confusing) to the casual installer |
|
1447 | 1440 |
--enable-fulldist For use by program maintainer |
1448 | 1441 |
--enable-maintainer For use by program maintainer |
1449 | 1442 |
--enable-static-linking Link binaries statically (default=no) |
... | ... |
@@ -1545,7 +1538,7 @@ fi |
1545 | 1538 |
test -n "$ac_init_help" && exit $ac_status |
1546 | 1539 |
if $ac_init_version; then |
1547 | 1540 |
cat <<\_ACEOF |
1548 |
-gstruct configure 2013-09-12 |
|
1541 |
+gstruct configure 2013-11-15 |
|
1549 | 1542 |
generated by GNU Autoconf 2.69 |
1550 | 1543 |
|
1551 | 1544 |
Copyright (C) 2012 Free Software Foundation, Inc. |
... | ... |
@@ -2151,7 +2144,7 @@ cat >config.log <<_ACEOF |
2151 | 2144 |
This file contains any messages produced by compilers while |
2152 | 2145 |
running configure, to aid debugging if configure makes a mistake. |
2153 | 2146 |
|
2154 |
-It was created by gstruct $as_me 2013-09-12, which was |
|
2147 |
+It was created by gstruct $as_me 2013-11-15, which was |
|
2155 | 2148 |
generated by GNU Autoconf 2.69. Invocation command line was |
2156 | 2149 |
|
2157 | 2150 |
$ $0 $@ |
... | ... |
@@ -2501,8 +2494,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu |
2501 | 2494 |
|
2502 | 2495 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking package version" >&5 |
2503 | 2496 |
$as_echo_n "checking package version... " >&6; } |
2504 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2013-09-12" >&5 |
|
2505 |
-$as_echo "2013-09-12" >&6; } |
|
2497 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2013-11-15" >&5 |
|
2498 |
+$as_echo "2013-11-15" >&6; } |
|
2506 | 2499 |
|
2507 | 2500 |
### Read defaults |
2508 | 2501 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CONFIG_SITE" >&5 |
... | ... |
@@ -2716,6 +2709,9 @@ test -n "$target_alias" && |
2716 | 2709 |
NONENONEs,x,x, && |
2717 | 2710 |
program_prefix=${target_alias}- |
2718 | 2711 |
|
2712 |
+# expand $ac_aux_dir to an absolute path |
|
2713 |
+am_aux_dir=`cd $ac_aux_dir && pwd` |
|
2714 |
+ |
|
2719 | 2715 |
ac_ext=c |
2720 | 2716 |
ac_cpp='$CPP $CPPFLAGS' |
2721 | 2717 |
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
... | ... |
@@ -3505,6 +3501,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
3505 | 3501 |
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
3506 | 3502 |
ac_compiler_gnu=$ac_cv_c_compiler_gnu |
3507 | 3503 |
|
3504 |
+ac_ext=c |
|
3505 |
+ac_cpp='$CPP $CPPFLAGS' |
|
3506 |
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
|
3507 |
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
|
3508 |
+ac_compiler_gnu=$ac_cv_c_compiler_gnu |
|
3509 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 |
|
3510 |
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } |
|
3511 |
+if ${am_cv_prog_cc_c_o+:} false; then : |
|
3512 |
+ $as_echo_n "(cached) " >&6 |
|
3513 |
+else |
|
3514 |
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
|
3515 |
+/* end confdefs.h. */ |
|
3516 |
+ |
|
3517 |
+int |
|
3518 |
+main () |
|
3519 |
+{ |
|
3520 |
+ |
|
3521 |
+ ; |
|
3522 |
+ return 0; |
|
3523 |
+} |
|
3524 |
+_ACEOF |
|
3525 |
+ # Make sure it works both with $CC and with simple cc. |
|
3526 |
+ # Following AC_PROG_CC_C_O, we do the test twice because some |
|
3527 |
+ # compilers refuse to overwrite an existing .o file with -o, |
|
3528 |
+ # though they will create one. |
|
3529 |
+ am_cv_prog_cc_c_o=yes |
|
3530 |
+ for am_i in 1 2; do |
|
3531 |
+ if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 |
|
3532 |
+ ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 |
|
3533 |
+ ac_status=$? |
|
3534 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
3535 |
+ (exit $ac_status); } \ |
|
3536 |
+ && test -f conftest2.$ac_objext; then |
|
3537 |
+ : OK |
|
3538 |
+ else |
|
3539 |
+ am_cv_prog_cc_c_o=no |
|
3540 |
+ break |
|
3541 |
+ fi |
|
3542 |
+ done |
|
3543 |
+ rm -f core conftest* |
|
3544 |
+ unset am_i |
|
3545 |
+fi |
|
3546 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 |
|
3547 |
+$as_echo "$am_cv_prog_cc_c_o" >&6; } |
|
3548 |
+if test "$am_cv_prog_cc_c_o" != yes; then |
|
3549 |
+ # Losing compiler, so override with the script. |
|
3550 |
+ # FIXME: It is wrong to rewrite CC. |
|
3551 |
+ # But if we don't then we get into trouble of one sort or another. |
|
3552 |
+ # A longer-term fix would be to have automake use am__CC in this case, |
|
3553 |
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" |
|
3554 |
+ CC="$am_aux_dir/compile $CC" |
|
3555 |
+fi |
|
3556 |
+ac_ext=c |
|
3557 |
+ac_cpp='$CPP $CPPFLAGS' |
|
3558 |
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
|
3559 |
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
|
3560 |
+ac_compiler_gnu=$ac_cv_c_compiler_gnu |
|
3561 |
+ |
|
3562 |
+ |
|
3508 | 3563 |
|
3509 | 3564 |
# Check whether --enable-largefile was given. |
3510 | 3565 |
if test "${enable_largefile+set}" = set; then : |
... | ... |
@@ -3718,7 +3773,7 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` |
3718 | 3773 |
|
3719 | 3774 |
|
3720 | 3775 |
#AM_INIT_AUTOMAKE([no-dependencies]) |
3721 |
-am__api_version='1.13' |
|
3776 |
+am__api_version='1.14' |
|
3722 | 3777 |
|
3723 | 3778 |
# Find a good install program. We prefer a C program (faster), |
3724 | 3779 |
# so one script is as good as another. But avoid the broken or |
... | ... |
@@ -3880,9 +3935,6 @@ fi |
3880 | 3935 |
|
3881 | 3936 |
rm -f conftest.file |
3882 | 3937 |
|
3883 |
-# expand $ac_aux_dir to an absolute path |
|
3884 |
-am_aux_dir=`cd $ac_aux_dir && pwd` |
|
3885 |
- |
|
3886 | 3938 |
if test x"${MISSING+set}" != xset; then |
3887 | 3939 |
case $am_aux_dir in |
3888 | 3940 |
*\ * | *\ *) |
... | ... |
@@ -4258,7 +4310,7 @@ fi |
4258 | 4310 |
# Define the identity of the package. |
4259 | 4311 |
|
4260 | 4312 |
PACKAGE=gstruct |
4261 |
- VERSION=2013-09-12 |
|
4313 |
+ VERSION=2013-11-15 |
|
4262 | 4314 |
|
4263 | 4315 |
|
4264 | 4316 |
cat >>confdefs.h <<_ACEOF |
... | ... |
@@ -4298,11 +4350,16 @@ mkdir_p='$(MKDIR_P)' |
4298 | 4350 |
# in the wild :-( We should find a proper way to deprecate it ... |
4299 | 4351 |
AMTAR='$${TAR-tar}' |
4300 | 4352 |
|
4353 |
+ |
|
4354 |
+# We'll loop over all known methods to create a tar archive until one works. |
|
4355 |
+_am_tools='gnutar pax cpio none' |
|
4356 |
+ |
|
4301 | 4357 |
am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' |
4302 | 4358 |
|
4303 | 4359 |
|
4304 | 4360 |
|
4305 | 4361 |
|
4362 |
+ |
|
4306 | 4363 |
depcc="$CC" am_compiler_list= |
4307 | 4364 |
|
4308 | 4365 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 |
... | ... |
@@ -4432,29 +4489,47 @@ fi |
4432 | 4489 |
|
4433 | 4490 |
|
4434 | 4491 |
|
4492 |
+# POSIX will say in a future version that running "rm -f" with no argument |
|
4493 |
+# is OK; and we want to be able to make that assumption in our Makefile |
|
4494 |
+# recipes. So use an aggressive probe to check that the usage we want is |
|
4495 |
+# actually supported "in the wild" to an acceptable degree. |
|
4496 |
+# See automake bug#10828. |
|
4497 |
+# To make any issue more visible, cause the running configure to be aborted |
|
4498 |
+# by default if the 'rm' program in use doesn't match our expectations; the |
|
4499 |
+# user can still override this though. |
|
4500 |
+if rm -f && rm -fr && rm -rf; then : OK; else |
|
4501 |
+ cat >&2 <<'END' |
|
4502 |
+Oops! |
|
4435 | 4503 |
|
4436 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 |
|
4437 |
-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } |
|
4438 |
- # Check whether --enable-maintainer-mode was given. |
|
4439 |
-if test "${enable_maintainer_mode+set}" = set; then : |
|
4440 |
- enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval |
|
4441 |
-else |
|
4442 |
- USE_MAINTAINER_MODE=yes |
|
4443 |
-fi |
|
4504 |
+Your 'rm' program seems unable to run without file operands specified |
|
4505 |
+on the command line, even when the '-f' option is present. This is contrary |
|
4506 |
+to the behaviour of most rm programs out there, and not conforming with |
|
4507 |
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> |
|
4444 | 4508 |
|
4445 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 |
|
4446 |
-$as_echo "$USE_MAINTAINER_MODE" >&6; } |
|
4447 |
- if test $USE_MAINTAINER_MODE = yes; then |
|
4448 |
- MAINTAINER_MODE_TRUE= |
|
4449 |
- MAINTAINER_MODE_FALSE='#' |
|
4450 |
-else |
|
4451 |
- MAINTAINER_MODE_TRUE='#' |
|
4452 |
- MAINTAINER_MODE_FALSE= |
|
4453 |
-fi |
|
4509 |
+Please tell bug-automake@gnu.org about your system, including the value |
|
4510 |
+of your $PATH and any error possibly output before this message. This |
|
4511 |
+can help us improve future automake versions. |
|
4454 | 4512 |
|
4455 |
- MAINT=$MAINTAINER_MODE_TRUE |
|
4513 |
+END |
|
4514 |
+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then |
|
4515 |
+ echo 'Configuration will proceed anyway, since you have set the' >&2 |
|
4516 |
+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 |
|
4517 |
+ echo >&2 |
|
4518 |
+ else |
|
4519 |
+ cat >&2 <<'END' |
|
4520 |
+Aborting the configuration process, to ensure you take notice of the issue. |
|
4456 | 4521 |
|
4522 |
+You can download and install GNU coreutils to get an 'rm' implementation |
|
4523 |
+that behaves properly: <http://www.gnu.org/software/coreutils/>. |
|
4457 | 4524 |
|
4525 |
+If you want to complete the configuration process using your problematic |
|
4526 |
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM |
|
4527 |
+to "yes", and re-run configure. |
|
4528 |
+ |
|
4529 |
+END |
|
4530 |
+ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 |
|
4531 |
+ fi |
|
4532 |
+fi |
|
4458 | 4533 |
|
4459 | 4534 |
if test "x$enable_fulldist" = xyes; then |
4460 | 4535 |
FULLDIST_TRUE= |
... | ... |
@@ -5139,16 +5214,14 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
5139 | 5214 |
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
5140 | 5215 |
ac_compiler_gnu=$ac_cv_c_compiler_gnu |
5141 | 5216 |
|
5142 |
-if test "x$CC" != xcc; then |
|
5143 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 |
|
5144 |
-$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } |
|
5145 |
-else |
|
5146 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 |
|
5147 |
-$as_echo_n "checking whether cc understands -c and -o together... " >&6; } |
|
5148 |
-fi |
|
5149 |
-set dummy $CC; ac_cc=`$as_echo "$2" | |
|
5150 |
- sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` |
|
5151 |
-if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : |
|
5217 |
+ac_ext=c |
|
5218 |
+ac_cpp='$CPP $CPPFLAGS' |
|
5219 |
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
|
5220 |
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
|
5221 |
+ac_compiler_gnu=$ac_cv_c_compiler_gnu |
|
5222 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 |
|
5223 |
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } |
|
5224 |
+if ${am_cv_prog_cc_c_o+:} false; then : |
|
5152 | 5225 |
$as_echo_n "(cached) " >&6 |
5153 | 5226 |
else |
5154 | 5227 |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
... | ... |
@@ -5162,100 +5235,30 @@ main () |
5162 | 5235 |
return 0; |
5163 | 5236 |
} |
5164 | 5237 |
_ACEOF |
5165 |
-# Make sure it works both with $CC and with simple cc. |
|
5166 |
-# We do the test twice because some compilers refuse to overwrite an |
|
5167 |
-# existing .o file with -o, though they will create one. |
|
5168 |
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' |
|
5169 |
-rm -f conftest2.* |
|
5170 |
-if { { case "(($ac_try" in |
|
5171 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
|
5172 |
- *) ac_try_echo=$ac_try;; |
|
5173 |
-esac |
|
5174 |
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
|
5175 |
-$as_echo "$ac_try_echo"; } >&5 |
|
5176 |
- (eval "$ac_try") 2>&5 |
|
5177 |
- ac_status=$? |
|
5178 |
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
|
5179 |
- test $ac_status = 0; } && |
|
5180 |
- test -f conftest2.$ac_objext && { { case "(($ac_try" in |
|
5181 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
|
5182 |
- *) ac_try_echo=$ac_try;; |
|
5183 |
-esac |
|
5184 |
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
|
5185 |
-$as_echo "$ac_try_echo"; } >&5 |
|
5186 |
- (eval "$ac_try") 2>&5 |
|
5187 |
- ac_status=$? |
|
5188 |
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
|
5189 |
- test $ac_status = 0; }; |
|
5190 |
-then |
|
5191 |
- eval ac_cv_prog_cc_${ac_cc}_c_o=yes |
|
5192 |
- if test "x$CC" != xcc; then |
|
5193 |
- # Test first that cc exists at all. |
|
5194 |
- if { ac_try='cc -c conftest.$ac_ext >&5' |
|
5195 |
- { { case "(($ac_try" in |
|
5196 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
|
5197 |
- *) ac_try_echo=$ac_try;; |
|
5198 |
-esac |
|
5199 |
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
|
5200 |
-$as_echo "$ac_try_echo"; } >&5 |
|
5201 |
- (eval "$ac_try") 2>&5 |
|
5202 |
- ac_status=$? |
|
5203 |
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
|
5204 |
- test $ac_status = 0; }; }; then |
|
5205 |
- ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' |
|
5206 |
- rm -f conftest2.* |
|
5207 |
- if { { case "(($ac_try" in |
|
5208 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
|
5209 |
- *) ac_try_echo=$ac_try;; |
|
5210 |
-esac |
|
5211 |
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
|
5212 |
-$as_echo "$ac_try_echo"; } >&5 |
|
5213 |
- (eval "$ac_try") 2>&5 |
|
5214 |
- ac_status=$? |
|
5215 |
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
|
5216 |
- test $ac_status = 0; } && |
|
5217 |
- test -f conftest2.$ac_objext && { { case "(($ac_try" in |
|
5218 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
|
5219 |
- *) ac_try_echo=$ac_try;; |
|
5220 |
-esac |
|
5221 |
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
|
5222 |
-$as_echo "$ac_try_echo"; } >&5 |
|
5223 |
- (eval "$ac_try") 2>&5 |
|
5224 |
- ac_status=$? |
|
5225 |
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
|
5226 |
- test $ac_status = 0; }; |
|
5227 |
- then |
|
5228 |
- # cc works too. |
|
5229 |
- : |
|
5230 |
- else |
|
5231 |
- # cc exists but doesn't like -o. |
|
5232 |
- eval ac_cv_prog_cc_${ac_cc}_c_o=no |
|
5233 |
- fi |
|
5238 |
+ # Make sure it works both with $CC and with simple cc. |
|
5239 |
+ # Following AC_PROG_CC_C_O, we do the test twice because some |
|
5240 |
+ # compilers refuse to overwrite an existing .o file with -o, |
|
5241 |
+ # though they will create one. |
|
5242 |
+ am_cv_prog_cc_c_o=yes |
|
5243 |
+ for am_i in 1 2; do |
|
5244 |
+ if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 |
|
5245 |
+ ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 |
|
5246 |
+ ac_status=$? |
|
5247 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
5248 |
+ (exit $ac_status); } \ |
|
5249 |
+ && test -f conftest2.$ac_objext; then |
|
5250 |
+ : OK |
|
5251 |
+ else |
|
5252 |
+ am_cv_prog_cc_c_o=no |
|
5253 |
+ break |
|
5234 | 5254 |
fi |
5235 |
- fi |
|
5236 |
-else |
|
5237 |
- eval ac_cv_prog_cc_${ac_cc}_c_o=no |
|
5238 |
-fi |
|
5239 |
-rm -f core conftest* |
|
5240 |
- |
|
5241 |
-fi |
|
5242 |
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then |
|
5243 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
|
5244 |
-$as_echo "yes" >&6; } |
|
5245 |
-else |
|
5246 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
|
5247 |
-$as_echo "no" >&6; } |
|
5248 |
- |
|
5249 |
-$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h |
|
5250 |
- |
|
5255 |
+ done |
|
5256 |
+ rm -f core conftest* |
|
5257 |
+ unset am_i |
|
5251 | 5258 |
fi |
5252 |
- |
|
5253 |
-# FIXME: we rely on the cache variable name because |
|
5254 |
-# there is no other way. |
|
5255 |
-set dummy $CC |
|
5256 |
-am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` |
|
5257 |
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o |
|
5258 |
-if test "$am_t" != yes; then |
|
5259 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 |
|
5260 |
+$as_echo "$am_cv_prog_cc_c_o" >&6; } |
|
5261 |
+if test "$am_cv_prog_cc_c_o" != yes; then |
|
5259 | 5262 |
# Losing compiler, so override with the script. |
5260 | 5263 |
# FIXME: It is wrong to rewrite CC. |
5261 | 5264 |
# But if we don't then we get into trouble of one sort or another. |
... | ... |
@@ -5263,6 +5266,12 @@ if test "$am_t" != yes; then |
5263 | 5266 |
# and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" |
5264 | 5267 |
CC="$am_aux_dir/compile $CC" |
5265 | 5268 |
fi |
5269 |
+ac_ext=c |
|
5270 |
+ac_cpp='$CPP $CPPFLAGS' |
|
5271 |
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
|
5272 |
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
|
5273 |
+ac_compiler_gnu=$ac_cv_c_compiler_gnu |
|
5274 |
+ |
|
5266 | 5275 |
|
5267 | 5276 |
|
5268 | 5277 |
case `pwd` in |
... | ... |
@@ -15458,10 +15467,6 @@ else |
15458 | 15467 |
am__EXEEXT_FALSE= |
15459 | 15468 |
fi |
15460 | 15469 |
|
15461 |
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then |
|
15462 |
- as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. |
|
15463 |
-Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
|
15464 |
-fi |
|
15465 | 15470 |
if test -z "${FULLDIST_TRUE}" && test -z "${FULLDIST_FALSE}"; then |
15466 | 15471 |
as_fn_error $? "conditional \"FULLDIST\" was never defined. |
15467 | 15472 |
Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
... | ... |
@@ -15876,7 +15881,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
15876 | 15881 |
# report actual input values of CONFIG_FILES etc. instead of their |
15877 | 15882 |
# values after options handling. |
15878 | 15883 |
ac_log=" |
15879 |
-This file was extended by gstruct $as_me 2013-09-12, which was |
|
15884 |
+This file was extended by gstruct $as_me 2013-11-15, which was |
|
15880 | 15885 |
generated by GNU Autoconf 2.69. Invocation command line was |
15881 | 15886 |
|
15882 | 15887 |
CONFIG_FILES = $CONFIG_FILES |
... | ... |
@@ -15942,7 +15947,7 @@ _ACEOF |
15942 | 15947 |
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
15943 | 15948 |
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
15944 | 15949 |
ac_cs_version="\\ |
15945 |
-gstruct config.status 2013-09-12 |
|
15950 |
+gstruct config.status 2013-11-15 |
|
15946 | 15951 |
configured by $0, generated by GNU Autoconf 2.69, |
15947 | 15952 |
with options \\"\$ac_cs_config\\" |
15948 | 15953 |
|
... | ... |
@@ -17001,7 +17006,7 @@ $as_echo X"$mf" | |
17001 | 17006 |
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
17002 | 17007 |
test -z "$DEPDIR" && continue |
17003 | 17008 |
am__include=`sed -n 's/^am__include = //p' < "$mf"` |
17004 |
- test -z "am__include" && continue |
|
17009 |
+ test -z "$am__include" && continue |
|
17005 | 17010 |
am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
17006 | 17011 |
# Find all dependency output files, they are included files with |
17007 | 17012 |
# $(DEPDIR) in their names. We invoke sed twice because it is the |
... | ... |
@@ -1,7 +1,7 @@ |
1 |
-# Makefile.in generated by automake 1.13.1 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.14 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 |
-# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
|
4 |
+# Copyright (C) 1994-2013 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, |
... | ... |
@@ -18,23 +18,51 @@ |
18 | 18 |
|
19 | 19 |
|
20 | 20 |
VPATH = @srcdir@ |
21 |
-am__make_dryrun = \ |
|
22 |
- { \ |
|
23 |
- am__dry=no; \ |
|
21 |
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
|
22 |
+am__make_running_with_option = \ |
|
23 |
+ case $${target_option-} in \ |
|
24 |
+ ?) ;; \ |
|
25 |
+ *) echo "am__make_running_with_option: internal error: invalid" \ |
|
26 |
+ "target option '$${target_option-}' specified" >&2; \ |
|
27 |
+ exit 1;; \ |
|
28 |
+ esac; \ |
|
29 |
+ has_opt=no; \ |
|
30 |
+ sane_makeflags=$$MAKEFLAGS; \ |
|
31 |
+ if $(am__is_gnu_make); then \ |
|
32 |
+ sane_makeflags=$$MFLAGS; \ |
|
33 |
+ else \ |
|
24 | 34 |
case $$MAKEFLAGS in \ |
25 | 35 |
*\\[\ \ ]*) \ |
26 |
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
|
27 |
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
|
28 |
- *) \ |
|
29 |
- for am__flg in $$MAKEFLAGS; do \ |
|
30 |
- case $$am__flg in \ |
|
31 |
- *=*|--*) ;; \ |
|
32 |
- *n*) am__dry=yes; break;; \ |
|
33 |
- esac; \ |
|
34 |
- done;; \ |
|
36 |
+ bs=\\; \ |
|
37 |
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
|
38 |
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
|
35 | 39 |
esac; \ |
36 |
- test $$am__dry = yes; \ |
|
37 |
- } |
|
40 |
+ fi; \ |
|
41 |
+ skip_next=no; \ |
|
42 |
+ strip_trailopt () \ |
|
43 |
+ { \ |
|
44 |
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
|
45 |
+ }; \ |
|
46 |
+ for flg in $$sane_makeflags; do \ |
|
47 |
+ test $$skip_next = yes && { skip_next=no; continue; }; \ |
|
48 |
+ case $$flg in \ |
|
49 |
+ *=*|--*) continue;; \ |
|
50 |
+ -*I) strip_trailopt 'I'; skip_next=yes;; \ |
|
51 |
+ -*I?*) strip_trailopt 'I';; \ |
|
52 |
+ -*O) strip_trailopt 'O'; skip_next=yes;; \ |
|
53 |
+ -*O?*) strip_trailopt 'O';; \ |
|
54 |
+ -*l) strip_trailopt 'l'; skip_next=yes;; \ |
|
55 |
+ -*l?*) strip_trailopt 'l';; \ |
|
56 |
+ -[dEDm]) skip_next=yes;; \ |
|
57 |
+ -[JT]) skip_next=yes;; \ |
|
58 |
+ esac; \ |
|
59 |
+ case $$flg in \ |
|
60 |
+ *$$target_option*) has_opt=yes; break;; \ |
|
61 |
+ esac; \ |
|
62 |
+ done; \ |
|
63 |
+ test $$has_opt = yes |
|
64 |
+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
|
65 |
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
|
38 | 66 |
pkgdatadir = $(datadir)/@PACKAGE@ |
39 | 67 |
pkgincludedir = $(includedir)/@PACKAGE@ |
40 | 68 |
pkglibdir = $(libdir)/@PACKAGE@ |
... | ... |
@@ -360,7 +388,6 @@ LIBTOOL = @LIBTOOL@ |
360 | 388 |