[SCM] The rsync repository. - branch master updated
Rsync CVS commit messages
rsync-cvs at lists.samba.org
Fri May 1 15:30:58 MDT 2015
The branch, master has been updated
via 3bc3197 Use AS_IF instead of plain if/then/fi
via a689fb1 Ignore .deps directories.
via b560a96 Check for perl and assign it to a var since it is needed for generating the protocol header.
via 51e3c3d Remove dead targets from build system
via 461086b Handle configure's new version style.
via 0069461 Specify package name and version in call to AC_INIT
via 8e3a6db Properly quote arguments for AC_LIBOBJ.
via 8354cad Must define LIBOBJDIR in the Makefile.
via 317a0e8 Use AC_CONFIG_LIBOBJ_DIR and AC_REPLACE_FUNCS to adhere to autoconf standards
via 066ad8c Modularize m4 macros
via ec4f644 Properly quote m4 macro
via 4bf342c Update generated-files logic.
via a2f733c Rename aclocal.m4 to acinclude.m4 and add make target
from 3ea74eb rsync: fix of-by-one in check of snprintf() result. Fixes bug 11229.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3bc319766d1b00da3989b5cf05bc5669fef54aec
Author: Tiziano Müller <tiziano.mueller at stepping-stone.ch>
Date: Wed Apr 8 13:29:42 2015 +0200
Use AS_IF instead of plain if/then/fi
commit a689fb1f5f578ec6bbcb5aa1e89b88ee769fa430
Author: Tiziano Müller <tiziano.mueller at stepping-stone.ch>
Date: Wed Apr 8 13:29:41 2015 +0200
Ignore .deps directories.
commit b560a96b2c2d97ce23a5d16f84884a11e2f8dc4a
Author: Tiziano Müller <tiziano.mueller at stepping-stone.ch>
Date: Wed Apr 8 13:29:40 2015 +0200
Check for perl and assign it to a var since it is needed for generating the protocol header.
commit 51e3c3da85792443d2d6dbfebc9caae12eae5e75
Author: Tiziano Müller <tiziano.mueller at stepping-stone.ch>
Date: Wed Apr 8 13:29:39 2015 +0200
Remove dead targets from build system
commit 461086bbe7af30177ab6f9e1958125c383892a7c
Author: Wayne Davison <wayned at samba.org>
Date: Sun Apr 26 17:30:15 2015 -0700
Handle configure's new version style.
commit 00694610a6ecb1bb345639b523b2fce42826eec5
Author: Tiziano Müller <tiziano.mueller at stepping-stone.ch>
Date: Wed Apr 8 13:29:38 2015 +0200
Specify package name and version in call to AC_INIT
commit 8e3a6db842ef76f5fb262cbb92cad99479e6db36
Author: Tiziano Müller <tiziano.mueller at stepping-stone.ch>
Date: Wed Apr 8 13:29:37 2015 +0200
Properly quote arguments for AC_LIBOBJ.
commit 8354cad53e5c1dc8a09ec4cc68693e69d35d1357
Author: Wayne Davison <wayned at samba.org>
Date: Fri May 1 14:25:50 2015 -0700
Must define LIBOBJDIR in the Makefile.
commit 317a0e8ca57b40ff89e78f46af85503695657d92
Author: Tiziano Müller <tiziano.mueller at stepping-stone.ch>
Date: Wed Apr 8 13:29:36 2015 +0200
Use AC_CONFIG_LIBOBJ_DIR and AC_REPLACE_FUNCS to adhere to autoconf standards
commit 066ad8c71918a2888bfb5939117e02eecdcae928
Author: Tiziano Müller <tiziano.mueller at stepping-stone.ch>
Date: Wed Apr 8 13:29:35 2015 +0200
Modularize m4 macros
Split acinclude.m4 into one file per function in m4/
commit ec4f644d2f019da4667bf8bacf4b25e1bd498d76
Author: Tiziano Müller <tiziano.mueller at stepping-stone.ch>
Date: Wed Apr 8 13:29:34 2015 +0200
Properly quote m4 macro
commit 4bf342c60f643b21197e2528c42baed22249955f
Author: Wayne Davison <wayned at samba.org>
Date: Sun Apr 26 16:25:56 2015 -0700
Update generated-files logic.
commit a2f733c664c977a79a91f4e63b5eacff642f4370
Author: Tiziano Müller <tiziano.mueller at stepping-stone.ch>
Date: Wed Apr 8 13:29:33 2015 +0200
Rename aclocal.m4 to acinclude.m4 and add make target
It is common practice to split up m4 files for easier maintenance and
generate the required aclocal.m4 using `aclocal` instead.
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 2 ++
Makefile.in | 17 +++++----------
configure.ac | 29 ++++++++++++++-----------
m4/have_type.m4 | 22 +++++++++++++++++++
aclocal.m4 => m4/socklen_t.m4 | 47 ----------------------------------------
m4/validate_cache_system_type.m4 | 23 ++++++++++++++++++++
packaging/nightly-rsync | 4 ++--
packaging/release-rsync | 8 +++----
prepare-source | 4 ++--
prepare-source.mak | 3 +++
10 files changed, 79 insertions(+), 80 deletions(-)
create mode 100644 m4/have_type.m4
rename aclocal.m4 => m4/socklen_t.m4 (50%)
create mode 100644 m4/validate_cache_system_type.m4
Changeset truncated at 500 lines:
diff --git a/.gitignore b/.gitignore
index 948d3f7..f0204bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ config.h.in
config.h.in.old
config.log
config.status
+aclocal.m4
/proto.h
/proto.h-tstamp
/rsync.1
@@ -44,3 +45,4 @@ config.status
/testsuite/devices-fake.test
/testsuite/xattrs-hlink.test
/patches
+.deps
diff --git a/Makefile.in b/Makefile.in
index d0e0dde..4e20827 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,6 +14,7 @@ CFLAGS=@CFLAGS@
CPPFLAGS=@CPPFLAGS@
EXEEXT=@EXEEXT@
LDFLAGS=@LDFLAGS@
+LIBOBJDIR=lib/
INSTALLCMD=@INSTALL@
INSTALLMAN=@INSTALL@
@@ -28,7 +29,7 @@ VERSION=@RSYNC_VERSION@
.SUFFIXES:
.SUFFIXES: .c .o
-GENFILES=configure.sh config.h.in proto.h proto.h-tstamp rsync.1 rsyncd.conf.5
+GENFILES=configure.sh aclocal.m4 config.h.in proto.h proto.h-tstamp rsync.1 rsyncd.conf.5
HEADERS=byteorder.h config.h errcode.h proto.h rsync.h ifuncs.h itypes.h inums.h \
lib/pool_alloc.h
LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o lib/md5.o \
@@ -143,6 +144,9 @@ gensend: gen
conf:
cd $(srcdir) && $(MAKE) -f prepare-source.mak conf
+aclocal.m4: m4/*.m4
+ aclocal
+
configure.sh config.h.in: configure.ac aclocal.m4
@if test -f configure.sh; then cp -p configure.sh configure.sh.old; else touch configure.sh.old; fi
@if test -f config.h.in; then cp -p config.h.in config.h.in.old; else touch config.h.in.old; fi
@@ -303,17 +307,6 @@ installcheck: $(CHECK_PROGS) $(CHECK_SYMLINKS)
splint:
splint +unixlib +gnuextensions -weak rsync.c
-
-rsync.dvi: doc/rsync.texinfo
- texi2dvi -o $@ $<
-
-rsync.ps: rsync.dvi
- dvips -ta4 -o $@ $<
-
-rsync.pdf: doc/rsync.texinfo
- texi2dvi -o $@ --pdf $<
-
-
doxygen:
cd $(srcdir) && rm dox/html/* && doxygen
diff --git a/configure.ac b/configure.ac
index 5c557a8..ca0c6fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,20 +1,25 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT()
+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)
-RSYNC_VERSION=3.1.2dev
-AC_SUBST(RSYNC_VERSION)
-AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION])
+AC_SUBST(RSYNC_VERSION, $PACKAGE_VERSION)
+AC_MSG_NOTICE([Configuring rsync $PACKAGE_VERSION])
-AC_DEFINE_UNQUOTED(RSYNC_VERSION, ["$RSYNC_VERSION"], [rsync release version])
+AC_DEFINE_UNQUOTED(RSYNC_VERSION, ["$PACKAGE_VERSION"], [rsync release version])
LDFLAGS=${LDFLAGS-""}
AC_CANONICAL_HOST
+dnl define the directory for replacement function since AC_LIBOBJ does not
+dnl officially support subdirs and fails with automake
+AC_CONFIG_LIBOBJ_DIR([lib])
+
# We must decide this before testing the compiler.
# Please allow this to default to yes, so that your users have more
@@ -42,6 +47,7 @@ AC_PROG_INSTALL
AC_PROG_MKDIR_P
AC_PROG_CC_STDC
AC_SUBST(SHELL)
+AC_PATH_PROG([PERL], [perl])
AC_DEFINE([_GNU_SOURCE], 1,
[Define _GNU_SOURCE so that we get all necessary prototypes])
@@ -486,8 +492,7 @@ AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
dnl AC_MSG_NOTICE([Looking in libraries: $LIBS])
-AC_CHECK_FUNCS(inet_ntop, , [AC_LIBOBJ(lib/inet_ntop)])
-AC_CHECK_FUNCS(inet_pton, , [AC_LIBOBJ(lib/inet_pton)])
+AC_REPLACE_FUNCS([inet_ntop inet_pton])
AC_HAVE_TYPE([struct addrinfo], [#include <netdb.h>])
AC_HAVE_TYPE([struct sockaddr_storage], [#include <sys/types.h>
@@ -506,7 +511,7 @@ AC_CACHE_CHECK([whether defines needed by getaddrinfo exist],
#endif],
rsync_cv_HAVE_GETADDR_DEFINES=yes,
rsync_cv_HAVE_GETADDR_DEFINES=no)])
-if test x"$rsync_cv_HAVE_GETADDR_DEFINES" = x"yes" -a x"$ac_cv_type_struct_addrinfo" = x"yes"; then
+AS_IF([test x"$rsync_cv_HAVE_GETADDR_DEFINES" = x"yes" -a x"$ac_cv_type_struct_addrinfo" = x"yes"],[
# Tru64 UNIX has getaddrinfo() but has it renamed in libc as
# something else so we must include <netdb.h> to get the
# redefinition.
@@ -519,10 +524,8 @@ if test x"$rsync_cv_HAVE_GETADDR_DEFINES" = x"yes" -a x"$ac_cv_type_struct_addri
AC_DEFINE(HAVE_GETADDRINFO, 1,
[Define to 1 if you have the "getaddrinfo" function and required types.])],
[AC_MSG_RESULT([no])
- AC_LIBOBJ(lib/getaddrinfo)])])
-else
- AC_LIBOBJ(lib/getaddrinfo)
-fi
+ AC_LIBOBJ([getaddrinfo])])])
+ ],[AC_LIBOBJ([getaddrinfo])])
AC_CHECK_MEMBER([struct sockaddr.sa_len],
[ AC_DEFINE(HAVE_SOCKADDR_LEN, 1, [Do we have sockaddr.sa_len?]) ],
@@ -748,7 +751,7 @@ 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
-AC_CHECK_FUNCS(getpass, , [AC_LIBOBJ(lib/getpass)])
+AC_REPLACE_FUNCS([getpass])
if test x"$with_included_popt" != x"yes"; then
AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes])
diff --git a/m4/have_type.m4 b/m4/have_type.m4
new file mode 100644
index 0000000..704ca33
--- /dev/null
+++ b/m4/have_type.m4
@@ -0,0 +1,22 @@
+dnl AC_HAVE_TYPE(TYPE,INCLUDES)
+AC_DEFUN([AC_HAVE_TYPE], [
+AC_REQUIRE([AC_HEADER_STDC])
+cv=`echo "$1" | sed 'y%./+- %__p__%'`
+AC_MSG_CHECKING(for $1)
+AC_CACHE_VAL([ac_cv_type_$cv],
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+AC_INCLUDES_DEFAULT
+$2]],
+[[$1 foo;]])],
+[eval "ac_cv_type_$cv=yes"],
+[eval "ac_cv_type_$cv=no"]))dnl
+ac_foo=`eval echo \\$ac_cv_type_$cv`
+AC_MSG_RESULT($ac_foo)
+if test "$ac_foo" = yes; then
+ ac_tr_hdr=HAVE_`echo $1 | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+if false; then
+ AC_CHECK_TYPES($1)
+fi
+ AC_DEFINE_UNQUOTED($ac_tr_hdr, 1, [Define if you have type `$1'])
+fi
+])
diff --git a/aclocal.m4 b/m4/socklen_t.m4
similarity index 50%
rename from aclocal.m4
rename to m4/socklen_t.m4
index d489b20..831820c 100644
--- a/aclocal.m4
+++ b/m4/socklen_t.m4
@@ -1,27 +1,3 @@
-dnl AC_VALIDATE_CACHE_SYSTEM_TYPE[(cmd)]
-dnl if the cache file is inconsistent with the current host,
-dnl target and build system types, execute CMD or print a default
-dnl error message.
-AC_DEFUN(AC_VALIDATE_CACHE_SYSTEM_TYPE, [
- AC_REQUIRE([AC_CANONICAL_SYSTEM])
- AC_MSG_CHECKING([config.cache system type])
- if { test x"${ac_cv_host_system_type+set}" = x"set" &&
- test x"$ac_cv_host_system_type" != x"$host"; } ||
- { test x"${ac_cv_build_system_type+set}" = x"set" &&
- test x"$ac_cv_build_system_type" != x"$build"; } ||
- { test x"${ac_cv_target_system_type+set}" = x"set" &&
- test x"$ac_cv_target_system_type" != x"$target"; }; then
- AC_MSG_RESULT([different])
- ifelse($#, 1, [$1],
- [AC_MSG_ERROR(["you must remove config.cache and restart configure"])])
- else
- AC_MSG_RESULT([same])
- fi
- ac_cv_host_system_type="$host"
- ac_cv_build_system_type="$build"
- ac_cv_target_system_type="$target"
-])
-
dnl Check for socklen_t: historically on BSD it is an int, and in
dnl POSIX 1g it is a type of its own, but some platforms use different
dnl types for the argument to getsockopt, getpeername, etc. So we
@@ -67,26 +43,3 @@ AC_DEFUN([TYPE_SOCKLEN_T],
[#include <sys/types.h>
#include <sys/socket.h>])
])
-
-dnl AC_HAVE_TYPE(TYPE,INCLUDES)
-AC_DEFUN([AC_HAVE_TYPE], [
-AC_REQUIRE([AC_HEADER_STDC])
-cv=`echo "$1" | sed 'y%./+- %__p__%'`
-AC_MSG_CHECKING(for $1)
-AC_CACHE_VAL([ac_cv_type_$cv],
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-AC_INCLUDES_DEFAULT
-$2]],
-[[$1 foo;]])],
-[eval "ac_cv_type_$cv=yes"],
-[eval "ac_cv_type_$cv=no"]))dnl
-ac_foo=`eval echo \\$ac_cv_type_$cv`
-AC_MSG_RESULT($ac_foo)
-if test "$ac_foo" = yes; then
- ac_tr_hdr=HAVE_`echo $1 | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
-if false; then
- AC_CHECK_TYPES($1)
-fi
- AC_DEFINE_UNQUOTED($ac_tr_hdr, 1, [Define if you have type `$1'])
-fi
-])
diff --git a/m4/validate_cache_system_type.m4 b/m4/validate_cache_system_type.m4
new file mode 100644
index 0000000..dcb3b54
--- /dev/null
+++ b/m4/validate_cache_system_type.m4
@@ -0,0 +1,23 @@
+dnl AC_VALIDATE_CACHE_SYSTEM_TYPE[(cmd)]
+dnl if the cache file is inconsistent with the current host,
+dnl target and build system types, execute CMD or print a default
+dnl error message.
+AC_DEFUN([AC_VALIDATE_CACHE_SYSTEM_TYPE], [
+ AC_REQUIRE([AC_CANONICAL_SYSTEM])
+ AC_MSG_CHECKING([config.cache system type])
+ if { test x"${ac_cv_host_system_type+set}" = x"set" &&
+ test x"$ac_cv_host_system_type" != x"$host"; } ||
+ { test x"${ac_cv_build_system_type+set}" = x"set" &&
+ test x"$ac_cv_build_system_type" != x"$build"; } ||
+ { test x"${ac_cv_target_system_type+set}" = x"set" &&
+ test x"$ac_cv_target_system_type" != x"$target"; }; then
+ AC_MSG_RESULT([different])
+ ifelse($#, 1, [$1],
+ [AC_MSG_ERROR(["you must remove config.cache and restart configure"])])
+ else
+ AC_MSG_RESULT([same])
+ fi
+ ac_cv_host_system_type="$host"
+ ac_cv_build_system_type="$build"
+ ac_cv_target_system_type="$target"
+])
diff --git a/packaging/nightly-rsync b/packaging/nightly-rsync
index 44e8558..6e888be 100755
--- a/packaging/nightly-rsync
+++ b/packaging/nightly-rsync
@@ -59,13 +59,13 @@ if ($make_tar) {
my $confversion;
open(IN, '<', 'configure.ac') or die "Unable to open configure.ac: $!\n";
while (<IN>) {
- if (/^RSYNC_VERSION=(.*)/) {
+ if (/^AC_INIT\(\[rsync\],\s+\[(\d.+?)\]/) {
$confversion = $1;
last;
}
}
close IN;
- die "Unable to find RSYNC_VERSION in configure.ac\n" unless defined $confversion;
+ die "Unable to find AC_INIT with version in configure.ac\n" unless defined $confversion;
open(IN, '<', 'OLDNEWS') or die "Unable to open OLDNEWS: $!\n";
$_ = <IN>;
diff --git a/packaging/release-rsync b/packaging/release-rsync
index b15aae1..5f77c2e 100755
--- a/packaging/release-rsync
+++ b/packaging/release-rsync
@@ -67,13 +67,13 @@ check_git_state($master_branch, 1, 1);
my $confversion;
open(IN, '<', 'configure.ac') or die $!;
while (<IN>) {
- if (/^RSYNC_VERSION=(.*)/) {
+ if (/^AC_INIT\(\[rsync\],\s+\[(\d.+?)\]/) {
$confversion = $1;
last;
}
}
close IN;
-die "Unable to find RSYNC_VERSION in configure.ac\n" unless defined $confversion;
+die "Unable to find AC_INIT with version in configure.ac\n" unless defined $confversion;
open(IN, '<', 'OLDNEWS') or die $!;
$_ = <IN>;
@@ -202,8 +202,8 @@ foreach my $fn (@tweak_files) {
undef $/; $_ = <IN>; $/ = "\n";
close IN;
if ($fn =~ /configure/) {
- s/^RSYNC_VERSION=.*/RSYNC_VERSION=$version/m
- or die "Unable to update RSYNC_VERSION in $fn\n";
+ s/^(AC_INIT\(\[rsync\],\s+\[)\d.+?(\])/$1$version$2/m
+ or die "Unable to update AC_INIT with version in $fn\n";
} elsif ($fn =~ /\.spec/) {
while (my($str, $val) = each %specvars) {
s/^\Q$str\E .*/$str $val/m
diff --git a/prepare-source b/prepare-source
index 0e73138..b1e7628 100755
--- a/prepare-source
+++ b/prepare-source
@@ -27,9 +27,9 @@ for action in "${@}"; do
;;
fetch)
if perl --version >/dev/null 2>/dev/null; then
- files='c*'
+ files='[ca]*'
else
- files='[cp]*'
+ files='[cap]*'
fi
rsync -pvz rsync://rsync.samba.org/rsyncftp/generated-files/"$files" .
;;
diff --git a/prepare-source.mak b/prepare-source.mak
index 054bab7..efb6228 100644
--- a/prepare-source.mak
+++ b/prepare-source.mak
@@ -1,5 +1,8 @@
conf: configure.sh config.h.in
+aclocal.m4:
+ aclocal
+
configure.sh: configure.ac aclocal.m4
autoconf -o configure.sh
--
The rsync repository.
More information about the rsync-cvs
mailing list