diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-09-14 19:36:26 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:18:43 -0500 |
| commit | 2a3ebd9a7e81e48b9e0975a471b301918156c5c3 (patch) | |
| tree | fdcd68f1b3d0e423c27e2231c9fa9039022c6003 /source4/lib/popt | |
| parent | 0e9147029f0ca5b7e7d53235fe4bd81dd4fb1b3d (diff) | |
| download | samba-2a3ebd9a7e81e48b9e0975a471b301918156c5c3.tar.gz samba-2a3ebd9a7e81e48b9e0975a471b301918156c5c3.tar.bz2 samba-2a3ebd9a7e81e48b9e0975a471b301918156c5c3.zip | |
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)
Diffstat (limited to 'source4/lib/popt')
| -rw-r--r-- | source4/lib/popt/libpopt.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
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 |