The branch, v4-0-test has been updated via 87385e4c873f80956dc1c43424dd4f49a993586c (commit) via c85a3632623184cb97c2e8567ca77834e81070a4 (commit) from f573c1ff4443f3002c310d3ba29d8c343ad03907 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log ----------------------------------------------------------------- commit 87385e4c873f80956dc1c43424dd4f49a993586c Author: Volker Lendecke <[EMAIL PROTECTED]> Date: Thu Jun 19 12:39:25 2008 +0200 Include events_util.h in events_aio.c Without this, linking fails with DLIST_ADD and DLIST_REMOVE being undefined Signed-off-by: Stefan Metzmacher <[EMAIL PROTECTED]> commit c85a3632623184cb97c2e8567ca77834e81070a4 Author: Volker Lendecke <[EMAIL PROTECTED]> Date: Thu Jun 19 12:29:50 2008 +0200 Remove the dependency on $(abspath) in makefiles This is not around before GNU make 3.81, for me this fixes the build on GNU make 3.80 Signed-off-by: Stefan Metzmacher <[EMAIL PROTECTED]> ----------------------------------------------------------------------- Summary of changes: source/heimdal_build/asn1_deps.pl | 3 ++- source/heimdal_build/et_deps.pl | 3 ++- source/lib/events/events_aio.c | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source/heimdal_build/asn1_deps.pl b/source/heimdal_build/asn1_deps.pl index 6121781..8033432 100755 --- a/source/heimdal_build/asn1_deps.pl +++ b/source/heimdal_build/asn1_deps.pl @@ -6,6 +6,7 @@ # GPL use File::Basename; +use Cwd 'getcwd'; my $file = shift; my $prefix = shift; @@ -31,7 +32,7 @@ my $header = "$dirname/$prefix.h"; print "$header: \$(heimdalsrcdir)/$file \$(ASN1C)\n"; print "[EMAIL PROTECTED] \"Compiling ASN1 file \$(heimdalsrcdir)/$file\"\n"; -print "[EMAIL PROTECTED](heimdalbuildsrcdir)/asn1_compile_wrapper.sh \$(builddir) $dirname \$(ASN1C) \$(abspath \$(heimdalsrcdir)/$file) $prefix $options\n\n"; +print "[EMAIL PROTECTED](heimdalbuildsrcdir)/asn1_compile_wrapper.sh \$(builddir) $dirname \$(ASN1C) " . getcwd() . "/\$(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/et_deps.pl b/source/heimdal_build/et_deps.pl index 6a0485b..5deabe8 100755 --- a/source/heimdal_build/et_deps.pl +++ b/source/heimdal_build/et_deps.pl @@ -1,6 +1,7 @@ #!/usr/bin/perl use File::Basename; +use Cwd 'getcwd'; my $file = shift; my $dirname = shift; @@ -10,7 +11,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 "[EMAIL PROTECTED] \"Compiling error table $file\"\n"; -print "[EMAIL PROTECTED](heimdalbuildsrcdir)/et_compile_wrapper.sh \$(builddir) $dirname \$(ET_COMPILER) \$(abspath \$(heimdalsrcdir)/$file) $source\n\n"; +print "[EMAIL PROTECTED](heimdalbuildsrcdir)/et_compile_wrapper.sh \$(builddir) $dirname \$(ET_COMPILER) " . getcwd() . "/\$(heimdalsrcdir)/$file $source\n\n"; print "clean:: \n"; print "[EMAIL PROTECTED] -f $header $source\n\n"; diff --git a/source/lib/events/events_aio.c b/source/lib/events/events_aio.c index 933ce26..e30213a 100644 --- a/source/lib/events/events_aio.c +++ b/source/lib/events/events_aio.c @@ -34,6 +34,7 @@ #include "replace.h" #include "events.h" #include "events_internal.h" +#include "events_util.h" #include <sys/epoll.h> #include <libaio.h> -- Samba Shared Repository