diff --git a/configure.ac b/configure.ac
index bea2bd98a22e..d6c1ac9fa3fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11542,7 +11542,12 @@ if test "$_os" = "SunOS" -o "$_os" = "Darwin"; then
     if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
         AC_MSG_RESULT([yes])
     else
-        AC_MSG_ERROR([no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it])
+        if $GNUPATCH --version | grep "2\.0-.*-Apple" >/dev/null 2>/dev/null; then
+            AC_MSG_RESULT([no, but accepted (Apple patch)])
+            add_warning "patch utility is not GNU patch. Apple's patch should work OK, but it might experience issues where GNU patch doesn't."
+        else
+            AC_MSG_ERROR([no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it])
+        fi
     fi
 else
     GNUPATCH=$PATCH
diff --git a/external/cppunit/enable-win32-debug.patch b/external/cppunit/enable-win32-debug.patch
index dc159ecc51ad..2c7f4f956d2f 100644
--- a/external/cppunit/enable-win32-debug.patch
+++ b/external/cppunit/enable-win32-debug.patch
@@ -1,6 +1,6 @@
 --- misc/cppunit-1.14.0/src/cppunit/cppunit_dll.vcxproj
 +++ misc/build/cppunit-1.14.0/src/cppunit/cppunit_dll.vcxproj
-@@ -107,7 +107,6 @@
+@@ -190,7 +190,6 @@
        <SuppressStartupBanner>true</SuppressStartupBanner>
        <WarningLevel>Level3</WarningLevel>
        <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -8,7 +8,7 @@
        <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CPPUNIT_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <AssemblerListingLocation>.\ReleaseDll\</AssemblerListingLocation>
-@@ -138,6 +137,7 @@
+@@ -222,6 +221,7 @@
      <Link>
        <SuppressStartupBanner>true</SuppressStartupBanner>
        <LinkDLL>true</LinkDLL>