svn commit: samba r20298 - in branches/SAMBA_4_0/source: build/smb_build include pidl/tests

[jelmer at samba.org]

Author: jelmer
Date: 2006-12-21 01:51:35 +0000 (Thu, 21 Dec 2006)
New Revision: 20298

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20298

Log:
Fix pidl tests (missing symlink..).

Modified:
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm
   branches/SAMBA_4_0/source/build/smb_build/output.pm
   branches/SAMBA_4_0/source/include/includes.h
   branches/SAMBA_4_0/source/pidl/tests/Util.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2006-12-21 00:53:38 UTC (rev 20297)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2006-12-21 01:51:35 UTC (rev 20298)
@@ -264,22 +264,24 @@
 	}
 
 	my $soarg = "";
-	my $soargdebug = "";
+	my $lns = "";
 	if ($self->{config}->{SONAMEFLAG} ne "" and defined($ctx->{LIBRARY_SONAME})) {
 		$soarg = "$self->{config}->{SONAMEFLAG}$ctx->{LIBRARY_SONAME} ";
 		if ($ctx->{LIBRARY_REALNAME} ne $ctx->{LIBRARY_SONAME}) {
-			$soargdebug = "\n\t\@ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$ctx->{LIBRARY_SONAME}";
+			$lns .= "\n\t\@ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$ctx->{LIBRARY_SONAME}";
 		}
 	}
 
-	my $singlesoarg = "";
-
 	if ($self->{config}->{SONAMEFLAG} ne "" and 
 		defined($ctx->{LIBRARY_SONAME}) and 
 		$ctx->{LIBRARY_REALNAME} ne $ctx->{LIBRARY_SONAME}) {
-		$singlesoarg = "\n\t\@ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$ctx->{LIBRARY_SONAME}";
+		$lns .= "\n\t\@ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$ctx->{LIBRARY_SONAME}";
 	}
 
+	if (defined($ctx->{LIBRARY_SONAME})) {
+		$lns .= "\n\t\@ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$ctx->{LIBRARY_DEBUGNAME}";
+	}
+
 	$self->output(<< "__EOD__"
 #
 
@@ -290,7 +292,7 @@
 		\$($ctx->{TYPE}_$ctx->{NAME}\_FULL_OBJ_LIST) \\
 		\$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) $extraflags \\
 		 $soarg \\
-		$init_obj $singlesoarg$soargdebug
+		$init_obj $lns
 __EOD__
 );
 

Modified: branches/SAMBA_4_0/source/build/smb_build/output.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/output.pm	2006-12-21 00:53:38 UTC (rev 20297)
+++ branches/SAMBA_4_0/source/build/smb_build/output.pm	2006-12-21 01:51:35 UTC (rev 20298)
@@ -65,6 +65,8 @@
 		}
 	}
 
+	$lib->{LIBRARY_DEBUGNAME} = $lib->{LIBRARY_REALNAME};
+
 	if (defined($lib->{VERSION})) {
 		$lib->{LIBRARY_SONAME} = "$lib->{LIBRARY_REALNAME}.$lib->{SO_VERSION}";
 		$lib->{LIBRARY_REALNAME} = "$lib->{LIBRARY_REALNAME}.$lib->{VERSION}";

Modified: branches/SAMBA_4_0/source/include/includes.h
===================================================================
--- branches/SAMBA_4_0/source/include/includes.h	2006-12-21 00:53:38 UTC (rev 20297)
+++ branches/SAMBA_4_0/source/include/includes.h	2006-12-21 01:51:35 UTC (rev 20298)
@@ -77,7 +77,9 @@
 #include "system/time.h"
 #include "system/wait.h"
 
+#ifndef _PRINTF_ATTRIBUTE
 #define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
+#endif
 
 /* Lists, trees, caching, database... */
 #include "talloc/talloc.h"

Modified: branches/SAMBA_4_0/source/pidl/tests/Util.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/tests/Util.pm	2006-12-21 00:53:38 UTC (rev 20297)
+++ branches/SAMBA_4_0/source/pidl/tests/Util.pm	2006-12-21 01:51:35 UTC (rev 20298)
@@ -46,9 +46,9 @@
 		$outfile = "test-$name";
 	}
 
-	my $cflags = `pkg-config --libs --cflags ndr`;
+	my $flags = `pkg-config --libs --cflags ndr samba-config`;
 
-	open CC, "|cc -x c - -o $outfile $cflags";
+	open CC, "|cc -x c - -o $outfile $flags";
 	print CC "#define uint_t unsigned int\n";
 	print CC "#define _GNU_SOURCE\n";
 	print CC "#include <stdint.h>\n";