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

Commitd55062e

Browse files
committed
configure: improve the prefix warning, and simplify some bits
It's better to compare prefixes than to check if $prefix/bin/mono binaryexists, because in the case of being inside a parallel mono environment[1],it would warn the user about choosing /usr prefix if mono's prefix insidethis environment is not /usr (i.e.: /opt/mono).Also, cleanup some variables:* CANON_MONODIR not needed, as it's actually just Mono's prefix.* No need to check both Mono's libdir and prefix via pkgconfig, asthese two variables have been both there in Mono's PC file for years [2],and anyway the existance of $MONODIR/2.0/mscorlib.dll is checked later,just in case.[1]http://www.mono-project.com/Parallel_Mono_Environments[2]https://github.com/mono/mono/commits/master/data/mono.pc.in
1 parent19507b9 commitd55062e

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

‎configure.ac‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,10 @@ AC_ARG_WITH([gacdir],
5353
[with_gacdir=no]
5454
)
5555

56+
MONOPREFIX=$(cd `$PKG_CONFIG --variable=prefix mono` && pwd)
57+
5658
if test "x$with_gacdir" = "xno"; then
57-
MONODIR=`$PKG_CONFIG --variable=libdir mono`/mono
58-
if ! test -e $MONODIR/2.0/mscorlib.dll; then
59-
MONODIR=`$PKG_CONFIG --variable=prefix mono`/lib/mono
60-
fi
59+
MONODIR="$MONOPREFIX"/lib/mono
6160
else
6261
MONODIR=$(cd "$with_gacdir/.." && pwd)
6362
fi
@@ -104,10 +103,7 @@ src/fsharp/policy.4.3.FSharp.Core/Makefile
104103
])
105104
AC_OUTPUT
106105

107-
CANON_MONODIR=`cd $MONODIR/../..; pwd`
108-
109-
if ! test -e $prefix/bin/mono; then
110-
AC_WARN($prefix/bin/mono not found. Prefix should normally be set to the mono installation path. Consider using
111-
./autogen.sh --prefix=$CANON_MONODIR
112-
)
106+
if ! test "x$MONOPREFIX" = "x$prefix"; then
107+
AC_WARN([Prefix to use is not the same as mono's: $prefix
108+
Consider using: ./autogen.sh --prefix=$MONOPREFIX])
113109
fi

0 commit comments

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