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 /source4/lib/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 'source4/lib/popt/samba.m4')
-rw-r--r-- | source4/lib/popt/samba.m4 | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/source4/lib/popt/samba.m4 b/source4/lib/popt/samba.m4 deleted file mode 100644 index 855fd6c402..0000000000 --- a/source4/lib/popt/samba.m4 +++ /dev/null @@ -1,8 +0,0 @@ -m4_include(lib/popt/libpopt.m4) - -if test x"$POPT_OBJ" = "x"; then - SMB_EXT_LIB(LIBPOPT, [${POPT_LIBS}]) -else - SMB_INCLUDE_MK(lib/popt/config.mk) -fi - |