[Scummvm-cvs-logs] scummvm master -> 38ee05d75bb19d7a607bc85472d67281e43d72d0
sev-
sev at scummvm.org
Wed May 28 15:59:50 CEST 2014
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
3de1a9dcaa CONFIGURE: Detect and use Fink if installed
38ee05d75b CONFIGURE: Detect and use Mac Homebrew if it is installed
Commit: 3de1a9dcaa0458c7907839b3903f356eb811497d
https://github.com/scummvm/scummvm/commit/3de1a9dcaa0458c7907839b3903f356eb811497d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-05-28T16:58:55+03:00
Commit Message:
CONFIGURE: Detect and use Fink if installed
Changed paths:
configure
diff --git a/configure b/configure
index c2020ab..def2d91 100755
--- a/configure
+++ b/configure
@@ -2203,6 +2203,30 @@ case $_host_os in
echo "Set staticlib-prefix to ${_staticlibpath}"
fi
fi
+
+ # Fink
+ # There is no way to get the prefix, so implementing a hack here
+ fink_version=`fink -V 2>/dev/null`
+ if test "$?" -eq 0; then
+ fink_version="`echo "${fink_version}" | sed -ne 's/Package manager version: \([0-9.]*\)/\1/gp'`"
+ echo_n "You seem to be running Fink version ${fink_version}..."
+
+ fink_prefix=`which fink`
+ # strip off /bin/fink from /sw/bin/port
+ fink_prefix=`dirname ${fink_prefix}`
+ fink_prefix=`dirname ${fink_prefix}`
+
+ echo "adding ${fink_prefix} to paths"
+
+ LDFLAGS="-L${fink_prefix}/lib $LDFLAGS"
+ CXXFLAGS="-I${fink_prefix}/include $CXXFLAGS"
+
+ if test -z "$_staticlibpath"; then
+ _staticlibpath=${fink_prefix}
+ echo "Set staticlib-prefix to ${_staticlibpath}"
+ fi
+ fi
+
# If _staticlibpath is not set yet try first /sw (fink) then /usr/local
# (the macports case is handled above).
if test -z "$_staticlibpath"; then
Commit: 38ee05d75bb19d7a607bc85472d67281e43d72d0
https://github.com/scummvm/scummvm/commit/38ee05d75bb19d7a607bc85472d67281e43d72d0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-05-28T16:58:55+03:00
Commit Message:
CONFIGURE: Detect and use Mac Homebrew if it is installed
Changed paths:
configure
diff --git a/configure b/configure
index def2d91..46edeaf 100755
--- a/configure
+++ b/configure
@@ -2227,6 +2227,25 @@ case $_host_os in
fi
fi
+ # Homebrew
+ brew_version=`brew -v 2>/dev/null`
+ if test "$?" -eq 0; then
+ brew_version="`echo "${brew_version}" | sed -ne 's/Homebrew \([0-9.]*\)/\1/gp'`"
+ echo_n "You seem to be running Homebrew version ${brew_version}..."
+
+ brew_prefix=`brew --prefix`
+
+ echo "adding ${brew_prefix} to paths"
+
+ LDFLAGS="-L${brew_prefix}/lib $LDFLAGS"
+ CXXFLAGS="-I${brew_prefix}/include $CXXFLAGS"
+
+ if test -z "$_staticlibpath"; then
+ _staticlibpath=${brew_prefix}
+ echo "Set staticlib-prefix to ${_staticlibpath}"
+ fi
+ fi
+
# If _staticlibpath is not set yet try first /sw (fink) then /usr/local
# (the macports case is handled above).
if test -z "$_staticlibpath"; then
More information about the Scummvm-git-logs
mailing list