~ubuntu-branches/debian/experimental/pango1.0/experimental

« back to all changes in this revision

Viewing changes to aclocal.m4

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2008-06-17 10:58:54 UTC
  • mfrom: (1.2.51 upstream)
  • Revision ID: james.westby@ubuntu.com-20080617105854-9yw4lw7mwncrwyae
Tags: 1.21.3-0ubuntu1
* New upstream version:
  - Various small fixes and improvements
  - Bugs fixed in this release:
  Bug 538661 – Improve pango_cairo_context_update_context
  Bug 536190 – Make pango_fc_font_map_clear_cache() public?
  Bug 537258 – Add a pango_language_to_string() function
  Bug 537257 – pango_language_from_string(NULL) not happy
  Bug 537186 – Make PangoFcFont pattern property readable
* debian/control.in:
  - updated libcairo requirement
  - updated maintainer information

Show diffs side-by-side

added added

removed removed

Lines of Context:
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 -*- mode: autoconf -*-
 
23
 
 
24
# serial 1
 
25
 
 
26
dnl Usage:
 
27
dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
 
28
AC_DEFUN([GTK_DOC_CHECK],
 
29
[
 
30
  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
 
31
  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
 
32
  dnl for overriding the documentation installation directory
 
33
  AC_ARG_WITH([html-dir],
 
34
    AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
 
35
    [with_html_dir='${datadir}/gtk-doc/html'])
 
36
  HTML_DIR="$with_html_dir"
 
37
  AC_SUBST([HTML_DIR])
 
38
 
 
39
  dnl enable/disable documentation building
 
40
  AC_ARG_ENABLE([gtk-doc],
 
41
    AS_HELP_STRING([--enable-gtk-doc],
 
42
                   [use gtk-doc to build documentation [[default=no]]]),,
 
43
    [enable_gtk_doc=no])
 
44
 
 
45
  if test x$enable_gtk_doc = xyes; then
 
46
    ifelse([$1],[],
 
47
      [PKG_CHECK_EXISTS([gtk-doc],,
 
48
                        AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
 
49
      [PKG_CHECK_EXISTS([gtk-doc >= $1],,
 
50
                        AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))])
 
51
  fi
 
52
 
 
53
  AC_MSG_CHECKING([whether to build gtk-doc documentation])
 
54
  AC_MSG_RESULT($enable_gtk_doc)
 
55
 
 
56
  AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,)
 
57
 
 
58
  AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
 
59
  AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
 
60
])
 
61
 
22
62
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
23
63
 
24
64
# serial 51 AC_PROG_LIBTOOL
7602
7642
AC_SUBST([am__untar])
7603
7643
]) # _AM_PROG_TAR
7604
7644
 
7605
 
dnl -*- mode: autoconf -*-
7606
 
 
7607
 
# serial 1
7608
 
 
7609
 
dnl Usage:
7610
 
dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
7611
 
AC_DEFUN([GTK_DOC_CHECK],
7612
 
[
7613
 
  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
7614
 
  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
7615
 
  dnl for overriding the documentation installation directory
7616
 
  AC_ARG_WITH([html-dir],
7617
 
    AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
7618
 
    [with_html_dir='${datadir}/gtk-doc/html'])
7619
 
  HTML_DIR="$with_html_dir"
7620
 
  AC_SUBST([HTML_DIR])
7621
 
 
7622
 
  dnl enable/disable documentation building
7623
 
  AC_ARG_ENABLE([gtk-doc],
7624
 
    AS_HELP_STRING([--enable-gtk-doc],
7625
 
                   [use gtk-doc to build documentation [[default=no]]]),,
7626
 
    [enable_gtk_doc=no])
7627
 
 
7628
 
  if test x$enable_gtk_doc = xyes; then
7629
 
    ifelse([$1],[],
7630
 
      [PKG_CHECK_EXISTS([gtk-doc],,
7631
 
                        AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
7632
 
      [PKG_CHECK_EXISTS([gtk-doc >= $1],,
7633
 
                        AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))])
7634
 
  fi
7635
 
 
7636
 
  AC_MSG_CHECKING([whether to build gtk-doc documentation])
7637
 
  AC_MSG_RESULT($enable_gtk_doc)
7638
 
 
7639
 
  AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,)
7640
 
 
7641
 
  AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
7642
 
  AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
7643
 
])
7644
 
 
7645
7645
m4_include([acinclude.m4])