Author: raja
Date: 2005-03-23 23:29:38 -0500 (Wed, 23 Mar 2005)
New Revision: 42184
Modified:
trunk/mono/ChangeLog
trunk/mono/configure.in
trunk/mono/runtime/Makefile.am
Log:
* configure.in (libgdiplus): Make more intuitive.
* runtime/Makefile.am (wrapper-config): Update to change.
Modified: trunk/mono/ChangeLog
===================================================================
--- trunk/mono/ChangeLog 2005-03-24 03:52:05 UTC (rev 42183)
+++ trunk/mono/ChangeLog 2005-03-24 04:29:38 UTC (rev 42184)
@@ -1,6 +1,8 @@
-2005-03-24 Raja R Harinath <[EMAIL PROTECTED]>
+2005-03-24 Raja R Harinath <[EMAIL PROTECTED]>
+ * configure.in (libgdiplus): Make more intuitive.
* runtime/Makefile.am (wrapper-config): Remove temporary file.
+ Update to change.
2005-03-23 Raja R Harinath <[EMAIL PROTECTED]>
Modified: trunk/mono/configure.in
===================================================================
--- trunk/mono/configure.in 2005-03-24 03:52:05 UTC (rev 42183)
+++ trunk/mono/configure.in 2005-03-24 04:29:38 UTC (rev 42184)
@@ -309,16 +309,16 @@
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])
+ [ --with-libgdiplus=installed|sibling|<path> Override the libgdiplus
used for System.Drawing tests (defaults to NO)],
+ [], [with_libgdiplus=installed])
case $with_libgdiplus in
-no) libgdiplus_topdir= ;;
-yes|sibling) libgdiplus_topdir=`cd ../libgdiplus && pwd` ;;
-/*) libgdiplus_topdir=$with_libgdiplus ;;
-*) libgdiplus_topdir=`cd $with_libgdiplus && pwd` ;;
+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_topdir])
+AC_SUBST([libgdiplus_loc])
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
if test "x$PKG_CONFIG" = "xno"; then
@@ -1681,10 +1681,7 @@
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
+libgdiplus_msg=${libgdiplus_loc:-assumed to be installed}
echo "
mcs source: $mcs_topdir
@@ -1695,7 +1692,7 @@
Engine: $jit_status
2.0 Alpha: $PREVIEW
JNI support: $jdk_headers_found
- libgdiplus: $libgdiplus_loc
+ libgdiplus: $libgdiplus_msg
$disabled
"
Modified: trunk/mono/runtime/Makefile.am
===================================================================
--- trunk/mono/runtime/Makefile.am 2005-03-24 03:52:05 UTC (rev 42183)
+++ trunk/mono/runtime/Makefile.am 2005-03-24 04:29:38 UTC (rev 42184)
@@ -103,9 +103,9 @@
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 \
+ if test -z "$(libgdiplus_loc)"; then :; else \
mv $@ [EMAIL PROTECTED]; \
- sed 's,<configuration>,& <dllmap dll="gdiplus.dll"
target="'"$(libgdiplus_topdir)/src/libgdiplus.la"'" />,' [EMAIL PROTECTED] >
$@; \
+ sed 's,<configuration>,& <dllmap dll="gdiplus.dll"
target="$(libgdiplus_loc)" />,' [EMAIL PROTECTED] > $@; \
rm -f [EMAIL PROTECTED]; \
fi
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
