diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-16 17:20:54 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-16 17:20:54 +0200 |
| commit | 9ef623beda5d6a7507ff6c871117c8f88e547441 (patch) | |
| tree | dff1dc9cb6de1389a9aa18af51349e1fbef90b83 /popt/samba.m4 | |
| parent | a347ab83f447d7921d5d427e56f6965342b25834 (diff) | |
| parent | c8bff39df639c70afc94b1795c94629ee8b7b482 (diff) | |
| download | samba-9ef623beda5d6a7507ff6c871117c8f88e547441.tar.gz samba-9ef623beda5d6a7507ff6c871117c8f88e547441.tar.bz2 samba-9ef623beda5d6a7507ff6c871117c8f88e547441.zip | |
Merge branch 'singlepopt' into single
Conflicts:
source4/Makefile
Diffstat (limited to 'popt/samba.m4')
| -rw-r--r-- | popt/samba.m4 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/popt/samba.m4 b/popt/samba.m4 new file mode 100644 index 0000000000..9ee77dfa13 --- /dev/null +++ b/popt/samba.m4 @@ -0,0 +1,8 @@ +m4_include(../popt/libpopt.m4) + +if test x"$POPT_OBJ" = "x"; then + SMB_EXT_LIB(LIBPOPT, [${POPT_LIBS}]) +else + SMB_INCLUDE_MK(../popt/config.mk) +fi + |