diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2014-08-18 14:34:24 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2014-08-18 14:34:24 +0400 |
| commit | 46743b1551b70fef63174c770e7b05ada10f96f6 (patch) | |
| tree | 19ab5d1e3b27839406934425f6389d8262861f19 /configure.ac | |
| parent | ffa090bbd5d0b889d427d85e4b687ca7e1de2a47 (diff) | |
| parent | 5803c1dcf0a6e590cfd98ca8ab11d5573652cb14 (diff) | |
| download | apt-46743b1551b70fef63174c770e7b05ada10f96f6.tar.gz | |
Merge branch 'debian/sid' of git://anonscm.debian.org/apt/apt
Conflicts:
.gitignore
Makefile
apt-inst/makefile
apt-pkg/install-progress.h
apt-pkg/makefile
buildlib/defaults.mak
buildlib/environment.mak.in
buildlib/library.mak
buildlib/po4a_manpage.mak
buildlib/program.mak
buildlib/python.mak
buildlib/staticlibrary.mak
cmdline/makefile
configure.ac
debian/apt.install.in
debian/changelog
debian/control
debian/libapt-pkg4.12.symbols
debian/rules
doc/makefile
ftparchive/makefile
po/ar.po
po/bs.po
po/cy.po
po/dz.po
po/el.po
po/fi.po
po/km.po
po/ku.po
po/lt.po
po/ne.po
po/nn.po
po/pt_BR.po
po/ro.po
po/th.po
po/tl.po
po/uk.po
test/libapt/makefile
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 42 |
1 files changed, 40 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 027a30af..c51b2ef9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,15 @@ -AC_INIT([apt], [1.0.0+1], [pashev.igor@gmail.com]) +AC_INIT([apt], [1.0.6+1], [pashev.igor@gmail.com]) AC_CONFIG_AUX_DIR([build-aux]) - AM_INIT_AUTOMAKE([subdir-objects]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES]) AC_CONFIG_HEADERS([config.h]) +AC_LANG_PUSH([C++]) +AC_CHECK_HEADER(gtest/gtest.h,, + AC_MSG_ERROR([failed: I need gtest to build tests]), +) +AC_LANG_POP([C++]) __apt_macros_h="apt-pkg/contrib/macros.h" ap_maj=`$AWK '/^\#define APT_PKG_MAJOR/ {print $3}' $srcdir/$__apt_macros_h` @@ -97,6 +101,40 @@ fi dnl Solaris: AC_CHECK_HEADERS([sys/isa_defs.h sys/ttold.h]) +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) + +dnl Check the architecture +AC_C_BIGENDIAN + +dnl HP-UX sux.. +AC_MSG_CHECKING(for missing socklen_t) +AC_EGREP_HEADER(socklen_t, sys/socket.h,[AC_MSG_RESULT(no)],[ + AC_DEFINE(NEED_SOCKLEN_T_DEFINE) + NEED_SOCKLEN_T_DEFINE=yes + AC_MSG_RESULT(missing.)]) +AC_SUBST(NEED_SOCKLEN_T_DEFINE) + +dnl HP-UX needs -d_XOPEN_SOURCE_EXTENDED for h_errno +AC_MSG_CHECKING(for h_errno) +AC_EGREP_HEADER(h_errno, netdb.h, [AC_MSG_RESULT(normal)], + [CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" + AC_EGREP_HEADER(h_errno, netdb.h, + [AC_MSG_RESULT(needs _XOPEN_SOURCE_EXTENDED)], + [AC_MSG_ERROR("not found.")]) + ]) + +dnl Check for doxygen +AC_PATH_PROG(DOXYGEN, doxygen) + +dnl Check for the XSLTProc tool needed to build man pages together with po4a +AC_PATH_PROG(XSLTPROC,xsltproc) +AC_PATH_PROG(W3M, w3m) AC_TYPE_UINT8_T AC_TYPE_UINT16_T |