diff --git a/configure.ac b/configure.ac
index d7ea2faa..5bafb0b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,28 +3,35 @@
 
 AC_PREREQ([2.50])
 AC_INIT([shairport-sync], [2.1], [mikebrady@eircom.net])
+AC_CANONICAL_TARGET([])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([shairport.c])
 AC_CONFIG_HEADERS([config.h])
 
+#The following would print linux or darwin
+#echo "Target OS: ${target_os%%[[[:digit:]]]*}"
+
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_INSTALL
 
 # Checks for libraries.
-AC_CHECK_LIB([rt],[clock_gettime], , AC_MSG_ERROR(librt needed))
+if test "x${target_os%-gnu}" = xlinux; then
+ AC_CHECK_LIB([rt],[clock_gettime], , AC_MSG_ERROR(librt needed))
+fi
+
 AC_CHECK_LIB([daemon],[daemon_log], , AC_MSG_ERROR(libdaemon needed))
 AC_CHECK_LIB([pthread],[pthread_create], , AC_MSG_ERROR(pthread library needed))
 AC_CHECK_LIB([m],[exp], , AC_MSG_ERROR(maths library needed))
 AC_CHECK_LIB([popt],[poptGetContext], , AC_MSG_ERROR(libpopt needed))
 
 # Look for polarssl flag
-AC_ARG_WITH(polarssl, [  --with-polarssl = choose polarssl for encryption services (choose this or openssl)], [
+AC_ARG_WITH(polarssl, [  --with-polarssl = choose polarssl for encryption services (choose this or --with-openssl)], [
   AC_MSG_RESULT(>>Including polarssl)
   AC_CHECK_LIB([polarssl],[ssl_init], , AC_MSG_ERROR(PolarSSL selected but the library cannot be found!))], )
 
 # Look for openssl flag
-AC_ARG_WITH(openssl, [  --with-openssl = choose openssl for encryption services (choose this or polarssl)], [
+AC_ARG_WITH(openssl, [  --with-openssl = choose openssl for encryption services (choose this or --with-polarssl)], [
   AC_MSG_RESULT(>>Including openssl and libcrypto)
   AC_CHECK_LIB([crypto], [MD5_Init], , AC_MSG_ERROR(libcrypto selected, but the library cannot be found!))
   AC_CHECK_LIB([ssl],[SSL_library_init], , AC_MSG_ERROR(openssl selected but the library cannot be found!))], )