Index: configure.ac
===================================================================
--- configure.ac	(Revision 4315)
+++ configure.ac	(Arbeitskopie)
@@ -10,6 +10,8 @@
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_LIBOBJ_DIR([.])
 
+AC_CANONICAL_TARGET
+
 dnl we may need a newer automake version - the oldest tested is 1.7
 AC_PREREQ(2.59)
 AM_INIT_AUTOMAKE(1.5 foreign no-installinfo)
@@ -52,31 +54,33 @@
 AC_PROG_MAKE_SET
 AC_PROG_YACC
 
+# Check for OS special cases
+case $target_os in
+darwin*)
+    AC_MSG_NOTICE(found Darwin - Adding -DBIND_8_COMPAT to CFLAGS)
+    CPFLAGS="-DBIND_8_COMPAT"
+    ;;
+# Check for FreeBSD special case: more libs needed
+freebsd*)
+    AC_MSG_NOTICE(found FreeBSD - Adding -lmd -lkvm -lcom_err to standard libraries)
+    LIBS="$LIBS -lmd -lkvm -lcom_err"
+    ;;
 # Check for LynxOS special case: -lbsd needed (at least on 2.3.0) and -s
 # not working.
-if test `uname` = "LynxOS" 
-then
-  echo "Adding -lbsd to standard libraries"
-  LIBS="$LIBS -lbsd"
-  LDFLAGS=""
-  echo "Prepending standard include path to gcc flags"
-  CPFLAGS="-I/usr/include"
-fi
+lynxos*)
+    AC_MSG_NOTICE(found LynxOS - Adding -lbsd to standard libraries)
+    LIBS="$LIBS -lbsd"
+    LDFLAGS=`echo $LDFLAGS | sed "s/-s //"`
+    AC_MSG_NOTICE(found LynxOS - Prepending standard include path to gcc flags)
+    CPFLAGS="-I/usr/include"
+    ;;
+# Check for Rhapsody special case: it doesn't like -s
+rhapsody*)
+    AC_MSG_NOTICE(found Rhapsody - Removing -s load flag)
+    LDFLAGS=`echo $LDFLAGS | sed "s/-s //"`
+    ;;
+esac
 
-# Check for FreeBSD special case: more libs needed
-if test `uname` = "FreeBSD" 
-then
-   echo "Adding -lmd -lkvm -lcom_err to standard libraries"
-   LIBS="$LIBS -lmd -lkvm -lcom_err"
-fi
- 
-# Check for Rhapsody special case: it doesn't like -s
-if test `uname` = "Rhapsody" 
-then
-   echo "Removing -s load flag"
-   LDFLAGS=`echo $LDFLAGS | sed "s/-s //"`
-fi
- 
 dnl i18n
 AM_GNU_GETTEXT([external], [need-ngettext])
 AM_GNU_GETTEXT_VERSION(0.14.1)