@@ -8,20 +8,25 @@ AC_INIT([fsharp], [0.1], [avidigal@novell.com])
88AC_PROG_MAKE_SET
99
1010AC_PATH_PROG ( PKG_CONFIG ,pkg-config ,no )
11- if test "x$PKG_CONFIG" = "xno"; then
11+
12+ # On OSX use Mono's private copy of pkg-config if it exists, see https://github.com/fsharp/fsharp/issues/107
13+ osx_pkg_config=/Library/Frameworks/Mono.framework/Versions/Current/bin/pkg-config
14+ if test -e $osx_pkg_config; then
15+ PKG_CONFIG=$osx_pkg_config
16+ elif test "x$PKG_CONFIG" = "xno"; then
1217AC_MSG_ERROR ( [ You need to install pkg-config] )
1318fi
1419
1520MONO_REQUIRED_VERSION=2.9
1621MONO_RECOMMENDED_VERSION=3.0
1722
18- if !pkg-config --atleast-version=$MONO_REQUIRED_VERSION mono; then
23+ if !$PKG_CONFIG --atleast-version=$MONO_REQUIRED_VERSION mono; then
1924AC_MSG_ERROR ( "You need mono $MONO_REQUIRED_VERSION" )
2025fi
2126
2227AC_PATH_PROG ( MONO_SGEN ,mono-sgen ,no )
2328
24- if !pkg-config --atleast-version=$MONO_RECOMMENDED_VERSION mono; then
29+ if !$PKG_CONFIG --atleast-version=$MONO_RECOMMENDED_VERSION mono; then
2530AC_MSG_WARN ( [ Mono $MONO_RECOMMENDED_VERSION or higher is recommended, for better MSBuild (xbuild) compatibility] )
2631
2732# stability of Mono's SGEN GC is not so good in older versions than Mono v3.0
@@ -49,9 +54,9 @@ AC_ARG_WITH([gacdir],
4954)
5055
5156if test "x$with_gacdir" = "xno"; then
52- MONODIR=`pkg-config --variable=libdir mono`/mono
57+ MONODIR=`$PKG_CONFIG --variable=libdir mono`/mono
5358if ! test -e $MONODIR/2.0/mscorlib.dll; then
54- MONODIR=`pkg-config --variable=prefix mono`/lib/mono
59+ MONODIR=`$PKG_CONFIG --variable=prefix mono`/lib/mono
5560fi
5661else
5762MONODIR=$(cd "$with_gacdir/.." && pwd)