1 Patch to allow us to specify alternate autogen, columns and getdefs binaries

     2 when running tests.

     3 

     4 This patch has been sent upstream.

     5 

     6 --- autogen-5.16.2/agen5/bootstrap.dir.orig	2015-08-11 09:49:20.142168670 -0700

     7 +++ autogen-5.16.2/agen5/bootstrap.dir	2015-08-11 09:51:33.172606217 -0700

     8 @@ -40,9 +40,9 @@

     9  {

    10      builddir=$(pwd)

    11      srcdir=${srcdir:-$builddir}

    12 -    AGexe=$(command -v autogen)

    13 -    CLexe=$(command -v columns)

    14 -    GDexe=$(command -v getdefs)

    15 +    AGexe=${AGexe:-$(command -v autogen)}

    16 +    CLexe=${CLexe:-$(command -v columns)}

    17 +    GDexe=${GDexe:-$(command -v getdefs)}

    18  

    19      test -x "${AGexe}" -a -x "${GDexe}" -a -x "${CLexe}" || \

    20          die "autogen is required"

    21 --- autogen-5.16.2/config/bootstrap.orig	2015-08-11 09:52:09.296125796 -0700

    22 +++ autogen-5.16.2/config/bootstrap	2015-08-11 09:53:13.481511016 -0700

    23 @@ -72,7 +72,7 @@

    24  

    25      #  Check for AutoGen version 5.

    26      #

    27 -    AGexe=$(command -v autogen)

    28 +    AGexe=${AGexe:-$(command -v autogen)}

    29      case "${AGexe}" in

    30      ( /* )

    31          v=$($AGexe --version || :)

    32 @@ -87,8 +87,8 @@

    33          ;;

    34      esac

    35  

    36 -    GDexe=$(command -v getdefs)

    37 -    CLexe=$(command -v columns)

    38 +    GDexe=${GDexe:-$(command -v getdefs)}

    39 +    CLexe=${CLexe:-$(command -v columns)}

    40      test -x "${GDexe}" -a -x "${CLexe}" || \

    41          die "autogen support programs are missing"

    42      export AGexe GDexe CLexe