diff options
| author | Cody Russell <crussell@canonical.com> | 2010-06-21 14:47:08 -0500 |
|---|---|---|
| committer | Cody Russell <crussell@canonical.com> | 2010-06-21 14:47:08 -0500 |
| commit | c4eb1c83cb2bc10c1cfb2346a83182f09e159e53 (patch) | |
| tree | 5e640a3f32b597dd406cbd425d1ced9b5e5ab3ff /configure.ac | |
| parent | cfdd33a19758224cb835efa705a410d3d4d0db91 (diff) | |
| parent | 3d800bf9b0133a613d28c31957c081d157a89af8 (diff) | |
| download | libdbusmenu-c4eb1c83cb2bc10c1cfb2346a83182f09e159e53.tar.gz libdbusmenu-c4eb1c83cb2bc10c1cfb2346a83182f09e159e53.tar.bz2 libdbusmenu-c4eb1c83cb2bc10c1cfb2346a83182f09e159e53.zip | |
Mainline merge, resolve conflicts.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 33ad44d..938fe84 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(libdbusmenu, 0.3.1, ted@canonical.com) +AC_INIT(libdbusmenu, 0.3.2, ted@canonical.com) AC_COPYRIGHT([Copyright 2009,2010 Canonical]) AC_PREREQ(2.62) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libdbusmenu, 0.3.1, [-Wno-portability]) +AM_INIT_AUTOMAKE(libdbusmenu, 0.3.2, [-Wno-portability]) AM_MAINTAINER_MODE @@ -22,6 +22,13 @@ AC_CONFIG_MACRO_DIR([m4]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) ########################### +# GTK Doc +########################### + +GTK_DOC_CHECK([1.4]) +GNOME_DOC_INIT + +########################### # Dependencies - GLib ########################### @@ -119,6 +126,13 @@ libdbusmenu-gtk/dbusmenu-gtk.pc tools/Makefile tools/testapp/Makefile tests/Makefile +docs/Makefile +docs/libdbusmenu-glib/Makefile +docs/libdbusmenu-glib/reference/Makefile +docs/libdbusmenu-glib/reference/version.xml +docs/libdbusmenu-gtk/Makefile +docs/libdbusmenu-gtk/reference/Makefile +docs/libdbusmenu-gtk/reference/version.xml ]) ########################### |