Config: CONFIG_OWN_GETOPT moved to UCW namespace

diff --git a/ucw/Makefile b/ucw/Makefile
index 54fce8d1f33a441d62d83bac4ad007a6ea6c4fb9..97144a0a215527e0fb2c332e5ef49dc1a8c09d03 100644 (file)
--- a/ucw/Makefile
+++ b/ucw/Makefile
@@ -70,7 +70,7 @@ ifdef CONFIG_UCW_FB_DIRECT
 LIBUCW_MODS+=fb-direct
 endif
 
 LIBUCW_MODS+=fb-direct
 endif
 

-ifdef CONFIG_OWN_GETOPT
+ifdef CONFIG_UCW_OWN_GETOPT

 include $(s)/ucw/getopt/Makefile
 endif
 
 include $(s)/ucw/getopt/Makefile
 endif
 

diff --git a/ucw/default.cfg b/ucw/default.cfg
index 46c6fa40298e49b860b4a4dec536690d4db715e2..625c4cbd8c0f2192f4d20195c4c96192e10a80c4 100644 (file)
--- a/ucw/default.cfg
+++ b/ucw/default.cfg
@@ -23,7 +23,7 @@ UnSet("CONFIG_STATIC_PIC");
 
 # If your system can't reset getopt with 'optind = 0', you need to compile our internal copy
 # of GNU libc's getopt. This should not be necessary on GNU libc.
 
 # If your system can't reset getopt with 'optind = 0', you need to compile our internal copy
 # of GNU libc's getopt. This should not be necessary on GNU libc.

-UnSet("CONFIG_OWN_GETOPT");
+UnSet("CONFIG_UCW_OWN_GETOPT");

 
 # Install libraries and their API includes
 UnSet("CONFIG_INSTALL_API");
 
 # Install libraries and their API includes
 UnSet("CONFIG_INSTALL_API");

diff --git a/ucw/getopt.h b/ucw/getopt.h
index eb350012374f198bc2e50eeb2439a1e2cafc7cc4..a192c0f725584960c6d662bd8691e98f17749ceb 100644 (file)
--- a/ucw/getopt.h
+++ b/ucw/getopt.h
@@ -11,7 +11,7 @@
 #ifndef        _UCW_GETOPT_H
 #define        _UCW_GETOPT_H
 
 #ifndef        _UCW_GETOPT_H
 #define        _UCW_GETOPT_H
 

-#ifdef CONFIG_OWN_GETOPT
+#ifdef CONFIG_UCW_OWN_GETOPT

 #include "ucw/getopt/getopt-sh.h"
 #else
 #include <getopt.h>
 #include "ucw/getopt/getopt-sh.h"
 #else
 #include <getopt.h>