diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-19 00:54:12 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-19 00:54:12 +0100 |
commit | 1d0c46287d508236506ee59417e8da05c0cee3e5 (patch) | |
tree | e44b4a7ad97472ca0523cff975a958a7b93982e5 /scripts | |
parent | b668796b88da374fefa35b87f305ebcc03147e5d (diff) |
avoid autotools usage on host system
There are to many combinations of autotools on host systems.
If you need to patch the autotool buildsystem of a package
always add a autotool.patch and regenerate configure on your
host. That is the most portable way.
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/autoconf | 26 | ||||
-rw-r--r-- | scripts/automake.dep | 1 | ||||
-rwxr-xr-x | scripts/autoreconf | 38 | ||||
-rw-r--r-- | scripts/scan-tools.sh | 24 | ||||
-rwxr-xr-x | scripts/tsort | 8 |
5 files changed, 3 insertions, 94 deletions
diff --git a/scripts/autoconf b/scripts/autoconf deleted file mode 100755 index ce75759cf..000000000 --- a/scripts/autoconf +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -ac262=$(which autoconf-2.62) -ac261=$(which autoconf-2.61) - -if [ ! -z "$ac262" -a -x "$ac262" ];then - if [ -x /usr/bin/autoconf ];then - AUTOCONF_VERSION=2.62 /usr/bin/autoconf "$@" - else - AUTOCONF_VERSION=2.62 /usr/local/bin/autoconf "$@" - fi -elif [ ! -z "$ac261" -a -x "$ac261" ];then - if [ -x /usr/bin/autoconf ];then - AUTOCONF_VERSION=2.61 /usr/bin/autoconf "$@" - else - AUTOCONF_VERSION=2.61 /usr/local/bin/autoconf "$@" - fi -else - if [ -x /usr/bin/autoconf ];then - /usr/bin/autoconf "$@" - else - /usr/local/bin/autoconf "$@" - fi -fi diff --git a/scripts/automake.dep b/scripts/automake.dep index c729e87a1..317bd6741 100644 --- a/scripts/automake.dep +++ b/scripts/automake.dep @@ -11,6 +11,7 @@ aclocal.m4 acinclude.m4 config.h.in configure.in config.h.in configure.ac config.h.in aclocal.m4 +config.h.in autoconfig.h.in configure configure.in configure configure.ac configure aclocal.m4 diff --git a/scripts/autoreconf b/scripts/autoreconf deleted file mode 100755 index 844ecd157..000000000 --- a/scripts/autoreconf +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -ac262=$(which autoreconf-2.62) -ac261=$(which autoreconf-2.61) - -if [ ! -z "$ac262" -a -x "$ac262" ];then - if [ -x /usr/bin/autoreconf ];then - env \ - AUTOMAKE_VERSION=1.9 \ - AUTOCONF_VERSION=2.62 \ - /usr/bin/autoreconf "$@" - else - env \ - AUTOMAKE_VERSION=1.9 \ - AUTOCONF_VERSION=2.62 \ - /usr/local/bin/autoreconf "$@" - fi -elif [ ! -z "$ac261" -a -x "$ac261" ];then - if [ -x /usr/bin/autoreconf ];then - env \ - AUTOMAKE_VERSION=1.9 \ - AUTOCONF_VERSION=2.61 \ - /usr/bin/autoreconf "$@" - else - env \ - AUTOMAKE_VERSION=1.9 \ - AUTOCONF_VERSION=2.61 \ - /usr/local/bin/autoreconf "$@" - fi -else - if [ -x /usr/bin/autoreconf ];then - /usr/bin/autoreconf "$@" - else - /usr/local/bin/autoreconf "$@" - fi -fi diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh index 56b79663d..8d1fa0022 100644 --- a/scripts/scan-tools.sh +++ b/scripts/scan-tools.sh @@ -95,12 +95,6 @@ if [[ $X != *@(Native compiler works)* ]]; then fi rm test 2>/dev/null -#if ! which cpp >/dev/null 2>&1; then -# echo You must install a C preprocessor to continue. -# echo -# out=1 -#fi - if ! which tar >/dev/null 2>&1; then echo You must install GNU tar to continue. echo @@ -220,24 +214,6 @@ if ! which wget >/dev/null 2>&1; then out=1 fi -if ! which autoconf >/dev/null 2>&1; then - echo You must install autoconf to continue. - echo - out=1 -fi - -if ! which automake >/dev/null 2>&1; then - echo You must install automake to continue. - echo - out=1 -fi - -if ! which libtool >/dev/null 2>&1; then - echo You must install libtool to continue. - echo - out=1 -fi - if ! which file >/dev/null 2>&1; then echo You must install \"file\" to continue. echo diff --git a/scripts/tsort b/scripts/tsort index 45bd2bc24..d4b176f6f 100755 --- a/scripts/tsort +++ b/scripts/tsort @@ -5,13 +5,9 @@ os=$(uname) case $os in NetBSD|MirBSD|OpenBSD) - targ="-r" + /usr/bin/tsort -r ;; *) - targ="|tac" + /usr/bin/tsort | tac ;; esac -if [ -x /usr/bin/tsort ];then - /usr/bin/tsort $targ "$@" -fi - |