X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ddd491d45e7fc3bb21443876bb91c78d098f99a1..d2094cc33dd87229f453176918e4ae2c2536f88e:/configure.in

diff --git a/configure.in b/configure.in
index 71481437..5f72a312 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(byteorder.h)
 AC_CONFIG_HEADER(config.h)
-AC_PREREQ(2.12)
+AC_PREREQ(2.52)
 
 LDFLAGS=${LDFLAGS-""}
 
@@ -28,19 +28,12 @@ fi
 
 CFLAGS="$CFLAGS -DHAVE_CONFIG_H"
 
-# look for getconf early as this affects just about everything
-AC_CHECK_PROG(HAVE_GETCONF, getconf, "yes", "no")
-if test $HAVE_GETCONF = "yes"; then
-	CFLAGS=$CFLAGS" "`getconf LFS_CFLAGS 2> /dev/null`
-	LDFLAGS=$LDFLAGS" "`getconf LFS_LDFLAGS 2> /dev/null`
-fi
-
 AC_ARG_WITH(included-popt,
         [  --with-included-popt    use bundled popt library, not from system])
 
 AC_ARG_WITH(rsync-path,
 	[  --with-rsync-path=PATH  set default --rsync-path to PATH (default: \"rsync\")],
-	[ RSYNC_PATH="$with_rsync_name" ],
+	[ RSYNC_PATH="$with_rsync_path" ],
 	[ RSYNC_PATH="rsync" ])
 AC_DEFINE_UNQUOTED(RSYNC_PATH, "$RSYNC_PATH", [ ])
 
@@ -76,7 +69,8 @@ AC_TYPE_SIZE_T
 AC_TYPE_PID_T
 AC_TYPE_GETGROUPS
 AC_STRUCT_ST_RDEV
-AC_CHECK_TYPE(ino_t,unsigned, [ ])
+AC_CHECK_TYPE([ino_t], [unsigned])
+TYPE_SOCKLEN_T
 
 AC_CACHE_CHECK([for errno in errno.h],rsync_cv_errno, [
     AC_TRY_COMPILE([#include <errno.h>],[int i = errno],
@@ -162,10 +156,10 @@ then
     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
-    AC_MSG_RESULT("$srcdir/popt")
+    AC_MSG_RESULT($srcdir/popt)
     BUILD_POPT='$(popt_OBJS)'
     CFLAGS="$CFLAGS -I$srcdir/popt"
 else
@@ -346,4 +340,4 @@ AC_SUBST(OBJ_RESTORE)
 AC_SUBST(CC_SHOBJ_FLAG)
 AC_SUBST(BUILD_POPT)
 
-AC_OUTPUT(Makefile lib/dummy zlib/dummy)
+AC_OUTPUT(Makefile lib/dummy zlib/dummy shconfig)