diff options
Diffstat (limited to 'scripts/check-dependencies.sh')
| -rwxr-xr-x | scripts/check-dependencies.sh | 34 |
1 files changed, 30 insertions, 4 deletions
diff --git a/scripts/check-dependencies.sh b/scripts/check-dependencies.sh index 6a3e637..ef8c904 100755 --- a/scripts/check-dependencies.sh +++ b/scripts/check-dependencies.sh @@ -418,12 +418,14 @@ find_installed_version() depname=$1 # try to find/parse headers and/or binary output + # break on the first match. (change the order to change precedence) if [ ! $fsv_tmp ]; then - for syspath in "/opt" "/usr/pkg" "/usr" "/usr/local" $OPENSCAD_LIBRARIES; do + for syspath in "/usr/local" "/opt/local" "/usr/pkg" "/usr" $OPENSCAD_LIBRARIES; do if [ -e $syspath ]; then debug $depname"_sysver" $syspath eval $depname"_sysver" $syspath fsv_tmp=`eval echo "$"$depname"_sysver_result"` + if [ $fsv_tmp ]; then break; fi fi done fi @@ -449,17 +451,23 @@ check_old_local() warnon= if [ "`uname | grep -i linux`" ]; then header_list="opencsg.h CGAL boost GL/glew.h gmp.h mpfr.h eigen2 eigen3" - liblist="libboost_system libboost_system-mt libopencsg libCGAL libglew" - for i in $header_list $liblist; do + for i in $header_list; do if [ -e /usr/local/include/$i ]; then echo "Warning: you have a copy of "$i" under /usr/local/include" warnon=1 fi + done + liblist="libboost_system libboost_system-mt libopencsg libCGAL libglew" + for i in $liblist; do if [ -e /usr/local/lib/$i.so ]; then echo "Warning: you have a copy of "$i" under /usr/local/lib" warnon=1 fi done + if [ -e /usr/local/lib/pkgconfig ]; then + echo "Warning: you have pkgconfig under /usr/local/lib" + warnon=1 + fi fi if [ $warnon ]; then echo "Please verify these local copies don't conflict with the system" @@ -471,6 +479,24 @@ check_misc() if [ "`uname -a|grep -i netbsd`" ]; then echo "NetBSD: Please manually verify the X Sets have been installed" fi + + if [ "`uname -a|grep -i darwin`" ]; then + sparkle= + libs="~/Library /Library" + for libhome in $libs; do + echo "$libhome/Frameworks/Sparkle.framework..." + if [ -d $libhome/Frameworks/Sparkle.framework ]; then + echo "Found in $libhome" + sparkle=$libhome + break + fi + done + if [ -n "$sparkle" ]; then + echo "OS X: Make sure Sparkle.framework is installed in your Frameworks path" + else + echo "OS X: Sparkle.framework found in $libhome" + fi + fi } checkargs() @@ -494,7 +520,7 @@ main() dep_minver=$find_min_version_result compare_version $dep_minver $dep_sysver dep_compare=$compare_version_result - pretty_print $depname $dep_minver $dep_sysver $dep_compare + pretty_print $depname $dep_minver $dep_sysver $dep_compare done check_old_local check_misc |