svn commit: samba r13902 - in branches/SAMBA_4_0/source: build/m4 build/smb_build lib/com lib/com/dcom torture/com web_server

[jelmer at samba.org]

Author: jelmer
Date: 2006-03-06 22:01:03 +0000 (Mon, 06 Mar 2006)
New Revision: 13902

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

Log:
Stricter checking for the -fvisibility flag
Add two more proto headers.

Modified:
   branches/SAMBA_4_0/source/build/m4/check_cc.m4
   branches/SAMBA_4_0/source/build/smb_build/output.pm
   branches/SAMBA_4_0/source/lib/com/com.h
   branches/SAMBA_4_0/source/lib/com/config.mk
   branches/SAMBA_4_0/source/lib/com/dcom/dcom.h
   branches/SAMBA_4_0/source/torture/com/simple.c
   branches/SAMBA_4_0/source/web_server/config.mk
   branches/SAMBA_4_0/source/web_server/web_server.h


Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/check_cc.m4
===================================================================
--- branches/SAMBA_4_0/source/build/m4/check_cc.m4	2006-03-06 21:58:07 UTC (rev 13901)
+++ branches/SAMBA_4_0/source/build/m4/check_cc.m4	2006-03-06 22:01:03 UTC (rev 13902)
@@ -115,18 +115,25 @@
 #
 # Check if the compiler support ELF visibility for symbols
 #
+
 visibility_attribute=no
-AC_MSG_CHECKING([whether the C compiler supports the visibility attribute])
-AC_TRY_RUN([
-#pragma GCC visibility push(hidden)
-void vis_foo1(void) {}
-__attribute__((visibility("default"))) void vis_foo2(void) {}
-#include "${srcdir-.}/build/tests/trivial.c"
-], [
-	AC_MSG_RESULT(yes)
-	AC_DEFINE(HAVE_VISIBILITY_ATTR,1,[Whether the C compiler supports the visibility attribute])
-	visibility_attribute=yes
-], [AC_MSG_RESULT(no);])
+if test x"$GCC" = x"yes" ; then
+    AX_CFLAGS_GCC_OPTION([-fvisibility=hidden], VISIBILITY_CFLAGS)
+fi
+
+if test -n "$VISIBILITY_CFLAGS"; then
+	AC_MSG_CHECKING([whether the C compiler supports the visibility attribute])
+	AC_TRY_RUN([
+	#pragma GCC visibility push(hidden)
+	void vis_foo1(void) {}
+	__attribute__((visibility("default"))) void vis_foo2(void) {}
+	#include "${srcdir-.}/build/tests/trivial.c"
+	], [
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_VISIBILITY_ATTR,1,[Whether the C compiler supports the visibility attribute])
+		visibility_attribute=yes
+	], [AC_MSG_RESULT(no);])
+fi
 AC_SUBST(visibility_attribute)
 
 #

Modified: branches/SAMBA_4_0/source/build/smb_build/output.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/output.pm	2006-03-06 21:58:07 UTC (rev 13901)
+++ branches/SAMBA_4_0/source/build/smb_build/output.pm	2006-03-06 22:01:03 UTC (rev 13902)
@@ -111,8 +111,8 @@
 			$part->{OUTPUT_TYPE} = "OBJLIST";
 		}
 
-		if ($part->{DEFAULT_VISIBILITY} ne "default" and 
-			$config->{visibility_attribute} eq "yes") {
+		if (($part->{DEFAULT_VISIBILITY} ne "default") and 
+			($config->{visibility_attribute} eq "yes")) {
 			$part->{EXTRA_CFLAGS} .= " -fvisibility=$part->{DEFAULT_VISIBILITY}";
 		}
 

Modified: branches/SAMBA_4_0/source/lib/com/com.h
===================================================================
--- branches/SAMBA_4_0/source/lib/com/com.h	2006-03-06 21:58:07 UTC (rev 13901)
+++ branches/SAMBA_4_0/source/lib/com/com.h	2006-03-06 22:01:03 UTC (rev 13902)
@@ -31,4 +31,7 @@
 
 typedef struct IUnknown *(*get_class_object_function) (const struct GUID *clsid);
 
+
+#include "lib/com/proto.h"
+
 #endif /* _COM_H */

Modified: branches/SAMBA_4_0/source/lib/com/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/com/config.mk	2006-03-06 21:58:07 UTC (rev 13901)
+++ branches/SAMBA_4_0/source/lib/com/config.mk	2006-03-06 22:01:03 UTC (rev 13902)
@@ -1,12 +1,12 @@
 [SUBSYSTEM::COM]
-PRIVATE_PROTO_HEADER = com_proto.h
+PRIVATE_PROTO_HEADER = proto.h
 OBJ_FILES = \
 		tables.o \
 		rot.o \
 		main.o
 
 [SUBSYSTEM::DCOM]
-PRIVATE_PROTO_HEADER = dcom_proto.h
+PRIVATE_PROTO_HEADER = dcom/proto.h
 OBJ_FILES = \
 		dcom/main.o \
 		dcom/tables.o

Modified: branches/SAMBA_4_0/source/lib/com/dcom/dcom.h
===================================================================
--- branches/SAMBA_4_0/source/lib/com/dcom/dcom.h	2006-03-06 21:58:07 UTC (rev 13901)
+++ branches/SAMBA_4_0/source/lib/com/dcom/dcom.h	2006-03-06 22:01:03 UTC (rev 13902)
@@ -22,6 +22,7 @@
 #define _DCOM_H 
 
 #include "lib/com/com.h"
+#include "lib/com/dcom/proto.h"
 
 struct dcom_client_context {
 	struct cli_credentials *credentials;

Modified: branches/SAMBA_4_0/source/torture/com/simple.c
===================================================================
--- branches/SAMBA_4_0/source/torture/com/simple.c	2006-03-06 21:58:07 UTC (rev 13901)
+++ branches/SAMBA_4_0/source/torture/com/simple.c	2006-03-06 22:01:03 UTC (rev 13902)
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "lib/com/com.h"
+#include "lib/com/dcom/dcom.h"
 #include "librpc/gen_ndr/com_dcom.h"
 #include "lib/cmdline/popt_common.h"
 

Modified: branches/SAMBA_4_0/source/web_server/config.mk
===================================================================
--- branches/SAMBA_4_0/source/web_server/config.mk	2006-03-06 21:58:07 UTC (rev 13901)
+++ branches/SAMBA_4_0/source/web_server/config.mk	2006-03-06 22:01:03 UTC (rev 13902)
@@ -3,6 +3,7 @@
 #######################
 # Start SUBSYSTEM WEB
 [SUBSYSTEM::WEB]
+PRIVATE_PROTO_HEADER = proto.h
 OBJ_FILES = \
 		web_server.o \
 		http.o

Modified: branches/SAMBA_4_0/source/web_server/web_server.h
===================================================================
--- branches/SAMBA_4_0/source/web_server/web_server.h	2006-03-06 21:58:07 UTC (rev 13901)
+++ branches/SAMBA_4_0/source/web_server/web_server.h	2006-03-06 22:01:03 UTC (rev 13902)
@@ -19,6 +19,7 @@
 */
 
 #include "smbd/process_model.h"
+#include "web_server/proto.h"
 
 /*
   context of one open web connection