diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-16 17:07:11 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-16 17:07:11 +0200 |
| commit | a347ab83f447d7921d5d427e56f6965342b25834 (patch) | |
| tree | 68e38df8ccb86498f08809201f132cfe0a598fe5 /source4/main.mk | |
| parent | a8725f18fa5cac16583ba16cd8d54ee1ae492524 (diff) | |
| parent | ca2da6154068c8fb9ef89407d34deb9bb8f5fbfa (diff) | |
| download | samba-a347ab83f447d7921d5d427e56f6965342b25834.tar.gz samba-a347ab83f447d7921d5d427e56f6965342b25834.tar.bz2 samba-a347ab83f447d7921d5d427e56f6965342b25834.zip | |
Merge branch 'singlensswrap' into single
Conflicts:
source3/configure.in
source4/Makefile
source4/configure.ac
source4/lib/nss_wrapper/nss_wrapper.c
source4/lib/replace/system/passwd.h
source4/main.mk
Diffstat (limited to 'source4/main.mk')
| -rw-r--r-- | source4/main.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/main.mk b/source4/main.mk index 52170821e8..5ab9f95c05 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -17,7 +17,7 @@ mkinclude lib/messaging/config.mk mkinclude lib/events/config.mk mkinclude lib/cmdline/config.mk mkinclude ../socket_wrapper/config.mk -mkinclude lib/nss_wrapper/config.mk +mkinclude ../nss_wrapper/config.mk mkinclude lib/appweb/config.mk mkinclude lib/stream/config.mk mkinclude lib/util/config.mk |