USE_LOG -> ENABLE_LOGGING, DEBUG -> ENABLE_DEBUG, USE_SELINUX -> WITH_SELINUX

5 files changed, 15 insertions, 17 deletions

diff --git a/configure.ac b/configure.ac
index e9c949647a..85ca34aec6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ libdir_name=$with_libdir_name
 AC_SUBST(libdir_name)
 
 AC_ARG_WITH(selinux,
-	AS_HELP_STRING([--with-selinux], [compile with SELinux support]),
+	AS_HELP_STRING([--with-selinux], [enable SELinux support]),
 	[], with_selinux=no)
 if test "x$with_selinux" = xyes; then
 	LIBS_save=$LIBS
@@ -45,26 +45,24 @@ if test "x$with_selinux" = xyes; then
 		[],
 		AC_MSG_ERROR([SELinux selected but libselinux not found]))
 	LIBS=$LIBS_save
-	AC_DEFINE(USE_SELINUX, [1] ,[compile with SELinux support])
 	SELINUX_LIBS="-lselinux -lsepol"
+	AC_DEFINE(WITH_SELINUX, [1] ,[SELinux support.])
 fi
 AC_SUBST([SELINUX_LIBS])
-AM_CONDITIONAL(USE_SELINUX, [test "x$with_selinux" = xyes], [compile with SELinux support])
+AM_CONDITIONAL(WITH_SELINUX, [test "x$with_selinux" = xyes])
 
 AC_ARG_ENABLE(debug,
-	AS_HELP_STRING([--enable-debug], [turn on debugging]),
+	AS_HELP_STRING([--enable-debug], [enable debug messages]),
 	[], enable_debug=no)
 if test "x$enable_debug" = "xyes"; then
-	AC_DEFINE(DEBUG, [1] ,[Compile in debug messages])
-	DEBUG_CFLAGS="-DDEBUG"
+	AC_DEFINE(ENABLE_DEBUG, [1], [Debug messages.])
 fi
-AC_SUBST(DEBUG_CFLAGS)
 
 AC_ARG_ENABLE(logging,
-	AS_HELP_STRING([--disable-logging], [turn off logging/syslog]),
+	AS_HELP_STRING([--disable-logging], [disable system logging]),
 	[], enable_logging=yes)
-if test "x$enable_logging" != "xno"; then
-	AC_DEFINE(USE_LOG, [1] ,[Use logging/syslog])
+if test "x$enable_logging" = "xyes"; then
+	AC_DEFINE(ENABLE_LOGGING, [1], [System logging.])
 fi
 
 AC_CONFIG_HEADERS(config.h)
diff --git a/extras/floppy/Makefile.am b/extras/floppy/Makefile.am
index cbdcf6e8fb..6854d62d57 100644
--- a/extras/floppy/Makefile.am
+++ b/extras/floppy/Makefile.am
@@ -15,7 +15,7 @@ create_floppy_devices_SOURCES = \
 	../../libudev/libudev-device.c \
 	../../libudev/libudev-enumerate.c
 
-if USE_SELINUX
+if WITH_SELINUX
 create_floppy_devices_SOURCES += \
 	../../libudev/libudev-selinux-private.c
 create_floppy_devices_LDADD = \
diff --git a/libudev/libudev-private.h b/libudev/libudev-private.h
index 9770e8b63c..5c10b4e37a 100644
--- a/libudev/libudev-private.h
+++ b/libudev/libudev-private.h
@@ -29,8 +29,8 @@ udev_log_null(struct udev *udev, const char *format, ...) {}
       udev_log(udev, LOG_ERR, __FILE__, __LINE__, __FUNCTION__, ## arg); \
   } while (0)
 
-#ifdef USE_LOG
-#  ifdef DEBUG
+#ifdef ENABLE_LOGGING
+#  ifdef ENABLE_DEBUG
 #    define dbg(udev, arg...) udev_log_cond(udev, LOG_DEBUG, ## arg)
 #  else
 #    define dbg(udev, arg...) udev_log_null(udev, ## arg)
@@ -219,7 +219,7 @@ int util_resolve_subsys_kernel(struct udev *udev, const char *string,
 				      char *result, size_t maxsize, int read_value);
 
 /* libudev-selinux-private.c */
-#ifndef USE_SELINUX
+#ifndef WITH_SELINUX
 static inline void udev_selinux_init(struct udev *udev) {}
 static inline void udev_selinux_exit(struct udev *udev) {}
 static inline void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsigned int mode) {}
diff --git a/udev/Makefile.am b/udev/Makefile.am
index 14ec79e8d6..5f6f7c54c0 100644
--- a/udev/Makefile.am
+++ b/udev/Makefile.am
@@ -29,7 +29,7 @@ common_files = \
 	../libudev/libudev-queue-private.c \
 	../libudev/libudev-ctrl.c
 
-if USE_SELINUX
+if WITH_SELINUX
 common_files += \
 	../libudev/libudev-selinux-private.c
 common_ldadd += \
diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index 5cb381ebac..7db890fed9 100644
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -211,7 +211,7 @@ struct rule_tmp {
 	unsigned int token_cur;
 };
 
-#ifdef DEBUG
+#ifdef ENABLE_DEBUG
 static const char *operation_str(enum operation_type type)
 {
 	static const char *operation_strs[] = {
@@ -421,7 +421,7 @@ static inline const char *operation_str(enum operation_type type) { return NULL;
 static inline const char *token_str(enum token_type type) { return NULL; }
 static inline void dump_token(struct udev_rules *rules, struct token *token) {}
 static inline void dump_rules(struct udev_rules *rules) {}
-#endif /* DEBUG */
+#endif /* ENABLE_DEBUG */
 
 static int add_new_string(struct udev_rules *rules, const char *str, size_t bytes)
 {