Add --with-icu=yes/no

Add --with-preview=yes/no
Install mcs/mbas into $prefix/lib/mono/1.1
Install gmcs into $prefix/lib/mono/2.0

This is in preparation for the dual installation of libraries GAC + devel.

svn path=/trunk/mono/; revision=26599

diff --git a/configure.in b/configure.in
index d5f8d57a014d86763ba0cb2aacb37076850d13ac..8a89fd6b31e67e7fc547f4aaa8f62636629be834 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -980,18 +980,32 @@ if test "x$try_shared_handles" != "xyes"; then
        AC_SUBST(DISABLE_SHARED_HANDLES)
 fi
 
+#
+# ICU 
+#
 ICU_CFLAGS=""
 ICU_LIBS=""
 enable_icu=no
-AC_PATH_PROG(ICU_CONFIG, icu-config, no)
-if test "x$ICU_CONFIG" = "xno" -o ! -x "$ICU_CONFIG"; then
-       AC_MSG_WARN([Only invariant locale available; install ICU for I18N support])
-       enable_icu="no, if you want full i18n support download it from: http://oss.software.ibm.com/icu/index.html"
-else
-       enable_icu="yes. Version: `$ICU_CONFIG --version`"
-       AC_DEFINE(HAVE_ICU)
-       ICU_CFLAGS=`$ICU_CONFIG --cppflags`
-       ICU_LIBS=`$ICU_CONFIG --ldflags`
+
+probe_icu=true
+AC_ARG_WITH(icu, [  --with-icu=yes/no],
+       if test x$with_icu = xno; then
+          probe_icu=false;
+          AC_MSG_RESULT(Will not probe for ICU)
+       fi
+)
+
+if $probe_icu; then
+       AC_PATH_PROG(ICU_CONFIG, icu-config, no)
+       if test "x$ICU_CONFIG" = "xno" -o ! -x "$ICU_CONFIG"; then
+               AC_MSG_WARN([Only invariant locale available; install ICU for I18N support])
+               enable_icu="no, if you want full i18n support download it from: http://oss.software.ibm.com/icu/index.html"
+       else
+               enable_icu="yes. Version: `$ICU_CONFIG --version`"
+               AC_DEFINE(HAVE_ICU)
+               ICU_CFLAGS=`$ICU_CONFIG --cppflags`
+               ICU_LIBS=`$ICU_CONFIG --ldflags`
+       fi
 fi
 AC_SUBST(ICU_CFLAGS)
 AC_SUBST(ICU_LIBS)
@@ -1123,6 +1137,15 @@ if test ${ACCESS_UNALIGNED} = no; then
        CPPFLAGS="$CPPFLAGS -DNO_UNALIGNED_ACCESS"
 fi
 
+PREVIEW=no
+AC_ARG_WITH(preview, [ --with-preview=yes,no     If you want to install the 2.0 FX preview],[
+       if test x$with_preview = xyes; then
+             PREVIEW=yes
+       fi
+])
+
+AM_CONDITIONAL(INSTALL_2_0, test x$PREVIEW = xyes)
+
 AM_CONDITIONAL(MIPS_GCC, test ${TARGET}${ac_cv_prog_gcc} = MIPSyes)
 AM_CONDITIONAL(MIPS_SGI, test ${TARGET}${ac_cv_prog_gcc} = MIPSno)
 AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC)
@@ -1198,5 +1221,6 @@ echo "
        NPTL:        $with_nptl
        SIGALTSTACK: $with_sigaltstack
        Engine:      $jit_status
+       2.0 Alpha:   $PREVIEW
        
 "

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index 3afe86a6e0ef9b71cf6edfc6d6e4e1537a907fec..204b044f122941bae85cbd020966e529d7d00a22 100644 (file)
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -7,8 +7,6 @@ SUBDIRS = . net_1_1 net_2_0
 mcs_topdir=$(top_srcdir)/../mcs
 
 monobins_DATA = \
-       mcs.exe                                 \
-       mbas.exe                                \
        monoresgen.exe                          \
        secutil.exe                             \
        ilasm.exe                               \
@@ -28,10 +26,16 @@ monobins_DATA = \
        certmgr.exe                             \
        MakeCert.exe                            \
        gacutil.exe                             \
-       gmcs.exe                                \
        sn.exe
 
-EXTRA_DIST= $(monobins_DATA)
+fx11_DATA = \
+       mcs.exe                                 \
+       mbas.exe
+
+fx20_DATA = \
+       gmcs.exe
+
+EXTRA_DIST= $(monobins_DATA) $(fx11_DATA) $(fx20_DATA)
 
 MAINTAINERCLEANFILES = $(EXTRA_DIST)
 
@@ -40,8 +44,12 @@ MAINTAINERCLEANFILES = $(EXTRA_DIST)
 #
 if PLATFORM_WIN32
 monobinsdir = $(libdir)
+fx11dir = $(libdir)
+fx20dir = $(libdir)
 else
 monobinsdir = $(bindir)
+fx11dir = $(libdir)/mono/1.1/
+fx20dir = $(libdir)/mono/2.0/
 endif
 
 $(monobins_DATA):

diff --git a/runtime/net_1_1/Makefile.am b/runtime/net_1_1/Makefile.am
index 69bb15be64f453c4f27e85ef63bfe5d499c1f67e..9603d1219614c85ca3cbdb497039ab9cbc077cc2 100644 (file)
--- a/runtime/net_1_1/Makefile.am
+++ b/runtime/net_1_1/Makefile.am
@@ -5,8 +5,6 @@
 mcs_topdir=$(top_srcdir)/../mcs
 gacutil=$(srcdir)/../gacutil.exe
 
-PROFILE=default
-
 if JIT_SUPPORTED
 mono_runtime = $(top_builddir)/mono/mini/mono
 else
@@ -79,7 +77,7 @@ MAINTAINERCLEANFILES = $(EXTRA_DIST)
 assembliesdir = $(libdir)
 
 mscorlib.dll $(gac_assemblies):
-       cp -f $(mcs_topdir)/class/lib/$(PROFILE)/$@ $(srcdir)
+       cp -f $(mcs_topdir)/class/lib/default/$@ $(srcdir)
 
 all-local: $(gac_assemblies)
 

diff --git a/runtime/net_2_0/Makefile.am b/runtime/net_2_0/Makefile.am
index 303e044dd0de87b9bf70495944d3d0f8b4f65c50..91a49e05690dff89833dc1bff606de763571ad8a 100644 (file)
--- a/runtime/net_2_0/Makefile.am
+++ b/runtime/net_2_0/Makefile.am
@@ -5,8 +5,6 @@
 mcs_topdir=$(top_srcdir)/../mcs
 gacutil=$(srcdir)/../gacutil.exe
 
-PROFILE=net_2_0
-
 if JIT_SUPPORTED
 mono_runtime = $(top_builddir)/mono/mini/mono
 else
@@ -64,9 +62,13 @@ gac_assemblies_list = \
        System.Windows.Forms                            \
        System.Xml
 
+if INSTALL_2_0
 gac_assemblies = $(gac_assemblies_list:=.dll)
+else
+gac_assemblies = 
+endif
 
-corlibdir = $(libdir)/net_2_0
+corlibdir = $(libdir)/mono/2.0
 corlib_DATA = mscorlib.dll
 
 EXTRA_DIST = $(gac_assemblies) $(corlib_DATA)
@@ -78,7 +80,7 @@ MAINTAINERCLEANFILES = $(EXTRA_DIST)
 assembliesdir = $(libdir)
 
 mscorlib.dll $(gac_assemblies):
-       cp -f $(mcs_topdir)/class/lib/$(PROFILE)/$@ $(srcdir)
+       cp -f $(mcs_topdir)/class/lib/net_2_0/$@ $(srcdir)
 
 all-local: $(gac_assemblies)
 

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 9239cde1513edd3847d1508d749b35f087099ac8..4515e4b60a5196c815ab90cbe5c10732f231e480 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -12,20 +12,24 @@ endif
 
 if PLATFORM_WIN32
 plat_bindir = $(shell cygpath -m $(libdir))
+fx11_instdir = $(shell cygpath -m $(libdir))/mono/1.1/
+fx20_instdir = $(shell cygpath -m $(libdir))/mono/2.0/
 else
-plat_bindir = $(bindir)
+plat_bindir = $(bindir)/mono
+fx11_instdir = $(libdir)/mono/1.1/
+fx20_instdir = $(libdir)/mono/2.0/
 endif
 
 mcs: mcs.in
-       sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/mcs.in > mcs.tmp \
+       sed -e 's^\@fx11_instdir\@^$(fx11_instdir)^g' -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/mcs.in > mcs.tmp \
        && mv mcs.tmp mcs
 
 gmcs: gmcs.in
-       sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@libdir\@^$(libdir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/gmcs.in > gmcs.tmp \
+       sed -e 's^\@fx20_instdir\@^$(fx20_instdir)^g' -e 's^\@bindir\@^$(bindir)^g' -e 's^\@libdir\@^$(libdir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/gmcs.in > gmcs.tmp \
        && mv gmcs.tmp gmcs 
 
 mbas: mbas.in
-       sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/mbas.in > mbas.tmp \
+       sed -e 's^\@fx11_instdir\@^$(fx11_instdir)^g' -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/mbas.in > mbas.tmp \
        && mv mbas.tmp mbas 
 
 ilasm: ilasm.in

diff --git a/scripts/gmcs.in b/scripts/gmcs.in
index c6fa8b50b0778d61dd0af69bbcb77a3a381f04eb..e35df44d1bb3fb661b8a715977260d7ec7f8d663 100644 (file)
--- a/scripts/gmcs.in
+++ b/scripts/gmcs.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-MONO_PATH="@libdir@//net_2_0:$MONO_PATH" exec @bindir@/@mono_interp@ @plat_bindir@/gmcs.exe "$@"
+MONO_PATH="@fx20_instdir@:$MONO_PATH" exec @bindir@/@mono_interp@ @fx20_instdir@/gmcs.exe "$@"

diff --git a/scripts/mbas.in b/scripts/mbas.in
index 691a624045a121e01d9f3ca9fe2715d6e561098a..28c3c634a31aa1703c1908114381def61474fe90 100644 (file)
--- a/scripts/mbas.in
+++ b/scripts/mbas.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @bindir@/@mono_interp@ @plat_bindir@/mbas.exe "$@"
+exec @bindir@/@mono_interp@ @fx11_instdir@/mbas.exe "$@"

diff --git a/scripts/mcs.in b/scripts/mcs.in
index 76536980bb226a0fce03010734c501fabbe22cfe..679a0eab85ca9cf8a1440ea6ea660ce4ad9af55b 100644 (file)
--- a/scripts/mcs.in
+++ b/scripts/mcs.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @bindir@/@mono_interp@ @plat_bindir@/mcs.exe "$@"
+exec @bindir@/@mono_interp@ @fx11_instdir@/mcs.exe "$@"