Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit19643d9

Browse files
committed
Fixfsharp#107 - Installing on Mono 3.0.4
@migueldeicaza says "The problem is that we installed a pkg-configprogram in /usr/bin which only looked up at the Mono database ofpackages, as it was a symlink to the one in/Library/Frameworks/Mono.framework This caused problem for people thateither had their own, or were using popular Unix install systems likeHomebrew or MacPorts. The correct fix is to detect if/Library/Frameworks/Mono.framework/Versions/Current/bin/pkg-configexists, if it does, use that, instead use /usr/bin/pkg-config"
1 parente6351d4 commit19643d9

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

‎configure.ac‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,25 @@ AC_INIT([fsharp], [0.1], [avidigal@novell.com])
88
AC_PROG_MAKE_SET
99

1010
AC_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
1217
AC_MSG_ERROR([You need to install pkg-config])
1318
fi
1419

1520
MONO_REQUIRED_VERSION=2.9
1621
MONO_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
1924
AC_MSG_ERROR("Youneedmono$MONO_REQUIRED_VERSION")
2025
fi
2126

2227
AC_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
2530
AC_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

5156
if test "x$with_gacdir" = "xno"; then
52-
MONODIR=`pkg-config --variable=libdir mono`/mono
57+
MONODIR=`$PKG_CONFIG --variable=libdir mono`/mono
5358
if ! 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
5560
fi
5661
else
5762
MONODIR=$(cd "$with_gacdir/.." && pwd)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp