[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  9b59590 s3:vlp: fix build on OS X
      from  86c2d48 buildtools: use egrep when we need the "-f patternfile" option

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 9b59590a89e796c302d77da0e42949ff6b43190f
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Jul 27 01:04:33 2012 +0200

    s3:vlp: fix build on OS X
    
    Autobuild-User(master): Björn Jacke <bj at sernet.de>
    Autobuild-Date(master): Fri Jul 27 03:13:59 CEST 2012 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/Makefile.in |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 75a3262..1408614 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1585,6 +1585,7 @@ VLP_OBJ = printing/tests/vlp.o \
           ../lib/util/charset/iconv.o \
           ../lib/util/charset/weird.o \
           ../lib/util/charset/convert_string.o \
+          $(CHARSET_MACOSXFS_OBJ) \
           ../lib/util/talloc_stack.o \
           ../lib/util/smb_threads.o \
           ../lib/util/xfile.o \


-- 
Samba Shared Repository