Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Another try at socklen_t: just check for it, and otherwise use int.
[rsync/rsync.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
fbf2138
..
e08249d
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-39,11
+39,10
@@
AC_ARG_WITH(included-popt,
[ --with-included-popt use bundled popt library, not from system])
AC_ARG_WITH(rsync-path,
[ --with-included-popt use bundled popt library, not from system])
AC_ARG_WITH(rsync-path,
- [ --with-rsync-path=PATH set
rsync path used on server to PATH (default: "rsync
")],
+ [ --with-rsync-path=PATH set
default --rsync-path to PATH (default: \"rsync\
")],
[ RSYNC_PATH="$with_rsync_name" ],
[ RSYNC_PATH="rsync" ])
[ RSYNC_PATH="$with_rsync_name" ],
[ RSYNC_PATH="rsync" ])
-RSYNC_PATH="\"$RSYNC_PATH\""
-AC_DEFINE_UNQUOTED(RSYNC_PATH, $RSYNC_PATH, [ ])
+AC_DEFINE_UNQUOTED(RSYNC_PATH, "$RSYNC_PATH", [ ])
dnl Checks for programs.
AC_PROG_CC
dnl Checks for programs.
AC_PROG_CC
@@
-77,7
+76,9
@@
AC_TYPE_SIZE_T
AC_TYPE_PID_T
AC_TYPE_GETGROUPS
AC_STRUCT_ST_RDEV
AC_TYPE_PID_T
AC_TYPE_GETGROUPS
AC_STRUCT_ST_RDEV
-AC_CHECK_TYPE(ino_t,unsigned, [ ])
+AC_CHECK_TYPE([ino_t], [unsigned])
+dnl TYPE_SOCKLEN_T
+AC_CHECK_TYPE([socklen_t], [size_t])
AC_CACHE_CHECK([for errno in errno.h],rsync_cv_errno, [
AC_TRY_COMPILE([#include <errno.h>],[int i = errno],
AC_CACHE_CHECK([for errno in errno.h],rsync_cv_errno, [
AC_TRY_COMPILE([#include <errno.h>],[int i = errno],
@@
-163,10
+164,10
@@
then
AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes])
fi
AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes])
fi
-AC_MSG_CHECKING(
"whether to use included libpopt"
)
+AC_MSG_CHECKING(
[whether to use included libpopt]
)
if test x"$with_included_popt" = x"yes"
then
if test x"$with_included_popt" = x"yes"
then
- AC_MSG_RESULT(
"$srcdir/popt"
)
+ AC_MSG_RESULT(
$srcdir/popt
)
BUILD_POPT='$(popt_OBJS)'
CFLAGS="$CFLAGS -I$srcdir/popt"
else
BUILD_POPT='$(popt_OBJS)'
CFLAGS="$CFLAGS -I$srcdir/popt"
else