configure: Use --with/--without for libraries

5 files changed, 25 insertions, 25 deletions

diff --git a/src/bftw.c b/src/bftw.c
index 5322181..c80ac74 100644
--- a/src/bftw.c
+++ b/src/bftw.c
@@ -913,7 +913,7 @@ static int bftw_state_init(struct bftw_state *state, const struct bftw_args *arg
 	size_t qdepth = 4096;
 	size_t nthreads = args->nthreads;
 
-#if BFS_USE_LIBURING
+#if BFS_WITH_LIBURING
 	// io_uring uses one fd per ring, ioq uses one ring per thread
 	if (nthreads >= nopenfd - 1) {
 		nthreads = nopenfd - 2;
diff --git a/src/fsade.h b/src/fsade.h
index eefef9f..4465017 100644
--- a/src/fsade.h
+++ b/src/fsade.h
@@ -13,9 +13,9 @@
 
 #define BFS_CAN_CHECK_ACL (BFS_HAS_ACL_GET_FILE || BFS_HAS_ACL_TRIVIAL)
 
-#define BFS_CAN_CHECK_CAPABILITIES BFS_USE_LIBCAP
+#define BFS_CAN_CHECK_CAPABILITIES BFS_WITH_LIBCAP
 
-#define BFS_CAN_CHECK_CONTEXT BFS_USE_LIBSELINUX
+#define BFS_CAN_CHECK_CONTEXT BFS_WITH_LIBSELINUX
 
 #define BFS_CAN_CHECK_XATTRS (BFS_USE_SYS_EXTATTR_H || BFS_USE_SYS_XATTR_H)
 
diff --git a/src/ioq.c b/src/ioq.c
index 43a1b35..4057a5e 100644
--- a/src/ioq.c
+++ b/src/ioq.c
@@ -135,7 +135,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 
-#if BFS_USE_LIBURING
+#if BFS_WITH_LIBURING
 #  include <liburing.h>
 #endif
 
@@ -459,7 +459,7 @@ static void ioq_batch_push(struct ioqq *ioqq, struct ioq_batch *batch, struct io
 /** Sentinel stop command. */
 static struct ioq_ent IOQ_STOP;
 
-#if BFS_USE_LIBURING
+#if BFS_WITH_LIBURING
 /**
  * Supported io_uring operations.
  */
@@ -477,7 +477,7 @@ struct ioq_thread {
 	/** Pointer back to the I/O queue. */
 	struct ioq *parent;
 
-#if BFS_USE_LIBURING
+#if BFS_WITH_LIBURING
 	/** io_uring instance. */
 	struct io_uring ring;
 	/** Any error that occurred initializing the ring. */
@@ -497,7 +497,7 @@ struct ioq {
 
 	/** ioq_ent arena. */
 	struct arena ents;
-#if BFS_USE_LIBURING && BFS_USE_STATX
+#if BFS_WITH_LIBURING && BFS_USE_STATX
 	/** struct statx arena. */
 	struct arena xbufs;
 #endif
@@ -559,7 +559,7 @@ static void ioq_dispatch_sync(struct ioq *ioq, struct ioq_ent *ent) {
 	ent->result = -ENOSYS;
 }
 
-#if BFS_USE_LIBURING
+#if BFS_WITH_LIBURING
 
 /** io_uring worker state. */
 struct ioq_ring_state {
@@ -775,7 +775,7 @@ static void ioq_ring_work(struct ioq_thread *thread) {
 	}
 }
 
-#endif // BFS_USE_LIBURING
+#endif // BFS_WITH_LIBURING
 
 /** Synchronous syscall loop. */
 static void ioq_sync_work(struct ioq_thread *thread) {
@@ -811,7 +811,7 @@ static void ioq_sync_work(struct ioq_thread *thread) {
 static void *ioq_work(void *ptr) {
 	struct ioq_thread *thread = ptr;
 
-#if BFS_USE_LIBURING
+#if BFS_WITH_LIBURING
 	if (thread->ring_err == 0) {
 		ioq_ring_work(thread);
 		return NULL;
@@ -824,7 +824,7 @@ static void *ioq_work(void *ptr) {
 
 /** Initialize io_uring thread state. */
 static int ioq_ring_init(struct ioq *ioq, struct ioq_thread *thread) {
-#if BFS_USE_LIBURING
+#if BFS_WITH_LIBURING
 	struct ioq_thread *prev = NULL;
 	if (thread > ioq->threads) {
 		prev = thread - 1;
@@ -890,7 +890,7 @@ static int ioq_ring_init(struct ioq *ioq, struct ioq_thread *thread) {
 
 /** Destroy an io_uring. */
 static void ioq_ring_exit(struct ioq_thread *thread) {
-#if BFS_USE_LIBURING
+#if BFS_WITH_LIBURING
 	if (thread->ring_err == 0) {
 		io_uring_queue_exit(&thread->ring);
 	}
@@ -926,7 +926,7 @@ struct ioq *ioq_create(size_t depth, size_t nthreads) {
 	ioq->depth = depth;
 
 	ARENA_INIT(&ioq->ents, struct ioq_ent);
-#if BFS_USE_LIBURING && BFS_USE_STATX
+#if BFS_WITH_LIBURING && BFS_USE_STATX
 	ARENA_INIT(&ioq->xbufs, struct statx);
 #endif
 
@@ -1036,7 +1036,7 @@ int ioq_stat(struct ioq *ioq, int dfd, const char *path, enum bfs_stat_flags fla
 	args->flags = flags;
 	args->buf = buf;
 
-#if BFS_USE_LIBURING && BFS_USE_STATX
+#if BFS_WITH_LIBURING && BFS_USE_STATX
 	args->xbuf = arena_alloc(&ioq->xbufs);
 	if (!args->xbuf) {
 		ioq_free(ioq, ent);
@@ -1060,7 +1060,7 @@ void ioq_free(struct ioq *ioq, struct ioq_ent *ent) {
 	bfs_assert(ioq->size > 0);
 	--ioq->size;
 
-#if BFS_USE_LIBURING && BFS_USE_STATX
+#if BFS_WITH_LIBURING && BFS_USE_STATX
 	if (ent->op == IOQ_STAT && ent->stat.xbuf) {
 		arena_free(&ioq->xbufs, ent->stat.xbuf);
 	}
@@ -1091,7 +1091,7 @@ void ioq_destroy(struct ioq *ioq) {
 	ioqq_destroy(ioq->ready);
 	ioqq_destroy(ioq->pending);
 
-#if BFS_USE_LIBURING && BFS_USE_STATX
+#if BFS_WITH_LIBURING && BFS_USE_STATX
 	arena_destroy(&ioq->xbufs);
 #endif
 	arena_destroy(&ioq->ents);
diff --git a/src/parse.c b/src/parse.c
index 5dd85de..539aa05 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -2258,7 +2258,7 @@ static struct bfs_expr *parse_regextype(struct bfs_parser *parser, int arg1, int
 		parser->regex_type = BFS_REGEX_POSIX_BASIC;
 	} else if (strcmp(type, "posix-extended") == 0) {
 		parser->regex_type = BFS_REGEX_POSIX_EXTENDED;
-#if BFS_USE_ONIGURUMA
+#if BFS_WITH_ONIGURUMA
 	} else if (strcmp(type, "emacs") == 0) {
 		parser->regex_type = BFS_REGEX_EMACS;
 	} else if (strcmp(type, "grep") == 0) {
@@ -2280,7 +2280,7 @@ list_types:
 	cfprintf(cfile, "  ${bld}posix-basic${rs}:    POSIX basic regular expressions (BRE)\n");
 	cfprintf(cfile, "  ${bld}posix-extended${rs}: POSIX extended regular expressions (ERE)\n");
 	cfprintf(cfile, "  ${bld}ed${rs}:             Like ${grn}ed${rs} (same as ${bld}posix-basic${rs})\n");
-#if BFS_USE_ONIGURUMA
+#if BFS_WITH_ONIGURUMA
 	cfprintf(cfile, "  ${bld}emacs${rs}:          Like ${grn}emacs${rs}\n");
 	cfprintf(cfile, "  ${bld}grep${rs}:           Like ${grn}grep${rs}\n");
 #endif
diff --git a/src/xregex.c b/src/xregex.c
index c2711bc..484f099 100644
--- a/src/xregex.c
+++ b/src/xregex.c
@@ -13,7 +13,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if BFS_USE_ONIGURUMA
+#if BFS_WITH_ONIGURUMA
 #  include <langinfo.h>
 #  include <oniguruma.h>
 #else
@@ -21,7 +21,7 @@
 #endif
 
 struct bfs_regex {
-#if BFS_USE_ONIGURUMA
+#if BFS_WITH_ONIGURUMA
 	unsigned char *pattern;
 	OnigRegex impl;
 	int err;
@@ -32,7 +32,7 @@ struct bfs_regex {
 #endif
 };
 
-#if BFS_USE_ONIGURUMA
+#if BFS_WITH_ONIGURUMA
 
 static int bfs_onig_status;
 static OnigEncoding bfs_onig_enc;
@@ -121,7 +121,7 @@ int bfs_regcomp(struct bfs_regex **preg, const char *pattern, enum bfs_regex_typ
 		return -1;
 	}
 
-#if BFS_USE_ONIGURUMA
+#if BFS_WITH_ONIGURUMA
 	// onig_error_code_to_str() says
 	//
 	//     don't call this after the pattern argument of onig_new() is freed
@@ -204,7 +204,7 @@ fail:
 int bfs_regexec(struct bfs_regex *regex, const char *str, enum bfs_regexec_flags flags) {
 	size_t len = strlen(str);
 
-#if BFS_USE_ONIGURUMA
+#if BFS_WITH_ONIGURUMA
 	const unsigned char *ustr = (const unsigned char *)str;
 	const unsigned char *end = ustr + len;
 
@@ -263,7 +263,7 @@ int bfs_regexec(struct bfs_regex *regex, const char *str, enum bfs_regexec_flags
 
 void bfs_regfree(struct bfs_regex *regex) {
 	if (regex) {
-#if BFS_USE_ONIGURUMA
+#if BFS_WITH_ONIGURUMA
 		onig_free(regex->impl);
 		free(regex->pattern);
 #else
@@ -278,7 +278,7 @@ char *bfs_regerror(const struct bfs_regex *regex) {
 		return strdup(xstrerror(ENOMEM));
 	}
 
-#if BFS_USE_ONIGURUMA
+#if BFS_WITH_ONIGURUMA
 	unsigned char *str = malloc(ONIG_MAX_ERROR_MESSAGE_LEN);
 	if (str) {
 		onig_error_code_to_str(str, regex->err, &regex->einfo);