2005-03-24 Zoltan Varga <vargaz@freemail.hu>

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index 66bcacc9596c0299f156a8aaa2d11f8ac446d4c9..f715961619cee2c30845a97022124eb1b2f69937 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -308,6 +308,18 @@ mcs_topdir_from_srcdir='$(top_builddir)/'$mcsdir
 AC_SUBST([mcs_topdir])
 AC_SUBST([mcs_topdir_from_srcdir])
 
+AC_ARG_WITH([libgdiplus], 
+       [  --with-libgdiplus=installed|sibling|<path>   Override the libgdiplus used for System.Drawing tests (defaults to NO)], 
+       [], [with_libgdiplus=installed])
+
+case $with_libgdiplus in
+no|installed) libgdiplus_loc= ;;
+yes|sibling) libgdiplus_loc=`cd ../libgdiplus && pwd`/src/libgdiplus.la ;;
+/*) libgdiplus_loc=$with_libgdiplus ;;
+*) libgdiplus_loc=`pwd`/$with_libgdiplus ;;
+esac
+AC_SUBST([libgdiplus_loc])
+
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 if test "x$PKG_CONFIG" = "xno"; then
        AC_MSG_ERROR([You need to install pkg-config])
@@ -1521,7 +1533,7 @@ if test ${ACCESS_UNALIGNED} = no; then
        CPPFLAGS="$CPPFLAGS -DNO_UNALIGNED_ACCESS"
 fi
 
-PREVIEW=no
+PREVIEW=yes
 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
@@ -1669,6 +1681,8 @@ runtime/Makefile
   echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$mcsdir/build/config.make
 )
 
+libgdiplus_msg=${libgdiplus_loc:-assumed to be installed}
+
 echo "
         mcs source:  $mcs_topdir
        GC:          $gc
@@ -1678,6 +1692,7 @@ echo "
        Engine:      $jit_status
        2.0 Alpha:   $PREVIEW
        JNI support: $jdk_headers_found
+       libgdiplus:  $libgdiplus_msg
        $disabled
 
 "