svn commit: samba r23175 - in branches/SAMBA_4_0: . source/lib/replace source/script source/selftest

[jelmer at samba.org]

Author: jelmer
Date: 2007-05-28 21:04:59 +0000 (Mon, 28 May 2007)
New Revision: 23175

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

Log:
Handle PKG_CONFIG_PATH not set yet - fixes warning in selftest.pl
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/lib/replace/replace.h
   branches/SAMBA_4_0/source/script/mkproto.pl
   branches/SAMBA_4_0/source/selftest/selftest.pl


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: Mon 2007-05-28 16:21:22.220000029 +0200
committer: Jelmer Vernooij <jelmer at samba.org>
properties: 
	branch-nick: SAMBA_4_0

   + timestamp: Mon 2007-05-28 23:02:10.542000055 +0200
committer: Jelmer Vernooij <jelmer at samba.org>
properties: 
	branch-nick: SAMBA_4_0

Name: bzr:revision-id-v3
   - jelmer at samba.org-20070528142122-cf5oh79k3uyecr1j

   + jelmer at samba.org-20070528142122-cf5oh79k3uyecr1j
jelmer at samba.org-20070528210210-rmhpmrglmhpe9aps

Name: bzr:merge
...skipped...

Modified: branches/SAMBA_4_0/source/lib/replace/replace.h
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/replace.h	2007-05-28 14:24:36 UTC (rev 23174)
+++ branches/SAMBA_4_0/source/lib/replace/replace.h	2007-05-28 21:04:59 UTC (rev 23175)
@@ -258,6 +258,14 @@
 #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);

Modified: branches/SAMBA_4_0/source/script/mkproto.pl
===================================================================
--- branches/SAMBA_4_0/source/script/mkproto.pl	2007-05-28 14:24:36 UTC (rev 23174)
+++ branches/SAMBA_4_0/source/script/mkproto.pl	2007-05-28 21:04:59 UTC (rev 23175)
@@ -180,10 +180,10 @@
 		}
 
 		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/);

Modified: branches/SAMBA_4_0/source/selftest/selftest.pl
===================================================================
--- branches/SAMBA_4_0/source/selftest/selftest.pl	2007-05-28 14:24:36 UTC (rev 23174)
+++ branches/SAMBA_4_0/source/selftest/selftest.pl	2007-05-28 21:04:59 UTC (rev 23175)
@@ -519,7 +519,11 @@
 } 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}";