summaryrefslogtreecommitdiffstats
path: root/source/lib
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-09-14 19:36:26 +0000
committerAndrew Tridgell <tridge@samba.org>2006-09-14 19:36:26 +0000
commit1f3c8832411720c27fad48ade6ee907adb153cf5 (patch)
treeb7d3400102bbbb2c6d31eec63e2691812ad27649 /source/lib
parent662211475a0cc36056da59d87766e1675fae4a41 (diff)
downloadsamba-1f3c8832411720c27fad48ade6ee907adb153cf5.tar.gz
samba-1f3c8832411720c27fad48ade6ee907adb153cf5.tar.xz
samba-1f3c8832411720c27fad48ade6ee907adb153cf5.zip
r18537: after testing for poptGetContext, if the test fails, don't try to use
the external popt (this affects hpisgr8)
Diffstat (limited to 'source/lib')
-rw-r--r--source/lib/popt/libpopt.m42
1 files changed, 1 insertions, 1 deletions
diff --git a/source/lib/popt/libpopt.m4 b/source/lib/popt/libpopt.m4
index b6b8808a4e2..f0c683ce57c 100644
--- a/source/lib/popt/libpopt.m4
+++ b/source/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