← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/libdbusmenu/oneiric

« back to all changes in this revision

Viewing changes to m4/gnome-doc-utils.m4

  • Committer: Bazaar Package Importer
  • Author(s): Ken VanDine, Ted Gould, Ken VanDine
  • Date: 2011-06-24 14:55:59 UTC
  • mfrom: (1.1.50 upstream)
  • Revision ID: james.westby@ubuntu.com-20110624145559-rgt9s1hskuhrttaz
Tags: 0.4.90-0ubuntu1
https://launchpad.net/bugs/770263
https://launchpad.net/bugs/618587
https://launchpad.net/bugs/785828
https://launchpad.net/bugs/784890
[ Ted Gould ]
* debian/control, debian/*: Renaming packages for library version
  bump from 3 to 4.
* New upstream release.
  * Fixing visibility for Eclipse (LP: #770263 and LP: #618587)
  * Unseting a GValue properly (LP: #785828)
  * Memory leaks for GVariant usage (LP: #784890)
  * Making GTK 3 default build
  * Removing the SerializableMenuitem object
* debian/rules: Making GTK2 the special build 

[ Ken VanDine ]
* +debian/libdbusmenu-jsonloader4.symbols
* debian/*.symbols
  - Fixed sonames and removed all the duplicate symbols
* debian/*.install, debian/rules
  - Use cdbs to do the dual builds for gtk2/gtk3
* debian/control
  - Updated standards version to 3.9.2
  - Set version on the json-glib build depends to >= 0.13.4
  - Make gir1.2-dbusmenu-glib-0.4 break gir1.2-unity-3.0 and 
    gir1.2-indicate-0.5 built against older versions of dbusmenu to 
    prevent breakage in python apps that use gir loading multiple versions
    of dbusmenu-glib

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/gnome-doc-utils.m4
 
1
dnl Do not call GNOME_DOC_DEFINES directly.  It is split out from
 
2
dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself.
 
3
AC_DEFUN([GNOME_DOC_DEFINES],
 
4
[
 
5
AC_ARG_WITH([help-dir],
 
6
  AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),,
 
7
  [with_help_dir='${datadir}/gnome/help'])
 
8
HELP_DIR="$with_help_dir"
 
9
AC_SUBST(HELP_DIR)
 
10
 
 
11
AC_ARG_WITH([omf-dir],
 
12
  AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),,
 
13
  [with_omf_dir='${datadir}/omf'])
 
14
OMF_DIR="$with_omf_dir"
 
15
AC_SUBST(OMF_DIR)
 
16
 
 
17
AC_ARG_WITH([help-formats],
 
18
  AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),,
 
19
  [with_help_formats=''])
 
20
DOC_USER_FORMATS="$with_help_formats"
 
21
AC_SUBST(DOC_USER_FORMATS)
 
22
 
 
23
AC_ARG_ENABLE([scrollkeeper],
 
24
        [AC_HELP_STRING([--disable-scrollkeeper],
 
25
                        [do not make updates to the scrollkeeper database])],,
 
26
        enable_scrollkeeper=yes)
 
27
AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"])
 
28
 
 
29
dnl disable scrollkeeper automatically for distcheck
 
30
DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
 
31
AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
 
32
 
 
33
AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"])
 
34
])
 
35
 
 
36
# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
 
37
#
 
38
AC_DEFUN([GNOME_DOC_INIT],
 
39
[AC_REQUIRE([AC_PROG_LN_S])dnl
 
40
 
 
41
ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1])
 
42
 
 
43
AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required])
 
44
PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required],
 
45
        [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no])
 
46
 
 
47
if test "$gdu_cv_have_gdu" = "yes"; then
 
48
        AC_MSG_RESULT([yes])
 
49
        ifelse([$2],,[:],[$2])
 
50
else
 
51
        AC_MSG_RESULT([no])
 
52
        ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3])
 
53
fi
 
54
 
 
55
GNOME_DOC_DEFINES
 
56
])