From c6ce7f2def3e9fa4e649522b8ba9f44ef8f61ada Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Wed, 13 Jan 2021 09:11:04 +0100
Subject: [PATCH] s3:utils: Fix header and deps of mvxattr

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
---
 source3/utils/mvxattr.c     | 2 +-
 source3/utils/wscript_build | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/source3/utils/mvxattr.c b/source3/utils/mvxattr.c
index d15025b800f..7fad10bc60f 100644
--- a/source3/utils/mvxattr.c
+++ b/source3/utils/mvxattr.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "popt_common.h"
+#include <popt.h>
 #include <ftw.h>
 
 static struct rename_xattr_state {
diff --git a/source3/utils/wscript_build b/source3/utils/wscript_build
index 9859ecdf7ea..a541163141d 100644
--- a/source3/utils/wscript_build
+++ b/source3/utils/wscript_build
@@ -279,7 +279,8 @@ bld.SAMBA3_BINARY('mvxattr',
                  source='mvxattr.c',
                  deps='''
                  talloc
-                 popt_samba3
+                 popt
+                 samba-util
                  ''',
                  enabled=bld.env.build_mvxattr)
 
-- 
2.47.2