The branch, v3-2-test has been updated
via 24f0c35571b26187c13af933604fe40afed1da34 (commit)
via c402acd63a31bace402b361760a7d73f95db3717 (commit)
via 21bbd421d4bd2c16f4d8ab94a6a9e3388be4fb82 (commit)
via 74c644a2bed45d48215914da8002913254a7f54c (commit)
via 84a8a7d9e028aa223617a8cb7aa31d5fabd7636e (commit)
via a7a8abdbac00693a0437d3b3cb1e4e9784a03e51 (commit)
from 3b8c9ae9826705edd7a3852a9c0ffd0e632094c4 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 24f0c35571b26187c13af933604fe40afed1da34
Author: Stefan Metzmacher <[EMAIL PROTECTED]>
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
(cherry picked from commit 72bb01dda4d425528e28cd96e249595dc6c1952f)
(cherry picked from commit 85111dc2b60ca38027adf129a074641c752cb104)
commit c402acd63a31bace402b361760a7d73f95db3717
Author: Stefan Metzmacher <[EMAIL PROTECTED]>
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
(cherry picked from commit 67e43860b4973a458676b36785570bb4a66e046a)
(cherry picked from commit d786bfc48e20ed7e695a988da6ed56a573afdadc)
commit 21bbd421d4bd2c16f4d8ab94a6a9e3388be4fb82
Author: Stefan Metzmacher <[EMAIL PROTECTED]>
Date: Mon Jun 9 10:43:48 2008 +0200
configure: we require autoconf 2.54
I've tested with autoconf from 2.53 to 2.62.
metze
(cherry picked from commit a268a6d251e58c27262e11fcd85b8281dfaddd8b)
commit 74c644a2bed45d48215914da8002913254a7f54c
Author: Stefan Metzmacher <[EMAIL PROTECTED]>
Date: Mon Jun 9 10:27:12 2008 +0200
configure: fix warnings with autoconf-2.62 rename SMB_BUILD_ => samba_cv_
AC_CACHE_VAL() variables must contain _cv_ to be cached.
metze
(cherry picked from commit 89663ab4d10586b96807c56de53fd60d2488093c)
commit 84a8a7d9e028aa223617a8cb7aa31d5fabd7636e
Author: Stefan Metzmacher <[EMAIL PROTECTED]>
Date: Mon Jun 9 10:23:27 2008 +0200
configure: fix warnings with autoconf-2.62 rename samba_stat_hires =>
samba_cv_stat_hires
AC_CACHE_VAL() variables must contain _cv_ to be cached.
metze
(cherry picked from commit 426b1e36e262ae47ea62e36e1df8a76c930394bc)
commit a7a8abdbac00693a0437d3b3cb1e4e9784a03e51
Author: Stefan Metzmacher <[EMAIL PROTECTED]>
Date: Mon Jun 9 10:19:21 2008 +0200
configure: fix warnings with autoconf-2.62 rename smb_krb5_ => smb_krb5_cv_
AC_CACHE_VAL() variables must contain _cv_ to be cached.
metze
(cherry picked from commit 38a03d61ecd35a70905b895b839a994e974cbaf1)
-----------------------------------------------------------------------
Summary of changes:
source/configure.in | 64 +++++++++++++++++++-------------------
source/lib/replace/libreplace.m4 | 3 +-
source/lib/replace/win32.m4 | 8 ++--
3 files changed, 38 insertions(+), 37 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/configure.in b/source/configure.in
index 481f3cd..e015f9e 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
-dnl We must use autotools 2.53 or above
-AC_PREREQ(2.53)
+dnl We must use autotools 2.54 or above
+AC_PREREQ(2.54)
AC_INIT([Samba],[3],[EMAIL PROTECTED])
@@ -336,7 +336,7 @@ fi
# and don't truncate the values to INT_MAX
# a runtime test is needed here
AC_SUBST(PIDL_ARGS)
-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>
@@ -357,8 +357,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_MSG_WARN([using --unit-enums for pidl])
PIDL_ARGS="$PIDL_ARGS --uint-enums"
fi
@@ -1268,7 +1268,7 @@ fi
# "struct timespec" or "timespec_t". Linux doesn't have timespec_t, so we
# prefer struct timespec.
-AC_CACHE_CHECK([whether struct stat has sub-second timestamps],
samba_stat_hires,
+AC_CACHE_CHECK([whether struct stat has sub-second timestamps],
samba_cv_stat_hires,
[
AC_TRY_COMPILE(
[
@@ -1296,10 +1296,10 @@ AC_CACHE_CHECK([whether struct stat has sub-second
timestamps], samba_stat_hires
t.tv_sec = s.st_atim.tv_sec;
t.tv_nsec = s.st_atim.tv_nsec;
],
- samba_stat_hires=yes, samba_stat_hires=no)
+ samba_cv_stat_hires=yes, samba_cv_stat_hires=no)
])
-if test x"$samba_stat_hires" = x"yes" ; then
+if test x"$samba_cv_stat_hires" = x"yes" ; then
AC_DEFINE(HAVE_STAT_ST_MTIM, 1, [whether struct stat contains st_mtim])
AC_DEFINE(HAVE_STAT_ST_ATIM, 1, [whether struct stat contains st_atim])
AC_DEFINE(HAVE_STAT_ST_CTIM, 1, [whether struct stat contains st_ctim])
@@ -1307,7 +1307,7 @@ if test x"$samba_stat_hires" = x"yes" ; then
[whether struct stat has sub-second timestamps])
fi
-AC_CACHE_CHECK([whether struct stat has sub-second timestamps without struct
timespec], samba_stat_hires_notimespec,
+AC_CACHE_CHECK([whether struct stat has sub-second timestamps without struct
timespec], samba_cv_stat_hires_notimespec,
[
AC_TRY_COMPILE(
[
@@ -1335,10 +1335,10 @@ AC_CACHE_CHECK([whether struct stat has sub-second
timestamps without struct tim
t.tv_sec = s.st_atime;
t.tv_nsec = s.st_atimensec;
],
- samba_stat_hires=yes, samba_stat_hires=no)
+ samba_cv_stat_hires=yes, samba_cv_stat_hires=no)
])
-if test x"$samba_stat_hires_notimespec" = x"yes" ; then
+if test x"$samba_cv_stat_hires_notimespec" = x"yes" ; then
AC_DEFINE(HAVE_STAT_ST_MTIMENSEC, 1, [whether struct stat contains
st_mtimensec])
AC_DEFINE(HAVE_STAT_ST_ATIMENSEC, 1, [whether struct stat contains
st_atimensec])
AC_DEFINE(HAVE_STAT_ST_CTIMENSEC, 1, [whether struct stat contains
st_ctimensec])
@@ -3361,7 +3361,7 @@ if test x"$with_ads_support" != x"no"; then
LIBS="$KRB5_LIBS $LIBS"
AC_CACHE_CHECK(whether krb5_ticket contains kvno and enctype,
- smb_krb5_ticket_has_keyinfo,
+ smb_krb5_cv_ticket_has_keyinfo,
[
AC_TRY_COMPILE(
[
@@ -3375,17 +3375,17 @@ if test x"$with_ads_support" != x"no"; then
enctype = ticket.enc_part.enctype;
kvno = ticket.enc_part.kvno;
],
- [ smb_krb5_ticket_has_keyinfo=yes ],
- [ smb_krb5_ticket_has_keyinfo=no ])
+ [ smb_krb5_cv_ticket_has_keyinfo=yes ],
+ [ smb_krb5_cv_ticket_has_keyinfo=no ])
])
- if test x"$smb_krb5_ticket_has_keyinfo" = x"yes" ; then
+ if test x"$smb_krb5_cv_ticket_has_keyinfo" = x"yes" ; then
AC_DEFINE(KRB5_TICKET_HAS_KEYINFO, 1,
[Whether the krb5_ticket structure contains the kvno and enctype])
fi
AC_CACHE_CHECK(whether krb5_get_init_creds_opt_free takes a context argument,
- smb_krb5_creds_opt_free_context,
+ smb_krb5_cv_creds_opt_free_context,
[
AC_TRY_COMPILE([
#include <krb5.h>],
@@ -3394,25 +3394,25 @@ if test x"$with_ads_support" != x"no"; then
krb5_get_init_creds_opt *opt = NULL;
krb5_get_init_creds_opt_free(ctx, opt);
],
- [smb_krb5_creds_opt_free_context=yes],
- [smb_krb5_creds_opt_free_context=no]
+ [smb_krb5_cv_creds_opt_free_context=yes],
+ [smb_krb5_cv_creds_opt_free_context=no]
)
])
- if test x"$smb_krb5_creds_opt_free_context" = x"yes" ; then
+ if test x"$smb_krb5_cv_creds_opt_free_context" = x"yes" ; then
AC_DEFINE(KRB5_CREDS_OPT_FREE_REQUIRES_CONTEXT, 1,
[Whether krb5_get_init_creds_opt_free takes a context argument])
fi
- AC_CACHE_CHECK(whether krb5_verify_checksum takes 7 arguments,
smb_krb5_verify_checksum, [
+ AC_CACHE_CHECK(whether krb5_verify_checksum takes 7 arguments,
smb_krb5_cv_verify_checksum, [
AC_TRY_COMPILE([
#include <krb5.h>],
[krb5_verify_checksum(0, 0, 0, 0, 0, 0, 0);],
- [smb_krb5_verify_checksum=7],
- [smb_krb5_verify_checksum=6],
+ [smb_krb5_cv_verify_checksum=7],
+ [smb_krb5_cv_verify_checksum=6],
)
])
- AC_DEFINE_UNQUOTED(KRB5_VERIFY_CHECKSUM_ARGS, $smb_krb5_verify_checksum,
[Number of arguments to krb5_verify_checksum])
+ AC_DEFINE_UNQUOTED(KRB5_VERIFY_CHECKSUM_ARGS, $smb_krb5_cv_verify_checksum,
[Number of arguments to krb5_verify_checksum])
AC_CACHE_CHECK([for checksum in krb5_checksum],
samba_cv_HAVE_CHECKSUM_IN_KRB5_CHECKSUM,[
@@ -3735,7 +3735,7 @@ if test x"$with_ads_support" != x"no"; then
if test x"$ac_cv_func_ext_krb5_enctype_to_string" = x"yes"; then
AC_CACHE_CHECK([for krb5_error_code krb5_enctype_to_string(krb5_context
context, krb5_enctype enctype, char **str)],
- smb_krb5_enctype_to_string_takes_krb5_context_arg,[
+ smb_krb5_cv_enctype_to_string_takes_krb5_context_arg,[
AC_TRY_RUN_STRICT([
#include <krb5.h>
int main(void) {
@@ -3746,16 +3746,16 @@ if test x"$with_ads_support" != x"no"; then
return 0;
}
],[$Werror_FLAGS],[$CPPFLAGS],[$LDFLAGS],
- smb_krb5_enctype_to_string_takes_krb5_context_arg=yes,
- smb_krb5_enctype_to_string_takes_krb5_context_arg=no)])
+ smb_krb5_cv_enctype_to_string_takes_krb5_context_arg=yes,
+ smb_krb5_cv_enctype_to_string_takes_krb5_context_arg=no)])
- if test x"$smb_krb5_enctype_to_string_takes_krb5_context_arg" = x"yes";
then
+ if test x"$smb_krb5_cv_enctype_to_string_takes_krb5_context_arg" = x"yes";
then
AC_DEFINE(HAVE_KRB5_ENCTYPE_TO_STRING_WITH_KRB5_CONTEXT_ARG,1,
[whether krb5_enctype_to_string takes krb5_context argument])
fi
AC_CACHE_CHECK([for krb5_error_code krb5_enctype_to_string(krb5_enctype
enctype, char *str, size_t len)],
- smb_krb5_enctype_to_string_takes_size_t_arg,[
+ smb_krb5_cv_enctype_to_string_takes_size_t_arg,[
AC_TRY_RUN_STRICT([
#include <krb5.h>
int main(void) {
@@ -3764,10 +3764,10 @@ if test x"$with_ads_support" != x"no"; then
return 0;
}
],[$Werror_FLAGS],[$CPPFLAGS],[$LDFLAGS],
- smb_krb5_enctype_to_string_takes_size_t_arg=yes,
- smb_krb5_enctype_to_string_takes_size_t_arg=no)])
+ smb_krb5_cv_enctype_to_string_takes_size_t_arg=yes,
+ smb_krb5_cv_enctype_to_string_takes_size_t_arg=no)])
- if test x"$smb_krb5_enctype_to_string_takes_size_t_arg" = x"yes"; then
+ if test x"$smb_krb5_cv_enctype_to_string_takes_size_t_arg" = x"yes"; then
AC_DEFINE(HAVE_KRB5_ENCTYPE_TO_STRING_WITH_SIZE_T_ARG,1,
[whether krb5_enctype_to_string takes size_t argument])
fi
@@ -3837,7 +3837,7 @@ if test x"$with_ads_support" != x"no"; then
use_ads=no
fi
- if test x"$smb_krb5_ticket_has_keyinfo" != x"yes" ; then
+ if test x"$smb_krb5_cv_ticket_has_keyinfo" != x"yes" ; then
# We only need the following functions if we can't get the enctype
# and kvno out of the ticket directly (ie. on Heimdal).
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
