diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
| commit | 4dc2822fa71e8e3d3ab004c8c14867607bb4de06 (patch) | |
| tree | 21e5b36849ea23f526cc58578a540de3882d7376 /scripts | |
| parent | 8f1eff09d5706cbea36ddf1bfc4661579f688853 (diff) | |
| parent | 38910b0bc0393c60da90e1b2540e3d4c5858dae9 (diff) | |
resolve merge conflict
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/scan-pkgs.sh | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index a1e9e9440..854712190 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -33,6 +33,11 @@ if [[ -n $ADK_NATIVE ]];then fi fi +if [[ -n $ADK_PACKAGE_FIREFOX ]]; then + NEED_ZIP="$NEED_ZIP firefox" + NEED_LIBIDL="$NEED_LIBIDL firefox" +fi + if [[ -n $ADK_PACKAGE_LIBUSB ]]; then NEED_BISON="$NEED_BISON libusb" fi @@ -158,6 +163,20 @@ if [[ -n $NEED_BISON ]]; then fi fi +if [[ -n $NEED_ZIP ]]; then + if ! which zip >/dev/null 2>&1; then + echo >&2 You need zip to build $NEED_ZIP + out=1 + fi +fi + +if [[ -n $NEED_LIBIDL ]]; then + if ! which libIDL-config-2 >/dev/null 2>&1; then + echo >&2 You need libIDL-config-2 to build $NEED_LIBIDL + out=1 + fi +fi + if [[ -n $NEED_GPERF ]]; then if ! which gperf >/dev/null 2>&1; then echo >&2 You need gperf to build $NEED_GPERF |