diff options
| author | Kai Blin <kai@samba.org> | 2008-12-16 10:06:04 +0100 |
|---|---|---|
| committer | Kai Blin <kai@samba.org> | 2008-12-16 13:03:05 +0100 |
| commit | 5ee0392a55d3a35692c026f1b88909d7fd2d2666 (patch) | |
| tree | 083cd9a18e5a73d8374ce7d5c7679e5761f73b99 /source3 | |
| parent | 6821d898d7ecf10c6a9359560c5cf1c50a812b62 (diff) | |
| download | samba-5ee0392a55d3a35692c026f1b88909d7fd2d2666.tar.gz samba-5ee0392a55d3a35692c026f1b88909d7fd2d2666.tar.bz2 samba-5ee0392a55d3a35692c026f1b88909d7fd2d2666.zip | |
nsswitch: Move nsswitch files from source4 to top level nsswitch dir
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/samba4.m4 | 4 | ||||
| -rw-r--r-- | source3/samba4.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/samba4.m4 b/source3/samba4.m4 index 9ef3d71fd0..34d03de158 100644 --- a/source3/samba4.m4 +++ b/source3/samba4.m4 @@ -35,7 +35,7 @@ m4_include(../lib/util/time.m4) m4_include(../lib/popt/samba.m4) m4_include(../lib/util/charset/config.m4) m4_include(lib/socket/config.m4) -m4_include(nsswitch/nsstest.m4) +m4_include(../nsswitch/nsstest.m4) m4_include(../pidl/config.m4) AC_ZLIB([ SMB_EXT_LIB(ZLIB, [${ZLIB_LIBS}]) @@ -119,7 +119,7 @@ m4_include(ntvfs/unixuid/config.m4) m4_include(auth/config.m4) m4_include(kdc/config.m4) m4_include(ntvfs/sysdep/config.m4) -m4_include(nsswitch/config.m4) +m4_include(../nsswitch/config.m4) dnl Samba 4 files AC_SUBST(LD) diff --git a/source3/samba4.mk b/source3/samba4.mk index 38d1ec2e19..18f7541333 100644 --- a/source3/samba4.mk +++ b/source3/samba4.mk @@ -70,7 +70,7 @@ smbdsrcdir := $(samba4srcdir)/smbd clustersrcdir := $(samba4srcdir)/cluster libnetsrcdir := $(samba4srcdir)/libnet authsrcdir := $(samba4srcdir)/auth -nsswitchsrcdir := $(samba4srcdir)/nsswitch +nsswitchsrcdir := $(samba4srcdir)/../nsswitch libsrcdir := $(samba4srcdir)/lib libsocketsrcdir := $(samba4srcdir)/lib/socket libcharsetsrcdir := $(samba4srcdir)/../lib/util/charset @@ -161,7 +161,7 @@ modules:: $(PLUGINS) pythonmods:: $(PYTHON_PYS) $(PYTHON_SO) -all:: bin/samba4 bin/regpatch4 bin/regdiff4 bin/regshell4 bin/regtree4 bin/smbclient4 pythonmods setup +all:: bin/samba4 bin/regpatch4 bin/regdiff4 bin/regshell4 bin/regtree4 bin/smbclient4 bin/wbinfo4 pythonmods setup torture:: bin/smbtorture4 everything:: $(patsubst %,%4,$(BINARIES)) setup: |