PERFORCE change 109040 for review

[Michael Bushkov]

http://perforce.freebsd.org/chv.cgi?CH=109040

Change 109040 by bushman at bushman_nss_ldap_cached on 2006/11/02 14:11:34

	__pw_scan should be takend only from libnssutil

Affected files ...

.. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/chpass/Makefile#2 edit
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pwd_mkdb/Makefile#2 edit

Differences ...

==== //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/chpass/Makefile#2 (text+ko) ====

@@ -15,7 +15,12 @@
 .endif
 #Some people need this, uncomment to activate
 #CFLAGS+=-DRESTRICT_FULLNAME_CHANGE
-CFLAGS+=-I${.CURDIR}/../../usr.sbin/pwd_mkdb -I${.CURDIR}/../../lib/libc/gen -I.
+CFLAGS+=-I${.CURDIR}/../../usr.sbin/pwd_mkdb -I.
+
+# Needed to use __pw_scan function, which is in libnssutil
+CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../libnssutil
+LD_ADD+= -lnssutil
+LDFLAGS+= -L${.OBJDIR}/../../libnssutil
 
 DPADD=	${LIBCRYPT} ${LIBUTIL}
 LDADD=	-lcrypt -lutil

==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pwd_mkdb/Makefile#2 (text+ko) ====

@@ -8,6 +8,9 @@
 SRCS=	pw_scan.c pwd_mkdb.c
 
 WARNS?=	4
-CFLAGS+= -I${.CURDIR}/../../lib/libc/gen		# for pw_scan.h
+# Needed to use __pw_scan function, which is in libnssutil
+CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../libnssutil
+LD_ADD+= -lnssutil
+LDFLAGS+= -L${.OBJDIR}/../../libnssutil
 
 .include <bsd.prog.mk>