[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha4-110-g55a6e85

[Jelmer Vernooij]

The branch, v4-0-test has been updated
       via  55a6e852c77ffb91d2e0a0503dab06214f675db8 (commit)
       via  21b4d017a2cccdaa6ab4ed32409f19c612293fd0 (commit)
       via  1a771c664444ff43e141238f473273700b392aa7 (commit)
      from  8b4c7fb200598b7f747fc681f76d464760f693ee (commit)

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


- Log -----------------------------------------------------------------
commit 55a6e852c77ffb91d2e0a0503dab06214f675db8
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Jun 25 17:24:38 2008 +0200

    Undefine HAVE_KRB5_ENCRYPT_BLOCK because Heimdal really doesn't have it.

commit 21b4d017a2cccdaa6ab4ed32409f19c612293fd0
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Jun 25 17:12:19 2008 +0200

    Use workaround for $(abspath)

commit 1a771c664444ff43e141238f473273700b392aa7
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Jun 25 16:51:37 2008 +0200

    Revert "Remove the dependency on $(abspath) in makefiles"
    
    This reverts commit c85a3632623184cb97c2e8567ca77834e81070a4.

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

Summary of changes:
 source/build/make/templates.mk    |    3 +++
 source/heimdal_build/asn1_deps.pl |    3 +--
 source/heimdal_build/config.h     |    2 ++
 source/heimdal_build/et_deps.pl   |    3 +--
 4 files changed, 7 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/build/make/templates.mk b/source/build/make/templates.mk
index 41a7ccd..25bdde0 100644
--- a/source/build/make/templates.mk
+++ b/source/build/make/templates.mk
@@ -106,3 +106,6 @@ uninstallplugins::
 	@-rm $$(DESTDIR)$$(modulesdir)/$(1)/$(2)
 
 endef
+
+# abspath for older makes
+abspath := $(shell cd $(1); pwd)
diff --git a/source/heimdal_build/asn1_deps.pl b/source/heimdal_build/asn1_deps.pl
index 8033432..6b7181c 100755
--- a/source/heimdal_build/asn1_deps.pl
+++ b/source/heimdal_build/asn1_deps.pl
@@ -6,7 +6,6 @@
 # GPL
 
 use File::Basename;
-use Cwd 'getcwd';
 
 my $file = shift;
 my $prefix = shift;
@@ -32,7 +31,7 @@ my $header = "$dirname/$prefix.h";
 
 print "$header: \$(heimdalsrcdir)/$file \$(ASN1C)\n";
 print "\t\@echo \"Compiling ASN1 file \$(heimdalsrcdir)/$file\"\n";
-print "\t\@\$(heimdalbuildsrcdir)/asn1_compile_wrapper.sh \$(builddir) $dirname \$(ASN1C) " . getcwd() . "/\$(heimdalsrcdir)/$file $prefix $options\n\n";
+print "\t\@\$(heimdalbuildsrcdir)/asn1_compile_wrapper.sh \$(builddir) $dirname \$(ASN1C) \$(call abspath,\$(heimdalsrcdir)/$file) $prefix $options\n\n";
 
 open(IN,"heimdal/$file") or die("Can't open heimdal/$file: $!");
 my @lines = <IN>;
diff --git a/source/heimdal_build/config.h b/source/heimdal_build/config.h
index e2c735a..38cdfbb 100644
--- a/source/heimdal_build/config.h
+++ b/source/heimdal_build/config.h
@@ -21,4 +21,6 @@
 
 #define HDB_DB_DIR ""
 
+#undef HAVE_KRB5_ENCRYPT_BLOCK
+
 #endif
diff --git a/source/heimdal_build/et_deps.pl b/source/heimdal_build/et_deps.pl
index 5deabe8..5032d47 100755
--- a/source/heimdal_build/et_deps.pl
+++ b/source/heimdal_build/et_deps.pl
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 
 use File::Basename;
-use Cwd 'getcwd';
 
 my $file = shift;
 my $dirname = shift;
@@ -11,7 +10,7 @@ my $header = "$dirname/$basename"; $header =~ s/\.et$/.h/;
 my $source = "$dirname/$basename"; $source =~ s/\.et$/.c/;
 print "$header $source: \$(heimdalsrcdir)/$file \$(ET_COMPILER)\n";
 print "\t\@echo \"Compiling error table $file\"\n";
-print "\t\@\$(heimdalbuildsrcdir)/et_compile_wrapper.sh \$(builddir) $dirname \$(ET_COMPILER) " . getcwd() . "/\$(heimdalsrcdir)/$file $source\n\n";
+print "\t\@\$(heimdalbuildsrcdir)/et_compile_wrapper.sh \$(builddir) $dirname \$(ET_COMPILER) \$(call abspath,\$(heimdalsrcdir)/$file) $source\n\n";
 
 print "clean:: \n";
 print "\t\@rm -f $header $source\n\n";


-- 
Samba Shared Repository