From da65bf9dc18c2f85784fd544f813dc90a2e83cb0 Mon Sep 17 00:00:00 2001 From: Raja R Harinath Date: Wed, 4 Aug 2004 08:36:37 +0000 Subject: [PATCH] * configure.in (GTKHTML): Use SOVERSION=11 for GtkHTML 3.1.18. * gda/Makefile.am ($(API)): Remove duplicated $(srcdir). svn path=/trunk/gtk-sharp/; revision=31848 --- ChangeLog | 5 +++++ configure.in | 6 +++++- gda/Makefile.am | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 83a431c6c..81ae22fb0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-08-04 Raja R Harinath + + * configure.in (GTKHTML): Use SOVERSION=11 for GtkHTML 3.1.18. + * gda/Makefile.am ($(API)): Remove duplicated $(srcdir). + 2004-07-30 Mike Kestner * parser/gapi2xml.pl : char const * fixes for clahey's gsf binding. diff --git a/configure.in b/configure.in index 64d9d525a..12340f86c 100644 --- a/configure.in +++ b/configure.in @@ -160,7 +160,11 @@ else 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=7 + if $PKG_CONFIG --atleast-version=3.1.18 libgtkhtml-3.1; then + GTKHTML_SOVERSION=11 + else + GTKHTML_SOVERSION=7 + fi else GTKHTML_VERSION= GTKHTML_SOVERSION= diff --git a/gda/Makefile.am b/gda/Makefile.am index ef9d7228c..e81acb5f3 100644 --- a/gda/Makefile.am +++ b/gda/Makefile.am @@ -40,7 +40,7 @@ EXTRA_DIST = \ $(sources) \ gda-sharp.pc.in -$(API): $(srcdir)/$(srcdir)/$(METADATA) +$(API): $(srcdir)/$(METADATA) cp $(srcdir)/$(RAW_API) $(API) chmod u+w $(API) $(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA)