[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha4-51-g0dbacbf

[Stefan Metzmacher]

The branch, v4-0-test has been updated
       via  0dbacbf8be0eacaa4db6477873b7512f7261ef4c (commit)
       via  72bb01dda4d425528e28cd96e249595dc6c1952f (commit)
       via  67e43860b4973a458676b36785570bb4a66e046a (commit)
       via  0241af873fdefd5856932190ca0019a2d3c05703 (commit)
      from  0671dce355432a2a4c08ab010831eadd73e4561e (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 0dbacbf8be0eacaa4db6477873b7512f7261ef4c
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Jun 9 10:42:07 2008 +0200

    configure: we require autoconf 2.54
    
    I've tested with autoconf from 2.53 to 2.62.
    
    metze

commit 72bb01dda4d425528e28cd96e249595dc6c1952f
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Jun 9 10:39:48 2008 +0200

    libreplace: only include AC_USE_SYSTEM_EXTENSIONS fallback if required
    
    This fixes ./autogen.sh with autoconf-2.62
    
    metze

commit 67e43860b4973a458676b36785570bb4a66e046a
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Jun 9 10:38:09 2008 +0200

    libreplace: fix warnings with autoconf-2.62 rename ac_ => libreplace_cv_
    
    AC_CACHE_VAL() variables must contain _cv_ to be cached.
    
    metze

commit 0241af873fdefd5856932190ca0019a2d3c05703
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Jun 9 10:37:12 2008 +0200

    build/m4: fix warnings with autoconf-2.62 rename SMB_BUILD_ => samba_cv_
    
    AC_CACHE_VAL() variables must contain _cv_ to be cached.
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 source/build/m4/check_cc.m4      |    6 +++---
 source/configure.ac              |    3 +--
 source/lib/replace/libreplace.m4 |    3 ++-
 source/lib/replace/win32.m4      |    8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/build/m4/check_cc.m4 b/source/build/m4/check_cc.m4
index 569be38..51531ca 100644
--- a/source/build/m4/check_cc.m4
+++ b/source/build/m4/check_cc.m4
@@ -30,7 +30,7 @@ fi
 # check if the compiler can handle negative enum values
 # and don't truncate the values to INT_MAX
 # a runtime test is needed here
-AC_CACHE_CHECK([that the C compiler understands negative enum values],SMB_BUILD_CC_NEGATIVE_ENUM_VALUES, [
+AC_CACHE_CHECK([that the C compiler understands negative enum values],samba_cv_CC_NEGATIVE_ENUM_VALUES, [
     AC_TRY_RUN(
 [
 	#include <stdio.h>
@@ -45,8 +45,8 @@ AC_CACHE_CHECK([that the C compiler understands negative enum values],SMB_BUILD_
 		return 0;
 	}
 ],
-	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
+	samba_cv_CC_NEGATIVE_ENUM_VALUES=yes,samba_cv_CC_NEGATIVE_ENUM_VALUES=no)])
+if test x"$samba_cv_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then
 	AC_DEFINE(USE_UINT_ENUMS, 1, [Whether the compiler has uint enum support])
 fi
 
diff --git a/source/configure.ac b/source/configure.ac
index 73d3ffd..5014a87 100644
--- a/source/configure.ac
+++ b/source/configure.ac
@@ -1,8 +1,7 @@
 dnl -*- mode: m4-mode -*-
 dnl Process this file with autoconf to produce a configure script.
 
-dnl disabled 2.53 requirement - we do work with 2.52 on suse 7.3 for example
-dnl AC_PREREQ(2.53)
+AC_PREREQ(2.54)
 
 AC_INIT([samba],[4],[samba-technical at samba.org])
 
diff --git a/source/lib/replace/libreplace.m4 b/source/lib/replace/libreplace.m4
index 6a85ff5..71fa041 100644
--- a/source/lib/replace/libreplace.m4
+++ b/source/lib/replace/libreplace.m4
@@ -299,4 +299,5 @@ m4_include(libreplace_cc.m4)
 m4_include(libreplace_ld.m4)
 m4_include(libreplace_network.m4)
 m4_include(libreplace_macros.m4)
-m4_include(autoconf-2.60.m4)
+
+m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[m4_include(autoconf-2.60.m4)])
diff --git a/source/lib/replace/win32.m4 b/source/lib/replace/win32.m4
index 9ac84cd..eb364e2 100644
--- a/source/lib/replace/win32.m4
+++ b/source/lib/replace/win32.m4
@@ -2,7 +2,7 @@ AC_CHECK_HEADERS(direct.h windows.h winsock2.h ws2tcpip.h)
 
 #######################################
 # Check for mkdir mode
-AC_CACHE_CHECK( [whether mkdir supports mode], ac_mkdir_has_mode,
+AC_CACHE_CHECK( [whether mkdir supports mode], libreplace_cv_mkdir_has_mode,
 	AC_TRY_COMPILE([
 		#include <stdio.h>
 		#ifdef HAVE_DIRECT_H
@@ -11,10 +11,10 @@ AC_CACHE_CHECK( [whether mkdir supports mode], ac_mkdir_has_mode,
 			mkdir("foo",0777);
 			return 0;
 	],
-    ac_mkdir_has_mode="yes",
-    ac_mkdir_has_mode="no") )
+    libreplace_cv_mkdir_has_mode="yes",
+    libreplace_cv_mkdir_has_mode="no") )
 
-if test "$ac_mkdir_has_mode" = "yes"
+if test "$libreplace_cv_mkdir_has_mode" = "yes"
 then
     AC_DEFINE(HAVE_MKDIR_MODE, 1, [Define if target mkdir supports mode option])
 fi


-- 
Samba Shared Repository