diff --git a/configure b/configure
index 9931d53d463..ef010a831af 100755
--- a/configure
+++ b/configure
@@ -16460,6 +16460,17 @@ fi
 CPPFLAGS=$ac_save_CPPFLAGS
 
 fi
+if test "x$ac_cv_lib_soname_netapi" != xyes
+then :
+  case "x$with_netapi" in
+  x)   as_fn_append wine_notices "|libnetapi not found, Samba NetAPI won't be supported." ;;
+  xno) ;;
+  *)   as_fn_error $? "libnetapi not found, Samba NetAPI won't be supported.
+This is an error since --with-netapi was requested." "$LINENO" 5 ;;
+esac
+enable_netapi=${enable_netapi:-no}
+fi
+
 
 if test "x$enable_winealsa_drv$enable_winecoreaudio_drv$enable_winepulse_drv$enable_wineoss_drv$enable_wineandroid_drv" = xnonononono -a \
         "x$with_alsa$with_coreaudio$with_oss$with_pulse" != xnononono
diff --git a/configure.ac b/configure.ac
index 9cf059e1edc..e4c9c7edfef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1930,6 +1930,10 @@ then
     WINE_PACKAGE_FLAGS(NETAPI,[netapi],,,,
       [WINE_CHECK_SONAME(netapi,libnetapi_init,,[AC_DEFINE_UNQUOTED(SONAME_LIBNETAPI,["libnetapi.$LIBEXT"])],[$NETAPI_LIBS])])
 fi
+WINE_NOTICE_WITH(netapi,[test "x$ac_cv_lib_soname_netapi" != xyes],
+                 [libnetapi not found, Samba NetAPI won't be supported.],
+                 [enable_netapi])
+
 
 dnl **** Check for any sound system ****
 if test "x$enable_winealsa_drv$enable_winecoreaudio_drv$enable_winepulse_drv$enable_wineoss_drv$enable_wineandroid_drv" = xnonononono -a \