Browse files

Merge pull request #25 from knocte/master

Some final touches for xbuild integration

This merge includes 5 commits:
(473bcd4) install: symlink libs too from 4.5 to 4.0
(0199232) autogen.sh: don't tell to install autoconf if autoreconf exists	 
(46179e5) configure.ac: warn about not using the same prefix as mono
(a4ea68d) configure.ac: warn if not using Mono >= 2.11.5
(e22168a) configure.ac: fix typo
  • Loading branch information...
2 parents 09be1cb + e22168a commit 89263e0df38789efa141766cea4c27f244bd368b @shana shana committed Sep 24, 2012
Showing with 21 additions and 4 deletions.
  1. +2 −2 autogen.sh
  2. +10 −0 configure.ac
  3. +1 −1 src/fsharp/FSharp.Core/Makefile.in
  4. +1 −1 src/fsharp/fsi/Makefile.in
  5. +7 −0 src/fsharp/targets.make
View
4 autogen.sh
@@ -1,3 +1,3 @@
#!/usr/bin/env sh
-which autoreconf > /dev/null && autoreconf || echo "Please install autoconf"
-./configure $@
+which autoreconf > /dev/null || (echo "Please install autoconf" && exit 1)
+autoreconf && ./configure $@
View
10 configure.ac
@@ -14,6 +14,12 @@ fi
PKG_CHECK_MODULES([MONO], [mono >= 2.9])
+PKG_CHECK_MODULES([MONO_2_12],
+ [mono >= 2.11.5], HAVE_MONO_2_12_OR_HIGHER=yes, HAVE_MONO_2_12_OR_HIGHER=no)
+
+if test "x$HAVE_MONO_2_12_OR_HIGHER" = "xno" ; then
+ AC_MSG_WARN([Mono 2.11.5 or higher is recommended, for better MSBuild (xbuild) compatibility])
+fi
# Checks for libraries.
@@ -67,3 +73,7 @@ src/fsharp/FSharp.Compiler.Server.Shared/Makefile
src/fsharp/fsi/Makefile
])
AC_OUTPUT
+
+if ! test -e $prefix/bin/mono; then
+ AC_WARN($prefix/bin/mono not found: it is recommended to use the same install prefix where mono is installed)
+fi
View
2 src/fsharp/FSharp.Core/Makefile.in
@@ -79,5 +79,5 @@ $(tmpdir)FSCore.resources: $(srcdir)FSCore.resx
include $(topdir)/src/fsharp/targets.make
-install: install-lib-2 install-lib-4
+install: install-lib-2 install-lib-4 install-lib-4-5
View
2 src/fsharp/fsi/Makefile.in
@@ -37,5 +37,5 @@ $(tmpdir)FSIstrings.resources: $(srcdir)/FSIstrings.txt
include $(topdir)/src/fsharp/targets.make
-install: install-bin-2 install-bin-4
+install: install-bin-2 install-bin-4 install-bin-4-5
View
7 src/fsharp/targets.make
@@ -107,6 +107,13 @@ install-lib-2 install-lib-4:
$(INSTALL_LIB) $(outdir)Microsoft.FSharp.targets $(DESTDIR)/$(libdir)mono/$(TARGET)/;
ln -fs $(DESTDIR)/$(libdir)mono/$(TARGET)/Microsoft.FSharp.targets $(DESTDIR)/$(libdir)mono/Microsoft\ F#/v$(TARGET)/Microsoft.FSharp.Targets
+install-lib-4-5: install-lib-4
+ @if test -e $(DESTDIR)$(libdir)mono/4.5/; then \
+ ln -fs $(DESTDIR)$(libdir)mono/4.0/$(ASSEMBLY) $(DESTDIR)$(libdir)mono/4.5/$(ASSEMBLY); \
+ ln -fs $(DESTDIR)$(libdir)mono/4.0/$(NAME).sigdata $(DESTDIR)$(libdir)mono/4.5/$(NAME).sigdata; \
+ ln -fs $(DESTDIR)$(libdir)mono/4.0/$(NAME).optdata $(DESTDIR)$(libdir)mono/4.5/$(NAME).optdata; \
+ fi
+
install-bin-2 install-bin-4:
sed -e 's,[@]DIR[@],$(libdir)mono/$(TARGET),g' -e 's,[@]TOOL[@],$(ASSEMBLY),g' < $(topdir)launcher.in > $(outdir)$(subst fs,fsharp,$(NAME))$(VERSION)
chmod +x $(outdir)$(subst fs,fsharp,$(NAME))$(VERSION)

0 comments on commit 89263e0

Please sign in to comment.