--- /home/patrice/src/cvs/Dillo/dillo/configure.in	Mon Feb 17 12:53:45 2003
+++ dillo/configure.in	Wed Feb 19 18:20:14 2003
@@ -1,6 +1,10 @@
 dnl Process this file with aclocal, autoconf and automake.
 
 AC_INIT(src/dillo.c)
+
+dnl Detect the canonical host and target build environment
+AC_CANONICAL_SYSTEM
+
 AM_INIT_AUTOMAKE(dillo, 0.7.0)
 AM_CONFIG_HEADER(config.h)
 
@@ -77,13 +81,12 @@
 
 dnl Test for POSIX threads
 
-system=`uname -s`
-case $system in
-  Linux|SunOS)
+case $target in
+  *-*-linux*|*-*-solaris*)
     AC_CHECK_LIB(pthread, pthread_create)
     ;;
 
-  OSF1)
+  *-*-osf1*)
     AC_MSG_CHECKING(whether pthreads work)
     LDFLAGS="$LDFLAGS -lpthread -lexc -ldb"
     AC_MSG_WARN(*** _Untested pthreads_ try setting LDFLAGS manually if it doesn't work ***)
@@ -113,8 +116,8 @@
 esac
 
 dnl Workaround for nanosleep and solaris
-case $system in
-  SunOS)
+case $target in
+  *-*-solaris*)
     LDFLAGS="$LDFLAGS -lrt"
   ;;
 esac