svn commit: samba r19609 - in branches/SAMBA_4_0/source: build/smb_build lib/replace

[metze at samba.org]

Author: metze
Date: 2006-11-07 10:44:17 +0000 (Tue, 07 Nov 2006)
New Revision: 19609

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

Log:
fix uninitialized perl variabel, we need AC_SUBST() for all configure vars
we want to use in perl...

metze
Modified:
   branches/SAMBA_4_0/source/build/smb_build/env.pm
   branches/SAMBA_4_0/source/lib/replace/libreplace_cc.m4


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/env.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/env.pm	2006-11-07 10:42:26 UTC (rev 19608)
+++ branches/SAMBA_4_0/source/build/smb_build/env.pm	2006-11-07 10:44:17 UTC (rev 19609)
@@ -59,7 +59,7 @@
 
 	print __FILE__.": creating $path\n";
 
-	if ($self->{config}->{samba_cv_immediate_structures} eq "yes") {
+	if ($self->{config}->{libreplace_cv_immediate_structures} eq "yes") {
 		$cflags .= " -DHAVE_IMMEDIATE_STRUCTURES=1";
 	}
 

Modified: branches/SAMBA_4_0/source/lib/replace/libreplace_cc.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/libreplace_cc.m4	2006-11-07 10:42:26 UTC (rev 19608)
+++ branches/SAMBA_4_0/source/lib/replace/libreplace_cc.m4	2006-11-07 10:44:17 UTC (rev 19609)
@@ -140,23 +140,27 @@
 
 ############################################
 # check if the compiler can do immediate structures
-AC_CACHE_CHECK([for immediate structures],samba_cv_immediate_structures, [
-    AC_TRY_COMPILE([
-#include <stdio.h>],
-[
-   typedef struct {unsigned x;} FOOBAR;
-   #define X_FOOBAR(x) ((FOOBAR) { x })
-   #define FOO_ONE X_FOOBAR(1)
-   FOOBAR f = FOO_ONE;   
-   static const struct {
-	FOOBAR y; 
-	} f2[] = {
-		{FOO_ONE}
-	};   
-],
-	samba_cv_immediate_structures=yes,samba_cv_immediate_structures=no)])
-if test x"$samba_cv_immediate_structures" = x"yes"; then
-   AC_DEFINE(HAVE_IMMEDIATE_STRUCTURES,1,[Whether the compiler supports immediate structures])
+AC_SUBST(libreplace_cv_immediate_structures)
+AC_CACHE_CHECK([for immediate structures],libreplace_cv_immediate_structures,[
+	AC_TRY_COMPILE([
+		#include <stdio.h>
+	],[
+		typedef struct {unsigned x;} FOOBAR;
+		#define X_FOOBAR(x) ((FOOBAR) { x })
+		#define FOO_ONE X_FOOBAR(1)
+		FOOBAR f = FOO_ONE;   
+		static const struct {
+			FOOBAR y; 
+		} f2[] = {
+			{FOO_ONE}
+		};   
+	],
+	libreplace_cv_immediate_structures=yes,
+	libreplace_cv_immediate_structures=no,
+	libreplace_cv_immediate_structures=cross)
+])
+if test x"$libreplace_cv_immediate_structures" = x"yes"; then
+	AC_DEFINE(HAVE_IMMEDIATE_STRUCTURES,1,[Whether the compiler supports immediate structures])
 fi
 
 AC__LIBREPLACE_ONLY_CC_CHECKS_END