← Back to branch summary

~timo-jyrinki/ubuntu/trusty/pitivi/backport_utopic_fixes

« back to all changes in this revision

Viewing changes to aclocal.m4

  • Committer: Bazaar Package Importer
  • Author(s): Jeremy Bicha
  • Date: 2011-08-15 02:32:20 UTC
  • mfrom: (1.5.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20110815023220-x2n5l0i4deiqn7dn
Tags: 0.14.2-0ubuntu1
* New upstream version.
  - New Mallard format help
* debian/control:
  - Add gnome-doc-utils to build-depends
  - Bump pygtk minimum to 2.24
* debian/patches/01_lpi.patch
  - Move LPI items below User Manual in Help menu
* debian/watch: Watch for 0.14.* tar.bz2

Show diffs side-by-side

added added

removed removed

Lines of Context:
aclocal.m4
19
19
If you have problems, you may need to regenerate the build system entirely.
20
20
To do so, use the procedure documented by the package, typically `autoreconf'.])])
21
21
 
 
22
dnl Do not call GNOME_DOC_DEFINES directly.  It is split out from
 
23
dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself.
 
24
AC_DEFUN([GNOME_DOC_DEFINES],
 
25
[
 
26
AC_ARG_WITH([help-dir],
 
27
  AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),,
 
28
  [with_help_dir='${datadir}/gnome/help'])
 
29
HELP_DIR="$with_help_dir"
 
30
AC_SUBST(HELP_DIR)
 
31
 
 
32
AC_ARG_WITH([omf-dir],
 
33
  AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),,
 
34
  [with_omf_dir='${datadir}/omf'])
 
35
OMF_DIR="$with_omf_dir"
 
36
AC_SUBST(OMF_DIR)
 
37
 
 
38
AC_ARG_WITH([help-formats],
 
39
  AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),,
 
40
  [with_help_formats=''])
 
41
DOC_USER_FORMATS="$with_help_formats"
 
42
AC_SUBST(DOC_USER_FORMATS)
 
43
 
 
44
AC_ARG_ENABLE([scrollkeeper],
 
45
        [AC_HELP_STRING([--disable-scrollkeeper],
 
46
                        [do not make updates to the scrollkeeper database])],,
 
47
        enable_scrollkeeper=yes)
 
48
AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"])
 
49
 
 
50
dnl disable scrollkeeper automatically for distcheck
 
51
DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
 
52
AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
 
53
 
 
54
AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"])
 
55
])
 
56
 
 
57
# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
 
58
#
 
59
AC_DEFUN([GNOME_DOC_INIT],
 
60
[AC_REQUIRE([AC_PROG_LN_S])dnl
 
61
 
 
62
ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1])
 
63
 
 
64
AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required])
 
65
PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required],
 
66
        [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no])
 
67
 
 
68
if test "$gdu_cv_have_gdu" = "yes"; then
 
69
        AC_MSG_RESULT([yes])
 
70
        ifelse([$2],,[:],[$2])
 
71
else
 
72
        AC_MSG_RESULT([no])
 
73
        ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3])
 
74
fi
 
75
 
 
76
GNOME_DOC_DEFINES
 
77
])
 
78
 
22
79
 
23
80
dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
24
81
# serial 40 IT_PROG_INTLTOOL
1180
1237
m4_include([common/m4/as-python.m4])
1181
1238
m4_include([common/m4/as-version.m4])
1182
1239
m4_include([common/m4/glib-gettext.m4])
 
1240
m4_include([common/m4/pkg.m4])