[Scummvm-cvs-logs] scummvm master -> 4132a3b9c1c0e186a4e3dcdb4fc8f4f429bff770
criezy
criezy at scummvm.org
Tue Sep 17 23:00:34 CEST 2013
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
4132a3b9c1 CONFIGURE: Better default for static lib prefix on OSX
Commit: 4132a3b9c1c0e186a4e3dcdb4fc8f4f429bff770
https://github.com/scummvm/scummvm/commit/4132a3b9c1c0e186a4e3dcdb4fc8f4f429bff770
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2013-09-17T13:54:58-07:00
Commit Message:
CONFIGURE: Better default for static lib prefix on OSX
Instead of always assuming /sw (i.e. fink) it should now also pick up
the macports prefix or /usr/local depending on which one exists.
Of course this can still be overwritten with --with-staticlib-prefix
Changed paths:
configure
diff --git a/configure b/configure
index d4ee1e5..9761544 100755
--- a/configure
+++ b/configure
@@ -167,7 +167,7 @@ _windres=windres
_stagingpath="staging"
_win32path="c:/scummvm"
_aos4path="Games:ScummVM"
-_staticlibpath=/sw
+_staticlibpath=
_sdlconfig=sdl-config
_freetypeconfig=freetype-config
_sdlpath="$PATH"
@@ -2115,6 +2115,24 @@ case $_host_os in
LDFLAGS="-L${macport_prefix}/lib $LDFLAGS"
CXXFLAGS="-I${macport_prefix}/include $CXXFLAGS"
+
+ if test -z "$_staticlibpath"; then
+ _staticlibpath=${macport_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
+ if test -d "/sw"; then
+ _staticlibpath=/sw
+ echo "Set staticlib-prefix to ${_staticlibpath}"
+ elif test -d "/usr/local"; then
+ _staticlibpath=/usr/local
+ echo "Set staticlib-prefix to ${_staticlibpath}"
+ else
+ echo "Could not determine prefix for static libraries"
+ fi
fi
;;
dreamcast)
More information about the Scummvm-git-logs
mailing list