sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

r23175: Handle PKG_CONFIG_PATH not set yet - fixes warning in selftest.pl

Browse Source
This commit is contained in:
Jelmer Vernooij 2007-05-28 21:04:59 +00:00 committed by Gerald (Jerry) Carter
parent a6293ab5cb
commit 222acbe33b
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/lib/replace/replace.h
View File

@ -258,6 +258,14 @@ int rep_socketpair(int d, int type, int protocol, int sv[2]);
#endif #endif
#endif #endif
#ifndef _DEPRECATED_
#if (__GNUC__ >= 3) && (__GNUC_MINOR__ >= 1 )
#define _DEPRECATED_ __attribute__ ((deprecated))
#else
#define _DEPRECATED_
#endif
#endif
#ifndef HAVE_VASPRINTF #ifndef HAVE_VASPRINTF
#define vasprintf rep_vasprintf #define vasprintf rep_vasprintf
int rep_vasprintf(char **ptr, const char *format, va_list ap) PRINTF_ATTRIBUTE(2,0); int rep_vasprintf(char **ptr, const char *format, va_list ap) PRINTF_ATTRIBUTE(2,0);

8
source/script/mkproto.pl
View File

@ -180,10 +180,10 @@ sub process_file($$$)
} }
next unless ( $is_public || $line =~ / next unless ( $is_public || $line =~ /
^void|^BOOL|^bool|^int|^struct|^char|^const|^\w+_[tT]\s|^uint|^unsigned|^long| (_DEPRECATED_ )?^(void|BOOL|bool|int|struct|char|const|\w+_[tT]\s|uint|unsigned|long|NTSTATUS|
^NTSTATUS|^ADS_STATUS|^enum\s.*\(|^DATA_BLOB|^WERROR|^XFILE|^FILE|^DIR| ADS_STATUS|enum\s.*\(|DATA_BLOB|WERROR|XFILE|FILE|DIR|
^double|^TDB_CONTEXT|^TDB_DATA|^TALLOC_CTX|^NTTIME|^FN_|^init_module| double|TDB_CONTEXT|TDB_DATA|TALLOC_CTX|NTTIME|FN_|init_module|
^GtkWidget|^GType|^smb_ucs2_t|^krb5_error_code GtkWidget|GType|smb_ucs2_t|krb5_error_code)
/xo); /xo);
next if ($line =~ /^int\s*main/); next if ($line =~ /^int\s*main/);

6
source/selftest/selftest.pl
View File

@ -519,7 +519,11 @@ if (defined($ENV{LD_LIBRARY_PATH})) {
} else { } else {
$ENV{LD_LIBRARY_PATH} = "$old_pwd/bin/shared"; $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}"; $ENV{PATH} = "$old_pwd/bin:$ENV{PATH}";