svn commit: samba r14517 - in
branches/SAMBA_4_0/source/build/smb_build: .
jelmer at samba.org
jelmer at samba.org
Fri Mar 17 15:36:44 GMT 2006
Author: jelmer
Date: 2006-03-17 15:36:43 +0000 (Fri, 17 Mar 2006)
New Revision: 14517
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14517
Log:
Put Modulesdir: line in .pc files, so 3rd parties know where to install
their modules.
Modified:
branches/SAMBA_4_0/source/build/smb_build/env.pm
Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/env.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/env.pm 2006-03-17 15:36:03 UTC (rev 14516)
+++ branches/SAMBA_4_0/source/build/smb_build/env.pm 2006-03-17 15:36:43 UTC (rev 14517)
@@ -54,9 +54,9 @@
}
}
-sub PkgConfig($$$$$$$)
+sub PkgConfig($$$$$$$$)
{
- my ($self,$path,$name,$libs,$cflags,$version,$desc) = @_;
+ my ($self,$path,$name,$libs,$cflags,$version,$desc,$hasmodules) = @_;
print __FILE__.": creating $path\n";
@@ -67,9 +67,14 @@
exec_prefix=$self->{config}->{exec_prefix}
libdir=$self->{config}->{libdir}
includedir=$self->{config}->{includedir}
-
__EOF__
+ if ($hasmodules) {
+ print OUT "modulesdir=$self->{config}->{modulesdir}\n" ;
+ }
+
+ print OUT "\n";
+
print OUT "Name: $name\n";
if (defined($desc)) {
print OUT "Description: $desc\n";
@@ -77,6 +82,9 @@
print OUT "Version: $version\n";
print OUT "Libs: -L\${libdir} $libs\n";
print OUT "Cflags: -I\${includedir} $cflags\n";
+ if ($hasmodules) {
+ print OUT "Modulesdir: \${modulesdir}\n";
+ }
close(OUT);
}
More information about the samba-cvs
mailing list