svn commit: trunk/uClibc: debian extra/Configs libc/pwd_grp

[vapier at uclibc.org]

Author: vapier
Date: 2006-08-23 08:15:47 -0700 (Wed, 23 Aug 2006)
New Revision: 15920

Log:
fix from psm: add UCLIBC_ prefix to HAS_SHADOW option

Modified:
   trunk/uClibc/Makefile.in
   trunk/uClibc/debian/config
   trunk/uClibc/extra/Configs/Config.in
   trunk/uClibc/libc/pwd_grp/Makefile.in
   trunk/uClibc/libc/pwd_grp/pwd_grp.c
   trunk/uClibc/libc/pwd_grp/pwd_grp_internal.c


Changeset:
Modified: trunk/uClibc/Makefile.in
===================================================================
--- trunk/uClibc/Makefile.in	2006-08-23 05:11:29 UTC (rev 15919)
+++ trunk/uClibc/Makefile.in	2006-08-23 15:15:47 UTC (rev 15920)
@@ -181,7 +181,7 @@
 	$(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

Modified: trunk/uClibc/debian/config
===================================================================
--- trunk/uClibc/debian/config	2006-08-23 05:11:29 UTC (rev 15919)
+++ trunk/uClibc/debian/config	2006-08-23 15:15:47 UTC (rev 15920)
@@ -80,7 +80,7 @@
 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

Modified: trunk/uClibc/extra/Configs/Config.in
===================================================================
--- trunk/uClibc/extra/Configs/Config.in	2006-08-23 05:11:29 UTC (rev 15919)
+++ trunk/uClibc/extra/Configs/Config.in	2006-08-23 15:15:47 UTC (rev 15920)
@@ -463,7 +463,7 @@
 	  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

Modified: trunk/uClibc/libc/pwd_grp/Makefile.in
===================================================================
--- trunk/uClibc/libc/pwd_grp/Makefile.in	2006-08-23 05:11:29 UTC (rev 15919)
+++ trunk/uClibc/libc/pwd_grp/Makefile.in	2006-08-23 15:15:47 UTC (rev 15920)
@@ -11,7 +11,7 @@
 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 \

Modified: trunk/uClibc/libc/pwd_grp/pwd_grp.c
===================================================================
--- trunk/uClibc/libc/pwd_grp/pwd_grp.c	2006-08-23 05:11:29 UTC (rev 15919)
+++ trunk/uClibc/libc/pwd_grp/pwd_grp.c	2006-08-23 15:15:47 UTC (rev 15920)
@@ -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__

Modified: trunk/uClibc/libc/pwd_grp/pwd_grp_internal.c
===================================================================
--- trunk/uClibc/libc/pwd_grp/pwd_grp_internal.c	2006-08-23 05:11:29 UTC (rev 15919)
+++ trunk/uClibc/libc/pwd_grp/pwd_grp_internal.c	2006-08-23 15:15:47 UTC (rev 15920)
@@ -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__