diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-30 15:39:09 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-30 15:39:09 +0200 |
| commit | 27767d6da4e2dfd2505adff10a88b404831f3f6d (patch) | |
| tree | 7fcba7ee423e7bc425e4ac85ee3893e9ac777b17 /scripts/scan-pkgs.sh | |
| parent | dd50e3ad11a5c40e40c0238320332598ebb872e6 (diff) | |
| parent | 6506a9625c772f787201532cc579c2652ad437c8 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'scripts/scan-pkgs.sh')
| -rw-r--r-- | scripts/scan-pkgs.sh | 43 |
1 files changed, 34 insertions, 9 deletions
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index f08ee812a..303935a9b 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -26,7 +26,6 @@ out=0 if [[ -n $ADK_NATIVE ]];then if [[ -n $ADK_PACKAGE_GIT ]];then NEED_CURLDEV="$NEED_CURLDEV git" - NEED_SSLDEV="$NEED_SSLDEV git" fi if [[ -n $ADK_TARGET_PACKAGE_RPM ]]; then NEED_RPM="$NEED_RPM rpm" @@ -36,6 +35,7 @@ fi if [[ -n $ADK_PACKAGE_FIREFOX ]]; then NEED_ZIP="$NEED_ZIP firefox" NEED_LIBIDL="$NEED_LIBIDL firefox" + NEED_PYTHON="$NEED_PYTHON firefox" fi if [[ -n $ADK_COMPILE_HEIMDAL ]]; then @@ -55,8 +55,15 @@ if [[ -n $ADK_COMPILE_AVAHI ]]; then NEED_PKGCONFIG="$NEED_PKGCONFIG avahi" fi +if [[ -n $ADK_COMPILE_AUTOCONF ]]; then + NEED_M4="$NEED_M4 autoconf" +fi + +if [[ -n $ADK_COMPILE_AUTOMAKE ]]; then + NEED_AUTOCONF="$NEED_AUTOCONF automake" +fi + if [[ -n $ADK_PACKAGE_SQUID ]]; then - NEED_SSLDEV="$NEED_SSLDEV squid" NEED_GXX="$NEED_GXX squid" fi @@ -139,6 +146,20 @@ if [[ -n $NEED_MKFONTDIR ]]; then fi fi +if [[ -n $NEED_M4 ]]; then + if ! which m4 >/dev/null 2>&1; then + echo >&2 You need GNU m4 to build $NEED_M4 + out=1 + fi +fi + +if [[ -n $NEED_AUTOCONF ]]; then + if ! which autoconf >/dev/null 2>&1; then + echo >&2 You need autoconf to build $NEED_AUTOCONF + out=1 + fi +fi + if [[ -n $NEED_INTL ]]; then if ! which intltool-update >/dev/null 2>&1; then echo >&2 You need intltool to build $NEED_INTL @@ -220,13 +241,6 @@ if [[ -n $NEED_GLIBZWO ]]; then fi fi -if [[ -n $ADK_USE_CCACHE ]]; then - if ! which ccache >/dev/null 2>&1; then - echo >&2 You have selected to build with ccache, but ccache could not be found. - out=1 - fi -fi - if [[ -n $NEED_RPM ]]; then if ! which rpmbuild >/dev/null 2>&1; then echo >&2 You need rpmbuild to to use $NEED_RPM package backend @@ -241,4 +255,15 @@ if [[ -n $NEED_FLEX ]]; then fi fi +if [[ -n $NEED_PYTHON ]]; then + if ! which python >/dev/null 2>&1; then + if ! test -x /usr/pkg/bin/python2.6 >/dev/null; then + echo >&2 You need python to to use $NEED_PYTHON package + out=1 + fi + fi +fi + +exit $out + exit $out |