diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-01-26 15:51:45 +0100 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-01-26 15:51:45 +0100 |
commit | 51f9f4d78deabf54dbbb6881139d2b1a319ffbfc (patch) | |
tree | 60a2bcd8911acd5c4ab8b4558bfd30344b673ff5 /configure.in | |
parent | 76fe5db7153957f8fda437e3bd614312b076f19e (diff) | |
parent | c1f168f54be5b4babeb9b91cd7145441ea2489ad (diff) |
merge from the mvo branch
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/configure.in b/configure.in index f90a32c3b..fe30d4ca1 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.20~exp3") +AC_DEFINE_UNQUOTED(VERSION,"0.7.25") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) @@ -112,6 +112,10 @@ if test x"$HAVE_STATVFS" != x"yes"; then ]) fi +AC_CHECK_MEMBERS([struct statfs.f_type],,, + [$ac_includes_default + #include <sys/vfs.h>]) + dnl We should use the real timegm function if we have it. AC_CHECK_FUNC(timegm,AC_DEFINE(HAVE_TIMEGM)) AC_SUBST(HAVE_TIMEGM) @@ -180,11 +184,11 @@ AC_PATH_PROG(DEBIANDOC_TEXT,debiandoc2text) dnl Check for doxygen AC_PATH_PROG(DOXYGEN, doxygen) -dnl Check for the SGML tools needed to build man pages -AC_PATH_PROG(DOCBOOK2MAN,docbook2man) +dnl Check for the XSLTProc tool needed to build man pages together with po4a +AC_PATH_PROG(XSLTPROC,xsltproc) -dnl Check for the XML tools needed to build man pages -AC_PATH_PROG(XMLTO,xmlto) +dnl Check for the po4a tool needed to build man pages +AC_PATH_PROG(PO4A,po4a) dnl Check for graphviz AC_CHECK_PROG([HAVE_DOT], [dot], [YES], [NO]) @@ -192,12 +196,7 @@ AC_PATH_PROG([DOT], [dot], []) DOTDIR=$(dirname $DOT) AC_SUBST(DOTDIR) -dnl Check for YODL -dnl AC_CHECK_PROG(YODL_MAN,yodl2man,"yes","") - ah_NUM_PROCS -rc_GLIBC_VER -rc_LIBSTDCPP_VER ah_GCC3DEP dnl It used to be that the user could select translations and that could get |