[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-1888-g8c0b551

Jelmer Vernooij jelmer at samba.org
Tue May 27 17:49:41 GMT 2008


The branch, v4-0-test has been updated
       via  8c0b55114fe35d498626d9d60cc4716b821d4d4f (commit)
       via  94167c7d4273fbd6084d6ddae7fd15dcb189d62f (commit)
      from  7b9b3ec02b27852cc32689a44c7f3fbbe43b7c6b (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 8c0b55114fe35d498626d9d60cc4716b821d4d4f
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue May 27 19:47:16 2008 +0200

    Allow librpcsrcdir to be an absolute path.

commit 94167c7d4273fbd6084d6ddae7fd15dcb189d62f
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue May 27 19:35:04 2008 +0200

    Add variable for smbreadline directory.

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

Summary of changes:
 source/Makefile                    |    1 +
 source/lib/smbreadline/readline.m4 |    4 ++--
 source/librpc/config.mk            |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/Makefile b/source/Makefile
index 370be2a..20a0876 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -63,6 +63,7 @@ libcharsetsrcdir := lib/charset
 ldb_sambasrcdir := lib/ldb-samba
 libtlssrcdir := lib/tls
 libregistrysrcdir := lib/registry
+smbreadlinesrcdir := lib/smbreadline
 libmessagingsrcdir := lib/messaging
 libeventssrcdir := lib/events
 libcmdlinesrcdir := lib/cmdline
diff --git a/source/lib/smbreadline/readline.m4 b/source/lib/smbreadline/readline.m4
index ab85bba..ad6bc66 100644
--- a/source/lib/smbreadline/readline.m4
+++ b/source/lib/smbreadline/readline.m4
@@ -79,10 +79,10 @@ AC_MSG_CHECKING(whether to use extern readline)
 if test x"$EXTERNAL_READLINE" = x"yes"; then
 	AC_MSG_RESULT(yes)
 	AC_DEFINE(HAVE_LIBREADLINE,1,[Whether the system has readline])
-	SMB_SUBSYSTEM(SMBREADLINE, [lib/smbreadline/smbreadline.o], [READLINE])
+	SMB_SUBSYSTEM(SMBREADLINE, [\$(smbreadlinesrcdir)/smbreadline.o], [READLINE])
 	SMB_EXT_LIB(READLINE, [${TERMLIBS}])
 	SMB_ENABLE(READLINE,YES)
 else
-	SMB_SUBSYSTEM(SMBREADLINE, [lib/smbreadline/smbreadline.o], [])
+	SMB_SUBSYSTEM(SMBREADLINE, [\$(smbreadlinesrcdir)/smbreadline.o], [])
 	AC_MSG_RESULT(no)
 fi
diff --git a/source/librpc/config.mk b/source/librpc/config.mk
index ab25921..a39f504 100644
--- a/source/librpc/config.mk
+++ b/source/librpc/config.mk
@@ -350,7 +350,7 @@ NDR_WINBIND_OBJ_FILES = $(gen_ndrsrcdir)/ndr_winbind.o
 #PUBLIC_HEADERS += $(gen_ndrsrcdir)/winbind.h
 
 $(librpcsrcdir)/idl-deps:
-	./$(librpcsrcdir)/idl-deps.pl $(librpcsrcdir)/idl/*.idl >$@
+	$(PERL) $(librpcsrcdir)/idl-deps.pl $(librpcsrcdir)/idl/*.idl >$@
 
 clean:: 
 	rm -f $(librpcsrcdir)/idl-deps


-- 
Samba Shared Repository


More information about the samba-cvs mailing list