ryujinx/GtkSharp
1
0
Fork 0
mirror of https://github.com/Ryujinx/GtkSharp.git synced 2025-01-22 23:42:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

2003-11-18 John Luke <jluke@cfl.rr.com>

Browse source 
* configure.in: test for gtkhtml3
		* gtkhtml/Makefile.in: build conditionally

svn path=/trunk/gtk-sharp/; revision=20184
This commit is contained in:
John Luke 2003-11-18 19:57:05 +00:00
parent 45faa30e22
commit e71f1cda17
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2003-11-18 John Luke <jluke@cfl.rr.com>
* configure.in: test for gtkhtml3
* gtkhtml/Makefile.in: build conditionally
2003-11-18 Mike Kestner <mkestner@ximian.com> 2003-11-18 Mike Kestner <mkestner@ximian.com>
* gdk/Pixbuf.custom : resurrect the stream/resource ctors. rename * gdk/Pixbuf.custom : resurrect the stream/resource ctors. rename

11
configure.in
View file

@ -78,7 +78,7 @@ if test "x$enable_glade" = "xyes"; then
BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS $GLADE_DEPENDENCIES_LIBS" BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS $GLADE_DEPENDENCIES_LIBS"
fi fi
LIBGDA_REQUIRED_VERSION=0.90 LIBGDA_REQUIRED_VERSION=1.0.0
PKG_CHECK_MODULES(LIBGDA_DEPENDENCIES, libgda >= $LIBGDA_REQUIRED_VERSION, enable_gda=yes, enable_gda=no) PKG_CHECK_MODULES(LIBGDA_DEPENDENCIES, libgda >= $LIBGDA_REQUIRED_VERSION, enable_gda=yes, enable_gda=no)
enable_gnomedb=no enable_gnomedb=no
if test "x$enable_gda" = "xyes"; then if test "x$enable_gda" = "xyes"; then
@ -99,6 +99,12 @@ if test "x$enable_rsvg" = "xyes"; then
BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS $RSVG_DEPENDENCIES_LIBS" BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS $RSVG_DEPENDENCIES_LIBS"
fi fi
GTKHTML_REQUIRED_VERSION=3.0
PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.0 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no)
if test "x$enable_gtkhtml" = "xyes"; then
BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS $GTKHTML_DEPENDENCIES_CFLAGS"
BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS $GTKHTML_DEPENDENCIES_LIBS"
fi
AC_SUBST(BASE_DEPENDENCIES_CFLAGS) AC_SUBST(BASE_DEPENDENCIES_CFLAGS)
AC_SUBST(BASE_DEPENDENCIES_LIBS) AC_SUBST(BASE_DEPENDENCIES_LIBS)
@ -108,6 +114,8 @@ AM_CONDITIONAL(ENABLE_GLADE, test "x$enable_glade" = "xyes")
AM_CONDITIONAL(ENABLE_GDA, test "x$enable_gda" = "xyes") AM_CONDITIONAL(ENABLE_GDA, test "x$enable_gda" = "xyes")
AM_CONDITIONAL(ENABLE_GNOMEDB, test "x$enable_gnomedb" = "xyes") AM_CONDITIONAL(ENABLE_GNOMEDB, test "x$enable_gnomedb" = "xyes")
AM_CONDITIONAL(ENABLE_RSVG, test "x$enable_rsvg" = "xyes") AM_CONDITIONAL(ENABLE_RSVG, test "x$enable_rsvg" = "xyes")
AM_CONDITIONAL(ENABLE_GTKHTML, test "x$enable_gtkhtml" = "xyes")
AC_SUBST(CFLAGS) AC_SUBST(CFLAGS)
@ -153,6 +161,7 @@ echo " * glade-sharp.dll: $enable_glade"
echo " * gda-sharp.dll: $enable_gda" echo " * gda-sharp.dll: $enable_gda"
echo " * gnomedb-sharp.dll: $enable_gnomedb" echo " * gnomedb-sharp.dll: $enable_gnomedb"
echo " * rsvg-sharp.dll: $enable_rsvg " echo " * rsvg-sharp.dll: $enable_rsvg "
echo " * gtkhtml-sharp.dll: $enable_gtkhtml "
echo "" echo ""
echo " NOTE: if any of the above say 'no' you may install the" echo " NOTE: if any of the above say 'no' you may install the"
echo " corresponding development packages for them, rerun" echo " corresponding development packages for them, rerun"

3
gtkhtml/Makefile.in
View file

@ -12,7 +12,8 @@ RUNTIME=mono
MCS=mcs MCS=mcs
ASSEMBLY=gtkhtml-sharp.dll ASSEMBLY=gtkhtml-sharp.dll
all: $(ASSEMBLY) @ENABLE_GTKHTML_TRUE@ all: $(ASSEMBLY)
@ENABLE_GTKHTML_FALSE@ all:
generated-stamp: gtkhtml-api.xml *.custom ../generator/gapi_codegen.exe Gtk.metadata generated-stamp: gtkhtml-api.xml *.custom ../generator/gapi_codegen.exe Gtk.metadata
$(RUNTIME) ../parser/gapi-fixup.exe --api=gtkhtml-api.xml --metadata=Gtk.metadata && \ $(RUNTIME) ../parser/gapi-fixup.exe --api=gtkhtml-api.xml --metadata=Gtk.metadata && \