Mercurial > vanilla

annotate dev/autoconf213/autoconf.patch @ 830:c080ec1c5226

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
system/upower: initial import, closes #1057
author David Demelier <markand@malikania.fr>
date Thu, 22 Aug 2019 21:00:00 +0200
parents 1100f4b43d48
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
480
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
1 Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
2 Date: 2016-06-11
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
3 Initial Package Version: 2.13
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
4 Upstream Status: Version is historic and unmaintained.
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
5 Origin: Found at fedora, plus fixes for LFS.
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
6 Description: All of the patches currently used by fedora, except for
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
7 the patch which ensures gawk is used in preference to mawk (we do not
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
8 install mawk). For LFS: we put mktemp in /usr/bin not /bin, remove
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
9 the install-info target because that will overwrite standards.info
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
10 with an old version (fedora always use a DESTDIR), and change the
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
11 man and info dirs to ${datadir}/ i.e. /usr/share (an empty /usr/info
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
12 will otherwise be created).
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
13
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
14 diff -Naur a/acgeneral.m4 b/acgeneral.m4
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
15 --- a/acgeneral.m4 1999-01-05 13:27:37.000000000 +0000
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
16 +++ b/acgeneral.m4 2016-06-11 00:18:24.429043947 +0100
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
17 @@ -1817,10 +1817,6 @@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
18 [cat > conftest.$ac_ext <<EOF
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
19 [#]line __oline__ "configure"
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
20 #include "confdefs.h"
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
21 -ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
22 -extern "C" void exit(int);
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
23 -#endif
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
24 -])dnl
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
25 [$1]
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
26 EOF
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
27 if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
28 @@ -1988,12 +1984,12 @@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
29 AC_MSG_CHECKING(size of $1)
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
30 AC_CACHE_VAL(AC_CV_NAME,
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
31 [AC_TRY_RUN([#include <stdio.h>
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
32 -main()
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
33 +int main()
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
34 {
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
35 FILE *f=fopen("conftestval", "w");
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
36 - if (!f) exit(1);
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
37 + if (!f) return(1);
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
38 fprintf(f, "%d\n", sizeof($1));
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
39 - exit(0);
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
40 + return(0);
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
41 }], AC_CV_NAME=`cat conftestval`, AC_CV_NAME=0, ifelse([$2], , , AC_CV_NAME=$2))])dnl
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
42 AC_MSG_RESULT($AC_CV_NAME)
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
43 AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME)
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
44 @@ -2160,20 +2156,38 @@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
45 dnl AC_OUTPUT_MAKE_DEFS()
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
46 define(AC_OUTPUT_MAKE_DEFS,
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
47 [# Transform confdefs.h into DEFS.
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
48 -dnl Using a here document instead of a string reduces the quoting nightmare.
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
49 # Protect against shell expansion while executing Makefile rules.
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
50 # Protect against Makefile macro expansion.
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
51 -cat > conftest.defs <<\EOF
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
52 +#
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
53 +# If the first sed substitution is executed (which looks for macros that
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
54 +# take arguments), then we branch to the quote section. Otherwise,
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
55 +# look for a macro that doesn't take arguments.
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
56 +cat >confdef2opt.sed <<\_ACEOF
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
57 changequote(<<, >>)dnl
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
58 -s%<<#define>> \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
59 -s%[ `~<<#>>$^&*(){}\\|;'"<>?]%\\&%g
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
60 -s%\[%\\&%g
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
61 -s%\]%\\&%g
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
62 -s%\$%$$%g
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
63 +t clear
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
64 +: clear
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
65 +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
66 +t quote
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
67 +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
68 +t quote
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
69 +d
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
70 +: quote
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
71 +s,[ `~#$^&*(){}\\|;'"<>?],\\&,g
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
72 +s,\[,\\&,g
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
73 +s,\],\\&,g
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
74 +s,\$,$$,g
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
75 +p
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
76 changequote([, ])dnl
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
77 -EOF
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
78 -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
79 -rm -f conftest.defs
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
80 +_ACEOF
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
81 +# We use echo to avoid assuming a particular line-breaking character.
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
82 +# The extra dot is to prevent the shell from consuming trailing
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
83 +# line-breaks from the sub-command output. A line-break within
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
84 +# single-quotes doesn't work because, if this script is created in a
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
85 +# platform that uses two characters for line-breaks (e.g., DOS), tr
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
86 +# would break.
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
87 +ac_LF_and_DOT=`echo; echo .`
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
88 +DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
89 +rm -f confdef2opt.sed
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
90 ])
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
91
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
92 dnl Do the variable substitutions to create the Makefiles or whatever.
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
93 diff -Naur a/acspecific.m4 b/acspecific.m4
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
94 --- a/acspecific.m4 1999-01-05 13:27:52.000000000 +0000
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
95 +++ b/acspecific.m4 2016-06-11 00:18:17.533078644 +0100
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
96 @@ -152,8 +152,41 @@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
97 CXXFLAGS=
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
98 fi
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
99 fi
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
100 +
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
101 +AC_PROG_CXX_EXIT_DECLARATION
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
102 ])
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
103
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
104 +
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
105 +# AC_PROG_CXX_EXIT_DECLARATION
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
106 +# -----------------------------
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
107 +# Find a valid prototype for exit and declare it in confdefs.h.
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
108 +AC_DEFUN(AC_PROG_CXX_EXIT_DECLARATION,
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
109 +[for ac_declaration in \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
110 + ''\
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
111 + '#include <stdlib.h>' \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
112 + 'extern "C" void std::exit (int) throw (); using std::exit;' \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
113 + 'extern "C" void std::exit (int); using std::exit;' \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
114 + 'extern "C" void exit (int) throw ();' \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
115 + 'extern "C" void exit (int);' \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
116 + 'void exit (int);'
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
117 +do
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
118 + AC_TRY_COMPILE([#include <stdlib.h>
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
119 +$ac_declaration],
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
120 + [exit (42);],
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
121 + [],
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
122 + [continue])
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
123 + AC_TRY_COMPILE([$ac_declaration],
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
124 + [exit (42);],
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
125 + [break])
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
126 +done
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
127 +if test -n "$ac_declaration"; then
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
128 + echo '#ifdef __cplusplus' >>confdefs.h
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
129 + echo $ac_declaration >>confdefs.h
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
130 + echo '#endif' >>confdefs.h
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
131 +fi
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
132 +])# AC_PROG_CXX_EXIT_DECLARATION
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
133 +
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
134 +
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
135 dnl Determine a Fortran 77 compiler to use. If `F77' is not already set
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
136 dnl in the environment, check for `g77', `f77' and `f2c', in that order.
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
137 dnl Set the output variable `F77' to the name of the compiler found.
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
138 @@ -1010,7 +1043,7 @@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
139 ])
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
140
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
141 AC_DEFUN(AC_FUNC_MMAP,
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
142 -[AC_CHECK_HEADERS(unistd.h)
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
143 +[AC_CHECK_HEADERS(stdlib.h unistd.h sys/stat.h sys/types.h)
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
144 AC_CHECK_FUNCS(getpagesize)
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
145 AC_CACHE_CHECK(for working mmap, ac_cv_func_mmap_fixed_mapped,
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
146 [AC_TRY_RUN([
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
147 @@ -1039,11 +1072,24 @@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
148 #include <fcntl.h>
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
149 #include <sys/mman.h>
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
150
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
151 +#if HAVE_SYS_TYPES_H
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
152 +# include <sys/types.h>
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
153 +#endif
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
154 +
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
155 +#if HAVE_STDLIB_H
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
156 +# include <stdlib.h>
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
157 +#endif
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
158 +
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
159 +#if HAVE_SYS_STAT_H
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
160 +# include <sys/stat.h>
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
161 +#endif
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
162 +
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
163 +#if HAVE_UNISTD_H
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
164 +# include <unistd.h>
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
165 +#endif
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
166 +
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
167 /* This mess was copied from the GNU getpagesize.h. */
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
168 #ifndef HAVE_GETPAGESIZE
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
169 -# ifdef HAVE_UNISTD_H
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
170 -# include <unistd.h>
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
171 -# endif
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
172
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
173 /* Assume that all systems that can run configure have sys/param.h. */
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
174 # ifndef HAVE_SYS_PARAM_H
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
175 @@ -1373,6 +1419,8 @@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
176 r.ru_majflt = r.ru_minflt = 0;
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
177 switch (fork()) {
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
178 case 0: /* Child. */
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
179 + /* Unless we actually _do_ something, the kernel sometimes doesn't chalk up any system time to this process. */
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
180 + if(fork()) { i = 123; wait(NULL); } else { i = 234; exit(0); }
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
181 sleep(1); /* Give up the CPU. */
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
182 _exit(0);
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
183 case -1: _exit(0); /* What can we do? */
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
184 diff -Naur a/autoconf.sh b/autoconf.sh
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
185 --- a/autoconf.sh 1999-01-05 13:27:53.000000000 +0000
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
186 +++ b/autoconf.sh 2016-06-11 00:22:17.351872133 +0100
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
187 @@ -45,20 +45,20 @@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
188 esac
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
189
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
190 : ${TMPDIR=/tmp}
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
191 -tmpout=${TMPDIR}/acout.$$
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
192 +tmpout=`/usr/bin/mktemp ${TMPDIR}/acout.XXXXXX`
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
193 localdir=
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
194 show_version=no
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
195
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
196 while test $# -gt 0 ; do
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
197 case "${1}" in
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
198 -h | --help | --h* )
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
199 - echo "${usage}" 1>&2; exit 0 ;;
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
200 + echo "${usage}" 1>&2; rm -f $tmpout ; exit 0 ;;
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
201 --localdir=* | --l*=* )
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
202 localdir="`echo \"${1}\" | sed -e 's/^[^=]*=//'`"
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
203 shift ;;
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
204 -l | --localdir | --l*)
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
205 shift
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
206 - test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
207 + test $# -eq 0 && { echo "${usage}" 1>&2; rm -f $tmpout; exit 1; }
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
208 localdir="${1}"
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
209 shift ;;
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
210 --macrodir=* | --m*=* )
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
211 @@ -66,7 +66,7 @@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
212 shift ;;
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
213 -m | --macrodir | --m* )
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
214 shift
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
215 - test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
216 + test $# -eq 0 && { echo "${usage}" 1>&2; rm -f $tmpout; exit 1; }
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
217 AC_MACRODIR="${1}"
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
218 shift ;;
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
219 --version | --v* )
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
220 @@ -76,7 +76,7 @@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
221 - ) # Use stdin as input.
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
222 break ;;
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
223 -* )
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
224 - echo "${usage}" 1>&2; exit 1 ;;
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
225 + echo "${usage}" 1>&2; rm -f $tmpout; exit 1 ;;
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
226 * )
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
227 break ;;
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
228 esac
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
229 @@ -86,23 +86,25 @@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
230 version=`sed -n 's/define.AC_ACVERSION.[ ]*\([0-9.]*\).*/\1/p' \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
231 $AC_MACRODIR/acgeneral.m4`
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
232 echo "Autoconf version $version"
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
233 + rm -f $tmpout
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
234 exit 0
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
235 fi
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
236
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
237 case $# in
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
238 0) infile=configure.in ;;
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
239 1) infile="$1" ;;
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
240 - *) echo "$usage" >&2; exit 1 ;;
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
241 + *) echo "$usage" >&2; rm -f $tmpout; exit 1 ;;
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
242 esac
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
243
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
244 trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
245
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
246 -tmpin=${TMPDIR}/acin.$$ # Always set this, to avoid bogus errors from some rm's.
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
247 +tmpin=`/usr/bin/mktemp ${TMPDIR}/acin.XXXXXX`
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
248 +# Always set this, to avoid bogus errors from some rm's.
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
249 if test z$infile = z-; then
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
250 infile=$tmpin
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
251 - cat > $infile
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
252 elif test ! -r "$infile"; then
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
253 echo "autoconf: ${infile}: No such file or directory" >&2
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
254 + rm -f $tmpin $tmpout
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
255 exit 1
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
256 fi
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
257
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
258 @@ -111,6 +113,8 @@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
259 else
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
260 use_localdir=
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
261 fi
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
262 +# Make sure we don't leave those around - they are annoying
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
263 +trap 'rm -f $tmpin $tmpout' 0
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
264
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
265 # Use the frozen version of Autoconf if available.
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
266 r= f=
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
267 @@ -118,7 +122,7 @@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
268 case `$M4 --help < /dev/null 2>&1` in
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
269 *reload-state*) test -r $AC_MACRODIR/autoconf.m4f && { r=--reload f=f; } ;;
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
270 *traditional*) ;;
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
271 -*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin; exit 1 ;;
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
272 +*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin $tmpout; exit 1 ;;
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
273 esac
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
274
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
275 $M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout ||
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
276 @@ -154,6 +158,6 @@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
277 /__oline__/s/^\([0-9][0-9]*\):\(.*\)__oline__/\2\1/
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
278 ' >&4
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
279
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
280 -rm -f $tmpout
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
281 +rm -f $tmpout $tmpin
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
282
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
283 exit $status
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
284 diff -Naur a/autoconf.texi b/autoconf.texi
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
285 --- a/autoconf.texi 1999-01-05 13:28:37.000000000 +0000
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
286 +++ b/autoconf.texi 2016-06-11 00:18:46.360933604 +0100
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
287 @@ -1,7 +1,7 @@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
288 \input texinfo @c -*-texinfo-*-
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
289 @c %**start of header
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
290 -@setfilename autoconf.info
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
291 -@settitle Autoconf
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
292 +@setfilename autoconf213.info
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
293 +@settitle Autoconf-2.13
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
294 @c For double-sided printing, uncomment:
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
295 @c @setchapternewpage odd
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
296 @c %**end of header
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
297 @@ -17,7 +17,8 @@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
298 @ifinfo
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
299 @format
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
300 START-INFO-DIR-ENTRY
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
301 -* Autoconf: (autoconf). Create source code configuration scripts.
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
302 +* Autoconf213: (autoconf213). Create source code configuration scripts.
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
303 + This is a legacy version of autoconf.
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
304 END-INFO-DIR-ENTRY
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
305 @end format
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
306
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
307 diff -Naur a/autoheader.sh b/autoheader.sh
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
308 --- a/autoheader.sh 1999-01-05 13:28:39.000000000 +0000
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
309 +++ b/autoheader.sh 2016-06-11 00:22:17.351872133 +0100
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
310 @@ -194,9 +194,9 @@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
311 # Some fgrep's have limits on the number of lines that can be in the
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
312 # pattern on the command line, so use a temporary file containing the
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
313 # pattern.
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
314 - (fgrep_tmp=${TMPDIR-/tmp}/autoh$$
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
315 + (fgrep_tmp=`/usr/bin/mktemp ${TMPDIR-/tmp}/autoh$$.XXXXXX`
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
316 trap "rm -f $fgrep_tmp; exit 1" 1 2 15
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
317 - cat > $fgrep_tmp <<EOF
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
318 + cat >> $fgrep_tmp <<EOF
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
319 $syms
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
320 EOF
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
321 fgrep -f $fgrep_tmp
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
322 diff -Naur a/autoupdate.sh b/autoupdate.sh
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
323 --- a/autoupdate.sh 1999-01-05 13:28:42.000000000 +0000
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
324 +++ b/autoupdate.sh 2016-06-11 00:23:19.151561252 +0100
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
325 @@ -26,7 +26,7 @@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
326 Usage: autoupdate [-h] [--help] [-m dir] [--macrodir=dir]
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
327 [--version] [template-file]"
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
328
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
329 -sedtmp=/tmp/acups.$$
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
330 +sedtmp=`/usr/bin/mktemp /tmp/acups.XXXXXX`
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
331 # For debugging.
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
332 #sedtmp=/tmp/acups
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
333 show_version=no
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
334 @@ -35,13 +35,13 @@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
335 while test $# -gt 0 ; do
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
336 case "${1}" in
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
337 -h | --help | --h* )
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
338 - echo "${usage}" 1>&2; exit 0 ;;
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
339 + echo "${usage}" 1>&2; rm -f $sedtmp; exit 0 ;;
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
340 --macrodir=* | --m*=* )
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
341 AC_MACRODIR="`echo \"${1}\" | sed -e 's/^[^=]*=//'`"
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
342 shift ;;
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
343 -m | --macrodir | --m* )
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
344 shift
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
345 - test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
346 + test $# -eq 0 && { echo "${usage}" 1>&2; rm -f $sedtmp; exit 1; }
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
347 AC_MACRODIR="${1}"
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
348 shift ;;
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
349 --version | --versio | --versi | --vers)
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
350 @@ -51,7 +51,7 @@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
351 - ) # Use stdin as input.
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
352 break ;;
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
353 -* )
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
354 - echo "${usage}" 1>&2; exit 1 ;;
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
355 + echo "${usage}" 1>&2; rm -f $sedtmp; exit 1 ;;
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
356 * )
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
357 break ;;
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
358 esac
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
359 @@ -61,6 +61,7 @@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
360 version=`sed -n 's/define.AC_ACVERSION.[ ]*\([0-9.]*\).*/\1/p' \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
361 $AC_MACRODIR/acgeneral.m4`
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
362 echo "Autoconf version $version"
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
363 + rm -f $sedtmp
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
364 exit 0
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
365 fi
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
366
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
367 @@ -68,6 +69,7 @@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
368
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
369 tmpout=acupo.$$
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
370 trap 'rm -f $sedtmp $tmpout; exit 1' 1 2 15
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
371 +trap 'rm -f $sedtmp' 0
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
372 case $# in
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
373 0) infile=configure.in; out="> $tmpout"
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
374 # Make sure $infile can be read, and $tmpout has the same permissions.
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
375 diff -Naur a/configure b/configure
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
376 --- a/configure 1999-01-05 13:28:57.000000000 +0000
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
377 +++ b/configure 2016-06-11 00:50:57.771231914 +0100
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
378 @@ -43,8 +43,8 @@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
379 libdir='${exec_prefix}/lib'
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
380 includedir='${prefix}/include'
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
381 oldincludedir='/usr/include'
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
382 -infodir='${prefix}/info'
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
383 -mandir='${prefix}/man'
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
384 +infodir='${datadir}/info'
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
385 +mandir='${datadir}/man'
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
386
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
387 # Initialize some other variables.
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
388 subdirs=
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
389 diff -Naur a/Makefile.in b/Makefile.in
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
390 --- a/Makefile.in 1999-01-05 13:27:16.000000000 +0000
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
391 +++ b/Makefile.in 2016-06-11 00:29:34.005678107 +0100
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
392 @@ -49,7 +49,7 @@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
393
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
394 # Directory in which to install library files.
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
395 datadir = @datadir@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
396 -acdatadir = $(datadir)/autoconf
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
397 +acdatadir = $(datadir)/autoconf-2.13
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
398
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
399 # Directory in which to install documentation info files.
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
400 infodir = @infodir@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
401 @@ -68,8 +68,8 @@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
402 DISTFILES = AUTHORS COPYING ChangeLog ChangeLog.1 INSTALL \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
403 Makefile.in NEWS README TODO $(M4FILES) \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
404 acconfig.h acfunctions acheaders acidentifiers \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
405 - acmakevars acprograms autoconf.info* \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
406 - autoconf.sh autoconf.texi install.texi \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
407 + acmakevars acprograms autoconf213.info* \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
408 + autoconf.sh autoconf213.texi install.texi \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
409 autoheader.sh autoscan.pl autoreconf.sh autoupdate.sh ifnames.sh \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
410 config.guess config.sub configure configure.in \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
411 install-sh mkinstalldirs texinfo.tex \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
412 @@ -106,11 +106,11 @@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
413 autoconf.m4f: autoconf.m4 acgeneral.m4 acspecific.m4 acoldnames.m4
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
414 autoheader.m4f: autoheader.m4 acgeneral.m4 acspecific.m4 acoldnames.m4
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
415
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
416 -info: autoconf.info @standards_info@ INSTALL
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
417 +info: autoconf213.info @standards_info@ INSTALL
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
418
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
419 # Use --no-split to avoid creating filenames > 14 chars.
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
420 -autoconf.info: autoconf.texi install.texi
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
421 - $(MAKEINFO) -I$(srcdir) $(srcdir)/autoconf.texi --no-split --output=$@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
422 +autoconf213.info: autoconf213.texi install.texi
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
423 + $(MAKEINFO) -I$(srcdir) $(srcdir)/autoconf213.texi --no-split --output=$@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
424
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
425 INSTALL: install.texi
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
426 $(MAKEINFO) -I$(srcdir) $(srcdir)/install.texi --output=$@ \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
427 @@ -121,8 +121,8 @@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
428
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
429 dvi: autoconf.dvi @standards_dvi@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
430
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
431 -autoconf.dvi: autoconf.texi
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
432 - $(TEXI2DVI) $(srcdir)/autoconf.texi
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
433 +autoconf.dvi: autoconf213.texi
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
434 + $(TEXI2DVI) $(srcdir)/autoconf213.texi
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
435
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
436 standards.dvi: standards.texi make-stds.texi
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
437 $(TEXI2DVI) $(srcdir)/standards.texi
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
438 @@ -137,35 +137,35 @@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
439 cd testsuite && ${MAKE} AUTOCONF=${bindir}/autoconf $@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
440
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
441 installdirs:
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
442 - $(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(acdatadir)
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
443 + $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)/$(bindir) $(DESTDIR)/$(infodir) $(DESTDIR)/$(acdatadir)
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
444
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
445 -install: all $(M4FILES) acconfig.h installdirs install-info
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
446 +install: all $(M4FILES) acconfig.h installdirs
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
447 for p in $(ASCRIPTS); do \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
448 - $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
449 + $(INSTALL_PROGRAM) $$p $(DESTDIR)/$(bindir)/`echo $$p|sed '$(transform)'`; \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
450 done
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
451 for i in $(M4FROZEN); do \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
452 - $(INSTALL_DATA) $$i $(acdatadir)/$$i; \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
453 + $(INSTALL_DATA) $$i $(DESTDIR)/$(acdatadir)/$$i; \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
454 done
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
455 for i in $(M4FILES) acconfig.h; do \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
456 - $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
457 + $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/$(acdatadir)/$$i; \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
458 done
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
459 -if test -f autoscan; then \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
460 - $(INSTALL_PROGRAM) autoscan $(bindir)/`echo autoscan|sed '$(transform)'`; \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
461 + $(INSTALL_PROGRAM) autoscan $(DESTDIR)/$(bindir)/`echo autoscan|sed '$(transform)'`; \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
462 for i in acfunctions acheaders acidentifiers acprograms \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
463 acmakevars; do \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
464 - $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
465 + $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/$(acdatadir)/$$i; \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
466 done; \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
467 else :; fi
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
468
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
469 # Don't cd, to avoid breaking install-sh references.
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
470 install-info: info installdirs
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
471 - if test -f autoconf.info; then \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
472 + if test -f autoconf213.info; then \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
473 for i in *.info*; do \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
474 - $(INSTALL_DATA) $$i $(infodir)/$$i; \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
475 + $(INSTALL_DATA) $$i $(DESTDIR)/$(infodir)/$$i; \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
476 done; \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
477 else \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
478 for i in $(srcdir)/*.info*; do \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
479 - $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
480 + $(INSTALL_DATA) $$i $(DESTDIR)/$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
481 done; \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
482 fi
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
483
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
484 @@ -174,7 +174,7 @@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
485 rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
486 done
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
487 rm -fr $(acdatadir)
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
488 - cd $(infodir) && rm -f autoconf.info*
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
489 + cd $(infodir) && rm -f autoconf213.info*
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
490 if test -f standards.info || test -f $(srcdir)/standards.info; \
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
491 then cd $(infodir) && rm -f standards.info*; fi
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
492
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
493 diff -Naur a/testsuite/autoconf.s/syntax.exp b/testsuite/autoconf.s/syntax.exp
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
494 --- a/testsuite/autoconf.s/syntax.exp 1999-01-05 13:29:54.000000000 +0000
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
495 +++ b/testsuite/autoconf.s/syntax.exp 2016-06-11 00:18:51.996905247 +0100
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
496 @@ -2,7 +2,7 @@
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
497
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
498 send_user "Checking for syntax errors in the specific tests...\n"
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
499 set script {s/^AC_DEFUN(\([^,]*\).*/\1/p}
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
500 -set macros [exec sed -n $script $srcdir/../acspecific.m4]
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
501 +set macros [exec sed -n $script $srcdir/../acspecific.m4 | grep -v -e AC_FUNC_GETLOADAVG -e F77]
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
502
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
503 foreach mac $macros {
1100f4b43d48 dev/autoconf213: initial import, closes #1573
David Demelier <markand@malikania.fr>
parents:
diff changeset
504 send_user "$mac\n"