diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-05-28 21:04:59 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:52:59 -0500 |
| commit | dc919c25343211b25ed8c55577bc5451791cbde4 (patch) | |
| tree | b24c210cd078e9aa7a02c2d649df6dd4f0af1992 | |
| parent | 5a74acbb177efb5ea1d555383d70174ffe0b2129 (diff) | |
| download | samba-dc919c25343211b25ed8c55577bc5451791cbde4.tar.gz samba-dc919c25343211b25ed8c55577bc5451791cbde4.tar.bz2 samba-dc919c25343211b25ed8c55577bc5451791cbde4.zip | |
r23175: Handle PKG_CONFIG_PATH not set yet - fixes warning in selftest.pl
(This used to be commit 222acbe33b427a6ccae3b9e27b545f22e4564d5c)
| -rw-r--r-- | source4/lib/replace/replace.h | 8 | ||||
| -rwxr-xr-x | source4/script/mkproto.pl | 8 | ||||
| -rwxr-xr-x | source4/selftest/selftest.pl | 6 |
3 files changed, 17 insertions, 5 deletions
diff --git a/source4/lib/replace/replace.h b/source4/lib/replace/replace.h index 5918f98bc4..a43f436083 100644 --- a/source4/lib/replace/replace.h +++ b/source4/lib/replace/replace.h @@ -258,6 +258,14 @@ int rep_socketpair(int d, int type, int protocol, int sv[2]); #endif #endif +#ifndef _DEPRECATED_ +#if (__GNUC__ >= 3) && (__GNUC_MINOR__ >= 1 ) +#define _DEPRECATED_ __attribute__ ((deprecated)) +#else +#define _DEPRECATED_ +#endif +#endif + #ifndef HAVE_VASPRINTF #define vasprintf rep_vasprintf int rep_vasprintf(char **ptr, const char *format, va_list ap) PRINTF_ATTRIBUTE(2,0); diff --git a/source4/script/mkproto.pl b/source4/script/mkproto.pl index ea2e5acd45..1df53dffbb 100755 --- a/source4/script/mkproto.pl +++ b/source4/script/mkproto.pl @@ -180,10 +180,10 @@ sub process_file($$$) } next unless ( $is_public || $line =~ / - ^void|^BOOL|^bool|^int|^struct|^char|^const|^\w+_[tT]\s|^uint|^unsigned|^long| - ^NTSTATUS|^ADS_STATUS|^enum\s.*\(|^DATA_BLOB|^WERROR|^XFILE|^FILE|^DIR| - ^double|^TDB_CONTEXT|^TDB_DATA|^TALLOC_CTX|^NTTIME|^FN_|^init_module| - ^GtkWidget|^GType|^smb_ucs2_t|^krb5_error_code + (_DEPRECATED_ )?^(void|BOOL|bool|int|struct|char|const|\w+_[tT]\s|uint|unsigned|long|NTSTATUS| + ADS_STATUS|enum\s.*\(|DATA_BLOB|WERROR|XFILE|FILE|DIR| + double|TDB_CONTEXT|TDB_DATA|TALLOC_CTX|NTTIME|FN_|init_module| + GtkWidget|GType|smb_ucs2_t|krb5_error_code) /xo); next if ($line =~ /^int\s*main/); diff --git a/source4/selftest/selftest.pl b/source4/selftest/selftest.pl index 0c9f6acd08..263abae363 100755 --- a/source4/selftest/selftest.pl +++ b/source4/selftest/selftest.pl @@ -519,7 +519,11 @@ if (defined($ENV{LD_LIBRARY_PATH})) { } else { $ENV{LD_LIBRARY_PATH} = "$old_pwd/bin/shared"; } -$ENV{PKG_CONFIG_PATH} = "$old_pwd/bin/pkgconfig:$ENV{PKG_CONFIG_PATH}"; +if (defined($ENV{PKG_CONFIG_PATH})) { + $ENV{PKG_CONFIG_PATH} = "$old_pwd/bin/pkgconfig:$ENV{PKG_CONFIG_PATH}"; +} else { + $ENV{PKG_CONFIG_PATH} = "$old_pwd/bin/pkgconfig"; +} $ENV{PATH} = "$old_pwd/bin:$ENV{PATH}"; |