svn commit: samba r7425 - in branches/SAMBA_4_0/source: build/m4 build/smb_build script

metze at samba.org metze at samba.org
Thu Jun 9 07:51:58 GMT 2005


Author: metze
Date: 2005-06-09 07:51:58 +0000 (Thu, 09 Jun 2005)
New Revision: 7425

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

Log:
configure check to see if a compiler can handle negative enum values
if the compiler doesn't support it we pass --uint-enums to pidl

metze
Modified:
   branches/SAMBA_4_0/source/build/m4/check_cc.m4
   branches/SAMBA_4_0/source/build/m4/check_perl.m4
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm
   branches/SAMBA_4_0/source/script/build_idl.sh


Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/check_cc.m4
===================================================================
--- branches/SAMBA_4_0/source/build/m4/check_cc.m4	2005-06-09 07:48:26 UTC (rev 7424)
+++ branches/SAMBA_4_0/source/build/m4/check_cc.m4	2005-06-09 07:51:58 UTC (rev 7425)
@@ -67,6 +67,20 @@
    AC_DEFINE(HAVE_IMMEDIATE_STRUCTURES,1,[Whether the compiler supports immediate structures])
 fi
 
+############################################
+# check if the compiler can handle negative enum values
+AC_CACHE_CHECK([that the C compiler understands negative enum values],SMB_BUILD_CC_NEGATIVE_ENUM_VALUES, [
+    AC_TRY_COMPILE([
+#include <stdio.h>],
+[
+	enum negative_values { NEGATIVE_VALUE = 0xFFFFFFFF };
+],
+	SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes,SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=no)])
+if test x"$SMB_BUILD_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then
+	AC_MSG_WARN([using --unit-enums for pidl])
+	PIDL_ARGS="$PIDL_ARGS --uint-enums"
+fi
+
 AC_MSG_CHECKING([for test routines])
 AC_TRY_RUN([#include "${srcdir-.}/build/tests/trivial.c"],
 	    AC_MSG_RESULT(yes),

Modified: branches/SAMBA_4_0/source/build/m4/check_perl.m4
===================================================================
--- branches/SAMBA_4_0/source/build/m4/check_perl.m4	2005-06-09 07:48:26 UTC (rev 7424)
+++ branches/SAMBA_4_0/source/build/m4/check_perl.m4	2005-06-09 07:51:58 UTC (rev 7425)
@@ -13,3 +13,6 @@
 if test x"$debug" = x"yes";then
 	PERL="$PERL -W"
 fi
+
+PIDL_ARGS=""
+AC_SUBST(PIDL_ARGS)

Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2005-06-09 07:48:26 UTC (rev 7424)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2005-06-09 07:51:58 UTC (rev 7425)
@@ -130,10 +130,10 @@
 
 	return << '__EOD__';
 idl_full: build/pidl/idl.pm
-	CPP="@CPP@" PERL="$(PERL)" script/build_idl.sh FULL
+	CPP="@CPP@" PERL="$(PERL)" script/build_idl.sh FULL @PIDL_ARGS@
 
 idl: build/pidl/idl.pm
-	@CPP="@CPP@" PERL="$(PERL)" script/build_idl.sh PARTIAL
+	@CPP="@CPP@" PERL="$(PERL)" script/build_idl.sh PARTIAL @PIDL_ARGS@
 
 build/pidl/idl.pm: build/pidl/idl.yp
 	-yapp -s build/pidl/idl.yp

Modified: branches/SAMBA_4_0/source/script/build_idl.sh
===================================================================
--- branches/SAMBA_4_0/source/script/build_idl.sh	2005-06-09 07:48:26 UTC (rev 7424)
+++ branches/SAMBA_4_0/source/script/build_idl.sh	2005-06-09 07:51:58 UTC (rev 7425)
@@ -1,10 +1,12 @@
 #!/bin/sh
 
 FULLBUILD=$1
+shift 1
+PIDL_EXTRA_ARGS="$*"
 
 [ -d librpc/gen_ndr ] || mkdir -p librpc/gen_ndr || exit 1
 
-PIDL="$PERL ./build/pidl/pidl.pl --output librpc/gen_ndr/ndr_ --parse --header --parser --server --client --dcom-proxy --com-header --swig --odl"
+PIDL="$PERL ./build/pidl/pidl.pl --output librpc/gen_ndr/ndr_ --parse --header --parser --server --client --dcom-proxy --com-header --swig --odl $PIDL_EXTRA_ARGS"
 
 if [ x$FULLBUILD = xFULL ]; then
       echo Rebuilding all idl files in librpc/idl



More information about the samba-cvs mailing list