From d82b9ae4105581398013975782efe16a874b2eb4 Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Thu, 6 Jun 2013 21:58:02 +0200 Subject: [PATCH] build: Fix tdb.h path to enable building with system TDB library (This used to be ctdb commit f8bf99de3a5f56be67aaa67ed836458b1cf73e86) --- ctdb/client/ctdb_client.c | 2 +- ctdb/common/ctdb_io.c | 2 +- ctdb/common/ctdb_logging.c | 2 +- ctdb/common/ctdb_ltdb.c | 2 +- ctdb/common/ctdb_message.c | 2 +- ctdb/common/ctdb_util.c | 2 +- ctdb/lib/util/db_wrap.c | 2 +- ctdb/server/ctdb_banning.c | 2 +- ctdb/server/ctdb_call.c | 2 +- ctdb/server/ctdb_control.c | 2 +- ctdb/server/ctdb_daemon.c | 2 +- ctdb/server/ctdb_freeze.c | 2 +- ctdb/server/ctdb_ltdb_server.c | 2 +- ctdb/server/ctdb_persistent.c | 2 +- ctdb/server/ctdb_recover.c | 2 +- ctdb/server/ctdb_server.c | 2 +- ctdb/server/ctdb_takeover.c | 2 +- ctdb/server/ctdb_traverse.c | 2 +- ctdb/server/ctdb_update_record.c | 2 +- ctdb/server/ctdb_vacuum.c | 2 +- ctdb/tcp/tcp_connect.c | 2 +- ctdb/tcp/tcp_init.c | 2 +- ctdb/tcp/tcp_io.c | 2 +- ctdb/tests/src/ctdbd_test.c | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c index 334d830707d..51ca49b7cdd 100644 --- a/ctdb/client/ctdb_client.c +++ b/ctdb/client/ctdb_client.c @@ -20,7 +20,7 @@ #include "includes.h" #include "db_wrap.h" -#include "lib/tdb/include/tdb.h" +#include "tdb.h" #include "lib/util/dlinklist.h" #include "system/network.h" #include "system/filesys.h" diff --git a/ctdb/common/ctdb_io.c b/ctdb/common/ctdb_io.c index 4e592b97867..aee8864c179 100644 --- a/ctdb/common/ctdb_io.c +++ b/ctdb/common/ctdb_io.c @@ -21,7 +21,7 @@ */ #include "includes.h" -#include "lib/tdb/include/tdb.h" +#include "tdb.h" #include "lib/util/dlinklist.h" #include "system/network.h" #include "system/filesys.h" diff --git a/ctdb/common/ctdb_logging.c b/ctdb/common/ctdb_logging.c index 408fda8658d..9b69b383ecf 100644 --- a/ctdb/common/ctdb_logging.c +++ b/ctdb/common/ctdb_logging.c @@ -18,7 +18,7 @@ */ #include "includes.h" -#include "lib/tdb/include/tdb.h" +#include "tdb.h" #include "system/time.h" #include "../include/ctdb_private.h" #include "../include/ctdb_client.h" diff --git a/ctdb/common/ctdb_ltdb.c b/ctdb/common/ctdb_ltdb.c index dab88f36189..0bfc377ff7d 100644 --- a/ctdb/common/ctdb_ltdb.c +++ b/ctdb/common/ctdb_ltdb.c @@ -19,7 +19,7 @@ */ #include "includes.h" -#include "lib/tdb/include/tdb.h" +#include "tdb.h" #include "system/network.h" #include "system/filesys.h" #include "../include/ctdb_private.h" diff --git a/ctdb/common/ctdb_message.c b/ctdb/common/ctdb_message.c index b0d2ea0168f..0e19761da3d 100644 --- a/ctdb/common/ctdb_message.c +++ b/ctdb/common/ctdb_message.c @@ -22,7 +22,7 @@ protocol design and packet details */ #include "includes.h" -#include "lib/tdb/include/tdb.h" +#include "tdb.h" #include "system/network.h" #include "system/filesys.h" #include "../include/ctdb_private.h" diff --git a/ctdb/common/ctdb_util.c b/ctdb/common/ctdb_util.c index a910a0cd79c..d2bce36af2d 100644 --- a/ctdb/common/ctdb_util.c +++ b/ctdb/common/ctdb_util.c @@ -18,7 +18,7 @@ */ #include "includes.h" -#include "lib/tdb/include/tdb.h" +#include "tdb.h" #include "system/network.h" #include "system/filesys.h" #include "system/wait.h" diff --git a/ctdb/lib/util/db_wrap.c b/ctdb/lib/util/db_wrap.c index 7e7e17fac4d..07b066cbc28 100644 --- a/ctdb/lib/util/db_wrap.c +++ b/ctdb/lib/util/db_wrap.c @@ -28,7 +28,7 @@ #include "includes.h" #include "lib/util/dlinklist.h" -#include "lib/tdb/include/tdb.h" +#include "tdb.h" #include "db_wrap.h" static struct tdb_wrap *tdb_list; diff --git a/ctdb/server/ctdb_banning.c b/ctdb/server/ctdb_banning.c index 4e6db31ee16..bb3facc0131 100644 --- a/ctdb/server/ctdb_banning.c +++ b/ctdb/server/ctdb_banning.c @@ -17,7 +17,7 @@ along with this program; if not, see . */ #include "includes.h" -#include "lib/tdb/include/tdb.h" +#include "tdb.h" #include "system/time.h" #include "system/network.h" #include "system/filesys.h" diff --git a/ctdb/server/ctdb_call.c b/ctdb/server/ctdb_call.c index a98903dfe87..fe83bc158af 100644 --- a/ctdb/server/ctdb_call.c +++ b/ctdb/server/ctdb_call.c @@ -21,7 +21,7 @@ protocol design and packet details */ #include "includes.h" -#include "lib/tdb/include/tdb.h" +#include "tdb.h" #include "lib/util/dlinklist.h" #include "system/network.h" #include "system/filesys.h" diff --git a/ctdb/server/ctdb_control.c b/ctdb/server/ctdb_control.c index bf4a20d90ae..229ccddb08d 100644 --- a/ctdb/server/ctdb_control.c +++ b/ctdb/server/ctdb_control.c @@ -17,7 +17,7 @@ along with this program; if not, see . */ #include "includes.h" -#include "lib/tdb/include/tdb.h" +#include "tdb.h" #include "system/network.h" #include "system/filesys.h" #include "system/wait.h" diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c index cedee09a02f..29c26f6f830 100644 --- a/ctdb/server/ctdb_daemon.c +++ b/ctdb/server/ctdb_daemon.c @@ -19,7 +19,7 @@ #include "includes.h" #include "db_wrap.h" -#include "lib/tdb/include/tdb.h" +#include "tdb.h" #include "lib/util/dlinklist.h" #include "system/network.h" #include "system/filesys.h" diff --git a/ctdb/server/ctdb_freeze.c b/ctdb/server/ctdb_freeze.c index 88384f90a9f..e65415ca484 100644 --- a/ctdb/server/ctdb_freeze.c +++ b/ctdb/server/ctdb_freeze.c @@ -17,7 +17,7 @@ along with this program; if not, see . */ #include "includes.h" -#include "lib/tdb/include/tdb.h" +#include "tdb.h" #include "system/network.h" #include "system/filesys.h" #include "system/wait.h" diff --git a/ctdb/server/ctdb_ltdb_server.c b/ctdb/server/ctdb_ltdb_server.c index 0426d96bdbc..b5a27ded494 100644 --- a/ctdb/server/ctdb_ltdb_server.c +++ b/ctdb/server/ctdb_ltdb_server.c @@ -18,7 +18,7 @@ */ #include "includes.h" -#include "lib/tdb/include/tdb.h" +#include "tdb.h" #include "system/network.h" #include "system/filesys.h" #include "system/dir.h" diff --git a/ctdb/server/ctdb_persistent.c b/ctdb/server/ctdb_persistent.c index 2b3da32939e..dcbb6e0c5c3 100644 --- a/ctdb/server/ctdb_persistent.c +++ b/ctdb/server/ctdb_persistent.c @@ -22,7 +22,7 @@ #include "system/filesys.h" #include "system/wait.h" #include "db_wrap.h" -#include "lib/tdb/include/tdb.h" +#include "tdb.h" #include "../include/ctdb_private.h" struct ctdb_persistent_state { diff --git a/ctdb/server/ctdb_recover.c b/ctdb/server/ctdb_recover.c index d7741ab87e8..1c18acaed8f 100644 --- a/ctdb/server/ctdb_recover.c +++ b/ctdb/server/ctdb_recover.c @@ -18,7 +18,7 @@ along with this program; if not, see . */ #include "includes.h" -#include "lib/tdb/include/tdb.h" +#include "tdb.h" #include "system/time.h" #include "system/network.h" #include "system/filesys.h" diff --git a/ctdb/server/ctdb_server.c b/ctdb/server/ctdb_server.c index de3c6901d76..d0c34612973 100644 --- a/ctdb/server/ctdb_server.c +++ b/ctdb/server/ctdb_server.c @@ -18,7 +18,7 @@ */ #include "includes.h" -#include "lib/tdb/include/tdb.h" +#include "tdb.h" #include "lib/util/dlinklist.h" #include "system/network.h" #include "system/filesys.h" diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c index fda7c56018e..679177e09a2 100644 --- a/ctdb/server/ctdb_takeover.c +++ b/ctdb/server/ctdb_takeover.c @@ -19,7 +19,7 @@ along with this program; if not, see . */ #include "includes.h" -#include "lib/tdb/include/tdb.h" +#include "tdb.h" #include "lib/util/dlinklist.h" #include "system/network.h" #include "system/filesys.h" diff --git a/ctdb/server/ctdb_traverse.c b/ctdb/server/ctdb_traverse.c index d9aed2bfc8d..8d8a51776a1 100644 --- a/ctdb/server/ctdb_traverse.c +++ b/ctdb/server/ctdb_traverse.c @@ -21,7 +21,7 @@ #include "system/filesys.h" #include "system/wait.h" #include "db_wrap.h" -#include "lib/tdb/include/tdb.h" +#include "tdb.h" #include "../include/ctdb_private.h" #include "lib/util/dlinklist.h" diff --git a/ctdb/server/ctdb_update_record.c b/ctdb/server/ctdb_update_record.c index 1543b4687bf..ce8e8afe117 100644 --- a/ctdb/server/ctdb_update_record.c +++ b/ctdb/server/ctdb_update_record.c @@ -20,7 +20,7 @@ #include "includes.h" #include "db_wrap.h" -#include "lib/tdb/include/tdb.h" +#include "tdb.h" #include "ctdb_private.h" struct ctdb_persistent_write_state { diff --git a/ctdb/server/ctdb_vacuum.c b/ctdb/server/ctdb_vacuum.c index d7527d4da1a..1f2fb01e752 100644 --- a/ctdb/server/ctdb_vacuum.c +++ b/ctdb/server/ctdb_vacuum.c @@ -20,7 +20,7 @@ */ #include "includes.h" -#include "lib/tdb/include/tdb.h" +#include "tdb.h" #include "system/network.h" #include "system/filesys.h" #include "system/dir.h" diff --git a/ctdb/tcp/tcp_connect.c b/ctdb/tcp/tcp_connect.c index 93111f37aa3..e8cae58bd6f 100644 --- a/ctdb/tcp/tcp_connect.c +++ b/ctdb/tcp/tcp_connect.c @@ -19,7 +19,7 @@ */ #include "includes.h" -#include "lib/tdb/include/tdb.h" +#include "tdb.h" #include "system/network.h" #include "system/filesys.h" #include "../include/ctdb_private.h" diff --git a/ctdb/tcp/tcp_init.c b/ctdb/tcp/tcp_init.c index 3fec599ee5a..a65e7320f5e 100644 --- a/ctdb/tcp/tcp_init.c +++ b/ctdb/tcp/tcp_init.c @@ -18,7 +18,7 @@ */ #include "includes.h" -#include "lib/tdb/include/tdb.h" +#include "tdb.h" #include "system/network.h" #include "system/filesys.h" #include "../include/ctdb_private.h" diff --git a/ctdb/tcp/tcp_io.c b/ctdb/tcp/tcp_io.c index f8904af9b2d..5111195b178 100644 --- a/ctdb/tcp/tcp_io.c +++ b/ctdb/tcp/tcp_io.c @@ -19,7 +19,7 @@ #include "includes.h" #include "lib/util/dlinklist.h" -#include "lib/tdb/include/tdb.h" +#include "tdb.h" #include "system/network.h" #include "system/filesys.h" #include "../include/ctdb_private.h" diff --git a/ctdb/tests/src/ctdbd_test.c b/ctdb/tests/src/ctdbd_test.c index 6f045a3f7a2..bf95e0b84ff 100644 --- a/ctdb/tests/src/ctdbd_test.c +++ b/ctdb/tests/src/ctdbd_test.c @@ -21,7 +21,7 @@ #define _CTDBD_TEST_C #include "includes.h" -#include "lib/tdb/include/tdb.h" +#include "tdb.h" #include "ctdb_private.h" /* -- 2.11.4.GIT