diff options
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r-- | main/configure.in | 8 |
2 files changed, 8 insertions, 8 deletions
@@ -256,6 +256,14 @@ if [ x$select == xyes -o ! -a profiles/$profile ]; then select_packages fi +if test `uname` = "Darwin"; then + if test "x$DYLD_FALLBACK_LIBRARY_PATH" = "x"; then + export DYLD_FALLBACK_LIBRARY_PATH="/Library/Frameworks/Mono.framework/Versions/Current/lib:/lib:/usr/lib" + export PATH="$PATH:/Library/Frameworks/Mono.framework/Versions/Current/bin" + export ACLOCAL_FLAGS="-I /Library/Frameworks/Mono.framework/Versions/Current/share/aclocal" + fi +fi + configure_packages [ $? -eq 1 ] && exit 1 diff --git a/main/configure.in b/main/configure.in index 0be42cf39b..e14cdc0707 100644 --- a/main/configure.in +++ b/main/configure.in @@ -29,14 +29,6 @@ fi AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -# On OSX use Mono's private copy of pkg-config if it exists -OSX_PKG_CONFIG=/Library/Frameworks/Mono.framework/Versions/Current/bin/pkg-config -if test -e $OSX_PKG_CONFIG; then - PKG_CONFIG=$OSX_PKG_CONFIG -elif test "x$PKG_CONFIG" = "xno"; then - AC_MSG_ERROR([You need to install pkg-config]) -fi - MONO_REQUIRED_VERSION=2.10.9 if ! $PKG_CONFIG --atleast-version=$MONO_REQUIRED_VERSION mono; then |