Use popt.h rather than samba/popt.h, which is going away.

diff --git a/doc/examples/multiple_notif.c b/doc/examples/multiple_notif.c
index ad7233dbce45eefad379cf5495425762c5cbe305..58189fbd892a3e181ba0ac44ee524b2f69b8ce29 100644 (file)
--- a/doc/examples/multiple_notif.c
+++ b/doc/examples/multiple_notif.c
@@ -39,7 +39,7 @@
 
 #include <libmapi/libmapi.h>
 #include <pthread.h> 
-#include <samba/popt.h>
+#include <popt.h>
 
 #define        DEFAULT_PROFDB  "%s/.openchange/profiles.ldb"
 

diff --git a/mapiproxy/libmapistore/tests/mapistore_test.c b/mapiproxy/libmapistore/tests/mapistore_test.c
index fc63b8d05f631c8b5f1fd25a2d9346f0d6ef6c71..46306b89734bfde4b39faa0e9161fbef1ed79d18 100644 (file)
--- a/mapiproxy/libmapistore/tests/mapistore_test.c
+++ b/mapiproxy/libmapistore/tests/mapistore_test.c
@@ -23,7 +23,7 @@
 #include "mapiproxy/libmapistore/mapistore_errors.h"
 #include <talloc.h>
 #include <core/ntstatus.h>
-#include <samba/popt.h>
+#include <popt.h>
 #include <param.h>
 #include <util/debug.h>
 

diff --git a/testprogs/check_fasttransfer.c b/testprogs/check_fasttransfer.c
index 309f0abeacb6eaf56c5b2212027400b236f2e10f..e0855139847bea4f7eb5b5208c6f8eb9e497704e 100644 (file)
--- a/testprogs/check_fasttransfer.c
+++ b/testprogs/check_fasttransfer.c
@@ -23,7 +23,7 @@
 #include "mapiproxy/libmapistore/mapistore.h"
 #include "mapiproxy/libmapistore/mapistore_errors.h"
 
-#include <samba/popt.h>
+#include <popt.h>
 #include <ldb.h>
 #include <talloc.h>
 #include <inttypes.h>

diff --git a/testprogs/test_asyncnotif.c b/testprogs/test_asyncnotif.c
index be529b62c1b0ffa85c50e025f3de97c6108b061a..723654aa2464b45fed32d931e5e7f4ed4db3e96c 100644 (file)
--- a/testprogs/test_asyncnotif.c
+++ b/testprogs/test_asyncnotif.c
@@ -21,7 +21,7 @@
 
 #include "libmapi/libmapi.h"
 
-#include <samba/popt.h>
+#include <popt.h>
 #include <talloc.h>
 
 static void popt_openchange_version_callback(poptContext con,

diff --git a/utils/backup/openchangemapidump.c b/utils/backup/openchangemapidump.c
index d7ae4e273545ebb8f6f151bafc90626e9676b753..e3fb19cce82d446df64004837930c1dce7b00041 100644 (file)
--- a/utils/backup/openchangemapidump.c
+++ b/utils/backup/openchangemapidump.c
@@ -21,7 +21,7 @@
 */
 
 #include "libmapi/libmapi.h"
-#include <samba/popt.h>
+#include <popt.h>
 #include <param.h>
 
 #include "openchangebackup.h"

diff --git a/utils/exchange2mbox.c b/utils/exchange2mbox.c
index b3c9b00fa9b652083e5e5c9cf83fe88067c55800..0b38b728543321c2a0678cdbaddd3ef311f4e745 100644 (file)
--- a/utils/exchange2mbox.c
+++ b/utils/exchange2mbox.c
@@ -20,7 +20,7 @@
 */
 
 #include "libmapi/libmapi.h"
-#include <samba/popt.h>
+#include <popt.h>
 #include <ldb.h>
 
 #include <sys/types.h>

diff --git a/utils/mapiprofile.c b/utils/mapiprofile.c
index b3331ebd7f6c067b9b54af16f4597e9d428c596c..5c2f5fb45213a2fc6ab8ee41e7e33ff301746e5e 100644 (file)
--- a/utils/mapiprofile.c
+++ b/utils/mapiprofile.c
@@ -20,7 +20,7 @@
 */
 
 #include "libmapi/libmapi.h"
-#include <samba/popt.h>
+#include <popt.h>
 #include <param.h>
 #include "openchange-tools.h"
 

diff --git a/utils/mapitest/mapitest.c b/utils/mapitest/mapitest.c
index 3c5f58b57fd5a1bc9305c6829ea84142d3990c5a..518b1e3a7fbb2d2b935b3911725edddf5a99be95 100644 (file)
--- a/utils/mapitest/mapitest.c
+++ b/utils/mapitest/mapitest.c
@@ -22,7 +22,7 @@
 #include "utils/mapitest/mapitest.h"
 #include "utils/openchange-tools.h"
 
-#include <samba/popt.h>
+#include <popt.h>
 #include <param.h>
 
 #include "config.h"

diff --git a/utils/openchangeclient.c b/utils/openchangeclient.c
index 0f23d99e7e98f408f9669575965c3191a11ad575..ba2402ceeac023bf078fb58d2768e215014711d1 100644 (file)
--- a/utils/openchangeclient.c
+++ b/utils/openchangeclient.c
@@ -23,7 +23,7 @@
 #include "libmapi/libmapi_private.h"
 #include "libmapi/mapi_nameid.h"
 #include "libocpf/ocpf.h"
-#include <samba/popt.h>
+#include <popt.h>
 #include <param.h>
 
 #include "openchangeclient.h"

diff --git a/utils/openchangepfadmin.c b/utils/openchangepfadmin.c
index 35015e6a9fc5126cb442cfba3671737141866e75..cab093a4ab9b0ccb4f34976f6924c7da1501fff9 100644 (file)
--- a/utils/openchangepfadmin.c
+++ b/utils/openchangepfadmin.c
@@ -21,7 +21,7 @@
 
 #include "libmapi/libmapi.h"
 #include "libmapiadmin/libmapiadmin.h"
-#include <samba/popt.h>
+#include <popt.h>
 #include <param.h>
 
 #include "openchangepfadmin.h"