svn commit: samba r18537 - in branches/SAMBA_4_0/source/lib/popt: .

tridge at samba.org tridge at samba.org
Thu Sep 14 19:36:28 GMT 2006


Author: tridge
Date: 2006-09-14 19:36:26 +0000 (Thu, 14 Sep 2006)
New Revision: 18537

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18537

Log:

after testing for poptGetContext, if the test fails, don't try to use
the external popt (this affects hpisgr8)

Modified:
   branches/SAMBA_4_0/source/lib/popt/libpopt.m4


Changeset:
Modified: branches/SAMBA_4_0/source/lib/popt/libpopt.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/popt/libpopt.m4	2006-09-14 18:50:12 UTC (rev 18536)
+++ branches/SAMBA_4_0/source/lib/popt/libpopt.m4	2006-09-14 19:36:26 UTC (rev 18537)
@@ -11,7 +11,7 @@
 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



More information about the samba-cvs mailing list