fix from psm: add UCLIBC_ prefix to HAS_SHADOW option

diff --git a/Makefile.in b/Makefile.in
index a1de34e..d6f8cf7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -181,7 +181,7 @@ ifneq ($(UCLIBC_HAS_GETOPT_LONG),y)
        $(RM) $(PREFIX)$(DEVEL_PREFIX)include/getopt.h
 endif
 endif
-ifneq ($(HAS_SHADOW),y)
+ifneq ($(UCLIBC_HAS_SHADOW),y)
        # Remove shadow header since shadow password support is disabled.
        $(RM) $(PREFIX)$(DEVEL_PREFIX)include/shadow.h
 endif

diff --git a/debian/config b/debian/config
index 301f7b3..8362238 100644 (file)
--- a/debian/config
+++ b/debian/config
@@ -80,7 +80,7 @@ UCLIBC_HAS_LFS=y
 MALLOC_STANDARD=y
 MALLOC_GLIBC_COMPAT=y
 UCLIBC_DYNAMIC_ATEXIT=y
-HAS_SHADOW=y
+UCLIBC_HAS_SHADOW=y
 # UNIX98PTY_ONLY is not set
 ASSUME_DEVPTS=y
 UCLIBC_HAS_TM_EXTENSIONS=y

diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in
index 7f1b4b5..4eb7d0f 100644 (file)
--- a/extra/Configs/Config.in
+++ b/extra/Configs/Config.in
@@ -463,7 +463,7 @@ config UCLIBC_SUSV3_LEGACY
          Currently applies to bcopy/bzero/bcmp/index/rindex.
          WARNING! ABI incompatibility.
 
-config HAS_SHADOW
+config UCLIBC_HAS_SHADOW
        bool "Shadow Password Support"
        default y
        help

diff --git a/libc/pwd_grp/Makefile.in b/libc/pwd_grp/Makefile.in
index c1bbbf1..f9c7149 100644 (file)
--- a/libc/pwd_grp/Makefile.in
+++ b/libc/pwd_grp/Makefile.in
@@ -11,7 +11,7 @@ PWDGRP_OUT := $(top_builddir)libc/pwd_grp
 CSRC := $(notdir $(wildcard $(PWDGRP_DIR)/*.c))
 CSRC := $(filter-out pwd_grp.c pwd_grp_internal.c,$(CSRC))
 
-ifneq ($(HAS_SHADOW),y)
+ifneq ($(UCLIBC_HAS_SHADOW),y)
 SHADOW_CSRC := \
        fgetspent_r.c fgetspent.c getspent_r.c getspent.c \
        getspnam_r.c getspnam.c lckpwdf.c putspent.c \

diff --git a/libc/pwd_grp/pwd_grp.c b/libc/pwd_grp/pwd_grp.c
index 961899a..2a9d451 100644 (file)
--- a/libc/pwd_grp/pwd_grp.c
+++ b/libc/pwd_grp/pwd_grp.c
@@ -31,7 +31,7 @@
 #include <pwd.h>
 #include <grp.h>
 #include <paths.h>
-#ifdef __HAS_SHADOW__
+#ifdef __UCLIBC_HAS_SHADOW__
 #include <shadow.h>
 #endif
 #ifdef __UCLIBC_HAS_THREADS__

diff --git a/libc/pwd_grp/pwd_grp_internal.c b/libc/pwd_grp/pwd_grp_internal.c
index cb0ae76..c897478 100644 (file)
--- a/libc/pwd_grp/pwd_grp_internal.c
+++ b/libc/pwd_grp/pwd_grp_internal.c
@@ -31,7 +31,7 @@
 #include <pwd.h>
 #include <grp.h>
 #include <paths.h>
-#ifdef __HAS_SHADOW__
+#ifdef __UCLIBC_HAS_SHADOW__
 #include <shadow.h>
 #endif
 #ifdef __UCLIBC_HAS_THREADS__