Permalink
Browse files

2010-02-03 Michael Hutchinson <mhutchinson@novell.com>

	* configure.in:
	* asn1view/gtk/Makefile.am
	* docbrowser/BrowserWidget.cs:
	* docbrowser/Makefile.am: Make Gnome# optional.

	* autogen.sh: Pass ACLOCAL_FlAGS to aclocal.


svn path=/trunk/mono-tools/; revision=150807
  • Loading branch information...
1 parent 5029efa commit aaa40f7eecdf21cfeb68da8799e6c8dde1584d54 @mhutch mhutch committed Feb 4, 2010
Showing with 42 additions and 14 deletions.
  1. +9 −0 ChangeLog
  2. +11 −3 asn1view/gtk/Makefile.am
  3. +1 −1 autogen.sh
  4. +15 −6 configure.in
  5. +2 −0 docbrowser/BrowserWidget.cs
  6. +4 −4 docbrowser/Makefile.am
View
@@ -1,3 +1,12 @@
+2010-02-03 Michael Hutchinson <mhutchinson@novell.com>
+
+ * configure.in:
+ * asn1view/gtk/Makefile.am
+ * docbrowser/BrowserWidget.cs:
+ * docbrowser/Makefile.am: Make Gnome# optional.
+
+ * autogen.sh: Pass ACLOCAL_FlAGS to aclocal.
+
2009-11-29 Sebastien Pouliot <sebastien@ximian.com>
* configure.in: Now 2.7
@@ -7,13 +7,11 @@
#
local_flags = -debug+ -debug:full -nologo $(NUNIT_LIBS)
-local_flags += $(MCSFLAGS) $(GTK_SHARP_LIBS)
+local_flags += $(MCSFLAGS) $(GTK_SHARP_LIBS) $(GNOME_SHARP_LIBS)
gasnview_SCRIPTS = gasnview.exe
gasnviewdir = $(prefix)/lib/mono/1.0
-CLEANFILES = gasnview.exe gasnview.exe.mdb gasnview
-EXTRA_DIST = $(gasnview_sources_dist) gui.glade script.in
resources = $(srcdir)/gui.glade \
$(srcdir)/../art/export-16.png \
@@ -34,6 +32,10 @@ gasnview_sources_build = $(gasnview_sources) $(gasnview_sources_in:.in=)
###
ress= $(foreach res,$(resources), $(addprefix -resource:,$(res)),$(notdir $(res)))
+if ENABLE_GNOME
+
+CLEANFILES = gasnview.exe gasnview.exe.mdb gasnview
+
gasnview.exe: $(gasnview_sources_build) $(resources)
$(MCS) $(MCSFLAGS) $(local_flags) $(ress) -out:$@ $(gasnview_sources_build)
@@ -50,3 +52,9 @@ REWRITE = sed \
gasnview: $(srcdir)/script.in Makefile
$(REWRITE) $(srcdir)/script.in > $@.tmp
mv $@.tmp $@
+else
+all:
+endif
+
+EXTRA_DIST = $(gasnview_sources_dist) gui.glade script.in
+
View
@@ -1,7 +1,7 @@
glib-gettextize --force --copy ||
{ echo "**Error**: glib-gettextize failed."; exit 1; }
-aclocal
+aclocal $ACLOCAL_FLAGS
automake -a
autoconf
./configure --enable-maintainer-mode $*
View
@@ -43,21 +43,29 @@ AC_SUBST(MONODOC_LIBS)
AC_PATH_PROG(MDOC, mdoc, no)
AC_SUBST(MDOC)
-PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 glade-sharp-2.0 gnome-sharp-2.0 gconf-sharp-2.0)
-#PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp glade-sharp gconf-sharp)
+PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 glade-sharp-2.0)
AC_SUBST(GTK_SHARP_LIBS)
+CSHARP_FLAGS=""
+
+PKG_CHECK_MODULES(GNOME_SHARP, gnome-sharp-2.0 gconf-sharp-2.0, enable_gnome=yes, enable_gnome=no)
+if test "x$enable_gnome" = "xyes"; then
+ CSHARP_FLAGS="-d:GNOME"
+fi
+AC_SUBST(GNOME_SHARP_LIBS)
+AM_CONDITIONAL(ENABLE_GNOME, test "x$enable_gnome" = "xyes")
+
PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-3.14, enable_gtkhtml=yes, enable_gtkhtml=no)
if test "x$enable_gtkhtml" = "xyes"; then
-CSHARP_FLAGS="-d:GTKHTML_SHARP_3_14"
+ CSHARP_FLAGS="-d:GTKHTML_SHARP_3_14 $CSHARP_FLAGS"
else
-PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-2.0, enable_gtkhtml=yes, enable_gtkhtml=no)
-CSHARP_FLAGS=
+ PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-2.0, enable_gtkhtml=yes, enable_gtkhtml=no)
fi
AC_SUBST(GTKHTML_SHARP_LIBS)
-AC_SUBST(CSHARP_FLAGS)
AM_CONDITIONAL(ENABLE_GTKHTML, test "x$enable_gtkhtml" = "xyes")
+AC_SUBST(CSHARP_FLAGS)
+
PKG_CHECK_MODULES(GECKO_SHARP, gecko-sharp-2.0, enable_gecko=yes, enable_gecko=no)
AC_SUBST(GECKO_SHARP_LIBS)
AM_CONDITIONAL(ENABLE_GECKO, test "x$enable_gecko" = "xyes")
@@ -265,6 +273,7 @@ echo " * Using Gecko = $enable_gecko"
echo " * Using GtkHtml = $enable_gtkhtml"
echo " * Using Mono.WebBrowser = $enable_monowebbrowser"
echo " * Using WebKit = $enable_webkit"
+echo " * Using Gnome = $enable_gnome"
echo ""
echo " NOTE: if any of the above say 'no' you may install the"
echo " corresponding development packages for them, rerun"
@@ -27,7 +27,9 @@
using Mono.WebBrowser;
using Gtk;
using Gdk;
+#if GNOME
using Gnome;
+#endif
namespace Monodoc
{
@@ -59,14 +59,14 @@ admin_sources = \
$(srcdir)/admin.cs \
$(srcdir)/Contributions.cs
-browser_assemblies = $(GTK_SHARP_LIBS) $(MONODOC_LIBS) -r:System.Web.Services
+browser_assemblies = $(GTK_SHARP_LIBS) $(MONODOC_LIBS) $(GNOME_SHARP_LIBS) -r:System.Web.Services
# we insert gtkhtml libs if we have them for printing
geckorender_assemblies = $(GTK_SHARP_LIBS) $(GTKHTML_SHARP_LIBS) $(GECKO_SHARP_LIBS) $(MONODOC_LIBS) -r:browser.exe
-gtkhtmlrender_assemblies = $(GTK_SHARP_LIBS) $(GTKHTML_SHARP_LIBS) $(MONODOC_LIBS) -r:browser.exe
+gtkhtmlrender_assemblies = $(GTK_SHARP_LIBS) $(GTKHTML_SHARP_LIBS) $(GNOME_SHARP_LIBS) $(MONODOC_LIBS) -r:browser.exe
webkitrender_assemblies = $(GTK_SHARP_LIBS) $(WEBKIT_SHARP_LIBS) $(MONODOC_LIBS) -r:browser.exe
-monowebbrowserrender_assemblies = $(GTK_SHARP_LIBS) $(MONOWEBBROWSER_LIBS) $(MONODOC_LIBS) -r:browser.exe -r:Mono.WebBrowser.dll
+monowebbrowserrender_assemblies = $(GTK_SHARP_LIBS) $(GNOME_SHARP_LIBS) $(MONOWEBBROWSER_LIBS) $(MONODOC_LIBS) -r:browser.exe -r:Mono.WebBrowser.dll
EXTRA_DIST = \
$(browser_sources) \
@@ -89,7 +89,7 @@ admin.exe: $(admin_sources) $(srcdir)/admin.glade
endif
browser.exe: $(browser_sources) $(browser_built_sources) $(srcdir)/browser.glade $(srcdir)/monodoc.png
- $(GMCS) -debug -out:browser.exe $(browser_sources) $(browser_built_sources) -resource:$(srcdir)/monodoc.png,monodoc.png -resource:$(srcdir)/browser.glade,browser.glade $(browser_assemblies)
+ $(GMCS) -debug -out:browser.exe $(browser_sources) $(browser_built_sources) -resource:$(srcdir)/monodoc.png,monodoc.png -resource:$(srcdir)/browser.glade,browser.glade $(browser_assemblies) $(CSHARP_FLAGS)
GeckoHtmlRender.dll : $(geckorender_sources) browser.exe
$(GMCS) -debug -target:library -out:$@ $(geckorender_sources) $(geckorender_assemblies) $(GECKO_PRINTING_DEF) $(CSHARP_FLAGS)

0 comments on commit aaa40f7

Please sign in to comment.