X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7fc089088120ac201b7db96bd12446bb1a95a225..b765ec32b93d8fa78f19a48fbc7cc9066beb488e:/configure.in

diff --git a/configure.in b/configure.in
index 6775dd68..59cb99d1 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_CONFIG_SRCDIR([byteorder.h])
 AC_CONFIG_HEADER(config.h)
 AC_PREREQ(2.52)
 
-RSYNC_VERSION=2.5.6cvs
+RSYNC_VERSION=2.5.6pre2cvs
 AC_SUBST(RSYNC_VERSION)
 AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION])
 
@@ -25,7 +25,7 @@ AC_SUBST(SHELL)
 AC_DEFINE([_GNU_SOURCE], 1,
           [Define _GNU_SOURCE so that we get all necessary prototypes])
 
-if test "$xac_cv_prog_cc_stdc" = xno
+if test "x$ac_cv_prog_cc_stdc" = xno
 then
 	AC_MSG_WARN([rsync requires an ANSI C compiler and you don't seem to have one])
 fi
@@ -421,11 +421,11 @@ then
     AC_MSG_RESULT($srcdir/popt)
     BUILD_POPT='$(popt_OBJS)'
     CFLAGS="$CFLAGS -I$srcdir/popt"
-    if test -z "$ALLOCA"
+    if test x"$ALLOCA" != x
     then
-	# this can be removed when/if we add an included alloca.c; see
-	#  autoconf documentation on AC_FUNC_ALLOCA
-	AC_MSG_ERROR([included libpopt requires alloca which is not available])
+	# this can be removed when/if we add an included alloca.c;
+	#  see autoconf documentation on AC_FUNC_ALLOCA
+	AC_MSG_WARN([included libpopt will use malloc, not alloca (which wastes a small amount of memory)])
     fi
 else
     AC_MSG_RESULT(no)