diff options
| author | Thierry Crozat | 2013-09-17 21:54:12 +0100 |
|---|---|---|
| committer | Thierry Crozat | 2013-09-17 21:54:58 +0100 |
| commit | 4132a3b9c1c0e186a4e3dcdb4fc8f4f429bff770 (patch) | |
| tree | 283b8c3741bff72fbc82bc6529787be47e68df5d | |
| parent | eeac2c0c4ff986071cbe097f7c063b906b926806 (diff) | |
| download | scummvm-rg350-4132a3b9c1c0e186a4e3dcdb4fc8f4f429bff770.tar.gz scummvm-rg350-4132a3b9c1c0e186a4e3dcdb4fc8f4f429bff770.tar.bz2 scummvm-rg350-4132a3b9c1c0e186a4e3dcdb4fc8f4f429bff770.zip | |
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
| -rwxr-xr-x | configure | 20 |
1 files changed, 19 insertions, 1 deletions
@@ -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) |