X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/6a48ca56ebe7ee7e2c251b8e0661d399f0a7ec45..f62c17e3786ac6643981d9ec68a1cd130ffcf149:/configure.in

diff --git a/configure.in b/configure.in
index 8c16d43e..d8dd6c03 100644
--- a/configure.in
+++ b/configure.in
@@ -1,30 +1,52 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(byteorder.h)
 AC_CONFIG_HEADER(config.h)
+AC_PREREQ(2.12)
 
-# compile with optimisation and without debugging by default
-CFLAGS=${CFLAGS-"-O"}
 LDFLAGS=${LDFLAGS-""}
 
 AC_CANONICAL_SYSTEM
 AC_VALIDATE_CACHE_SYSTEM_TYPE
 
+# compile with optimisation and without debugging by default, unless
+# --debug is given.  We must decide this before testing the compiler.
+
+AC_ARG_ENABLE(debug,
+        [  --enable-debug          including debugging symbols and features])
+
+AC_MSG_CHECKING([whether to include debugging symbols])
+if test x"$enable_debug" = x"yes"
+then
+    AC_MSG_RESULT(yes)
+    # leave CFLAGS alone; AC_PROG_CC will try to include -g if it can
+    AC_DEFINE(DEBUG, 1, [Define to turn on debugging code that may slow normal operation])
+    CFLAGS=${CFLAGS-"-g"}
+else
+    AC_MSG_RESULT(no)
+    CFLAGS=${CFLAGS-"-O"}
+fi
+
+CFLAGS="$CFLAGS -DHAVE_CONFIG_H"
+
 # look for getconf early as this affects just about everything
-AC_CHECK_PROG(HAVE_GETCONF, getconf, 1, 0)
-if test $HAVE_GETCONF = 1; then
-	CFLAGS=$CFLAGS" "`getconf LFS_CFLAGS`
-	LDFLAGS=$LDFLAGS" "`getconf LFS_LDFLAGS`
+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])
+
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_SUBST(SHELL)
 
-
 AC_CHECK_PROG(HAVE_REMSH, remsh, 1, 0)
 AC_DEFINE_UNQUOTED(HAVE_REMSH, $HAVE_REMSH)
 
+AC_SYS_LARGEFILE
 AC_C_BIGENDIAN
 AC_HEADER_DIRENT
 AC_HEADER_TIME
@@ -32,7 +54,7 @@ AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h unistd.h utime.h grp.h)
 AC_CHECK_HEADERS(compat.h sys/param.h ctype.h sys/wait.h sys/ioctl.h)
 AC_CHECK_HEADERS(sys/filio.h string.h stdlib.h sys/socket.h sys/mode.h)
-AC_CHECK_HEADERS(glob.h)
+AC_CHECK_HEADERS(glob.h alloca.h mcheck.h)
 
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
@@ -106,7 +128,7 @@ AC_FUNC_UTIME_NULL
 AC_CHECK_FUNCS(waitpid wait4 getcwd strdup strerror chown chmod mknod)
 AC_CHECK_FUNCS(fchmod fstat strchr readlink link utime utimes strftime)
 AC_CHECK_FUNCS(memmove lchown vsnprintf snprintf setsid glob strpbrk)
-AC_CHECK_FUNCS(strlcat strlcpy)
+AC_CHECK_FUNCS(strlcat strlcpy mtrace)
 
 AC_CACHE_CHECK([for working socketpair],rsync_cv_HAVE_SOCKETPAIR,[
 AC_TRY_RUN([#include <sys/types.h>
@@ -129,20 +151,19 @@ if test x"$rsync_cv_HAVE_FNMATCH" = x"yes"; then
     AC_DEFINE(HAVE_FNMATCH)
 fi
 
-# sometimes getopt_long cannot parse same arguments twice
-# e.g. on certain versions of CygWin32
-AC_CACHE_CHECK([for working getopt_long],rsync_cv_HAVE_GETOPT_LONG,[
-AC_TRY_RUN([#include <getopt.h>
-main() {
-    int i, x = 0; char *argv[] = { "x", "--xx" };
-    struct option o[] = {{"xx", 0, 0, 1}, {0,0,0,0}};
-    getopt_long(2, argv, "x", o, &i) == 1 ? x++ : 0; optind = 0;
-    getopt_long(2, argv, "x", o, &i) == 1 ? x++ : 0;
-    exit(x == 2 ? 0 : 1);
-}], rsync_cv_HAVE_GETOPT_LONG=yes,rsync_cv_HAVE_GETOPT_LONG=no,
-    rsync_cv_HAVE_GETOPT_LONG=cross)])
-if test x"$rsync_cv_HAVE_GETOPT_LONG" = x"yes"; then
-    AC_DEFINE(HAVE_GETOPT_LONG)
+if test x"$with_included_popt" != x"yes"
+then
+    AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes])
+fi
+
+AC_MSG_CHECKING("whether to use included libpopt")
+if test x"$with_included_popt" = x"yes"
+then
+    AC_MSG_RESULT("$srcdir/popt")
+    BUILD_POPT='$(popt_OBJS)'
+    CFLAGS="$CFLAGS -I $srcdir/popt"
+else
+    AC_MSG_RESULT(no)
 fi
 
 AC_CACHE_CHECK([for long long],rsync_cv_HAVE_LONGLONG,[
@@ -210,6 +231,28 @@ if test x"$rsync_cv_HAVE_GETTIMEOFDAY_TZ" = x"yes"; then
     AC_DEFINE(HAVE_GETTIMEOFDAY_TZ)
 fi
 
+AC_CACHE_CHECK([for secure mkstemp],rsync_cv_HAVE_SECURE_MKSTEMP,[
+AC_TRY_RUN([#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+main() { 
+  struct stat st;
+  char tpl[20]="/tmp/test.XXXXXX"; 
+  int fd = mkstemp(tpl); 
+  if (fd == -1) exit(1);
+  unlink(tpl);
+  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)])
+if test x"$rsync_cv_HAVE_SECURE_MKSTEMP" = x"yes"; then
+    AC_DEFINE(HAVE_SECURE_MKSTEMP)
+fi
+
 
 AC_CACHE_CHECK([for broken inet_ntoa],rsync_cv_REPLACE_INET_NTOA,[
 AC_TRY_RUN([
@@ -269,6 +312,6 @@ fi
 AC_SUBST(OBJ_SAVE)
 AC_SUBST(OBJ_RESTORE)
 AC_SUBST(CC_SHOBJ_FLAG)
-
+AC_SUBST(BUILD_POPT)
 
 AC_OUTPUT(Makefile lib/dummy zlib/dummy)