← Back to branch summary

~ubuntu-branches/ubuntu/maverick/gvfs/maverick-proposed

« back to all changes in this revision

Viewing changes to aclocal.m4

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2010-02-23 13:00:18 UTC
  • mfrom: (1.1.54 upstream)
  • Revision ID: james.westby@ubuntu.com-20100223130018-m3txkn095qz6z0w9
Tags: 1.5.4-0ubuntu1
https://launchpad.net/bugs/365662
* New upstream release:
  - gphoto2: Better support for devices that are read-only + delete
  - gdu: Various fixes and preparation for LVM
  - ftp: fix asserts
  - sftp: remember to save password if username changed (LP: #365662)
  - gio module: don't call g_file_find_enclosing_mount_async callback
    directly
  - gvfs-monitor: Track moves if available
  - Translation updates
* debian/control.in: Bump gdu and glib build dependency, according to
  configure.ac.
* debian/rules: Explicitly set D-Bus service dir configuration option, to
  work around regression in upstream configure.ac (now fixed in trunk).

Show diffs side-by-side

added added

removed removed

Lines of Context:
aclocal.m4
13
13
 
14
14
m4_ifndef([AC_AUTOCONF_VERSION],
15
15
  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
16
 
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
17
 
[m4_warning([this file was generated for autoconf 2.65.
 
16
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
 
17
[m4_warning([this file was generated for autoconf 2.63.
18
18
You have another version of autoconf.  It may work, but is not guaranteed to.
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'.])])
462
462
[
463
463
  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
464
464
  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
465
 
 
466
 
  dnl check for tools we added during development
467
 
  AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
468
 
  AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
469
 
  AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
470
 
 
471
465
  dnl for overriding the documentation installation directory
472
466
  AC_ARG_WITH([html-dir],
473
467
    AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
486
480
      [PKG_CHECK_EXISTS([gtk-doc],,
487
481
                        AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
488
482
      [PKG_CHECK_EXISTS([gtk-doc >= $1],,
489
 
                        AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
 
483
                        AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))])
490
484
  fi
491
485
 
492
486
  AC_MSG_CHECKING([whether to build gtk-doc documentation])
493
487
  AC_MSG_RESULT($enable_gtk_doc)
494
488
 
495
 
  dnl enable/disable output formats
496
 
  AC_ARG_ENABLE([gtk-doc-html],
497
 
    AS_HELP_STRING([--enable-gtk-doc-html],
498
 
                   [build documentation in html format [[default=yes]]]),,
499
 
    [enable_gtk_doc_html=yes])
500
 
    AC_ARG_ENABLE([gtk-doc-pdf],
501
 
      AS_HELP_STRING([--enable-gtk-doc-pdf],
502
 
                     [build documentation in pdf format [[default=no]]]),,
503
 
      [enable_gtk_doc_pdf=no])
504
 
 
505
 
  if test -z "$GTKDOC_MKPDF"; then
506
 
    enable_gtk_doc_pdf=no
507
 
  fi
508
 
 
 
489
  AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,)
509
490
 
510
491
  AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
511
 
  AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
512
 
  AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
513
492
  AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
514
 
  AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
515
493
])
516
494
 
517
495