From 2a9311c0a4c66bad7e70f605cfa0154df2c25c53 Mon Sep 17 00:00:00 2001
From: Paul Ackersviller <packersv@users.sourceforge.net>
Date: Thu, 29 Nov 2007 02:29:02 +0000
Subject: Merge of 24118: only link against libnsl if we have NIS and need it
 for yp_all, or if we need it for getpwnam.

---
 configure.ac | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3f103aa36..0ffd4e674 100644
--- a/configure.ac
+++ b/configure.ac
@@ -727,10 +727,7 @@ case $LIBS in
   AC_DEFINE(ZSH_IGNORE_NCURSES) ;;
 esac
 
-dnl Some systems (Solaris 2.x, Linux Redhat 5.x) require
-dnl libnsl (Network Services Library) to find yp_all
-
-AC_SEARCH_LIBS(yp_all, nsl)
+AC_SEARCH_LIBS(getpwnam, nsl)
 
 dnl I am told that told that unicos reqire these for nis_list
 if test `echo $host_os | sed 's/^\(unicos\).*/\1/'` = unicos; then
@@ -1648,6 +1645,9 @@ AC_CACHE_CHECK(for NIS, zsh_cv_sys_nis,
 zsh_cv_sys_nis=yes || zsh_cv_sys_nis=no])
 if test $zsh_cv_sys_nis = yes; then
   AC_DEFINE(HAVE_NIS)
+dnl Some systems (Solaris 2.x, Linux Redhat 5.x) require
+dnl libnsl (Network Services Library) to find yp_all
+  AC_SEARCH_LIBS(yp_all, nsl)
 fi
 
 dnl -----------------
-- 
cgit 1.4.1