1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-22 22:04:08 +03:00

32 Commits

Author SHA1 Message Date
Andrew Tridgell
3a5b199752 s3build: added NMBDSOCKETDIR to dynconfig
this is needed for the s3 top level build

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-02-18 15:09:46 +11:00
Andrew Tridgell
a759b1a3ca s4-build: added LOCALEDIR config option
s3 needs dyn_LOCALEDIR
2011-02-17 00:57:10 +01:00
Simo Sorce
18926e5907 Fix private libdir and codepages paths
The private libraries need to be arch specific as well.

With --enable-fhs the codepages should go in /usr/share/samba and not
in /usr/lib{64}/samba as they are data files not libraries.

Autobuild-User: Simo Sorce <idra@samba.org>
Autobuild-Date: Tue Feb 15 04:22:37 CET 2011 on sn-devel-104
2011-02-15 04:22:37 +01:00
Andrew Tridgell
4d3de16b8b s4-build: fixed uses of os.path.relpath()
these should be os_path_relpath() to support older python versions.
This should fix the build on FreeBSD 7.2

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Mon Feb  7 05:49:58 CET 2011 on sn-devel-104
2011-02-07 05:49:58 +01:00
Andrew Tridgell
1867a6033c s4-charset: use dyn_CODEPAGEDIR for location of upcase.dat/lowcase.dat
this matches samba3 behaviour

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-02-07 13:22:02 +11:00
Andrew Bartlett
19c3546872 s4-waf Add PYTHONDIR and PYTHONARCHDIR to the 'different on install' list
This allows the C code to rely on PYTHONDIR and PYTHONARCHDIR to
always be correct, and so not to cause problems when forcing these
into sys.path.

Andrew Bartlett
2011-02-07 13:22:01 +11:00
Andrew Tridgell
5364548e44 s4-build: fixed install of version.h from source4 build 2011-02-07 13:22:01 +11:00
Andrew Tridgell
9ccb868591 build: fixed make install for top level build 2011-02-07 13:22:01 +11:00
Andrew Tridgell
479a4235e3 s4-dynconfig: fixed dyn_SETUPDIR to point to the right directory
this make dyn_SETUPDIR correct for both source4/ build and a top level
build

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-02-07 13:22:00 +11:00
Andrew Tridgell
46a3588d3f waf: use PYTHONARCHDIR for installing python shared libs
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Fri Jan 14 08:19:40 CET 2011 on sn-devel-104
2011-01-14 08:19:39 +01:00
Andrew Tridgell
93d311c07e s4-dynconfig: override more paths when running from the build directory
this ensures consistency between binaries and scripts when testing as
a developer
2010-11-24 00:19:15 +01:00
Andrew Tridgell
b5ffdb6f9c s4: don't rebuild all of heimdal when dynconfig options change
only 2 files in heimdal depend on dynconfig variables
2010-10-13 11:00:04 +00:00
Andrew Tridgell
72de3e698b s4-dynconfig: use the build modules when running from build directory
we need to use the newly built modules when running from the build
directory to ensure we don't run tests against a stale install

Pair-Programmed-With: Jelmer Vernooij <jelmer@samba.org>
2010-10-13 11:00:04 +00:00
Andrew Bartlett
3ca886b835 s4-heimdal_build fix up build after heimdal import
Heimdal has it's own dynconfig like system, and so we need the
LIBDIR etc in the CFLAGS here.

We also need to define build rules for the new files imported in
the merge commit, and fix up some header files.

This includes the work by Matthieu Patou <mat@matws.net>

Andrew Bartlett
2010-10-03 01:15:04 +00:00
Andrew Tridgell
9de745fd53 s3compat: use right variable for STATEDIR
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2010-05-14 23:25:45 +10:00
Andrew Tridgell
3043c1924d s4-dynconfig: make dynconfig more compatible with s3 2010-05-14 23:25:45 +10:00
Andrew Bartlett
ba4842a880 Revert "s4: remove unused references to swat"
This reverts most of commit 1765732f82719a4bc925f21ef4999bd19a8d1f6c.

The s3compat build needs the SWAT location to be compatible with
Samba3.
2010-05-14 23:25:44 +10:00
Stefan Metzmacher
1765732f82 s4: remove unused references to swat
metze
2010-04-29 12:36:47 +02:00
Stefan Metzmacher
8e792d7b9b s4:dynconfig: fix fhs variables and list them all explicit
This adds 'samba' subdirs to smb.conf and setup.

metze
2010-04-29 12:36:46 +02:00
Stefan Metzmacher
48fb78eba6 s4:dynconfig: reorder non fhs variables
metze
2010-04-29 12:36:46 +02:00
Andrew Tridgell
6072ab0d57 s4-dynconfig: added dyn_PYTHONDIR 2010-04-20 20:59:24 +10:00
Stefan Metzmacher
7233699ad8 s4:dynconfig/wscript: ${LOCALSTATEDIR} already has var/ included
metze
2010-04-15 18:26:38 +02:00
Thomas Nagy
7f3116a63d build: allow the waf build to work with python 3.0 and 3.1
Python 3.x is a bit fussier about print statements and indentation.

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2010-04-08 07:46:39 +10:00
Andrew Tridgell
ed5522adf2 s4-waf: install in /usr/local/samba by default 2010-04-06 20:27:16 +10:00
Andrew Tridgell
1567750070 s4-waf: added --enable-fhs configure option 2010-04-06 20:27:16 +10:00
Andrew Tridgell
f9eae32f4b s4-waf: mark the wscript files as python so vim/emacs knows how to highlight them 2010-04-06 20:27:11 +10:00
Andrew Tridgell
1ee19592f0 s4-waf: move the gnu dirs check to the generic wafsamba code 2010-04-06 20:27:11 +10:00
Andrew Tridgell
bd44f14d8f s4-waf: enable the pc_files in the build rules 2010-04-06 20:27:10 +10:00
Andrew Tridgell
aa5e08eb83 s4-waf: install the rest of the headers 2010-04-06 20:27:09 +10:00
Andrew Tridgell
03998d0970 s4-waf: started adding auto-install of include files 2010-04-06 20:27:09 +10:00
Andrew Tridgell
7848344d55 build: split out the base waf rules into buildtools/wafsamba/wscript
this stops lib/replace becoming a mess
2010-04-06 20:27:04 +10:00
Andrew Tridgell
845e0cbe6f build: commit all the waf build files in the tree 2010-04-06 20:26:48 +10:00