applied_patches/0322-mono-climaker-config.diff

   1 --- configure.in.old    2007-02-16 15:26:16.000000000 +0100
   2 +++ configure.in        2007-02-20 10:39:18.000000000 +0100
   3 @@ -1693,6 +1693,21 @@ if test "$_os" = "Linux"; then
   4                                 "`echo $MCS_VERSION | cut -d"." -f3`" -ge "8"; then
   5                                 ENABLE_MONO=YES
   6                                 CSC=$MCS
   7 +                               AC_PATH_PROG(GMCS, gmcs, no)
   8 +                               AC_PATH_PROG(MKBUNDLE2, mkbundle2, no)
   9 +                               GMCS_VERSION=`$GMCS --version | cut -d" " -f5`
  10 +                               if test "`echo $GMCS_VERSION | cut -d"." -f1`" -gt "1" || \
  11 +                                  test "`echo $GMCS_VERSION | cut -d"." -f1`" = "1" -a \
  12 +                                       "`echo $GMCS_VERSION | cut -d"." -f2`" -ge "3" || \
  13 +                                  test "`echo $GMCS_VERSION | cut -d"." -f1`" = "1" -a \
  14 +                                       "`echo $GMCS_VERSION | cut -d"." -f2`" = "2" -a \
  15 +                                       "`echo $GMCS_VERSION | cut -d"." -f3`" -ge "3"; then
  16 +                                   # mkbundle2 does not work on ppc, http://bugzilla.ximian.com/show_bug.cgi?id=81525
  17 +                                   if test "`uname -m`" != "ppc" -a "`uname -m`" != "ppc64" ; then
  18 +                                       ENABLE_MONO_CLIMAKER=YES
  19 +                                       AC_MSG_NOTICE([mono is up-to-date enough - building mono climaker])
  20 +                                   fi
  21 +                               fi
  22                         else
  23                                 if test -n "$enable_mono" ; then
  24                                         AC_MSG_ERROR([no, mcs >= 1.1.8 is needed.])
  25 @@ -1714,6 +1729,7 @@ AC_SUBST(AL)
  26  AC_SUBST(ENABLE_MONO)
  27  AC_SUBST(MONO_CFLAGS)
  28  AC_SUBST(MONO_LIBS)
  29 +AC_SUBST(ENABLE_MONO_CLIMAKER)
  30
  31  dnl ===================================================================
  32  dnl Check if stdc headers are available excluding windows.
  33 --- set_soenv.in.old    2007-02-16 15:26:16.000000000 +0100
  34 +++ set_soenv.in        2007-02-20 10:39:18.000000000 +0100
  35 @@ -1630,6 +1627,7 @@ ToFile( "MKDEPENDSOLVER",    "TRUE",
  36  ToFile( "Platform dependent constant values.", $empty, "c" );
  37  ToFile( "SOLAR_JAVA",        $SOLAR_JAVA,        "e" );
  38  ToFile( "ENABLE_MONO",       "@ENABLE_MONO@",    "e" );
  39 +ToFile( "ENABLE_MONO_CLIMAKER",       "@ENABLE_MONO_CLIMAKER@",    "e" );
  40  ToFile( "CSC",               "@CSC@",            "e" );
  41  ToFile( "AL",                "@AL@",             "e" );
  42  ToFile( "CSC_PATH",          "@CSC_PATH@",       "e" );