diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-09-06 10:50:52 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:17:44 -0500 |
| commit | d52b2fb7c4a7f2b2a700204236f29bbb97b0f1d6 (patch) | |
| tree | 5408edd277ab33c06ddf0184e30ee7958bcf2763 /source4/lib/popt/samba.m4 | |
| parent | 70b6211c98a15faf95a917b454a5f33961248e88 (diff) | |
| download | samba-d52b2fb7c4a7f2b2a700204236f29bbb97b0f1d6.tar.gz samba-d52b2fb7c4a7f2b2a700204236f29bbb97b0f1d6.tar.bz2 samba-d52b2fb7c4a7f2b2a700204236f29bbb97b0f1d6.zip | |
r18157: Fix building with external popt.
(This used to be commit 72e71de3e591091d71e43a3c9efd1cafd82d6c89)
Diffstat (limited to 'source4/lib/popt/samba.m4')
| -rw-r--r-- | source4/lib/popt/samba.m4 | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source4/lib/popt/samba.m4 b/source4/lib/popt/samba.m4 index d940075f86..d9f62f28d7 100644 --- a/source4/lib/popt/samba.m4 +++ b/source4/lib/popt/samba.m4 @@ -1,3 +1,10 @@ m4_include(lib/popt/libpopt.m4) -SMB_SUBSYSTEM(LIBPOPT, + +if test x"$POPTOBJ" = "x"; then + SMB_EXT_LIB(LIBPOPT, [${POPT_LIBS}]) + SMB_ENABLE(LIBPOPT,YES) +else + SMB_SUBSYSTEM(LIBPOPT, [lib/popt/findme.o lib/popt/popt.o lib/popt/poptconfig.o lib/popt/popthelp.o lib/popt/poptparse.o], [], [-I$srcdir/lib/popt]) +fi + |