From 2a3ebd9a7e81e48b9e0975a471b301918156c5c3 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 14 Sep 2006 19:36:26 +0000
Subject: r18537: after testing for poptGetContext, if the test fails, don't
 try to use the external popt (this affects hpisgr8) (This used to be commit
 9afbd60f91bca84dd645372ed7139e42f712384d)

---
 source4/lib/popt/libpopt.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4')

diff --git a/source4/lib/popt/libpopt.m4 b/source4/lib/popt/libpopt.m4
index b6b8808a4e..f0c683ce57 100644
--- a/source4/lib/popt/libpopt.m4
+++ b/source4/lib/popt/libpopt.m4
@@ -11,7 +11,7 @@ AC_SUBST(POPT_CFLAGS)
 if test x"$INCLUDED_POPT" != x"yes"; then
 	AC_CHECK_HEADERS(popt.h)
 	AC_CHECK_LIB(popt, poptGetContext, [ POPT_LIBS="-lpopt" ])
-	if test x"$ac_cv_header_popt_h" = x"no"; then
+	if test x"$ac_cv_header_popt_h" = x"no" -o x"$ac_cv_lib_popt_poptGetContext" = x"no"; then
 		INCLUDED_POPT=yes
 		POPT_CFLAGS=""
 	else
-- 
cgit