[SCM] Samba Shared Repository - branch master updated
Ira Cooper
ira at samba.org
Sat Aug 9 12:48:04 MDT 2014
The branch, master has been updated
via 587befb lib/popt: Remove non third_party popt.
via 38de110 third_party/popt: Initial support for popt.
via 8cc9667 third_party/popt: Initial copy of popt.
via b08cbc6 lib/zlib: Remove non third_party zlib.
via ba8ee8c third_party/zlib: Initial support for zlib
via e8e8568 third_party/zlib: Initial copy of zlib.
via ea3d62e lib/iniparser: Remove non third_party iniparser.
via f46b79b third_party/iniparser: Initial support for iniparser.
via cdbcb7b third_party/iniparser: Initial copy of iniparser.
via 61dd665 nsswitch: Fix bogus #include line.
from f215cf1 passdb: add missing newline to debug message in get_primary_group_sid()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 587befbbb2f624031aeaf5ba734619f7996ba23f
Author: Ira Cooper <ira at samba.org>
Date: Tue Jul 22 21:11:01 2014 -0700
lib/popt: Remove non third_party popt.
Signed-off-by: Ira Cooper <ira at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Ira Cooper <ira at samba.org>
Autobuild-Date(master): Sat Aug 9 20:47:05 CEST 2014 on sn-devel-104
commit 38de110b02ff7e622d6394e12d99c3e01568db3e
Author: Ira Cooper <ira at samba.org>
Date: Tue Jul 22 21:34:17 2014 -0700
third_party/popt: Initial support for popt.
ctdb, ldb, and samba are supported builds for third_party popt.
Signed-off-by: Ira Cooper <ira at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 8cc966747df8531eb0afc8870dac29a306fb4352
Author: Ira Cooper <ira at samba.org>
Date: Wed Jul 23 00:17:30 2014 -0700
third_party/popt: Initial copy of popt.
Signed-off-by: Ira Cooper <ira at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit b08cbc64c00d563738c45a701d4a7a7fd371e63f
Author: Ira Cooper <ira at samba.org>
Date: Wed Jul 23 00:16:24 2014 -0700
lib/zlib: Remove non third_party zlib.
Signed-off-by: Ira Cooper <ira at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit ba8ee8c9e011361cfc405b1355172d38718ba0cc
Author: Ira Cooper <ira at samba.org>
Date: Tue Jul 22 21:27:13 2014 -0700
third_party/zlib: Initial support for zlib
Signed-off-by: Ira Cooper <ira at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit e8e85689756eaf74e82f55b8ae6f706b430b01cd
Author: Ira Cooper <ira at samba.org>
Date: Tue Jul 22 21:26:40 2014 -0700
third_party/zlib: Initial copy of zlib.
Signed-off-by: Ira Cooper <ira at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit ea3d62eea980348e73d6eeb870f36d0908ab42c3
Author: Ira Cooper <ira at samba.org>
Date: Thu Jul 17 18:07:31 2014 -0400
lib/iniparser: Remove non third_party iniparser.
Signed-off-by: Ira Cooper <ira at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit f46b79bdb8824c7c95dee0a282b2c852091bcfce
Author: Ira Cooper <ira at samba.org>
Date: Thu Jul 17 18:04:35 2014 -0400
third_party/iniparser: Initial support for iniparser.
This is the initial support for iniparser, as well the basic
third_party framework.
Signed-off-by: Ira Cooper <ira at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit cdbcb7bb4b2363d459e0228f8a7a5457a736b007
Author: Ira Cooper <ira at samba.org>
Date: Thu Jul 17 17:31:05 2014 -0400
third_party/iniparser: Initial copy of iniparser.
Signed-off-by: Ira Cooper <ira at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 61dd66575dd1917ceaca4dbae271e0a6a264271d
Author: Ira Cooper <ira at samba.org>
Date: Wed Jul 16 17:40:57 2014 -0400
nsswitch: Fix bogus #include line.
We are not allowed to reach around behind the system's back and
include the wrong headerfiles.
Signed-off-by: Ira Cooper <ira at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_third_party.py | 41 ++++++++++++++++++++
buildtools/wafsamba/wafsamba.py | 1 +
ctdb/third_party | 1 +
ctdb/wscript | 15 ++++++-
lib/ldb/wscript | 18 +++++++-
lib/zlib/wscript | 30 --------------
nsswitch/wbinfo.c | 1 -
source4/torture/winbind/wscript_build | 2 +-
source4/torture/wscript_build | 16 ++++----
testsuite/headers/wscript_build | 2 +-
{lib => third_party}/iniparser/AUTHORS | 0
{lib => third_party}/iniparser/INSTALL | 0
{lib => third_party}/iniparser/LICENSE | 0
{lib => third_party}/iniparser/Makefile | 0
{lib => third_party}/iniparser/README | 0
{lib => third_party}/iniparser/html/doxygen.css | 0
{lib => third_party}/iniparser/html/doxygen.png | Bin 1281 -> 1281 bytes
.../iniparser/html/globals_func.html | 0
{lib => third_party}/iniparser/html/index.html | 0
.../iniparser/html/iniparser_8h.html | 0
.../iniparser/html/iniparser_8main.html | 0
{lib => third_party}/iniparser/html/tab_b.gif | Bin 35 -> 35 bytes
{lib => third_party}/iniparser/html/tab_l.gif | Bin 706 -> 706 bytes
{lib => third_party}/iniparser/html/tab_r.gif | Bin 2585 -> 2585 bytes
{lib => third_party}/iniparser/html/tabs.css | 0
{lib => third_party}/iniparser/src/dictionary.c | 0
{lib => third_party}/iniparser/src/dictionary.h | 0
{lib => third_party}/iniparser/src/iniparser.c | 0
{lib => third_party}/iniparser/src/iniparser.h | 0
{lib => third_party}/iniparser/src/strlib.c | 0
{lib => third_party}/iniparser/src/strlib.h | 0
{lib => third_party}/iniparser/src/wscript | 2 +-
{lib => third_party}/iniparser/test/Makefile | 0
{lib => third_party}/iniparser/test/iniexample.c | 0
{lib => third_party}/iniparser_build/dictionary.c | 0
{lib => third_party}/iniparser_build/iniparser.c | 0
{lib => third_party}/iniparser_build/strlib.c | 0
{lib => third_party}/popt/CHANGES | 0
{lib => third_party}/popt/COPYING | 0
{lib => third_party}/popt/README | 0
{lib => third_party}/popt/dummy.in | 0
{lib => third_party}/popt/findme.c | 0
{lib => third_party}/popt/findme.h | 0
{lib => third_party}/popt/popt.c | 0
{lib => third_party}/popt/popt.h | 0
{lib => third_party}/popt/poptconfig.c | 0
{lib => third_party}/popt/popthelp.c | 0
{lib => third_party}/popt/poptint.h | 0
{lib => third_party}/popt/poptparse.c | 0
{lib => third_party}/popt/system.h | 0
{lib => third_party}/popt/wscript | 2 +-
{lib => third_party}/zlib/ChangeLog | 0
{lib => third_party}/zlib/FAQ | 0
{lib => third_party}/zlib/INDEX | 0
{lib => third_party}/zlib/Makefile | 0
{lib => third_party}/zlib/Makefile.in | 0
{lib => third_party}/zlib/README | 0
{lib => third_party}/zlib/adler32.c | 0
{lib => third_party}/zlib/algorithm.txt | 0
{lib => third_party}/zlib/amiga/Makefile.pup | 0
{lib => third_party}/zlib/amiga/Makefile.sas | 0
{lib => third_party}/zlib/as400/bndsrc | 0
{lib => third_party}/zlib/as400/compile.clp | 0
{lib => third_party}/zlib/as400/readme.txt | 0
{lib => third_party}/zlib/as400/zlib.inc | 0
{lib => third_party}/zlib/compress.c | 0
{lib => third_party}/zlib/contrib/README.contrib | 0
.../zlib/contrib/ada/buffer_demo.adb | 0
{lib => third_party}/zlib/contrib/ada/mtest.adb | 0
{lib => third_party}/zlib/contrib/ada/read.adb | 0
{lib => third_party}/zlib/contrib/ada/readme.txt | 0
{lib => third_party}/zlib/contrib/ada/test.adb | 0
.../zlib/contrib/ada/zlib-streams.adb | 0
.../zlib/contrib/ada/zlib-streams.ads | 0
.../zlib/contrib/ada/zlib-thin.adb | 0
.../zlib/contrib/ada/zlib-thin.ads | 0
{lib => third_party}/zlib/contrib/ada/zlib.adb | 0
{lib => third_party}/zlib/contrib/ada/zlib.ads | 0
{lib => third_party}/zlib/contrib/ada/zlib.gpr | 0
.../zlib/contrib/asm586/README.586 | 0
{lib => third_party}/zlib/contrib/asm586/match.S | 0
.../zlib/contrib/asm686/README.686 | 0
{lib => third_party}/zlib/contrib/asm686/match.S | 0
{lib => third_party}/zlib/contrib/blast/Makefile | 0
{lib => third_party}/zlib/contrib/blast/README | 0
{lib => third_party}/zlib/contrib/blast/blast.c | 0
{lib => third_party}/zlib/contrib/blast/blast.h | 0
{lib => third_party}/zlib/contrib/blast/test.pk | Bin 8 -> 8 bytes
{lib => third_party}/zlib/contrib/blast/test.txt | 0
{lib => third_party}/zlib/contrib/delphi/ZLib.pas | 0
.../zlib/contrib/delphi/ZLibConst.pas | 0
.../zlib/contrib/delphi/readme.txt | 0
.../zlib/contrib/delphi/zlibd32.mak | 0
.../zlib/contrib/dotzlib/DotZLib.build | 0
.../zlib/contrib/dotzlib/DotZLib.chm | Bin 72728 -> 72728 bytes
.../zlib/contrib/dotzlib/DotZLib.sln | 0
.../zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs | 0
.../zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs | 0
.../zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs | 0
.../zlib/contrib/dotzlib/DotZLib/CodecBase.cs | 0
.../zlib/contrib/dotzlib/DotZLib/Deflater.cs | 0
.../zlib/contrib/dotzlib/DotZLib/DotZLib.cs | 0
.../zlib/contrib/dotzlib/DotZLib/DotZLib.csproj | 0
.../zlib/contrib/dotzlib/DotZLib/GZipStream.cs | 0
.../zlib/contrib/dotzlib/DotZLib/Inflater.cs | 0
.../zlib/contrib/dotzlib/DotZLib/UnitTests.cs | 0
.../zlib/contrib/dotzlib/LICENSE_1_0.txt | 0
.../zlib/contrib/dotzlib/readme.txt | 0
{lib => third_party}/zlib/contrib/infback9/README | 0
.../zlib/contrib/infback9/infback9.c | 0
.../zlib/contrib/infback9/infback9.h | 0
.../zlib/contrib/infback9/inffix9.h | 0
.../zlib/contrib/infback9/inflate9.h | 0
.../zlib/contrib/infback9/inftree9.c | 0
.../zlib/contrib/infback9/inftree9.h | 0
.../zlib/contrib/inflate86/inffas86.c | 0
.../zlib/contrib/inflate86/inffast.S | 0
.../zlib/contrib/iostream/test.cpp | 0
.../zlib/contrib/iostream/zfstream.cpp | 0
.../zlib/contrib/iostream/zfstream.h | 0
.../zlib/contrib/iostream2/zstream.h | 0
.../zlib/contrib/iostream2/zstream_test.cpp | 0
{lib => third_party}/zlib/contrib/iostream3/README | 0
{lib => third_party}/zlib/contrib/iostream3/TODO | 0
.../zlib/contrib/iostream3/test.cc | 0
.../zlib/contrib/iostream3/zfstream.cc | 0
.../zlib/contrib/iostream3/zfstream.h | 0
.../zlib/contrib/masm686/match.asm | 0
.../zlib/contrib/masmx64/bld_ml64.bat | 0
.../zlib/contrib/masmx64/gvmat64.asm | 0
.../zlib/contrib/masmx64/inffas8664.c | 0
.../zlib/contrib/masmx64/inffasx64.asm | 0
.../zlib/contrib/masmx64/readme.txt | 0
.../zlib/contrib/masmx86/bld_ml32.bat | 0
.../zlib/contrib/masmx86/gvmat32.asm | 0
.../zlib/contrib/masmx86/gvmat32c.c | 0
.../zlib/contrib/masmx86/inffas32.asm | 0
.../zlib/contrib/masmx86/mkasm.bat | 0
.../zlib/contrib/masmx86/readme.txt | 0
.../zlib/contrib/minizip/ChangeLogUnzip | 0
{lib => third_party}/zlib/contrib/minizip/Makefile | 0
{lib => third_party}/zlib/contrib/minizip/crypt.h | 0
{lib => third_party}/zlib/contrib/minizip/ioapi.c | 0
{lib => third_party}/zlib/contrib/minizip/ioapi.h | 0
.../zlib/contrib/minizip/iowin32.c | 0
.../zlib/contrib/minizip/iowin32.h | 0
.../zlib/contrib/minizip/miniunz.c | 0
.../zlib/contrib/minizip/minizip.c | 0
.../zlib/contrib/minizip/mztools.c | 0
.../zlib/contrib/minizip/mztools.h | 0
{lib => third_party}/zlib/contrib/minizip/unzip.c | 0
{lib => third_party}/zlib/contrib/minizip/unzip.h | 0
{lib => third_party}/zlib/contrib/minizip/zip.c | 0
{lib => third_party}/zlib/contrib/minizip/zip.h | 0
.../zlib/contrib/pascal/example.pas | 0
.../zlib/contrib/pascal/readme.txt | 0
.../zlib/contrib/pascal/zlibd32.mak | 0
.../zlib/contrib/pascal/zlibpas.pas | 0
{lib => third_party}/zlib/contrib/puff/Makefile | 0
{lib => third_party}/zlib/contrib/puff/README | 0
{lib => third_party}/zlib/contrib/puff/puff.c | 0
{lib => third_party}/zlib/contrib/puff/puff.h | 0
{lib => third_party}/zlib/contrib/puff/zeros.raw | Bin 1213 -> 1213 bytes
.../zlib/contrib/testzlib/testzlib.c | 0
.../zlib/contrib/testzlib/testzlib.txt | 0
{lib => third_party}/zlib/contrib/untgz/Makefile | 0
.../zlib/contrib/untgz/Makefile.msc | 0
{lib => third_party}/zlib/contrib/untgz/untgz.c | 0
.../zlib/contrib/vstudio/readme.txt | 0
.../zlib/contrib/vstudio/vc7/miniunz.vcproj | 0
.../zlib/contrib/vstudio/vc7/minizip.vcproj | 0
.../zlib/contrib/vstudio/vc7/testzlib.vcproj | 0
.../zlib/contrib/vstudio/vc7/zlib.rc | 0
.../zlib/contrib/vstudio/vc7/zlibstat.vcproj | 0
.../zlib/contrib/vstudio/vc7/zlibvc.def | 0
.../zlib/contrib/vstudio/vc7/zlibvc.sln | 0
.../zlib/contrib/vstudio/vc7/zlibvc.vcproj | 0
.../zlib/contrib/vstudio/vc8/miniunz.vcproj | 0
.../zlib/contrib/vstudio/vc8/minizip.vcproj | 0
.../zlib/contrib/vstudio/vc8/testzlib.vcproj | 0
.../zlib/contrib/vstudio/vc8/testzlibdll.vcproj | 0
.../zlib/contrib/vstudio/vc8/zlib.rc | 0
.../zlib/contrib/vstudio/vc8/zlibstat.vcproj | 0
.../zlib/contrib/vstudio/vc8/zlibvc.def | 0
.../zlib/contrib/vstudio/vc8/zlibvc.sln | 0
.../zlib/contrib/vstudio/vc8/zlibvc.vcproj | 0
{lib => third_party}/zlib/crc32.c | 0
{lib => third_party}/zlib/crc32.h | 0
{lib => third_party}/zlib/deflate.c | 0
{lib => third_party}/zlib/deflate.h | 0
{lib => third_party}/zlib/example.c | 0
{lib => third_party}/zlib/examples/README.examples | 0
{lib => third_party}/zlib/examples/fitblk.c | 0
{lib => third_party}/zlib/examples/gun.c | 0
{lib => third_party}/zlib/examples/gzappend.c | 0
{lib => third_party}/zlib/examples/gzjoin.c | 0
{lib => third_party}/zlib/examples/gzlog.c | 0
{lib => third_party}/zlib/examples/gzlog.h | 0
{lib => third_party}/zlib/examples/zlib_how.html | 0
{lib => third_party}/zlib/examples/zpipe.c | 0
{lib => third_party}/zlib/examples/zran.c | 0
{lib => third_party}/zlib/gzio.c | 0
{lib => third_party}/zlib/infback.c | 0
{lib => third_party}/zlib/inffast.c | 0
{lib => third_party}/zlib/inffast.h | 0
{lib => third_party}/zlib/inffixed.h | 0
{lib => third_party}/zlib/inflate.c | 0
{lib => third_party}/zlib/inflate.h | 0
{lib => third_party}/zlib/inftrees.c | 0
{lib => third_party}/zlib/inftrees.h | 0
{lib => third_party}/zlib/make_vms.com | 0
{lib => third_party}/zlib/minigzip.c | 0
{lib => third_party}/zlib/msdos/Makefile.bor | 0
{lib => third_party}/zlib/msdos/Makefile.dj2 | 0
{lib => third_party}/zlib/msdos/Makefile.emx | 0
{lib => third_party}/zlib/msdos/Makefile.msc | 0
{lib => third_party}/zlib/msdos/Makefile.tc | 0
{lib => third_party}/zlib/old/Makefile.riscos | 0
{lib => third_party}/zlib/old/README | 0
{lib => third_party}/zlib/old/descrip.mms | 0
{lib => third_party}/zlib/old/os2/Makefile.os2 | 0
{lib => third_party}/zlib/old/os2/zlib.def | 0
{lib => third_party}/zlib/old/visual-basic.txt | 0
{lib => third_party}/zlib/old/zlib.html | 0
{lib => third_party}/zlib/projects/README.projects | 0
.../zlib/projects/visualc6/README.txt | 0
.../zlib/projects/visualc6/example.dsp | 0
.../zlib/projects/visualc6/minigzip.dsp | 0
.../zlib/projects/visualc6/zlib.dsp | 0
.../zlib/projects/visualc6/zlib.dsw | 0
{lib => third_party}/zlib/qnx/package.qpg | 0
{lib => third_party}/zlib/trees.c | 0
{lib => third_party}/zlib/trees.h | 0
{lib => third_party}/zlib/uncompr.c | 0
{lib => third_party}/zlib/win32/DLL_FAQ.txt | 0
{lib => third_party}/zlib/win32/Makefile.bor | 0
{lib => third_party}/zlib/win32/Makefile.emx | 0
{lib => third_party}/zlib/win32/Makefile.gcc | 0
{lib => third_party}/zlib/win32/Makefile.msc | 0
{lib => third_party}/zlib/win32/VisualC.txt | 0
{lib => third_party}/zlib/win32/zlib.def | 0
{lib => third_party}/zlib/win32/zlib1.rc | 0
third_party/zlib/wscript | 17 ++++++++
{lib => third_party}/zlib/zconf.h | 0
{lib => third_party}/zlib/zconf.in.h | 0
{lib => third_party}/zlib/zlib.h | 0
{lib => third_party}/zlib/zutil.c | 0
{lib => third_party}/zlib/zutil.h | 0
wscript | 24 ++++++++++-
wscript_build | 7 ++-
250 files changed, 124 insertions(+), 55 deletions(-)
create mode 100644 buildtools/wafsamba/samba_third_party.py
create mode 120000 ctdb/third_party
delete mode 100644 lib/zlib/wscript
rename {lib => third_party}/iniparser/AUTHORS (100%)
rename {lib => third_party}/iniparser/INSTALL (100%)
rename {lib => third_party}/iniparser/LICENSE (100%)
rename {lib => third_party}/iniparser/Makefile (100%)
rename {lib => third_party}/iniparser/README (100%)
rename {lib => third_party}/iniparser/html/doxygen.css (100%)
rename {lib => third_party}/iniparser/html/doxygen.png (100%)
rename {lib => third_party}/iniparser/html/globals_func.html (100%)
rename {lib => third_party}/iniparser/html/index.html (100%)
rename {lib => third_party}/iniparser/html/iniparser_8h.html (100%)
rename {lib => third_party}/iniparser/html/iniparser_8main.html (100%)
rename {lib => third_party}/iniparser/html/tab_b.gif (100%)
rename {lib => third_party}/iniparser/html/tab_l.gif (100%)
rename {lib => third_party}/iniparser/html/tab_r.gif (100%)
rename {lib => third_party}/iniparser/html/tabs.css (100%)
rename {lib => third_party}/iniparser/src/dictionary.c (100%)
rename {lib => third_party}/iniparser/src/dictionary.h (100%)
rename {lib => third_party}/iniparser/src/iniparser.c (100%)
rename {lib => third_party}/iniparser/src/iniparser.h (100%)
rename {lib => third_party}/iniparser/src/strlib.c (100%)
rename {lib => third_party}/iniparser/src/strlib.h (100%)
rename {lib => third_party}/iniparser/src/wscript (84%)
rename {lib => third_party}/iniparser/test/Makefile (100%)
rename {lib => third_party}/iniparser/test/iniexample.c (100%)
rename {lib => third_party}/iniparser_build/dictionary.c (100%)
rename {lib => third_party}/iniparser_build/iniparser.c (100%)
rename {lib => third_party}/iniparser_build/strlib.c (100%)
rename {lib => third_party}/popt/CHANGES (100%)
rename {lib => third_party}/popt/COPYING (100%)
rename {lib => third_party}/popt/README (100%)
rename {lib => third_party}/popt/dummy.in (100%)
rename {lib => third_party}/popt/findme.c (100%)
rename {lib => third_party}/popt/findme.h (100%)
rename {lib => third_party}/popt/popt.c (100%)
rename {lib => third_party}/popt/popt.h (100%)
rename {lib => third_party}/popt/poptconfig.c (100%)
rename {lib => third_party}/popt/popthelp.c (100%)
rename {lib => third_party}/popt/poptint.h (100%)
rename {lib => third_party}/popt/poptparse.c (100%)
rename {lib => third_party}/popt/system.h (100%)
rename {lib => third_party}/popt/wscript (83%)
rename {lib => third_party}/zlib/ChangeLog (100%)
rename {lib => third_party}/zlib/FAQ (100%)
rename {lib => third_party}/zlib/INDEX (100%)
rename {lib => third_party}/zlib/Makefile (100%)
rename {lib => third_party}/zlib/Makefile.in (100%)
rename {lib => third_party}/zlib/README (100%)
rename {lib => third_party}/zlib/adler32.c (100%)
rename {lib => third_party}/zlib/algorithm.txt (100%)
rename {lib => third_party}/zlib/amiga/Makefile.pup (100%)
rename {lib => third_party}/zlib/amiga/Makefile.sas (100%)
rename {lib => third_party}/zlib/as400/bndsrc (100%)
rename {lib => third_party}/zlib/as400/compile.clp (100%)
rename {lib => third_party}/zlib/as400/readme.txt (100%)
rename {lib => third_party}/zlib/as400/zlib.inc (100%)
rename {lib => third_party}/zlib/compress.c (100%)
rename {lib => third_party}/zlib/contrib/README.contrib (100%)
rename {lib => third_party}/zlib/contrib/ada/buffer_demo.adb (100%)
rename {lib => third_party}/zlib/contrib/ada/mtest.adb (100%)
rename {lib => third_party}/zlib/contrib/ada/read.adb (100%)
rename {lib => third_party}/zlib/contrib/ada/readme.txt (100%)
rename {lib => third_party}/zlib/contrib/ada/test.adb (100%)
rename {lib => third_party}/zlib/contrib/ada/zlib-streams.adb (100%)
rename {lib => third_party}/zlib/contrib/ada/zlib-streams.ads (100%)
rename {lib => third_party}/zlib/contrib/ada/zlib-thin.adb (100%)
rename {lib => third_party}/zlib/contrib/ada/zlib-thin.ads (100%)
rename {lib => third_party}/zlib/contrib/ada/zlib.adb (100%)
rename {lib => third_party}/zlib/contrib/ada/zlib.ads (100%)
rename {lib => third_party}/zlib/contrib/ada/zlib.gpr (100%)
rename {lib => third_party}/zlib/contrib/asm586/README.586 (100%)
rename {lib => third_party}/zlib/contrib/asm586/match.S (100%)
rename {lib => third_party}/zlib/contrib/asm686/README.686 (100%)
rename {lib => third_party}/zlib/contrib/asm686/match.S (100%)
rename {lib => third_party}/zlib/contrib/blast/Makefile (100%)
rename {lib => third_party}/zlib/contrib/blast/README (100%)
rename {lib => third_party}/zlib/contrib/blast/blast.c (100%)
rename {lib => third_party}/zlib/contrib/blast/blast.h (100%)
rename {lib => third_party}/zlib/contrib/blast/test.pk (100%)
rename {lib => third_party}/zlib/contrib/blast/test.txt (100%)
rename {lib => third_party}/zlib/contrib/delphi/ZLib.pas (100%)
rename {lib => third_party}/zlib/contrib/delphi/ZLibConst.pas (100%)
rename {lib => third_party}/zlib/contrib/delphi/readme.txt (100%)
rename {lib => third_party}/zlib/contrib/delphi/zlibd32.mak (100%)
rename {lib => third_party}/zlib/contrib/dotzlib/DotZLib.build (100%)
rename {lib => third_party}/zlib/contrib/dotzlib/DotZLib.chm (100%)
rename {lib => third_party}/zlib/contrib/dotzlib/DotZLib.sln (100%)
rename {lib => third_party}/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs (100%)
rename {lib => third_party}/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs (100%)
rename {lib => third_party}/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs (100%)
rename {lib => third_party}/zlib/contrib/dotzlib/DotZLib/CodecBase.cs (100%)
rename {lib => third_party}/zlib/contrib/dotzlib/DotZLib/Deflater.cs (100%)
rename {lib => third_party}/zlib/contrib/dotzlib/DotZLib/DotZLib.cs (100%)
rename {lib => third_party}/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj (100%)
rename {lib => third_party}/zlib/contrib/dotzlib/DotZLib/GZipStream.cs (100%)
rename {lib => third_party}/zlib/contrib/dotzlib/DotZLib/Inflater.cs (100%)
rename {lib => third_party}/zlib/contrib/dotzlib/DotZLib/UnitTests.cs (100%)
rename {lib => third_party}/zlib/contrib/dotzlib/LICENSE_1_0.txt (100%)
rename {lib => third_party}/zlib/contrib/dotzlib/readme.txt (100%)
rename {lib => third_party}/zlib/contrib/infback9/README (100%)
rename {lib => third_party}/zlib/contrib/infback9/infback9.c (100%)
rename {lib => third_party}/zlib/contrib/infback9/infback9.h (100%)
rename {lib => third_party}/zlib/contrib/infback9/inffix9.h (100%)
rename {lib => third_party}/zlib/contrib/infback9/inflate9.h (100%)
rename {lib => third_party}/zlib/contrib/infback9/inftree9.c (100%)
rename {lib => third_party}/zlib/contrib/infback9/inftree9.h (100%)
rename {lib => third_party}/zlib/contrib/inflate86/inffas86.c (100%)
rename {lib => third_party}/zlib/contrib/inflate86/inffast.S (100%)
rename {lib => third_party}/zlib/contrib/iostream/test.cpp (100%)
rename {lib => third_party}/zlib/contrib/iostream/zfstream.cpp (100%)
rename {lib => third_party}/zlib/contrib/iostream/zfstream.h (100%)
rename {lib => third_party}/zlib/contrib/iostream2/zstream.h (100%)
rename {lib => third_party}/zlib/contrib/iostream2/zstream_test.cpp (100%)
rename {lib => third_party}/zlib/contrib/iostream3/README (100%)
rename {lib => third_party}/zlib/contrib/iostream3/TODO (100%)
rename {lib => third_party}/zlib/contrib/iostream3/test.cc (100%)
rename {lib => third_party}/zlib/contrib/iostream3/zfstream.cc (100%)
rename {lib => third_party}/zlib/contrib/iostream3/zfstream.h (100%)
rename {lib => third_party}/zlib/contrib/masm686/match.asm (100%)
rename {lib => third_party}/zlib/contrib/masmx64/bld_ml64.bat (100%)
rename {lib => third_party}/zlib/contrib/masmx64/gvmat64.asm (100%)
rename {lib => third_party}/zlib/contrib/masmx64/inffas8664.c (100%)
rename {lib => third_party}/zlib/contrib/masmx64/inffasx64.asm (100%)
rename {lib => third_party}/zlib/contrib/masmx64/readme.txt (100%)
rename {lib => third_party}/zlib/contrib/masmx86/bld_ml32.bat (100%)
rename {lib => third_party}/zlib/contrib/masmx86/gvmat32.asm (100%)
rename {lib => third_party}/zlib/contrib/masmx86/gvmat32c.c (100%)
rename {lib => third_party}/zlib/contrib/masmx86/inffas32.asm (100%)
rename {lib => third_party}/zlib/contrib/masmx86/mkasm.bat (100%)
rename {lib => third_party}/zlib/contrib/masmx86/readme.txt (100%)
rename {lib => third_party}/zlib/contrib/minizip/ChangeLogUnzip (100%)
rename {lib => third_party}/zlib/contrib/minizip/Makefile (100%)
rename {lib => third_party}/zlib/contrib/minizip/crypt.h (100%)
rename {lib => third_party}/zlib/contrib/minizip/ioapi.c (100%)
rename {lib => third_party}/zlib/contrib/minizip/ioapi.h (100%)
rename {lib => third_party}/zlib/contrib/minizip/iowin32.c (100%)
rename {lib => third_party}/zlib/contrib/minizip/iowin32.h (100%)
rename {lib => third_party}/zlib/contrib/minizip/miniunz.c (100%)
rename {lib => third_party}/zlib/contrib/minizip/minizip.c (100%)
rename {lib => third_party}/zlib/contrib/minizip/mztools.c (100%)
rename {lib => third_party}/zlib/contrib/minizip/mztools.h (100%)
rename {lib => third_party}/zlib/contrib/minizip/unzip.c (100%)
rename {lib => third_party}/zlib/contrib/minizip/unzip.h (100%)
rename {lib => third_party}/zlib/contrib/minizip/zip.c (100%)
rename {lib => third_party}/zlib/contrib/minizip/zip.h (100%)
rename {lib => third_party}/zlib/contrib/pascal/example.pas (100%)
rename {lib => third_party}/zlib/contrib/pascal/readme.txt (100%)
rename {lib => third_party}/zlib/contrib/pascal/zlibd32.mak (100%)
rename {lib => third_party}/zlib/contrib/pascal/zlibpas.pas (100%)
rename {lib => third_party}/zlib/contrib/puff/Makefile (100%)
rename {lib => third_party}/zlib/contrib/puff/README (100%)
rename {lib => third_party}/zlib/contrib/puff/puff.c (100%)
rename {lib => third_party}/zlib/contrib/puff/puff.h (100%)
rename {lib => third_party}/zlib/contrib/puff/zeros.raw (100%)
rename {lib => third_party}/zlib/contrib/testzlib/testzlib.c (100%)
rename {lib => third_party}/zlib/contrib/testzlib/testzlib.txt (100%)
rename {lib => third_party}/zlib/contrib/untgz/Makefile (100%)
rename {lib => third_party}/zlib/contrib/untgz/Makefile.msc (100%)
rename {lib => third_party}/zlib/contrib/untgz/untgz.c (100%)
rename {lib => third_party}/zlib/contrib/vstudio/readme.txt (100%)
rename {lib => third_party}/zlib/contrib/vstudio/vc7/miniunz.vcproj (100%)
rename {lib => third_party}/zlib/contrib/vstudio/vc7/minizip.vcproj (100%)
rename {lib => third_party}/zlib/contrib/vstudio/vc7/testzlib.vcproj (100%)
rename {lib => third_party}/zlib/contrib/vstudio/vc7/zlib.rc (100%)
rename {lib => third_party}/zlib/contrib/vstudio/vc7/zlibstat.vcproj (100%)
rename {lib => third_party}/zlib/contrib/vstudio/vc7/zlibvc.def (100%)
rename {lib => third_party}/zlib/contrib/vstudio/vc7/zlibvc.sln (100%)
rename {lib => third_party}/zlib/contrib/vstudio/vc7/zlibvc.vcproj (100%)
rename {lib => third_party}/zlib/contrib/vstudio/vc8/miniunz.vcproj (100%)
rename {lib => third_party}/zlib/contrib/vstudio/vc8/minizip.vcproj (100%)
rename {lib => third_party}/zlib/contrib/vstudio/vc8/testzlib.vcproj (100%)
rename {lib => third_party}/zlib/contrib/vstudio/vc8/testzlibdll.vcproj (100%)
rename {lib => third_party}/zlib/contrib/vstudio/vc8/zlib.rc (100%)
rename {lib => third_party}/zlib/contrib/vstudio/vc8/zlibstat.vcproj (100%)
rename {lib => third_party}/zlib/contrib/vstudio/vc8/zlibvc.def (100%)
rename {lib => third_party}/zlib/contrib/vstudio/vc8/zlibvc.sln (100%)
rename {lib => third_party}/zlib/contrib/vstudio/vc8/zlibvc.vcproj (100%)
rename {lib => third_party}/zlib/crc32.c (100%)
rename {lib => third_party}/zlib/crc32.h (100%)
rename {lib => third_party}/zlib/deflate.c (100%)
rename {lib => third_party}/zlib/deflate.h (100%)
rename {lib => third_party}/zlib/example.c (100%)
rename {lib => third_party}/zlib/examples/README.examples (100%)
rename {lib => third_party}/zlib/examples/fitblk.c (100%)
rename {lib => third_party}/zlib/examples/gun.c (100%)
rename {lib => third_party}/zlib/examples/gzappend.c (100%)
rename {lib => third_party}/zlib/examples/gzjoin.c (100%)
rename {lib => third_party}/zlib/examples/gzlog.c (100%)
rename {lib => third_party}/zlib/examples/gzlog.h (100%)
rename {lib => third_party}/zlib/examples/zlib_how.html (100%)
rename {lib => third_party}/zlib/examples/zpipe.c (100%)
rename {lib => third_party}/zlib/examples/zran.c (100%)
rename {lib => third_party}/zlib/gzio.c (100%)
rename {lib => third_party}/zlib/infback.c (100%)
rename {lib => third_party}/zlib/inffast.c (100%)
rename {lib => third_party}/zlib/inffast.h (100%)
rename {lib => third_party}/zlib/inffixed.h (100%)
rename {lib => third_party}/zlib/inflate.c (100%)
rename {lib => third_party}/zlib/inflate.h (100%)
rename {lib => third_party}/zlib/inftrees.c (100%)
rename {lib => third_party}/zlib/inftrees.h (100%)
rename {lib => third_party}/zlib/make_vms.com (100%)
rename {lib => third_party}/zlib/minigzip.c (100%)
rename {lib => third_party}/zlib/msdos/Makefile.bor (100%)
rename {lib => third_party}/zlib/msdos/Makefile.dj2 (100%)
rename {lib => third_party}/zlib/msdos/Makefile.emx (100%)
rename {lib => third_party}/zlib/msdos/Makefile.msc (100%)
rename {lib => third_party}/zlib/msdos/Makefile.tc (100%)
rename {lib => third_party}/zlib/old/Makefile.riscos (100%)
rename {lib => third_party}/zlib/old/README (100%)
rename {lib => third_party}/zlib/old/descrip.mms (100%)
rename {lib => third_party}/zlib/old/os2/Makefile.os2 (100%)
rename {lib => third_party}/zlib/old/os2/zlib.def (100%)
rename {lib => third_party}/zlib/old/visual-basic.txt (100%)
rename {lib => third_party}/zlib/old/zlib.html (100%)
rename {lib => third_party}/zlib/projects/README.projects (100%)
rename {lib => third_party}/zlib/projects/visualc6/README.txt (100%)
rename {lib => third_party}/zlib/projects/visualc6/example.dsp (100%)
rename {lib => third_party}/zlib/projects/visualc6/minigzip.dsp (100%)
rename {lib => third_party}/zlib/projects/visualc6/zlib.dsp (100%)
rename {lib => third_party}/zlib/projects/visualc6/zlib.dsw (100%)
rename {lib => third_party}/zlib/qnx/package.qpg (100%)
rename {lib => third_party}/zlib/trees.c (100%)
rename {lib => third_party}/zlib/trees.h (100%)
rename {lib => third_party}/zlib/uncompr.c (100%)
rename {lib => third_party}/zlib/win32/DLL_FAQ.txt (100%)
rename {lib => third_party}/zlib/win32/Makefile.bor (100%)
rename {lib => third_party}/zlib/win32/Makefile.emx (100%)
rename {lib => third_party}/zlib/win32/Makefile.gcc (100%)
rename {lib => third_party}/zlib/win32/Makefile.msc (100%)
rename {lib => third_party}/zlib/win32/VisualC.txt (100%)
rename {lib => third_party}/zlib/win32/zlib.def (100%)
rename {lib => third_party}/zlib/win32/zlib1.rc (100%)
create mode 100644 third_party/zlib/wscript
rename {lib => third_party}/zlib/zconf.h (100%)
rename {lib => third_party}/zlib/zconf.in.h (100%)
rename {lib => third_party}/zlib/zlib.h (100%)
rename {lib => third_party}/zlib/zutil.c (100%)
rename {lib => third_party}/zlib/zutil.h (100%)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_third_party.py b/buildtools/wafsamba/samba_third_party.py
new file mode 100644
index 0000000..408d557
--- /dev/null
+++ b/buildtools/wafsamba/samba_third_party.py
@@ -0,0 +1,41 @@
+# functions to support third party libraries
+
+from Configure import conf
+import sys, Logs, os
+from samba_bundled import *
+
+ at conf
+def CHECK_FOR_THIRD_PARTY(conf):
+ return os.path.exists('third_party')
+
+Build.BuildContext.CHECK_FOR_THIRD_PARTY = CHECK_FOR_THIRD_PARTY
+
+ at conf
+def CHECK_INIPARSER(conf):
+ return conf.CHECK_BUNDLED_SYSTEM('iniparser', checkfunctions='iniparser_load', headers='iniparser.h')
+
+Build.BuildContext.CHECK_INIPARSER = CHECK_INIPARSER
+
+ at conf
+def CHECK_ZLIB(conf):
+ version_check='''
+ #if (ZLIB_VERNUM >= 0x1230)
+ #else
+ #error "ZLIB_VERNUM < 0x1230"
+ #endif
+ z_stream *z;
+ inflateInit2(z, -15);
+ '''
+ return conf.CHECK_BUNDLED_SYSTEM('z', minversion='1.2.3', pkg='zlib',
+ checkfunctions='zlibVersion',
+ headers='zlib.h',
+ checkcode=version_check,
+ implied_deps='replace')
+
+Build.BuildContext.CHECK_ZLIB = CHECK_ZLIB
+
+ at conf
+def CHECK_POPT(conf):
+ return conf.CHECK_BUNDLED_SYSTEM('popt', checkfunctions='poptGetContext', headers='popt.h')
+
+Build.BuildContext.CHECK_POPT = CHECK_POPT
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 8ec4cb8..a2b8eea 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -18,6 +18,7 @@ from samba_autoproto import *
from samba_python import *
from samba_deps import *
from samba_bundled import *
+from samba_third_party import *
import samba_install
import samba_conftests
import samba_abi
diff --git a/ctdb/third_party b/ctdb/third_party
new file mode 120000
index 0000000..d838c05
--- /dev/null
+++ b/ctdb/third_party
@@ -0,0 +1 @@
+../third_party
\ No newline at end of file
diff --git a/ctdb/wscript b/ctdb/wscript
index 389afbb..5014f05 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -12,7 +12,7 @@ while not os.path.exists(srcdir+'/buildtools') and len(srcdir.split('/')) < 5:
srcdir = srcdir + '/..'
sys.path.insert(0, srcdir + '/buildtools/wafsamba')
-import wafsamba, samba_dist, Options, Logs
+import wafsamba, samba_dist, Options, Logs, Utils
import samba_utils, samba_version
env = samba_utils.LOAD_ENVIRONMENT()
@@ -66,7 +66,14 @@ def configure(conf):
Options.options.disable_python = True
conf.RECURSE('lib/replace')
- conf.RECURSE('lib/popt')
+ if conf.CHECK_FOR_THIRD_PARTY():
+ conf.RECURSE('third_party/popt')
+ else:
+ if not conf.CHECK_POPT():
+ raise Utils.WafError('popt development packages have not been found\nIf third_party is installed, check that it is in the proper place.')
+ else:
+ conf.define('USING_SYSTEM_POPT', 1)
+
conf.RECURSE('lib/talloc')
conf.RECURSE('lib/tevent')
conf.RECURSE('lib/tdb')
@@ -155,7 +162,9 @@ def configure(conf):
def build(bld):
bld.RECURSE('lib/replace')
- bld.RECURSE('lib/popt')
+ if bld.CHECK_FOR_THIRD_PARTY():
+ bld.RECURSE('third_party/popt')
+
bld.RECURSE('lib/talloc')
bld.RECURSE('lib/tevent')
bld.RECURSE('lib/tdb')
diff --git a/lib/ldb/wscript b/lib/ldb/wscript
index ba75d67..be04544 100755
--- a/lib/ldb/wscript
+++ b/lib/ldb/wscript
@@ -16,7 +16,8 @@ sys.path.insert(0, srcdir + '/buildtools/wafsamba')
import wafsamba, samba_dist, Options
samba_dist.DIST_DIRS('''lib/ldb:. lib/replace:lib/replace lib/talloc:lib/talloc
- lib/tdb:lib/tdb lib/tdb:lib/tdb lib/tevent:lib/tevent lib/popt:lib/popt
+ lib/tdb:lib/tdb lib/tdb:lib/tdb lib/tevent:lib/tevent
+ third_party/popt:third_party/popt
buildtools:buildtools''')
@@ -31,7 +32,15 @@ def set_options(opt):
def configure(conf):
conf.RECURSE('lib/tdb')
conf.RECURSE('lib/tevent')
- conf.RECURSE('lib/popt')
+
+ if conf.CHECK_FOR_THIRD_PARTY():
+ conf.RECURSE('third_party/popt')
+ else:
+ if not conf.CHECK_POPT():
+ raise Utils.WafError('popt development packages have not been found.\nIf third_party is installed, check that it is in the proper place.')
+ else:
+ conf.define('USING_SYSTEM_POPT', 1)
+
conf.RECURSE('lib/replace')
conf.find_program('python', var='PYTHON')
conf.find_program('xsltproc', var='XSLTPROC')
@@ -75,7 +84,10 @@ def configure(conf):
def build(bld):
bld.RECURSE('lib/tevent')
- bld.RECURSE('lib/popt')
+
+ if os.path.exists('third_party'):
+ bld.RECURSE('third_party/popt')
+
bld.RECURSE('lib/replace')
bld.RECURSE('lib/tdb')
diff --git a/lib/zlib/wscript b/lib/zlib/wscript
deleted file mode 100644
index 9965fe2..0000000
--- a/lib/zlib/wscript
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env python
-
-def configure(conf):
- version_check='''
- #if (ZLIB_VERNUM >= 0x1230)
- #else
- #error "ZLIB_VERNUM < 0x1230"
- #endif
- z_stream *z;
- inflateInit2(z, -15);
- '''
-
- if conf.CHECK_BUNDLED_SYSTEM('z', minversion='1.2.3', pkg='zlib',
- checkfunctions='zlibVersion',
- headers='zlib.h',
- checkcode=version_check,
- implied_deps='replace'):
- conf.define('USING_SYSTEM_ZLIB', 1)
-
-def build(bld):
- if bld.CONFIG_SET('USING_SYSTEM_ZLIB'):
- return
-
- bld.SAMBA_LIBRARY('z',
- private_library=True,
- deps='replace',
- allow_warnings=True,
- source='''adler32.c compress.c crc32.c gzio.c
- uncompr.c deflate.c trees.c zutil.c
- inflate.c infback.c inftrees.c inffast.c''')
diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c
index a3e6451..a31fbdf 100644
--- a/nsswitch/wbinfo.c
+++ b/nsswitch/wbinfo.c
@@ -24,7 +24,6 @@
#include "includes.h"
#include "winbind_client.h"
#include "libwbclient/wbclient.h"
-#include "lib/popt/popt.h"
#include "../libcli/auth/libcli_auth.h"
#include "lib/cmdline/popt_common.h"
#include "lib/afs/afs_settoken.h"
diff --git a/source4/torture/winbind/wscript_build b/source4/torture/winbind/wscript_build
index 0ae9852..0def23e 100644
--- a/source4/torture/winbind/wscript_build
+++ b/source4/torture/winbind/wscript_build
@@ -6,6 +6,6 @@ bld.SAMBA_MODULE('TORTURE_WINBIND',
autoproto='proto.h',
subsystem='smbtorture',
init_function='torture_winbind_init',
- deps='wbclient winbind-client torture PAM_ERRORS',
+ deps='popt wbclient winbind-client torture PAM_ERRORS',
internal_module=True
)
diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index 4ba7675..39192b0 100755
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -3,7 +3,7 @@
bld.SAMBA_SUBSYSTEM('TORTURE_UTIL',
source='util_smb.c',
- public_deps='torture POPT_CREDENTIALS',
+ public_deps='torture popt POPT_CREDENTIALS',
deps='smbclient-raw'
)
@@ -12,7 +12,7 @@ bld.SAMBA_MODULE('TORTURE_BASIC',
source='basic/base.c basic/misc.c basic/scanner.c basic/utable.c basic/charset.c basic/mangle_test.c basic/denytest.c basic/aliases.c basic/locking.c basic/secleak.c basic/rename.c basic/dir.c basic/delete.c basic/unlink.c basic/disconnect.c basic/delaywrite.c basic/attr.c basic/properties.c',
allow_warnings=True,
subsystem='smbtorture',
- deps='LIBCLI_SMB POPT_CREDENTIALS TORTURE_UTIL smbclient-raw TORTURE_RAW',
+ deps='LIBCLI_SMB popt POPT_CREDENTIALS TORTURE_UTIL smbclient-raw TORTURE_RAW',
internal_module=True,
autoproto='basic/proto.h',
init_function='torture_base_init'
@@ -25,7 +25,7 @@ bld.SAMBA_MODULE('TORTURE_RAW',
autoproto='raw/proto.h',
subsystem='smbtorture',
init_function='torture_raw_init',
- deps='LIBCLI_SMB LIBCLI_LSA LIBCLI_SMB_COMPOSITE POPT_CREDENTIALS TORTURE_UTIL',
+ deps='LIBCLI_SMB LIBCLI_LSA LIBCLI_SMB_COMPOSITE popt POPT_CREDENTIALS TORTURE_UTIL',
internal_module=True
)
@@ -55,7 +55,7 @@ bld.SAMBA_MODULE('torture_rpc',
autoproto='rpc/proto.h',
subsystem='smbtorture',
init_function='torture_rpc_init',
- deps='ndr-table RPC_NDR_UNIXINFO dcerpc-samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL RPC_NDR_NETLOGON dcerpc-atsvc RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER samba-net LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP service process_model RPC_NDR_BROWSER LIBCLI_DRSUAPI TORTURE_DFS RPC_NDR_FSRVP '+heimdal_specific['rpc'][1],
+ deps='ndr-table RPC_NDR_UNIXINFO dcerpc-samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL RPC_NDR_NETLOGON dcerpc-atsvc RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER samba-net LIBCLI_AUTH popt POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP service process_model RPC_NDR_BROWSER LIBCLI_DRSUAPI TORTURE_DFS RPC_NDR_FSRVP '+heimdal_specific['rpc'][1],
internal_module=True
)
@@ -85,7 +85,7 @@ bld.SAMBA_MODULE('TORTURE_AUTH',
source='auth/ntlmssp.c auth/pac.c auth/smbencrypt.c',
autoproto='auth/proto.h',
subsystem='smbtorture',
- deps='LIBCLI_SMB gensec auth4 authkrb5 POPT_CREDENTIALS smbpasswdparser torture com_err gensec_ntlmssp',
+ deps='LIBCLI_SMB gensec auth4 authkrb5 popt POPT_CREDENTIALS smbpasswdparser torture com_err gensec_ntlmssp',
internal_module=True
)
@@ -114,7 +114,7 @@ bld.SAMBA_MODULE('TORTURE_UNIX',
bld.SAMBA_MODULE('TORTURE_LDAP',
source='ldap/common.c ldap/basic.c ldap/schema.c ldap/uptodatevector.c ldap/cldap.c ldap/netlogon.c ldap/cldapbench.c ldap/ldap_sort.c ldap/nested_search.c',
subsystem='smbtorture',
- deps='cli-ldap cli_cldap samdb POPT_CREDENTIALS torture ldbsamba',
+ deps='cli-ldap cli_cldap samdb popt POPT_CREDENTIALS torture ldbsamba',
internal_module=True,
autoproto='ldap/proto.h',
init_function='torture_ldap_init'
@@ -136,7 +136,7 @@ bld.SAMBA_MODULE('TORTURE_NET',
autoproto='libnet/proto.h',
subsystem='smbtorture',
init_function='torture_net_init',
- deps='samba-net POPT_CREDENTIALS torture_rpc PROVISION',
+ deps='samba-net popt POPT_CREDENTIALS torture_rpc PROVISION',
internal_module=True
)
@@ -146,7 +146,7 @@ bld.SAMBA_MODULE('TORTURE_NTP',
autoproto='ntp/proto.h',
subsystem='smbtorture',
init_function='torture_ntp_init',
- deps='POPT_CREDENTIALS torture_rpc',
+ deps='popt POPT_CREDENTIALS torture_rpc',
internal_module=True
)
diff --git a/testsuite/headers/wscript_build b/testsuite/headers/wscript_build
index 635c864..f612ad9 100644
--- a/testsuite/headers/wscript_build
+++ b/testsuite/headers/wscript_build
@@ -35,7 +35,7 @@ for lib in ['talloc', 'tevent', 'tdb', 'ldb', 'popt' ]:
cflags += bld.env.CPPPATH_ST % p + ' '
if not bld.env.USING_SYSTEM_POPT:
- cflags += bld.env.CPPPATH_ST % '../lib/popt'
+ cflags += bld.env.CPPPATH_ST % '../third_party/popt'
if bld.env.DEVELOPER_MODE:
bld.SAMBA_BINARY('test_headers',
diff --git a/lib/iniparser/AUTHORS b/third_party/iniparser/AUTHORS
similarity index 100%
rename from lib/iniparser/AUTHORS
rename to third_party/iniparser/AUTHORS
diff --git a/lib/iniparser/INSTALL b/third_party/iniparser/INSTALL
similarity index 100%
rename from lib/iniparser/INSTALL
rename to third_party/iniparser/INSTALL
diff --git a/lib/iniparser/LICENSE b/third_party/iniparser/LICENSE
similarity index 100%
rename from lib/iniparser/LICENSE
rename to third_party/iniparser/LICENSE
diff --git a/lib/iniparser/Makefile b/third_party/iniparser/Makefile
similarity index 100%
rename from lib/iniparser/Makefile
rename to third_party/iniparser/Makefile
diff --git a/lib/iniparser/README b/third_party/iniparser/README
similarity index 100%
rename from lib/iniparser/README
rename to third_party/iniparser/README
diff --git a/lib/iniparser/html/doxygen.css b/third_party/iniparser/html/doxygen.css
similarity index 100%
rename from lib/iniparser/html/doxygen.css
rename to third_party/iniparser/html/doxygen.css
diff --git a/lib/iniparser/html/globals_func.html b/third_party/iniparser/html/globals_func.html
similarity index 100%
rename from lib/iniparser/html/globals_func.html
rename to third_party/iniparser/html/globals_func.html
diff --git a/lib/iniparser/html/index.html b/third_party/iniparser/html/index.html
similarity index 100%
rename from lib/iniparser/html/index.html
rename to third_party/iniparser/html/index.html
diff --git a/lib/iniparser/html/iniparser_8h.html b/third_party/iniparser/html/iniparser_8h.html
similarity index 100%
rename from lib/iniparser/html/iniparser_8h.html
rename to third_party/iniparser/html/iniparser_8h.html
diff --git a/lib/iniparser/html/iniparser_8main.html b/third_party/iniparser/html/iniparser_8main.html
similarity index 100%
rename from lib/iniparser/html/iniparser_8main.html
rename to third_party/iniparser/html/iniparser_8main.html
diff --git a/lib/iniparser/html/tabs.css b/third_party/iniparser/html/tabs.css
similarity index 100%
rename from lib/iniparser/html/tabs.css
rename to third_party/iniparser/html/tabs.css
diff --git a/lib/iniparser/src/dictionary.c b/third_party/iniparser/src/dictionary.c
similarity index 100%
rename from lib/iniparser/src/dictionary.c
rename to third_party/iniparser/src/dictionary.c
diff --git a/lib/iniparser/src/dictionary.h b/third_party/iniparser/src/dictionary.h
similarity index 100%
rename from lib/iniparser/src/dictionary.h
rename to third_party/iniparser/src/dictionary.h
diff --git a/lib/iniparser/src/iniparser.c b/third_party/iniparser/src/iniparser.c
similarity index 100%
rename from lib/iniparser/src/iniparser.c
rename to third_party/iniparser/src/iniparser.c
diff --git a/lib/iniparser/src/iniparser.h b/third_party/iniparser/src/iniparser.h
similarity index 100%
rename from lib/iniparser/src/iniparser.h
rename to third_party/iniparser/src/iniparser.h
diff --git a/lib/iniparser/src/strlib.c b/third_party/iniparser/src/strlib.c
similarity index 100%
rename from lib/iniparser/src/strlib.c
rename to third_party/iniparser/src/strlib.c
diff --git a/lib/iniparser/src/strlib.h b/third_party/iniparser/src/strlib.h
similarity index 100%
rename from lib/iniparser/src/strlib.h
rename to third_party/iniparser/src/strlib.h
diff --git a/lib/iniparser/src/wscript b/third_party/iniparser/src/wscript
similarity index 84%
rename from lib/iniparser/src/wscript
rename to third_party/iniparser/src/wscript
index c66f298..df9f60d 100644
--- a/lib/iniparser/src/wscript
+++ b/third_party/iniparser/src/wscript
@@ -5,7 +5,7 @@ import Options
def configure(conf):
conf.CHECK_HEADERS('float.h')
- if conf.CHECK_BUNDLED_SYSTEM('iniparser', checkfunctions='iniparser_load', headers='iniparser.h'):
+ if conf.CHECK_INIPARSER():
conf.define('USING_SYSTEM_INIPARSER', 1)
def build(bld):
diff --git a/lib/iniparser/test/Makefile b/third_party/iniparser/test/Makefile
similarity index 100%
rename from lib/iniparser/test/Makefile
rename to third_party/iniparser/test/Makefile
diff --git a/lib/iniparser/test/iniexample.c b/third_party/iniparser/test/iniexample.c
similarity index 100%
rename from lib/iniparser/test/iniexample.c
rename to third_party/iniparser/test/iniexample.c
diff --git a/lib/iniparser_build/dictionary.c b/third_party/iniparser_build/dictionary.c
similarity index 100%
rename from lib/iniparser_build/dictionary.c
rename to third_party/iniparser_build/dictionary.c
diff --git a/lib/iniparser_build/iniparser.c b/third_party/iniparser_build/iniparser.c
similarity index 100%
rename from lib/iniparser_build/iniparser.c
rename to third_party/iniparser_build/iniparser.c
diff --git a/lib/iniparser_build/strlib.c b/third_party/iniparser_build/strlib.c
similarity index 100%
rename from lib/iniparser_build/strlib.c
rename to third_party/iniparser_build/strlib.c
diff --git a/lib/popt/CHANGES b/third_party/popt/CHANGES
similarity index 100%
rename from lib/popt/CHANGES
rename to third_party/popt/CHANGES
diff --git a/lib/popt/COPYING b/third_party/popt/COPYING
similarity index 100%
rename from lib/popt/COPYING
rename to third_party/popt/COPYING
diff --git a/lib/popt/README b/third_party/popt/README
similarity index 100%
rename from lib/popt/README
rename to third_party/popt/README
diff --git a/lib/popt/dummy.in b/third_party/popt/dummy.in
similarity index 100%
rename from lib/popt/dummy.in
rename to third_party/popt/dummy.in
diff --git a/lib/popt/findme.c b/third_party/popt/findme.c
similarity index 100%
rename from lib/popt/findme.c
rename to third_party/popt/findme.c
diff --git a/lib/popt/findme.h b/third_party/popt/findme.h
similarity index 100%
rename from lib/popt/findme.h
rename to third_party/popt/findme.h
diff --git a/lib/popt/popt.c b/third_party/popt/popt.c
similarity index 100%
rename from lib/popt/popt.c
rename to third_party/popt/popt.c
diff --git a/lib/popt/popt.h b/third_party/popt/popt.h
similarity index 100%
rename from lib/popt/popt.h
rename to third_party/popt/popt.h
diff --git a/lib/popt/poptconfig.c b/third_party/popt/poptconfig.c
similarity index 100%
rename from lib/popt/poptconfig.c
rename to third_party/popt/poptconfig.c
diff --git a/lib/popt/popthelp.c b/third_party/popt/popthelp.c
similarity index 100%
rename from lib/popt/popthelp.c
rename to third_party/popt/popthelp.c
diff --git a/lib/popt/poptint.h b/third_party/popt/poptint.h
similarity index 100%
rename from lib/popt/poptint.h
rename to third_party/popt/poptint.h
diff --git a/lib/popt/poptparse.c b/third_party/popt/poptparse.c
similarity index 100%
rename from lib/popt/poptparse.c
rename to third_party/popt/poptparse.c
diff --git a/lib/popt/system.h b/third_party/popt/system.h
similarity index 100%
rename from lib/popt/system.h
rename to third_party/popt/system.h
diff --git a/lib/popt/wscript b/third_party/popt/wscript
similarity index 83%
rename from lib/popt/wscript
rename to third_party/popt/wscript
index d622841..e81572c 100644
--- a/lib/popt/wscript
+++ b/third_party/popt/wscript
@@ -5,7 +5,7 @@ import Options
def configure(conf):
conf.CHECK_HEADERS('float.h')
- if conf.CHECK_BUNDLED_SYSTEM('popt', checkfunctions='poptGetContext', headers='popt.h'):
+ if conf.CHECK_POPT():
conf.define('USING_SYSTEM_POPT', 1)
def build(bld):
diff --git a/lib/zlib/ChangeLog b/third_party/zlib/ChangeLog
similarity index 100%
rename from lib/zlib/ChangeLog
rename to third_party/zlib/ChangeLog
diff --git a/lib/zlib/FAQ b/third_party/zlib/FAQ
similarity index 100%
rename from lib/zlib/FAQ
rename to third_party/zlib/FAQ
diff --git a/lib/zlib/INDEX b/third_party/zlib/INDEX
similarity index 100%
rename from lib/zlib/INDEX
rename to third_party/zlib/INDEX
diff --git a/lib/zlib/Makefile b/third_party/zlib/Makefile
similarity index 100%
rename from lib/zlib/Makefile
rename to third_party/zlib/Makefile
diff --git a/lib/zlib/Makefile.in b/third_party/zlib/Makefile.in
similarity index 100%
rename from lib/zlib/Makefile.in
rename to third_party/zlib/Makefile.in
diff --git a/lib/zlib/README b/third_party/zlib/README
similarity index 100%
rename from lib/zlib/README
rename to third_party/zlib/README
diff --git a/lib/zlib/adler32.c b/third_party/zlib/adler32.c
similarity index 100%
rename from lib/zlib/adler32.c
rename to third_party/zlib/adler32.c
diff --git a/lib/zlib/algorithm.txt b/third_party/zlib/algorithm.txt
--
Samba Shared Repository
More information about the samba-cvs
mailing list