From 0fbb494b343342af795a17a56d4b915499c52ed9 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 25 Jul 2007 20:27:40 -0300 Subject: * Applied patch from Guillem Jover to use dpkg-architecture to get the host architecture (closes: #407187) --- configure.in | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 9bb1a8baf..ad913f53e 100644 --- a/configure.in +++ b/configure.in @@ -81,12 +81,9 @@ dnl This is often the dpkg architecture string. dnl First check against the full canonical canoncial-system-type in $target dnl and if that fails, just look for the cpu AC_MSG_CHECKING(system architecture) -archset="`awk \" ! /^#|^\\\$/ { if(match(\\\"$target\\\",\\\"^\\\"\\\$1\\\"\\\$\\\")) {print \\\$2; exit}}\" $srcdir/buildlib/systemtable`" +archset="`dpkg-architecture -qDEB_HOST_ARCH`" if test "x$archset" = "x"; then - archset="`awk \" ! /^#|^\\\$/ { if(match(\\\"$target_cpu\\\",\\\"^\\\"\\\$1\\\"\\\$\\\")) {print \\\$2; exit}}\" $srcdir/buildlib/archtable`" - if test "x$archset" = "x"; then - AC_MSG_ERROR(failed: use --host= or check buildlib/archtable) - fi + AC_MSG_ERROR([failed: use --host= or output from dpkg-architecture]) fi AC_MSG_RESULT($archset) AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset") @@ -94,7 +91,7 @@ AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset") dnl Get a common name for the host OS - this is primarily only for HURD and is dnl non fatal if it fails AC_MSG_CHECKING(system OS) -osset="`awk \" ! /^#|^\\\$/ {if (match(\\\"$target_vendor-$target_os\\\",\\\$1)) {print \\\$2; exit}}\" $srcdir/buildlib/ostable`" +osset="`dpkg-architecture -qDEB_HOST_ARCH_OS`" AC_MSG_RESULT($osset) AC_DEFINE_UNQUOTED(COMMON_OS,"$osset") -- cgit v1.2.3 From 96c1153afd783c40af8bce9add60fb0b6f18080d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 30 Jul 2007 21:48:03 +0200 Subject: * methods/makefile: - install lzma symlink method (for full lzma support) * debian/control: - suggest "lzma" --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index ad913f53e..c33451390 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.4") +AC_DEFINE_UNQUOTED(VERSION,"0.7.5") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) -- cgit v1.2.3 From 5b28c8040795b53a4df54f33e57976720558ed32 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 1 Aug 2007 19:51:20 -0300 Subject: * Applied patch from Aurelien Jarno to fix wrong directory downloading on non-linux architectures (closes: #435597) --- configure.in | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index c33451390..0294b9ae7 100644 --- a/configure.in +++ b/configure.in @@ -80,20 +80,13 @@ dnl Converts the ARCH to be something singular for this general CPU family dnl This is often the dpkg architecture string. dnl First check against the full canonical canoncial-system-type in $target dnl and if that fails, just look for the cpu -AC_MSG_CHECKING(system architecture) +AC_MSG_CHECKING(debian architecture) archset="`dpkg-architecture -qDEB_HOST_ARCH`" if test "x$archset" = "x"; then AC_MSG_ERROR([failed: use --host= or output from dpkg-architecture]) fi AC_MSG_RESULT($archset) -AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset") - -dnl Get a common name for the host OS - this is primarily only for HURD and is -dnl non fatal if it fails -AC_MSG_CHECKING(system OS) -osset="`dpkg-architecture -qDEB_HOST_ARCH_OS`" -AC_MSG_RESULT($osset) -AC_DEFINE_UNQUOTED(COMMON_OS,"$osset") +AC_DEFINE_UNQUOTED(COMMON_ARCH,"$archset") dnl We use C99 types if at all possible AC_CACHE_CHECK([for C99 integer types],c9x_ints,[ -- cgit v1.2.3 From 36fc5dca8b8eaa38a4ebd3ec52b462df44dd1b82 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Wed, 19 Sep 2007 21:54:03 +0200 Subject: Thai translation added --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 95b4e6726..de2d698b6 100644 --- a/configure.in +++ b/configure.in @@ -196,7 +196,7 @@ ah_GCC3DEP dnl It used to be that the user could select translations and that could get dnl passed to the makefiles, but now that can only work if you use special dnl gettext approved makefiles, so this feature is unsupported by this. -ALL_LINGUAS="bg bs ca cs cy da de dz el en_GB es eu fi fr gl hu it ja ko ku nb nl nn pl pt_BR pt ro ru sk sl sv tl uk vi zn_CN zh_TW" +ALL_LINGUAS="bg bs ca cs cy da de dz el en_GB es eu fi fr gl hu it ja ko ku nb nl nn pl pt_BR pt ro ru sk sl sv th tl uk vi zn_CN zh_TW" AM_GNU_GETTEXT(external) if test x"$USE_NLS" = "xyes"; then AC_DEFINE(USE_NLS) -- cgit v1.2.3