Merge pull request #25 from codebrainz/devhelp-fixes

Devhelp fixes
e.g. make devhelp run also if only gtk3-libdevhelp is available

build/devhelp.m4

@@ -3,31 +3,26 @@ AC_DEFUN([GP_CHECK_DEVHELP],
     GP_ARG_DISABLE([devhelp], [auto])
 
     GTK_VERSION=2.16
-    GLIB_VERSION=2.16
-    WEBKIT_VERSION=1.1.18
-    DEVHELP1_VERSION=2.30.1
-    DEVHELP2_VERSION=2.32.0
+    WEBKIT_VERSION=1.1.13
+    GCONF_VERSION=2.6.0
+    LIBWNCK_VERSION=2.10.0
 
-    # Use newer libdevhelp-2.0 if present, and fallback on older libdevhelp-1.0
-    libdevhelp_pkg=libdevhelp-2.0
-    libdevhelp_version=${DEVHELP2_VERSION}
-    AS_IF([test "x$enable_devhelp" != "xno"],
-          [PKG_CHECK_EXISTS([${libdevhelp_pkg} >= ${libdevhelp_version}],
-                            [AC_DEFINE([HAVE_BOOK_MANAGER], [1], [Use libdevhelp-2.0])],
-                            [libdevhelp_pkg=libdevhelp-1.0
-                             libdevhelp_version=${DEVHELP1_VERSION}])])
+    AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+    AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
 
     GP_CHECK_PLUGIN_DEPS([devhelp], [DEVHELP],
                          [gtk+-2.0 >= ${GTK_VERSION}
-                          glib-2.0 >= ${GLIB_VERSION}
                           webkit-1.0 >= ${WEBKIT_VERSION}
-                          ${libdevhelp_pkg} >= ${libdevhelp_version}
-                          gthread-2.0])
+                          libwnck-1.0 >= ${LIBWNCK_VERSION}
+                          gconf-2.0 >= ${GCONF_VERSION}
+                          gthread-2.0
+                          zlib])
 
     GP_STATUS_PLUGIN_ADD([DevHelp], [$enable_devhelp])
 
     AC_CONFIG_FILES([
         devhelp/Makefile
+        devhelp/devhelp/Makefile
         devhelp/src/Makefile
         devhelp/data/Makefile
     ])

devhelp/Makefile.am

@@ -4,5 +4,5 @@ else
 include $(top_srcdir)/build/vars.docs.mk
 endif
 
-SUBDIRS = src data
+SUBDIRS = devhelp src data
 plugin = devhelp

devhelp/devhelp/Makefile.am

@@ -0,0 +1,84 @@
+dh_headers = \
+	dh-assistant.h \
+	dh-assistant-view.h \
+	dh-base.h \
+	dh-book-manager.h \
+	dh-book.h \
+	dh-book-tree.h \
+	dh-error.h \
+	dh-keyword-model.h \
+	dh-link.h \
+	dh-search.h \
+	dh-window.h
+
+dh-enum-types.h: dh-enum-types.h.template $(dh_headers) $(GLIB_MKENUMS)
+	$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template dh-enum-types.h.template $(dh_headers)) > $@
+
+dh-enum-types.c: dh-enum-types.c.template $(dh_headers) $(GLIB_MKENUMS)
+	$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template dh-enum-types.c.template $(dh_headers)) > $@
+
+BUILT_SOURCES = \
+	dh-marshal.h \
+	dh-marshal.c \
+	dh-enum-types.h \
+	dh-enum-types.c
+
+EXTRA_DIST = \
+	dh-marshal.list \
+	dh-enum-types.c.template \
+	dh-enum-types.h.template
+
+noinst_LTLIBRARIES = libdevhelp-2.la
+
+libdevhelp_2_la_SOURCES = \
+	dh-assistant.c \
+	dh-assistant-view.c \
+	dh-base.c \
+	dh-book.c \
+	dh-book-manager.c \
+	dh-book-tree.c \
+	dh-enum-types.c \
+	dh-enum-types.h \
+	dh-error.c \
+	dh-keyword-model.c \
+	dh-link.c \
+	dh-marshal.c \
+	dh-marshal.h \
+	dh-parser.c \
+	dh-parser.h \
+	dh-preferences.c \
+	dh-preferences.h \
+	dh-search.c \
+	dh-util.c \
+	dh-util.h \
+	dh-window.c \
+	eggfindbar.c \
+	eggfindbar.h \
+	ige-conf.c \
+	ige-conf-gconf.c \
+	ige-conf.h \
+	ige-conf-private.h \
+	$(dh_headers)
+
+libdevhelp_2_la_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-DLOCALEDIR=\""$(datadir)/locale"\" \
+	-DDATADIR=\""$(datadir)"\" \
+	-DG_LOG_DOMAIN=\"Devhelp\" \
+	$(DEVHELP_CPPFLAGS)
+
+libdevhelp_2_la_CFLAGS = \
+	$(DEVHELP_CFLAGS)
+
+libdevhelp_2_la_LIBADD = \
+	$(DEVHELP_LIBS)
+
+libdevhelp_2_la_LDFLAGS = \
+	-no-undefined
+
+dh-marshal.h: dh-marshal.list
+	$(AM_V_GEN) $(GLIB_GENMARSHAL) $< --header --prefix=_dh_marshal dh-marshal.list > $@
+
+dh-marshal.c: dh-marshal.list
+	$(AM_V_GEN) echo "#include \"dh-marshal.h\"" > $@ && \
+	$(GLIB_GENMARSHAL) $< --body --prefix=_dh_marshal dh-marshal.list >> $@