diff --git a/configure.in b/configure.in
index 9f29f60..c6fd388 100644
--- a/configure.in
+++ b/configure.in
@@ -585,7 +585,7 @@ AC_DEFUN([XB_FIND_SONAME],
       sed -e 's/ \+SONAME \+//'; done 2> /dev/null )
   if [[ -z "$$1_SONAME" ]]; then
     AC_MSG_RESULT([no])
-    AC_MSG_ERROR([Unable to determine soname of lib$2 library])
+    m4_default([$3], [AC_MSG_ERROR([Unable to determine soname of lib$2 library])])
   else
     AC_MSG_RESULT([$$1_SONAME])
     AC_SUBST($1_SONAME)
@@ -899,6 +899,12 @@ if test "x$use_crystalhd" != "xno"; then
       fi],
     [#define __LINUX_USER__])
     # check for new crystalhd lib
+    if test "x$use_crystalhd" != "xno" && test "$host_vendor" != "apple"; then
+      XB_FIND_SONAME([CRYSTALHD], [crystalhd], [
+        AC_MSG_RESULT($crystalhd_not_found)
+        use_crystalhd=no
+      ])
+    fi
     if test "x$use_crystalhd" != "xno"; then
       SAVE_CFLAGS="$CFLAGS"
       CFLAGS="-llibcrystalhd"
@@ -910,9 +916,6 @@ if test "x$use_crystalhd" != "xno"; then
         [ AC_DEFINE([HAVE_LIBCRYSTALHD], [2], [Define to 2 if you have the 'New Broadcom Crystal HD' library.]) ], 
         [ AC_DEFINE([HAVE_LIBCRYSTALHD], [1], [Define to 1 if you have the 'Old Broadcom Crystal HD' library.]) ])
       CFLAGS="$SAVE_CFLAGS"
-      if test "$host_vendor" != "apple"; then
-        XB_FIND_SONAME([CRYSTALHD], [crystalhd])
-      fi
     fi
 else
   AC_MSG_NOTICE($crystalhd_disabled)