| author | Rich Burridge <rich.burridge@oracle.com> |
| Fri, 14 Aug 2015 08:52:08 -0700 | |
| changeset 4775 | 3eeb991f0795 |
| permissions | -rw-r--r-- |
|
4775
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
Patch to allow us to specify alternate autogen, columns and getdefs binaries |
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
when running tests. |
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
|
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
This patch has been sent upstream. |
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
|
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
--- autogen-5.16.2/agen5/bootstrap.dir.orig 2015-08-11 09:49:20.142168670 -0700 |
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
+++ autogen-5.16.2/agen5/bootstrap.dir 2015-08-11 09:51:33.172606217 -0700 |
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
@@ -40,9 +40,9 @@ |
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
{
|
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
builddir=$(pwd) |
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
srcdir=${srcdir:-$builddir}
|
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
- AGexe=$(command -v autogen) |
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
- CLexe=$(command -v columns) |
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
- GDexe=$(command -v getdefs) |
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
+ AGexe=${AGexe:-$(command -v autogen)}
|
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
+ CLexe=${CLexe:-$(command -v columns)}
|
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
+ GDexe=${GDexe:-$(command -v getdefs)}
|
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |
|
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
19 |
test -x "${AGexe}" -a -x "${GDexe}" -a -x "${CLexe}" || \
|
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
20 |
die "autogen is required" |
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
21 |
--- autogen-5.16.2/config/bootstrap.orig 2015-08-11 09:52:09.296125796 -0700 |
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
22 |
+++ autogen-5.16.2/config/bootstrap 2015-08-11 09:53:13.481511016 -0700 |
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
23 |
@@ -72,7 +72,7 @@ |
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
24 |
|
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
25 |
# Check for AutoGen version 5. |
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
26 |
# |
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
27 |
- AGexe=$(command -v autogen) |
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
28 |
+ AGexe=${AGexe:-$(command -v autogen)}
|
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
29 |
case "${AGexe}" in
|
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
30 |
( /* ) |
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
31 |
v=$($AGexe --version || :) |
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
32 |
@@ -87,8 +87,8 @@ |
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
33 |
;; |
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
34 |
esac |
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
35 |
|
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
36 |
- GDexe=$(command -v getdefs) |
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
37 |
- CLexe=$(command -v columns) |
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
38 |
+ GDexe=${GDexe:-$(command -v getdefs)}
|
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
39 |
+ CLexe=${CLexe:-$(command -v columns)}
|
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
40 |
test -x "${GDexe}" -a -x "${CLexe}" || \
|
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
41 |
die "autogen support programs are missing" |
|
3eeb991f0795
21634797 autogen should hookup its system-test target.
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
42 |
export AGexe GDexe CLexe |