diff options
| author | Raja R Harinath <harinath@hurrynot.org> | 2005-03-23 15:26:26 +0300 |
|---|---|---|
| committer | Raja R Harinath <harinath@hurrynot.org> | 2005-03-23 15:26:26 +0300 |
| commit | a831679db84f4bb8fe6a445a8504689e0089cfca (patch) | |
| tree | d41d252c72b50dbb7e8289b96e41e94a61da5a1b | |
| parent | 664892b1f95aece136d3a94788710b8ffb3ca4cd (diff) | |
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.
svn path=/trunk/mono/; revision=42139
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 18 | ||||
| -rw-r--r-- | runtime/Makefile.am | 6 |
3 files changed, 31 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 4cb828b18d5..4acdb590a27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-03-23 Raja R Harinath <rharinath@novell.com> + + 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 <rharinath@novell.com> * runtime/Makefile.am (clean_profiles): Remove. diff --git a/configure.in b/configure.in index 66bcacc9596..e7675d47482 100644 --- 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=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 @@ runtime/Makefile 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 @@ echo " Engine: $jit_status 2.0 Alpha: $PREVIEW JNI support: $jdk_headers_found + libgdiplus: $libgdiplus_loc $disabled " diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 0cd5fb40f65..2b142d2d277 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -100,9 +100,13 @@ check-local: mcs-compileall mcs-do-test-profiles 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 $@ $@t; \ + sed 's,<configuration>,& <dllmap dll="gdiplus.dll" target="'"$(libgdiplus_topdir)/src/libgdiplus.la"'" />,' $@t > $@; \ + fi $(tmpinst)/bin/mono: mono-wrapper wrapper-config cp mono-wrapper $@ |