[PATCH] clean up the logging patch a bit to make the option more like the other options.

Also documented it and added it to the .spec file.

4 files changed, 28 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index 88c7cf0bc7..f19354fb05 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
 
 # Set the following to control the use of syslog
 # Set it to `false' to remove all logging
-LOG = true
+USE_LOG = true
 
 # Set the following to `true' to log the debug
 # and make a unstripped, unoptimized  binary.
@@ -109,7 +109,7 @@ else
 	CFLAGS+=-pipe
 endif
 
-ifeq ($(strip $(LOG)),true)
+ifeq ($(strip $(USE_LOG)),true)
 	CFLAGS  += -DLOG
 endif
 
diff --git a/README b/README
index 123fce6a1b..26032c35dc 100644
--- a/README
+++ b/README
@@ -30,18 +30,28 @@ To use:
   Note:
       There are a number of different flags that you can use when building
       udev.  They are as follows:
-	prefix - set this to the default root that you want udev to be
+	prefix
+		set this to the default root that you want udev to be
 		installed into.  This works just like the 'configure --prefix'
 		script does.  Default value is ''.  Only override this if you
 		really know what you are doing.
-	USE_KLIBC - if set to 'true', udev is built and linked against the included
-		version of klibc.  Default value is 'false'.
-	DEBUG - if set to 'true', debugging messages will be sent to the syslog
-		as udev is run.  Default value is 'false'.
-	USE_DBUS -  if set to 'true', DBUS messages will be sent everytime udev
+	USE_KLIBC
+		if set to 'true', udev is built and linked against the
+		included version of klibc.  Default value is 'false'.
+	USE_LOG
+		if set to 'true', udev will emit messages to the syslog when
+		it creates or removes device nodes.  This is helpful to see
+		what udev is doing.  This is enabled by default.  Note, if you
+		are building udev against klibc it is recommended that you
+		disable this option (due to klibc's syslog implementation.)
+	USE_DBUS
+		if set to 'true', DBUS messages will be sent everytime udev
 		creates or removes a device node.  This requires that DBUS
 		development headers and libraries be present on your system to
 		build properly.  Default value is 'false'.
+	DEBUG
+		if set to 'true', debugging messages will be sent to the syslog
+		as udev is run.  Default value is 'false'.
 
       So, if you want to build udev using klibc with debugging messages, you
       would do:
diff --git a/logging.h b/logging.h
index 85016ad328..1f2126839b 100644
--- a/logging.h
+++ b/logging.h
@@ -1,5 +1,5 @@
 /*
- * udev.h
+ * logging.h
  *
  * Userspace devfs
  *
diff --git a/udev.spec b/udev.spec
index 07331807ef..575e3cdf60 100644
--- a/udev.spec
+++ b/udev.spec
@@ -5,6 +5,12 @@
 # it probably is not where you want it to be.
 %define klibc 1
 
+# if we want to have logging support in or not.
+# 0 - no logging  support
+# 1 - logging support
+# Note, it is not recommend if you use klibc to enable logging.
+%define log 0
+
 # if we want to build DBUS support in or not.
 # 0 - no DBUS support
 # 1 - DBUS support
@@ -45,6 +51,9 @@ make CC="gcc $RPM_OPT_FLAGS"	\
 %if %{klibc}
 	USE_KLIBC=true		\
 %endif
+%if %{log}
+	USE_LOG=true		\
+%endif
 %if %{dbus}
 	USE_DBUS=true		\
 %endif