Author: raja
Date: 2005-03-23 07:26:26 -0500 (Wed, 23 Mar 2005)
New Revision: 42139
Modified:
trunk/mono/ChangeLog
trunk/mono/configure.in
trunk/mono/runtime/Makefile.am
Log:
Allow testing of System.Drawing with a libgdiplus snapshot.
* configure.in (libgdiplus): New --with-libgdiplus option. Allow
the location of libgdiplus to be overridden.
* runtime/Makefile.am (wrapper-config): Override location of
libgdiplus if requested.
Modified: trunk/mono/ChangeLog
===================================================================
--- trunk/mono/ChangeLog 2005-03-23 11:53:06 UTC (rev 42138)
+++ trunk/mono/ChangeLog 2005-03-23 12:26:26 UTC (rev 42139)
@@ -1,3 +1,11 @@
+2005-03-23 Raja R Harinath <[EMAIL PROTECTED]>
+
+ Allow testing of System.Drawing with a libgdiplus snapshot.
+ * configure.in (libgdiplus): New --with-libgdiplus option. Allow
+ the location of libgdiplus to be overridden.
+ * runtime/Makefile.am (wrapper-config): Override location of
+ libgdiplus if requested.
+
2005-03-14 Raja R Harinath <[EMAIL PROTECTED]>
* runtime/Makefile.am (clean_profiles): Remove.
Modified: trunk/mono/configure.in
===================================================================
--- trunk/mono/configure.in 2005-03-23 11:53:06 UTC (rev 42138)
+++ trunk/mono/configure.in 2005-03-23 12:26:26 UTC (rev 42139)
@@ -308,6 +308,18 @@
AC_SUBST([mcs_topdir])
AC_SUBST([mcs_topdir_from_srcdir])
+AC_ARG_WITH([libgdiplus],
+ [ --with-libgdiplus=no|sibling|<path> Override the libgdiplus used
for System.Drawing tests (defaults to NO)],
+ [], [with_libgdiplus=no])
+
+case $with_libgdiplus in
+no) libgdiplus_topdir= ;;
+yes|sibling) libgdiplus_topdir=`cd ../libgdiplus && pwd` ;;
+/*) libgdiplus_topdir=$with_libgdiplus ;;
+*) libgdiplus_topdir=`cd $with_libgdiplus && pwd` ;;
+esac
+AC_SUBST([libgdiplus_topdir])
+
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
if test "x$PKG_CONFIG" = "xno"; then
AC_MSG_ERROR([You need to install pkg-config])
@@ -1669,6 +1681,11 @@
echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >>
$srcdir/$mcsdir/build/config.make
)
+case $libgdiplus_topdir in
+'') libgdiplus_loc='installed (assumed to exist, have not checked)' ;;
+*) libgdiplus_loc=$libgdiplus_topdir ;;
+esac
+
echo "
mcs source: $mcs_topdir
GC: $gc
@@ -1678,6 +1695,7 @@
Engine: $jit_status
2.0 Alpha: $PREVIEW
JNI support: $jdk_headers_found
+ libgdiplus: $libgdiplus_loc
$disabled
"
Modified: trunk/mono/runtime/Makefile.am
===================================================================
--- trunk/mono/runtime/Makefile.am 2005-03-23 11:53:06 UTC (rev 42138)
+++ trunk/mono/runtime/Makefile.am 2005-03-23 12:26:26 UTC (rev 42139)
@@ -100,9 +100,13 @@
CLEANFILES = wrapper-config
-wrapper-config: ../data/config
+wrapper-config: ../data/config Makefile
d=`cd ../support && pwd`; \
sed
's,target="libMonoPosixHelper[^"]*",target="'$$d/libMonoPosixHelper.la'",'
../data/config > $@
+ if test -z "$(libgdiplus_topdir)"; then :; else \
+ cp $@ [EMAIL PROTECTED]; \
+ sed 's,<configuration>,& <dllmap dll="gdiplus.dll"
target="'"$(libgdiplus_topdir)/src/libgdiplus.la"'" />,' [EMAIL PROTECTED] >
$@; \
+ fi
$(tmpinst)/bin/mono: mono-wrapper wrapper-config
cp mono-wrapper $@
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
