diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-22 07:12:19 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-22 07:12:19 +0200 |
| commit | 48b18373159b70caca3f41643804c549552d66f4 (patch) | |
| tree | 8f3ffa76ec9d815777f85b62caa5e778d0f7beef /scripts | |
| parent | 8366ec6a2404cf4b75158b39faabc29a8a1ed8a0 (diff) | |
| parent | a58a6ff7e5a354b7f743ebdba219f42655c1695b (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/scan-pkgs.sh | 13 | ||||
| -rwxr-xr-x | scripts/tar | 9 |
2 files changed, 22 insertions, 0 deletions
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 0bf8f5808..67703df58 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -61,6 +61,10 @@ if [[ -n $ADK_NATIVE ]];then fi fi +if [[ -n $ADK_PACKAGE_LIBX11 ]]; then + NEED_X11="$NEED_X11 libx11" +fi + if [[ -n $ADK_PACKAGE_GPSD ]]; then NEED_PYTHON="$NEED_PYTHON gpsd" fi @@ -236,6 +240,15 @@ if [[ -n $NEED_X11DEV ]];then fi fi +if [[ -n $NEED_X11 ]];then + if ! test -f /usr/include/X11/X.h >/dev/null; then + if ! test -f /usr/local/include/X11/X.h >/dev/null; then + echo >&2 You need X11 headers to build $NEED_X11 + out=1 + fi + fi +fi + if [[ -n $NEED_XEXTDEV ]];then if ! test -f /usr/include/X11/extensions/XShm.h >/dev/null; then echo >&2 You need X11 extensions headers to build $NEED_XEXTDEV diff --git a/scripts/tar b/scripts/tar new file mode 100755 index 000000000..60c5057da --- /dev/null +++ b/scripts/tar @@ -0,0 +1,9 @@ +#!/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. + +if [ -z "$(which gtar 2>/dev/null)" ];then + /bin/tar "$@" +else + gtar "$@" +fi |