diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-17 19:00:46 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-17 19:00:46 +0200 |
| commit | 87e4e0e9406a4805c0116652b2ea34114acc279a (patch) | |
| tree | cdc67a526490daed41730599dd55bad052fdee4d /source3/samba4.m4 | |
| parent | 661d25402ecb36a35bee6b282440854f5280781a (diff) | |
| parent | f4293618a712ca7ce59b7d695e2e3d918ddbb542 (diff) | |
| download | samba-87e4e0e9406a4805c0116652b2ea34114acc279a.tar.gz samba-87e4e0e9406a4805c0116652b2ea34114acc279a.tar.bz2 samba-87e4e0e9406a4805c0116652b2ea34114acc279a.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into singlerpc
Conflicts:
source3/Makefile.in
Diffstat (limited to 'source3/samba4.m4')
| -rw-r--r-- | source3/samba4.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/samba4.m4 b/source3/samba4.m4 index 0a2ceb9636..c02d3d4b3b 100644 --- a/source3/samba4.m4 +++ b/source3/samba4.m4 @@ -16,7 +16,7 @@ m4_include(../lib/popt/samba.m4) m4_include(lib/charset/config.m4) m4_include(lib/socket/config.m4) m4_include(nsswitch/nsstest.m4) -m4_include(pidl/config.m4) +m4_include(../pidl/config.m4) m4_include(lib/zlib.m4) AC_CONFIG_FILES(../source4/lib/registry/registry.pc) |