diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-09-04 13:53:10 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-09-04 13:53:10 +0200 |
| commit | ad2d0cef574ff0143ee27cdbd058cba179368dbd (patch) | |
| tree | c97a2f993eb141cfae880d90dc0f4ea57c4be2db /configure.in | |
| parent | f352743312edeebf666e1c8304cdc4baf457469f (diff) | |
| parent | 056c36565706cad136df288db777c01555f4ecd9 (diff) | |
merged from lp:~donkult/apt/debian-experimental
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 50 |
1 files changed, 5 insertions, 45 deletions
diff --git a/configure.in b/configure.in index ecc0cecce..56eeaccbe 100644 --- a/configure.in +++ b/configure.in @@ -18,11 +18,14 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) PACKAGE="apt" -PACKAGE_VERSION="0.9.0" +PACKAGE_VERSION="0.9.7.1" +PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") +AC_DEFINE_UNQUOTED(PACKAGE_MAIL,"$PACKAGE_MAIL") AC_SUBST(PACKAGE) AC_SUBST(PACKAGE_VERSION) +AC_SUBST(PACKAGE_MAIL) dnl Check the archs, we want the target type. AC_CANONICAL_SYSTEM @@ -116,12 +119,6 @@ fi AC_MSG_RESULT($archset) AC_DEFINE_UNQUOTED(COMMON_ARCH,"$archset") -dnl We use C99 types if at all possible -AC_CACHE_CHECK([for C99 integer types],apt_cv_c9x_ints,[ - AC_TRY_COMPILE([#include <inttypes.h>], - [uint8_t Foo1;uint16_t Foo2;uint32_t Foo3;], - apt_cv_c9x_ints=yes,apt_cv_c9x_ints=no)]) - dnl Single Unix Spec statvfs AC_CHECK_FUNC(statvfs,[HAVE_STATVFS=yes]) AC_SUBST(HAVE_STATVFS) @@ -141,46 +138,9 @@ 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 sizes etc. of the architecture -dnl This is stupid, it should just use the AC macros like it does below -dnl Cross compilers can either get a real C library or preload the cache -dnl with their size values. -changequote(,) -archline="`awk \" ! /^#|^\\\$/ {if (match(\\\"$archset\\\",\\\$1)) {print; exit}}\" $srcdir/buildlib/sizetable | cut -f 2- -d ' '`" -if test "x$archline" != "x"; then - changequote([,]) - set $archline - if test "$1" = "little"; then - ac_cv_c_bigendian=no - else - ac_cv_c_bigendian=yes - fi - size_char=$2 - size_int=$3 - size_short=$4 - size_long=$5 -fi - -dnl I wonder what AC_C_BIGENDIAN does if you cross compile... -dnl This is probably bogus, as above we only care if we have to build our own -dnl C9x types. -if test "$cross_compiling" = "yes" -a "x$archline" = "x"; then - AC_MSG_ERROR(When cross compiling, architecture must be present in sizetable) -fi +dnl Check the architecture AC_C_BIGENDIAN -dnl We do not need this if we have inttypes! -HAVE_C9X=yes -if test x"$apt_cv_c9x_ints" = x"no"; then - AC_CHECK_SIZEOF(char,$size_char) - AC_CHECK_SIZEOF(int,$size_int) - AC_CHECK_SIZEOF(short,$size_short) - AC_CHECK_SIZEOF(long,$size_long) - - HAVE_C9X= - AC_SUBST(HAVE_C9X) -fi - dnl HP-UX sux.. AC_MSG_CHECKING(for missing socklen_t) AC_EGREP_HEADER(socklen_t, sys/socket.h,[AC_MSG_RESULT(no)],[ |