From c1288db722efc956b1823556b7db81ccb1262282 Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Thu, 16 Feb 2006 17:30:08 +0000 Subject: [PATCH] 2005-02-16 Mike Kestner * sample/gnomevfs/Makefile.am : make TestXfer conditional to a mono build since it uses Mono.GetOptions. [Fixes #77497] svn path=/trunk/gtk-sharp/; revision=56950 --- ChangeLog | 5 +++++ configure.in.in | 1 + sample/gnomevfs/Makefile.am | 19 ++++++++++++------- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5b29ca7ba..6223ba097 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-02-16 Mike Kestner + + * sample/gnomevfs/Makefile.am : make TestXfer conditional to a mono + build since it uses Mono.GetOptions. [Fixes #77497] + 2005-02-03 Mike Kestner * sample/gnomevfs/TestVolume.cs : remove C# 2.0 usage. diff --git a/configure.in.in b/configure.in.in index f1d150d25..520268a49 100644 --- a/configure.in.in +++ b/configure.in.in @@ -258,6 +258,7 @@ AM_CONDITIONAL(ENABLE_GTKHTML, test "x$enable_gtkhtml" = "xyes") AM_CONDITIONAL(ENABLE_VTE, test "x$enable_vte" = "xyes") AM_CONDITIONAL(ENABLE_DOTNET, test "x$enable_dotnet" = "xyes") AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_monodoc" = "xyes") +AM_CONDITIONAL(ENABLE_MONOGETOPTIONS, test "x$has_mono" = "xtrue") AM_CONDITIONAL(ENABLE_ALL_OPTIONAL, test "x$enable_libart" = "xyes" -a "x$enable_gnomevfs" = "xyes" -a "x$enable_gnome" = "xyes" -a "x$enable_glade" = "xyes" -a "x$enable_rsvg" = "xyes" -a "x$enable_gtkhtml" = "xyes" -a "x$enable_vte" = "xyes" -a "x$enable_dotnet" = "xyes" -a "x$enable_monodoc" = "xyes") AC_SUBST(CFLAGS) diff --git a/sample/gnomevfs/Makefile.am b/sample/gnomevfs/Makefile.am index 325de70be..e26a47504 100644 --- a/sample/gnomevfs/Makefile.am +++ b/sample/gnomevfs/Makefile.am @@ -12,17 +12,22 @@ TARGETS = \ TestSyncStream.exe \ TestSyncWrite.exe \ TestUnlink.exe \ - TestVolumes.exe \ - TestXfer.exe + TestVolumes.exe else TARGETS = endif -assemblies=../../glib/glib-sharp.dll ../../gnomevfs/gnome-vfs-sharp.dll -references = $(addprefix /r:, $(assemblies)) /r:Mono.GetOptions +if ENABLE_MONOGETOPTIONS +EXTRA_TARGETS = TestXfer.exe +else +EXTRA_TARGETS = +endif -noinst_SCRIPTS = $(TARGETS) -CLEANFILES = $(TARGETS) +assemblies=../../glib/glib-sharp.dll ../../gnomevfs/gnome-vfs-sharp.dll +references = $(addprefix /r:, $(assemblies)) + +noinst_SCRIPTS = $(TARGETS) $(EXTRA_TARGETS) +CLEANFILES = $(TARGETS) $(EXTRA_TARGETS) EXTRA_DIST = \ TestAsync.cs \ @@ -80,4 +85,4 @@ TestVolumes.exe: $(srcdir)/TestVolumes.cs $(assemblies) $(CSC) /out:TestVolumes.exe $(references) $(srcdir)/TestVolumes.cs TestXfer.exe: $(srcdir)/TestXfer.cs $(assemblies) - $(CSC) /out:TestXfer.exe $(references) $(srcdir)/TestXfer.cs + $(CSC) /out:TestXfer.exe $(references) -r:Mono.GetOptions.dll $(srcdir)/TestXfer.cs