Commit26520a0

committed

Merge pull requestfsharp#157 from knocte/small_fixes

configure: improve the prefix warning, and simplify some bits

2 parents19507b9 +d55062e commit26520a0Copy full SHA for 26520a0

File tree

-10

lines changed

-10

lines changed

Lines changed: 6 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,11 +53,10 @@ AC_ARG_WITH([gacdir],`
`53`	`53`	`[with_gacdir=no]`
`54`	`54`	`)`
`55`	`55`
	`56`	+MONOPREFIX=$(cd `$PKG_CONFIG --variable=prefix mono` && pwd)
	`57`	`+`
`56`	`58`	`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`
`61`	`60`	`else`
`62`	`61`	`MONODIR=$(cd "$with_gacdir/.." && pwd)`
`63`	`62`	`fi`
`@@ -104,10 +103,7 @@ src/fsharp/policy.4.3.FSharp.Core/Makefile`
`104`	`103`	`])`
`105`	`104`	`AC_OUTPUT`
`106`	`105`
`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])`
`113`	`109`	`fi`

Comments

(0)