diff --git a/external/dinglibs.m4 b/external/dinglibs.m4
index d7a478b29..5836e9947 100644
--- a/external/dinglibs.m4
+++ b/external/dinglibs.m4
@@ -129,7 +129,7 @@ AC_DEFUN([WITH_LIBINI_CONFIG],
         return ret;
     }
     ]])]
-    ,, [AC_MSG_ERROR(["ini_config library must support extended INI_MS_DETECT. See: https://pagure.io/SSSD/ding-libs/pull-request/3172"])])
+    ,, [AC_MSG_ERROR(["ini_config library must support extended INI_MS_DETECT."])], AC_MSG_WARN(["Cross Compiling. Make sure your ini_config library supports extended INI_MS_DETECT"]))
 
     have_libini_config=yes
   ], [
diff --git a/external/docbook.m4 b/external/docbook.m4
index cae89feb1..b5c128a93 100644
--- a/external/docbook.m4
+++ b/external/docbook.m4
@@ -23,7 +23,7 @@ dnl Checks if the XML catalog given by FILE exists and
 dnl if a particular URI appears in the XML catalog
 AC_DEFUN([CHECK_STYLESHEET],
 [
-  AC_CHECK_FILE($1, [], [AC_MSG_ERROR([could not find XML catalog])])
+  if ! test -e $1; then AC_MSG_ERROR([could not find XML catalog]); fi
 
   AC_MSG_CHECKING([for ifelse([$3],,[$2],[$3]) in XML catalog])
   if AC_RUN_LOG([$XMLCATALOG --noout "$1" "$2" >&2]); then