diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-03-10 11:25:19 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:56:54 -0500 |
| commit | 983d5afeadee2cb35de764a8bb6ffae5e35e9571 (patch) | |
| tree | 7fa8f16c628aa77a26bedec8e70849ee77b4dcde | |
| parent | 966cf4aecedc07ed91d101c67aa8da08ce383163 (diff) | |
| download | samba-983d5afeadee2cb35de764a8bb6ffae5e35e9571.tar.gz samba-983d5afeadee2cb35de764a8bb6ffae5e35e9571.tar.bz2 samba-983d5afeadee2cb35de764a8bb6ffae5e35e9571.zip | |
r14139: Fix issue with undefined variables.
(This used to be commit 03c06c6f7fedb0e47483cc6de7732c1e78e60703)
| -rw-r--r-- | source4/build/smb_build/TODO | 3 | ||||
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO index 480b6e31e4..c905e2fbb6 100644 --- a/source4/build/smb_build/TODO +++ b/source4/build/smb_build/TODO @@ -4,8 +4,9 @@ - saner names for some of the .pc files - .pc files also when there is a public header? - get rid of include/structs.h and include/proto.h + - support including a custom header by librpc/gen_ndr/*.c files +- plugin loading support in ldb - add register function to smbtorture -- improve (un)install scripts (rewrite in perl?) - proper #include dependencies: for each subsystem: - include line in Makefile diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 0d4e584730..8eaf66ed8a 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -538,15 +538,11 @@ sub PkgConfig($$) push (@{$self->{pc_files}}, $path); - if (not defined($ctx->{CFLAGS}) ) { - $ctx->{CFLAGS} = []; - } - smb_build::env::PkgConfig($self, $path, $link_name, $ctx->{OUTPUT}, - join(' ', @{$ctx->{CFLAGS}}), + "", "$ctx->{MAJOR_VERSION}.$ctx->{MINOR_VERSION}.$ctx->{RELEASE_VERSION}", $ctx->{DESCRIPTION} ); |