Commit5fcaef5

Andreia Gaita

committed

Fix mono path detection and add --with-gacdir flag for manually setting it

1 parent602770a commit5fcaef5Copy full SHA for 5fcaef5

File tree

+22

-1

lines changed

+22

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ topdir := @abs_top_srcdir@/`
`4`	`4`	`builddir := @abs_top_builddir@/`
`5`	`5`	`libdir := ${prefix}/lib/`
`6`	`6`	`installdir := ${prefix}/bin/`
`7`		-monodir :=`pkg-config --variable=libdir mono`/mono/
	`7`	`+monodir :=@MONODIR@`
`8`	`8`	`libdir2 := $(monodir)2.0/`
`9`	`9`	`libdir35 := $(monodir)3.5/`
`10`	`10`	`libdir4 := $(monodir)4.0/`

Lines changed: 21 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,27 @@ AC_ARG_WITH([bootstrap],`
`21`	`21`	`with_bootstrap=$(cd "$with_bootstrap" && pwd)`
`22`	`22`	`AC_SUBST(with_bootstrap)`
`23`	`23`
	`24`	`+AC_ARG_WITH([gacdir],`
	`25`	`+[ --with-gacdir=/path/to/gac Specify the gac directory (ex: /usr/lib/mono/gac)],`
	`26`	`+[],`
	`27`	`+[with_gacdir=no]`
	`28`	`+)`
	`29`	`+`
	`30`	`+if test "x$with_gacdir" = "xno"; then`
	`31`	+MONODIR=`pkg-config --variable=libdir mono`/mono
	`32`	`+if ! test -e $MONODIR/2.0/mscorlib.dll; then`
	`33`	+MONODIR=`pkg-config --variable=prefix mono`/lib/mono
	`34`	`+fi`
	`35`	`+else`
	`36`	`+MONODIR=$(cd "$with_gacdir/.." && pwd)`
	`37`	`+fi`
	`38`	`+`
	`39`	`+if ! test -e $MONODIR/2.0/mscorlib.dll; then`
	`40`	`+AC_ERROR(Couldn't find the mono gac directory or mscorlib.dll in the usual places. Set --with-gacdir=<path>)`
	`41`	`+fi`
	`42`	`+AC_SUBST(MONODIR)`
	`43`	`+`
	`44`	`+`
`24`	`45`	`AC_CONFIG_FILES([`
`25`	`46`	`launcher`
`26`	`47`	`Makefile`

Comments

(0)