--- configure.ac.orig	2013-11-17 16:45:29.000000000 -0600
+++ configure.ac	2013-11-17 16:47:06.000000000 -0600
@@ -65,17 +65,6 @@
 esac
 
 if test x"${mingw}" == "xno" ; then
-  # Bring additional directories where things might be found into our
-  # search path. I don't know why autoconf doesn't do this by default
-  for spfx in /usr/local /opt/local /sw /usr/local/ssl /usr/boost/include ; do
-    AC_MSG_NOTICE([checking ${spfx}/include])
-    if test -d ${spfx}/include; then
-        CPPFLAGS="-I${spfx}/include $CPPFLAGS"
-        LDFLAGS="-L${spfx}/lib $LDFLAGS"
-        AC_MSG_NOTICE([ *** ADDING ${spfx}/include to CPPFLAGS *** ])
-        AC_MSG_NOTICE([ *** ADDING ${spfx}/lib to LDFLAGS *** ])
-    fi
-  done
   AC_MSG_NOTICE([ CPPFLAGS = ${CPPFLAGS} ])        
   AC_MSG_NOTICE([ LDFLAGS = ${LDFLAGS} ])        
 fi
@@ -149,7 +138,7 @@
     -Woverloaded-virtual -Wsign-promo \
     -funit-at-a-time"
 
-if test x$CXX != "xclang++" && `uname -s` != 'Darwin' ; then
+if test "x$CXX" != "xclang++" -a "`uname -s`" != "Darwin" ; then
   # -Wstrict-null-sentinel is not supported under clang or under Darwin's gcc
   WARNINGS_TO_TEST="$WARNINGS_TO_TEST -Wstrict-null-sentinel"
 fi