2004-05-05 Mike Kestner <mkestner@ximian.com>
* configure.in : fix gtkhtml versioning *again*. * sample/gconf/Makefile.am : conditional build on ENABLE_GNOME. svn path=/trunk/gtk-sharp/; revision=26708
This commit is contained in:
parent
f5a8823bb6
commit
2681235b22
3 changed files with 15 additions and 3 deletions
|
@ -1,3 +1,8 @@
|
|||
2004-05-05 Mike Kestner <mkestner@ximian.com>
|
||||
|
||||
* configure.in : fix gtkhtml versioning *again*.
|
||||
* sample/gconf/Makefile.am : conditional build on ENABLE_GNOME.
|
||||
|
||||
2004-05-04 Mike Kestner <mkestner@ximian.com>
|
||||
|
||||
* configure.in : require gtkhtml-3.0.10 so we can use a single
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
AC_INIT(README)
|
||||
AC_CANONICAL_SYSTEM
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
AM_INIT_AUTOMAKE(gtk-sharp, 0.91)
|
||||
AM_INIT_AUTOMAKE(gtk-sharp, 0.91.1)
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
API_VERSION=1.0.0.0
|
||||
|
@ -160,10 +160,11 @@ if test "x$enable_gtkhtml" = "xyes"; then
|
|||
GTKHTML_VERSION=3.0
|
||||
GTKHTML_SOVERSION=4
|
||||
else
|
||||
GTKHTML_REQUIRED_VERSION=3.1.12
|
||||
PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.1 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no)
|
||||
if test "x$enable_gtkhtml" = "xyes"; then
|
||||
GTKHTML_VERSION=3.1
|
||||
GTKHTML_SOVERSION=4
|
||||
GTKHTML_SOVERSION=7
|
||||
else
|
||||
GTKHTML_VERSION=
|
||||
GTKHTML_SOVERSION=
|
||||
|
|
|
@ -1,3 +1,9 @@
|
|||
if ENABLE_GNOME
|
||||
TARGET=sample.exe
|
||||
else
|
||||
TARGET=
|
||||
endif
|
||||
|
||||
FILES = \
|
||||
Settings.cs \
|
||||
$(srcdir)/main.cs
|
||||
|
@ -9,7 +15,7 @@ REFERENCES = /r:../../glib/glib-sharp.dll /r:../../pango/pango-sharp.dll /r:../.
|
|||
top_builddir=../..
|
||||
GCONFDIR=$(top_builddir)/gconf
|
||||
|
||||
noinst_SCRIPTS = sample.exe
|
||||
noinst_SCRIPTS = $(TARGET)
|
||||
|
||||
sample.exe: $(SCHEMA) $(srcdir)/sample.glade $(FILES)
|
||||
$(CSC) /out:sample.exe $(FILES) $(REFERENCES) $(RESOURCES)
|
||||
|
|
Loading…
Reference in a new issue