diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2007-07-26 10:43:07 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2007-07-26 10:43:07 +0200 |
| commit | 94bdf40722a406f66383261d36e500213b0c2c38 (patch) | |
| tree | 22739e87f31bbad88214853c5f0e45040403ec25 /configure.in | |
| parent | f0efdda074effd4b8d668c1adfd6ddc4be698ae9 (diff) | |
| parent | dfd1a56e88c068f0085140630306901d01ed0f98 (diff) | |
* merged from apt--mvo
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/configure.in b/configure.in index e800913b6..609cedea4 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") |