[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-673-ga087310

Michael Adam obnox at samba.org
Mon Mar 23 12:30:15 GMT 2009


The branch, master has been updated
       via  a087310b336bf1b6b2827b27d32071876c23f3a9 (commit)
      from  f4aec7b5907065a2f48d1b19065c6673aff6a190 (commit)

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


- Log -----------------------------------------------------------------
commit a087310b336bf1b6b2827b27d32071876c23f3a9
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Mar 19 01:16:46 2009 +0100

    remove non standard way to point to ctdb path
    
    we can provide the path to ctdb via the --with-ctdb=... configure flag like we
    do it with other packageѕ, too. There is no need for another redundnant
    Makefile hack to point the ctdb header location
    
    Signed-off-by: Michael Adam <obnox at samba.org>

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

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


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 46216c7..673636f 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -158,7 +158,7 @@ CODEPAGEDIR = @codepagedir@
 # the directory where pid files go
 PIDDIR = @piddir@
 
-FLAGS = -I. -I$(srcdir) @FLAGS1@ @SAMBA_CPPFLAGS@ $(CPPFLAGS) -I$(CTDBDIR)/include $(ISA) -I$(srcdir)/lib -I.. -D_SAMBA_BUILD_=3 -I../source4
+FLAGS = -I. -I$(srcdir) @FLAGS1@ @SAMBA_CPPFLAGS@ $(CPPFLAGS) $(ISA) -I$(srcdir)/lib -I.. -D_SAMBA_BUILD_=3 -I../source4
 
 PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \
 	-DPRIVATE_DIR=\"$(PRIVATE_DIR)\" \
@@ -173,7 +173,6 @@ PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \
 	-DMODULESDIR=\"$(MODULESDIR)\" \
 	-DLOGFILEBASE=\"$(LOGFILEBASE)\" \
 	-DSHLIBEXT=\"@SHLIBEXT@\" \
-	-DCTDBDIR=\"$(CTDBDIR)\" \
 	-DNCALRPCDIR=\"$(NCALRPCDIR)\" \
 	-DCONFIGDIR=\"$(CONFIGDIR)\" \
 	-DCODEPAGEDIR=\"$(CODEPAGEDIR)\" \


-- 
Samba Shared Repository


More information about the samba-cvs mailing list