← Back to branch summary

~ubuntu-branches/ubuntu/utopic/gnome-desktop3/utopic

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Tim Lunn
  • Date: 2013-05-28 09:10:46 UTC
  • mfrom: (1.6.1) (21.1.10 experimental)
  • Revision ID: package-import@ubuntu.com-20130528091046-b0oc28za9l97fgq1
Tags: 3.8.2-0ubuntu1
https://launchpad.net/bugs/1184812
* New upstream release
* Sync with Debian (LP: #1184812) Remaining changes:
  - debian/patches:
    + 04_compute_average_color.patch: Compute the avergage color in
      gnome-desktop itself, not in unity to fix some races (LP #963140)
    + tweak_color_computation.patch, Patch from Gord, no patch header,
      no bug link.
    + git_revert_draw_background.patch
    + ubuntu_language.patch, Ported relevant bits from g-c-c 
      52_region_language.patch, as required for gnome 3.8 region panel
    + ubuntu_language_list_from_SUPPORTED.patch,
      adds api to get list of available languages from SUPPORTED file.
      To be used by gnome 3.8 region panel language installation.
  - debian/control.in:
    + Don't break gnome-shell << 3.7.90
    + Use source:Version for gnome-desktop3-data Depend
    + Add epoch to gnome-desktop3-data's Breaks/Replaces, as our old
      gnome-desktop source package introduced an epoch. This needs to be
      kept until after 14.04 LTS.
 - Install helper tools into a versioned directory (by overriding
   libexecdir). They could alternatively be installed in a separate package
* Dropped changes:
  - 02_refuse_to_break_GL_compositors.patch:
    + Doesn't appear to be needed any more
 

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
 
])