Attachment 11232 Details for Bug 11369 – patch consisting of autoupdate changes that do not involve evaluating code compatibility impact

[patch] patch consisting of autoupdate changes that do not involve evaluating code compatibility impact

rsync-configure-ac-patch.diff (text/plain), 22.72 KB, created by Brant Gurganus on 2015-07-04 00:48:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brant Gurganus

Created: 2015-07-04 00:48:03 UTC

Size: 22.72 KB

patch

obsolete

>diff --git a/configure.ac b/configure.ac
>index ca0c6fa..fa5d540 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -1,11 +1,11 @@
> dnl Process this file with autoconf to produce a configure script.
> 
>-AC_INIT([rsync], [3.1.2dev], [http://rsync.samba.org/bugzilla.html])
>+AC_INIT([rsync],[3.1.2dev],[http://rsync.samba.org/bugzilla.html])
> 
> AC_CONFIG_MACRO_DIR([m4])
> AC_CONFIG_SRCDIR([byteorder.h])
> AC_CONFIG_HEADER(config.h)
>-AC_PREREQ(2.60)
>+AC_PREREQ([2.69])
> 
> AC_SUBST(RSYNC_VERSION, $PACKAGE_VERSION)
> AC_MSG_NOTICE([Configuring rsync $PACKAGE_VERSION])
>@@ -27,8 +27,7 @@ AC_CONFIG_LIBOBJ_DIR([lib])
> 
> AC_MSG_CHECKING([whether to include debugging symbols])
> AC_ARG_ENABLE(debug,
>-	AC_HELP_STRING([--disable-debug],
>-		[disable debugging symbols and features]))
>+	AS_HELP_STRING([--disable-debug],[disable debugging symbols and features]))
> 
> if test x"$enable_debug" = x"no"; then
>     AC_MSG_RESULT(no)
>@@ -57,8 +56,7 @@ if test x"$ac_cv_prog_cc_stdc" = x"no"; then
> fi
> 
> AC_ARG_ENABLE(profile,
>-	AC_HELP_STRING([--enable-profile],
>-		[turn on CPU profiling]))
>+	AS_HELP_STRING([--enable-profile],[turn on CPU profiling]))
> if test x"$enable_profile" = x"yes"; then
> 	CFLAGS="$CFLAGS -pg"
> fi
>@@ -66,8 +64,7 @@ fi
> 
> # Specifically, this turns on panic_action handling.
> AC_ARG_ENABLE(maintainer-mode,
>-	AC_HELP_STRING([--enable-maintainer-mode],
>-		[turn on extra debug features]))
>+	AS_HELP_STRING([--enable-maintainer-mode],[turn on extra debug features]))
> if test x"$enable_maintainer_mode" = x"yes"; then
> 	CFLAGS="$CFLAGS -DMAINTAINER_MODE"
> fi
>@@ -83,26 +80,26 @@ if test x"$GCC" = x"yes"; then
> fi
> 
> AC_ARG_WITH(included-popt,
>-        AC_HELP_STRING([--with-included-popt], [use bundled popt library, not from system]))
>+        AS_HELP_STRING([--with-included-popt],[use bundled popt library, not from system]))
> 
> AC_ARG_WITH(included-zlib,
>-        AC_HELP_STRING([--with-included-zlib], [use bundled zlib library, not from system]))
>+        AS_HELP_STRING([--with-included-zlib],[use bundled zlib library, not from system]))
> 
> AC_ARG_WITH(protected-args,
>-        AC_HELP_STRING([--with-protected-args], [make --protected-args option the default]))
>+        AS_HELP_STRING([--with-protected-args],[make --protected-args option the default]))
> if test x"$with_protected_args" = x"yes"; then
> 	AC_DEFINE_UNQUOTED(RSYNC_USE_PROTECTED_ARGS, 1, [Define to 1 if --protected-args should be the default])
> fi
> 
> AC_ARG_WITH(rsync-path,
>-	AC_HELP_STRING([--with-rsync-path=PATH], [set default --rsync-path to PATH (default: rsync)]),
>+	AS_HELP_STRING([--with-rsync-path=PATH],[set default --rsync-path to PATH (default: rsync)]),
> 	[ RSYNC_PATH="$with_rsync_path" ],
> 	[ RSYNC_PATH="rsync" ])
> 
> AC_DEFINE_UNQUOTED(RSYNC_PATH, "$RSYNC_PATH", [location of rsync on remote machine])
> 
> AC_ARG_WITH(rsyncd-conf,
>-	AC_HELP_STRING([--with-rsyncd-conf=PATH], [set configuration file for rsync server to PATH (default: /etc/rsyncd.conf)]),
>+	AS_HELP_STRING([--with-rsyncd-conf=PATH],[set configuration file for rsync server to PATH (default: /etc/rsyncd.conf)]),
> 	[ if test ! -z "$with_rsyncd_conf" ; then
> 		case $with_rsyncd_conf in
> 			yes|no)
>@@ -123,7 +120,7 @@ AC_ARG_WITH(rsyncd-conf,
> AC_DEFINE_UNQUOTED(RSYNCD_SYSCONF, "$RSYNCD_SYSCONF", [location of configuration file for rsync server])
> 
> AC_ARG_WITH(rsh,
>-	AC_HELP_STRING([--with-rsh=CMD], [set remote shell command to CMD (default: ssh)]))
>+	AS_HELP_STRING([--with-rsh=CMD],[set remote shell command to CMD (default: ssh)]))
> 
> AC_CHECK_PROG(HAVE_REMSH, remsh, 1, 0)
> if test x$HAVE_REMSH = x1; then
>@@ -149,8 +146,7 @@ AC_PATH_PROG(SHELL_PATH, sh, /bin/sh, [/usr/xpg4/bin$PATH_SEPARATOR$PATH])
> AC_PATH_PROG(FAKEROOT_PATH, fakeroot, /usr/bin/fakeroot, [/usr/xpg4/bin$PATH_SEPARATOR$PATH])
> 
> AC_ARG_WITH(nobody-group,
>-    AC_HELP_STRING([--with-nobody-group=GROUP],
>-		   [set the default unprivileged group (default nobody or nogroup)]),
>+    AS_HELP_STRING([--with-nobody-group=GROUP],[set the default unprivileged group (default nobody or nogroup)]),
>     [ NOBODY_GROUP="$with_nobody_group" ])
> 
> if test x"$with_nobody_group" = x; then
>@@ -171,7 +167,7 @@ AC_DEFINE_UNQUOTED(NOBODY_GROUP, "$NOBODY_GROUP", [unprivileged group for unpriv
> # arrgh. libc in some old debian version screwed up the largefile
> # stuff, getting byte range locking wrong
> AC_CACHE_CHECK([for broken largefile support],rsync_cv_HAVE_BROKEN_LARGEFILE,[
>-AC_TRY_RUN([
>+AC_RUN_IFELSE([AC_LANG_SOURCE([[
> #define _FILE_OFFSET_BITS 64
> #include <stdio.h>
> #include <fcntl.h>
>@@ -203,8 +199,7 @@ int main(void)
> 	unlink(tpl);
> 	exit(WEXITSTATUS(status));
> }
>-],
>-rsync_cv_HAVE_BROKEN_LARGEFILE=yes,rsync_cv_HAVE_BROKEN_LARGEFILE=no,rsync_cv_HAVE_BROKEN_LARGEFILE=cross)])
>+]])],[rsync_cv_HAVE_BROKEN_LARGEFILE=yes],[rsync_cv_HAVE_BROKEN_LARGEFILE=no],[rsync_cv_HAVE_BROKEN_LARGEFILE=cross])])
> if test x"$rsync_cv_HAVE_BROKEN_LARGEFILE" != x"yes"; then
>    AC_SYS_LARGEFILE
> fi
>@@ -214,8 +209,7 @@ ipv6lib=none
> ipv6trylibc=yes
> 
> AC_ARG_ENABLE(ipv6,
>-	AC_HELP_STRING([--disable-ipv6],
>-		[do not even try to use IPv6]))
>+	AS_HELP_STRING([--disable-ipv6],[do not even try to use IPv6]))
> if test x"$enable_ipv6" != x"no"; then
> 	AC_MSG_CHECKING([ipv6 stack type])
> 	for i in inria kame linux-glibc linux-inet6 solaris toshiba v6d zeta cygwin; do
>@@ -326,8 +320,7 @@ fi
> 
> dnl Do you want to disable use of locale functions
> AC_ARG_ENABLE([locale],
>-	AC_HELP_STRING([--disable-locale],
>-		[disable locale features]))
>+	AS_HELP_STRING([--disable-locale],[disable locale features]))
> AH_TEMPLATE([CONFIG_LOCALE],
> [Undefine if you do not want locale features.  By default this is defined.])
> if test x"$enable_locale" != x"no"; then
>@@ -358,7 +351,7 @@ AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h \
> AC_HEADER_MAJOR
> 
> AC_CACHE_CHECK([if makedev takes 3 args],rsync_cv_MAKEDEV_TAKES_3_ARGS,[
>-AC_TRY_RUN([
>+AC_RUN_IFELSE([AC_LANG_SOURCE([[
> #include <sys/types.h>
> #ifdef MAJOR_IN_MKDEV
> #include <sys/mkdev.h>
>@@ -376,8 +369,7 @@ int main(void)
> 		exit(1);
> 	return 0;
> }
>-],
>-rsync_cv_MAKEDEV_TAKES_3_ARGS=yes,rsync_cv_MAKEDEV_TAKES_3_ARGS=no,rsync_cv_MAKEDEV_TAKES_3_ARGS=no)])
>+]])],[rsync_cv_MAKEDEV_TAKES_3_ARGS=yes],[rsync_cv_MAKEDEV_TAKES_3_ARGS=no],[rsync_cv_MAKEDEV_TAKES_3_ARGS=no])])
> if test x"$rsync_cv_MAKEDEV_TAKES_3_ARGS" = x"yes"; then
>    AC_DEFINE(MAKEDEV_TAKES_3_ARGS, 1, [Define to 1 if makedev() takes 3 args])
> fi
>@@ -396,9 +388,30 @@ AC_CHECK_SIZEOF(off64_t)
> AC_CHECK_SIZEOF(time_t)
> 
> AC_C_INLINE
>-AC_C_LONG_DOUBLE
>+AC_DIAGNOSE([obsolete],[The macro `AC_C_LONG_DOUBLE' is obsolete.
>+You should use `AC_TYPE_LONG_DOUBLE' or `AC_TYPE_LONG_DOUBLE_WIDER' instead.
>+])dnl
>+
>+    AC_TYPE_LONG_DOUBLE_WIDER
>+    ac_cv_c_long_double=$ac_cv_type_long_double_wider
>+    if test $ac_cv_c_long_double = yes; then
>+      AC_DEFINE([HAVE_LONG_DOUBLE],[1],[Define to 1 if the type `long double' works and has more range or
>+	 precision than `double'.])
>+    fi
>+  
>+
>+AC_DIAGNOSE([obsolete],[your code may safely assume C89 semantics that RETSIGTYPE is void.
>+Remove this warning and the `AC_CACHE_CHECK' when you adjust the code.])dnl
>+AC_CACHE_CHECK([return type of signal handlers],[ac_cv_type_signal],[AC_COMPILE_IFELSE(
>+[AC_LANG_PROGRAM([#include <sys/types.h>
>+#include <signal.h>
>+],
>+		 [return *(signal (0, 0)) (0) == 1;])],
>+		   [ac_cv_type_signal=int],
>+		   [ac_cv_type_signal=void])])
>+AC_DEFINE_UNQUOTED([RETSIGTYPE],[$ac_cv_type_signal],[Define as the return type of signal handlers
>+		    (`int' or `void').])
> 
>-AC_TYPE_SIGNAL
> AC_TYPE_UID_T
> AC_CHECK_TYPES([mode_t,off_t,size_t,pid_t,id_t])
> AC_TYPE_GETGROUPS
>@@ -418,8 +431,7 @@ AC_CHECK_MEMBERS([struct stat.st_rdev,
> TYPE_SOCKLEN_T
> 
> AC_CACHE_CHECK([for errno in errno.h],rsync_cv_errno, [
>-    AC_TRY_COMPILE([#include <errno.h>],[int i = errno],
>-	rsync_cv_errno=yes,rsync_cv_have_errno_decl=no)])
>+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <errno.h>]], [[int i = errno]])],[rsync_cv_errno=yes],[rsync_cv_have_errno_decl=no])])
> if test x"$rsync_cv_errno" = x"yes"; then
>    AC_DEFINE(HAVE_ERRNO_DECL, 1, [Define to 1 if errno is declared in errno.h])
> fi
>@@ -470,7 +482,7 @@ AC_SEARCH_LIBS(libiconv_open, iconv)
> 
> AC_MSG_CHECKING([for iconv declaration])
> AC_CACHE_VAL(am_cv_proto_iconv, [
>-    AC_TRY_COMPILE([
>+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
> #include <stdlib.h>
> #include <iconv.h>
> extern
>@@ -482,7 +494,7 @@ size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, si
> #else
> size_t iconv();
> #endif
>-], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
>+]], [[]])],[am_cv_proto_iconv_arg1=""],[am_cv_proto_iconv_arg1="const"])
>       am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
>     am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
> AC_MSG_RESULT([$]{ac_t:-
>@@ -517,13 +529,11 @@ AS_IF([test x"$rsync_cv_HAVE_GETADDR_DEFINES" = x"yes" -a x"$ac_cv_type_struct_a
> 	# redefinition.
> 	AC_CHECK_FUNCS(getaddrinfo, ,
> 		[AC_MSG_CHECKING([for getaddrinfo by including <netdb.h>])
>-		AC_TRY_LINK([#include <sys/types.h>
>+		AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
> 		#include <sys/socket.h>
>-		#include <netdb.h>],[getaddrinfo(NULL, NULL, NULL, NULL);],
>-			[AC_MSG_RESULT([yes])
>+		#include <netdb.h>]], [[getaddrinfo(NULL, NULL, NULL, NULL);]])],[AC_MSG_RESULT([yes])
> 			AC_DEFINE(HAVE_GETADDRINFO, 1,
>-				[Define to 1 if you have the "getaddrinfo" function and required types.])],
>-			[AC_MSG_RESULT([no])
>+				[Define to 1 if you have the "getaddrinfo" function and required types.])],[AC_MSG_RESULT([no])
> 			AC_LIBOBJ([getaddrinfo])])])
>     ],[AC_LIBOBJ([getaddrinfo])])
> 
>@@ -615,19 +625,15 @@ fi
> dnl Preallocation stuff (also fallocate, posix_fallocate function tests above):
> 
> AC_CACHE_CHECK([for useable fallocate],rsync_cv_have_fallocate,[
>-AC_TRY_LINK([#include <fcntl.h>
>-#include <sys/types.h>],
>-[fallocate(0, 0, 0, 0);],
>-rsync_cv_have_fallocate=yes,rsync_cv_have_fallocate=no)])
>+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <fcntl.h>
>+#include <sys/types.h>]], [[fallocate(0, 0, 0, 0);]])],[rsync_cv_have_fallocate=yes],[rsync_cv_have_fallocate=no])])
> if test x"$rsync_cv_have_fallocate" = x"yes"; then
>     AC_DEFINE(HAVE_FALLOCATE, 1, [Define to 1 if you have the fallocate function and it compiles and links without error])
> fi
> 
> AC_CACHE_CHECK([for SYS_fallocate],rsync_cv_have_sys_fallocate,[
>-AC_TRY_COMPILE([#include <sys/syscall.h>
>-#include <sys/types.h>],
>-[syscall(SYS_fallocate, 0, 0, (loff_t)0, (loff_t)0);],
>-rsync_cv_have_sys_fallocate=yes,rsync_cv_have_sys_fallocate=no)])
>+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/syscall.h>
>+#include <sys/types.h>]], [[syscall(SYS_fallocate, 0, 0, (loff_t)0, (loff_t)0);]])],[rsync_cv_have_sys_fallocate=yes],[rsync_cv_have_sys_fallocate=no])])
> if test x"$rsync_cv_have_sys_fallocate" = x"yes"; then
>     AC_DEFINE(HAVE_SYS_FALLOCATE, 1, [Define to 1 if you have the SYS_fallocate syscall number])
> fi
>@@ -654,8 +660,7 @@ if test $ac_cv_func_getpgrp = yes; then
> fi
> 
> AC_ARG_ENABLE(iconv-open,
>-    AC_HELP_STRING([--disable-iconv-open],
>-	    [disable all use of iconv_open() function]),
>+    AS_HELP_STRING([--disable-iconv-open],[disable all use of iconv_open() function]),
>     [], [enable_iconv_open=$ac_cv_func_iconv_open])
> 
> if test x"$enable_iconv_open" != x"no"; then
>@@ -663,8 +668,7 @@ if test x"$enable_iconv_open" != x"no"; then
> fi
> 
> AC_ARG_ENABLE(iconv,
>-    AC_HELP_STRING([--disable-iconv],
>-	    [disable rsync's --iconv option]),
>+    AS_HELP_STRING([--disable-iconv],[disable rsync's --iconv option]),
>     [], [enable_iconv=$enable_iconv_open])
> AH_TEMPLATE([ICONV_OPTION],
> [Define if you want the --iconv option.  Specifing a value will set the
>@@ -679,7 +683,7 @@ if test x"$enable_iconv" != x"no"; then
> fi
> 
> AC_CACHE_CHECK([whether chown() modifies symlinks],rsync_cv_chown_modifies_symlink,[
>-  AC_TRY_RUN([
>+  AC_RUN_IFELSE([AC_LANG_SOURCE([[
> #if HAVE_UNISTD_H
> # include <unistd.h>
> #endif
>@@ -691,14 +695,13 @@ AC_CACHE_CHECK([whether chown() modifies symlinks],rsync_cv_chown_modifies_symli
> 	if (symlink("conftest.no-such", dangling_symlink) < 0) abort();
> 	if (chown(dangling_symlink, getuid(), getgid()) < 0 && errno == ENOENT) exit(1);
> 	exit(0);
>-    }],
>-  rsync_cv_chown_modifies_symlink=yes,rsync_cv_chown_modifies_symlink=no,rsync_cv_chown_modifies_symlink=no)])
>+    }]])],[rsync_cv_chown_modifies_symlink=yes],[rsync_cv_chown_modifies_symlink=no],[rsync_cv_chown_modifies_symlink=no])])
> if test $rsync_cv_chown_modifies_symlink = yes; then
>   AC_DEFINE(CHOWN_MODIFIES_SYMLINK, 1, [Define to 1 if chown modifies symlinks.])
> fi
> 
> AC_CACHE_CHECK([whether link() can hard-link symlinks],rsync_cv_can_hardlink_symlink,[
>-  AC_TRY_RUN([
>+  AC_RUN_IFELSE([AC_LANG_SOURCE([[
> #if HAVE_UNISTD_H
> # include <unistd.h>
> #endif
>@@ -711,14 +714,13 @@ AC_CACHE_CHECK([whether link() can hard-link symlinks],rsync_cv_can_hardlink_sym
> 	unlink(FILENAME "2");
> 	if (link(FILENAME, FILENAME "2") < 0) exit(1);
> 	exit(0);
>-    }],
>-  rsync_cv_can_hardlink_symlink=yes,rsync_cv_can_hardlink_symlink=no,rsync_cv_can_hardlink_symlink=no)])
>+    }]])],[rsync_cv_can_hardlink_symlink=yes],[rsync_cv_can_hardlink_symlink=no],[rsync_cv_can_hardlink_symlink=no])])
> if test $rsync_cv_can_hardlink_symlink = yes; then
>   AC_DEFINE(CAN_HARDLINK_SYMLINK, 1, [Define to 1 if link() can hard-link symlinks.])
> fi
> 
> AC_CACHE_CHECK([whether link() can hard-link special files],rsync_cv_can_hardlink_special,[
>-  AC_TRY_RUN([
>+  AC_RUN_IFELSE([AC_LANG_SOURCE([[
> #if HAVE_UNISTD_H
> # include <unistd.h>
> #endif
>@@ -731,22 +733,20 @@ AC_CACHE_CHECK([whether link() can hard-link special files],rsync_cv_can_hardlin
> 	unlink(FILENAME "2");
> 	if (link(FILENAME, FILENAME "2") < 0) exit(1);
> 	exit(0);
>-    }],
>-  rsync_cv_can_hardlink_special=yes,rsync_cv_can_hardlink_special=no,rsync_cv_can_hardlink_special=no)])
>+    }]])],[rsync_cv_can_hardlink_special=yes],[rsync_cv_can_hardlink_special=no],[rsync_cv_can_hardlink_special=no])])
> if test $rsync_cv_can_hardlink_special = yes; then
>     AC_DEFINE(CAN_HARDLINK_SPECIAL, 1, [Define to 1 if link() can hard-link special files.])
> fi
> 
> AC_CACHE_CHECK([for working socketpair],rsync_cv_HAVE_SOCKETPAIR,[
>-AC_TRY_RUN([
>+AC_RUN_IFELSE([AC_LANG_SOURCE([[
> #include <sys/types.h>
> #include <sys/socket.h>
> 
> main() {
>        int fd[2];
>        exit((socketpair(AF_UNIX, SOCK_STREAM, 0, fd) != -1) ? 0 : 1);
>-}],
>-rsync_cv_HAVE_SOCKETPAIR=yes,rsync_cv_HAVE_SOCKETPAIR=no,rsync_cv_HAVE_SOCKETPAIR=cross)])
>+}]])],[rsync_cv_HAVE_SOCKETPAIR=yes],[rsync_cv_HAVE_SOCKETPAIR=no],[rsync_cv_HAVE_SOCKETPAIR=cross])])
> if test x"$rsync_cv_HAVE_SOCKETPAIR" = x"yes"; then
>     AC_DEFINE(HAVE_SOCKETPAIR, 1, [Define to 1 if you have the "socketpair" function])
> fi
>@@ -802,43 +802,37 @@ else
> fi
> 
> AC_CACHE_CHECK([for unsigned char],rsync_cv_SIGNED_CHAR_OK,[
>-AC_TRY_COMPILE([],[signed char *s = ""],
>-rsync_cv_SIGNED_CHAR_OK=yes,rsync_cv_SIGNED_CHAR_OK=no)])
>+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[signed char *s = ""]])],[rsync_cv_SIGNED_CHAR_OK=yes],[rsync_cv_SIGNED_CHAR_OK=no])])
> if test x"$rsync_cv_SIGNED_CHAR_OK" = x"yes"; then
>     AC_DEFINE(SIGNED_CHAR_OK, 1, [Define to 1 if "signed char" is a valid type])
> fi
> 
> AC_CACHE_CHECK([for broken readdir],rsync_cv_HAVE_BROKEN_READDIR,[
>-AC_TRY_RUN([#include <sys/types.h>
>+AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <sys/types.h>
> #include <dirent.h>
> main() { struct dirent *di; DIR *d = opendir("."); di = readdir(d);
> if (di && di->d_name[-2] == '.' && di->d_name[-1] == 0 &&
>-di->d_name[0] == 0) exit(0); exit(1);} ],
>-rsync_cv_HAVE_BROKEN_READDIR=yes,rsync_cv_HAVE_BROKEN_READDIR=no,rsync_cv_HAVE_BROKEN_READDIR=cross)])
>+di->d_name[0] == 0) exit(0); exit(1);} ]])],[rsync_cv_HAVE_BROKEN_READDIR=yes],[rsync_cv_HAVE_BROKEN_READDIR=no],[rsync_cv_HAVE_BROKEN_READDIR=cross])])
> if test x"$rsync_cv_HAVE_BROKEN_READDIR" = x"yes"; then
>     AC_DEFINE(HAVE_BROKEN_READDIR, 1, [Define to 1 if readdir() is broken])
> fi
> 
> AC_CACHE_CHECK([for utimbuf],rsync_cv_HAVE_STRUCT_UTIMBUF,[
>-AC_TRY_COMPILE([#include <sys/types.h>
>-#include <utime.h>],
>-[struct utimbuf tbuf;  tbuf.actime = 0; tbuf.modtime = 1; exit(utime("foo.c",&tbuf));],
>-rsync_cv_HAVE_STRUCT_UTIMBUF=yes,rsync_cv_HAVE_STRUCT_UTIMBUF=no)])
>+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
>+#include <utime.h>]], [[struct utimbuf tbuf;  tbuf.actime = 0; tbuf.modtime = 1; exit(utime("foo.c",&tbuf));]])],[rsync_cv_HAVE_STRUCT_UTIMBUF=yes],[rsync_cv_HAVE_STRUCT_UTIMBUF=no])])
> if test x"$rsync_cv_HAVE_STRUCT_UTIMBUF" = x"yes"; then
>     AC_DEFINE(HAVE_STRUCT_UTIMBUF, 1, [Define to 1 if you have the "struct utimbuf" type])
> fi
> 
> AC_CACHE_CHECK([if gettimeofday takes tz argument],rsync_cv_HAVE_GETTIMEOFDAY_TZ,[
>-AC_TRY_COMPILE([#include <sys/time.h>
>-#include <unistd.h>],
>-[struct timeval tv; exit(gettimeofday(&tv, NULL));],
>-rsync_cv_HAVE_GETTIMEOFDAY_TZ=yes,rsync_cv_HAVE_GETTIMEOFDAY_TZ=no)])
>+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/time.h>
>+#include <unistd.h>]], [[struct timeval tv; exit(gettimeofday(&tv, NULL));]])],[rsync_cv_HAVE_GETTIMEOFDAY_TZ=yes],[rsync_cv_HAVE_GETTIMEOFDAY_TZ=no])])
> if test x"$rsync_cv_HAVE_GETTIMEOFDAY_TZ" != x"no"; then
>     AC_DEFINE(HAVE_GETTIMEOFDAY_TZ, 1, [Define to 1 if gettimeofday() takes a time-zone arg])
> fi
> 
> AC_CACHE_CHECK([for C99 vsnprintf],rsync_cv_HAVE_C99_VSNPRINTF,[
>-AC_TRY_RUN([
>+AC_RUN_IFELSE([AC_LANG_SOURCE([[
> #include <sys/types.h>
> #include <stdarg.h>
> void foo(const char *format, ...) {
>@@ -856,15 +850,14 @@ void foo(const char *format, ...) {
>        exit(0);
> }
> main() { foo("hello"); }
>-],
>-rsync_cv_HAVE_C99_VSNPRINTF=yes,rsync_cv_HAVE_C99_VSNPRINTF=no,rsync_cv_HAVE_C99_VSNPRINTF=cross)])
>+]])],[rsync_cv_HAVE_C99_VSNPRINTF=yes],[rsync_cv_HAVE_C99_VSNPRINTF=no],[rsync_cv_HAVE_C99_VSNPRINTF=cross])])
> if test x"$rsync_cv_HAVE_C99_VSNPRINTF" = x"yes"; then
>     AC_DEFINE(HAVE_C99_VSNPRINTF, 1, [Define to 1 if vsprintf has a C99-compatible return value])
> fi
> 
> 
> AC_CACHE_CHECK([for secure mkstemp],rsync_cv_HAVE_SECURE_MKSTEMP,[
>-AC_TRY_RUN([#include <stdlib.h>
>+AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdlib.h>
> #include <sys/types.h>
> #include <sys/stat.h>
> #include <unistd.h>
>@@ -877,10 +870,7 @@ main() {
>   if (fstat(fd, &st) != 0) exit(1);
>   if ((st.st_mode & 0777) != 0600) exit(1);
>   exit(0);
>-}],
>-rsync_cv_HAVE_SECURE_MKSTEMP=yes,
>-rsync_cv_HAVE_SECURE_MKSTEMP=no,
>-rsync_cv_HAVE_SECURE_MKSTEMP=cross)])
>+}]])],[rsync_cv_HAVE_SECURE_MKSTEMP=yes],[rsync_cv_HAVE_SECURE_MKSTEMP=no],[rsync_cv_HAVE_SECURE_MKSTEMP=cross])])
> if test x"$rsync_cv_HAVE_SECURE_MKSTEMP" = x"yes"; then
>     case $host_os in
>     hpux*)
>@@ -897,29 +887,27 @@ fi
> 
> 
> AC_CACHE_CHECK([if mknod creates FIFOs],rsync_cv_MKNOD_CREATES_FIFOS,[
>-AC_TRY_RUN([
>+AC_RUN_IFELSE([AC_LANG_SOURCE([[
> #include <stdio.h>
> #include <sys/stat.h>
> #include <errno.h>
> main() { int rc, ec; char *fn = "fifo-test";
> unlink(fn); rc = mknod(fn,S_IFIFO,0600); ec = errno; unlink(fn);
> if (rc) {printf("(%d %d) ",rc,ec); return ec;}
>-return 0;}],
>-           rsync_cv_MKNOD_CREATES_FIFOS=yes,rsync_cv_MKNOD_CREATES_FIFOS=no,rsync_cv_MKNOD_CREATES_FIFOS=cross)])
>+return 0;}]])],[rsync_cv_MKNOD_CREATES_FIFOS=yes],[rsync_cv_MKNOD_CREATES_FIFOS=no],[rsync_cv_MKNOD_CREATES_FIFOS=cross])])
> if test x"$rsync_cv_MKNOD_CREATES_FIFOS" = x"yes"; then
>     AC_DEFINE(MKNOD_CREATES_FIFOS, 1, [Define to 1 if mknod() can create FIFOs.])
> fi
> 
> AC_CACHE_CHECK([if mknod creates sockets],rsync_cv_MKNOD_CREATES_SOCKETS,[
>-AC_TRY_RUN([
>+AC_RUN_IFELSE([AC_LANG_SOURCE([[
> #include <stdio.h>
> #include <sys/stat.h>
> #include <errno.h>
> main() { int rc, ec; char *fn = "sock-test";
> unlink(fn); rc = mknod(fn,S_IFSOCK,0600); ec = errno; unlink(fn);
> if (rc) {printf("(%d %d) ",rc,ec); return ec;}
>-return 0;}],
>-           rsync_cv_MKNOD_CREATES_SOCKETS=yes,rsync_cv_MKNOD_CREATES_SOCKETS=no,rsync_cv_MKNOD_CREATES_SOCKETS=cross)])
>+return 0;}]])],[rsync_cv_MKNOD_CREATES_SOCKETS=yes],[rsync_cv_MKNOD_CREATES_SOCKETS=no],[rsync_cv_MKNOD_CREATES_SOCKETS=cross])])
> if test x"$rsync_cv_MKNOD_CREATES_SOCKETS" = x"yes"; then
>     AC_DEFINE(MKNOD_CREATES_SOCKETS, 1, [Define to 1 if mknod() can create sockets.])
> fi
>@@ -966,8 +954,7 @@ AC_CHECK_FUNCS(_acl __acl _facl __facl)
> 
> AC_MSG_CHECKING([whether to support ACLs])
> AC_ARG_ENABLE(acl-support,
>-	AC_HELP_STRING([--disable-acl-support],
>-		       [disable ACL support]))
>+	AS_HELP_STRING([--disable-acl-support],[disable ACL support]))
> 
> if test x"$enable_acl_support" = x"no"; then
>     AC_MSG_RESULT(no)
>@@ -1013,20 +1000,16 @@ else
> 	AC_MSG_RESULT(running tests:)
> 	AC_CHECK_LIB(acl,acl_get_file)
> 	AC_CACHE_CHECK([for ACL support],samba_cv_HAVE_POSIX_ACLS,[
>-	    AC_TRY_LINK([#include <sys/types.h>
>-#include <sys/acl.h>],
>-[ acl_t acl; int entry_id; acl_entry_t *entry_p; return acl_get_entry( acl, entry_id, entry_p);],
>-samba_cv_HAVE_POSIX_ACLS=yes,samba_cv_HAVE_POSIX_ACLS=no)])
>+	    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
>+#include <sys/acl.h>]], [[ acl_t acl; int entry_id; acl_entry_t *entry_p; return acl_get_entry( acl, entry_id, entry_p);]])],[samba_cv_HAVE_POSIX_ACLS=yes],[samba_cv_HAVE_POSIX_ACLS=no])])
> 	AC_MSG_CHECKING(ACL test results)
> 	if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
> 	    AC_MSG_RESULT(Using posix ACLs)
> 	    AC_DEFINE(HAVE_POSIX_ACLS, 1, [true if you have posix ACLs])
> 	    AC_DEFINE(SUPPORT_ACLS, 1)
> 	    AC_CACHE_CHECK([for acl_get_perm_np],samba_cv_HAVE_ACL_GET_PERM_NP,[
>-		AC_TRY_LINK([#include <sys/types.h>
>-#include <sys/acl.h>],
>-[ acl_permset_t permset_d; acl_perm_t perm; return acl_get_perm_np( permset_d, perm);],
>-samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_cv_HAVE_ACL_GET_PERM_NP=no)])
>+		AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
>+#include <sys/acl.h>]], [[ acl_permset_t permset_d; acl_perm_t perm; return acl_get_perm_np( permset_d, perm);]])],[samba_cv_HAVE_ACL_GET_PERM_NP=yes],[samba_cv_HAVE_ACL_GET_PERM_NP=no])])
> 	    if test x"$samba_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then
> 		AC_DEFINE(HAVE_ACL_GET_PERM_NP, 1, [true if you have acl_get_perm_np])
> 	    fi
>@@ -1045,8 +1028,7 @@ fi
> # check for extended attribute support
> AC_MSG_CHECKING(whether to support extended attributes)
> AC_ARG_ENABLE(xattr-support,
>-    AC_HELP_STRING([--disable-xattr-support],
>-	    [disable extended attributes]),
>+    AS_HELP_STRING([--disable-xattr-support],[disable extended attributes]),
>     [], [case "$ac_cv_func_getxattr$ac_cv_func_extattr_get_link$ac_cv_func_attropen" in
> 	*yes*) enable_xattr_support=maybe ;;
> 	*) enable_xattr_support=no ;;
>@@ -1096,7 +1078,7 @@ if test x"$enable_acl_support" = x"no" -o x"$enable_xattr_support" = x"no" -o x"
>     AC_MSG_CHECKING([whether $CC supports -Wno-unused-parameter])
>     OLD_CFLAGS="$CFLAGS"
>     CFLAGS="$CFLAGS -Wno-unused-parameter"
>-    AC_TRY_LINK([#include <stdio.h>], [printf("hello\n");], [rsync_warn_flag=yes], [rsync_warn_flag=no])
>+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[printf("hello\n");]])],[rsync_warn_flag=yes],[rsync_warn_flag=no])
>     AC_MSG_RESULT([$rsync_warn_flag])
>     if test x"$rsync_warn_flag" = x"no"; then
> 	CFLAGS="$OLD_CFLAGS"

Actions: View

Attachments on bug 11369: 11232