X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/06963d0fca72b8af5c708544ba7972582b54d90b..56901bc7c3e4b2bcff9db602c70118373765775a:/configure.in diff --git a/configure.in b/configure.in index c55b07f5..1a5e74c5 100644 --- a/configure.in +++ b/configure.in @@ -1,30 +1,42 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(byteorder.h) +AC_INIT() +AC_CONFIG_SRCDIR([byteorder.h]) AC_CONFIG_HEADER(config.h) AC_PREREQ(2.52) LDFLAGS=${LDFLAGS-""} -AC_CANONICAL_SYSTEM -AC_VALIDATE_CACHE_SYSTEM_TYPE +AC_CANONICAL_TARGET([]) + +dnl Checks for programs. +AC_PROG_CC +AC_PROG_CPP +AC_PROG_INSTALL +AC_SUBST(SHELL) + +RSYNC_VERSION=2.4.7pre3 +AC_SUBST(RSYNC_VERSION) +AC_DEFINE_UNQUOTED(RSYNC_VERSION, ["$RSYNC_VERSION"], [rsync release version]) # compile with optimisation and without debugging by default, unless # --debug is given. We must decide this before testing the compiler. +AC_MSG_CHECKING([whether to include debugging symbols]) AC_ARG_ENABLE(debug, - [ --enable-debug including debugging symbols and features]) + AC_HELP_STRING([--enable-debug], + [including debugging symbols and features (default yes)]), + [], []) -AC_MSG_CHECKING([whether to include debugging symbols]) -if test x"$enable_debug" = x"yes" +if test x"$enable_debug" = x"no" 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"} +else + 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]) + dnl CFLAGS=${CFLAGS-"-g"} fi CFLAGS="$CFLAGS -DHAVE_CONFIG_H" @@ -38,12 +50,6 @@ AC_ARG_WITH(rsync-path, [ RSYNC_PATH="rsync" ]) AC_DEFINE_UNQUOTED(RSYNC_PATH, "$RSYNC_PATH", [ ]) -dnl Checks for programs. -AC_PROG_CC -AC_PROG_CPP -AC_PROG_INSTALL -AC_SUBST(SHELL) - AC_CHECK_PROG(HAVE_REMSH, remsh, 1, 0) AC_DEFINE_UNQUOTED(HAVE_REMSH, $HAVE_REMSH, [ ]) @@ -86,43 +92,21 @@ fi -AC_DEFINE(ss_family, __ss_family) -AC_DEFINE(ss_len, __ss_len) +AC_DEFINE(ss_family, __ss_family, [KAME hack]) +AC_DEFINE(ss_len, __ss_len, [KAME hack]) + CFLAGS="$CFLAGS" -AC_MSG_CHECKING([whether to enable ipv6]) AC_ARG_ENABLE(ipv6, -[ --enable-ipv6 Enable ipv6 (with ipv4) support - --disable-ipv6 Disable ipv6 support], -[ case "$enableval" in - no) - AC_MSG_RESULT(no) - ipv6=no - ;; - *) AC_MSG_RESULT(yes) - AC_DEFINE(ENABLE_IPV6) - ipv6=yes - ;; - esac ], - - AC_TRY_COMPILE([ /* AF_INET6 avalable check */ -#include -#include -main() -{ - if (socket(AF_INET6, SOCK_STREAM, 0) < 0) - exit(1); - else - exit(0); -} -], - AC_MSG_RESULT(yes) - AC_DEFINE(ENABLE_IPV6) - ipv6=yes, - AC_MSG_RESULT(no) - ipv6=no, - AC_MSG_RESULT(no) - ipv6=no -)) + AC_HELP_STRING([--enable-ipv6], [try to support IPv6])) +AC_MSG_CHECKING([whether IPv6 is requested]) +if test "$xenable_ipv6" = xyes +then + AC_MSG_RESULT(yes) + ipv6=yes +else + AC_MSG_RESULT(no) + ipv6=no +fi ipv6type=unknown ipv6lib=none @@ -140,7 +124,8 @@ if test "$ipv6" = "yes"; then yes #endif], [ipv6type=$i; - CFLAGS="-DINET6 $CFLAGS"]) + AC_DEFINE(INET6, 1, [true if you have IPv6]) + ]) ;; kame) # http://www.kame.net/ @@ -149,8 +134,8 @@ yes #ifdef __KAME__ yes #endif], - [ipv6type=$i; - CFLAGS="-DINET6 $CFLAGS"]) + [ipv6type=$i; + AC_DEFINE(INET6, 1, [true if you have IPv6])]) ;; linux-glibc) # http://www.v6.linux.or.jp/ @@ -160,7 +145,7 @@ yes yes #endif], [ipv6type=$i; - CFLAGS="-DINET6 $CFLAGS"]) +AC_DEFINE(INET6, 1, [true if you have IPv6])]) ;; linux-inet6) # http://www.v6.linux.or.jp/ @@ -169,7 +154,8 @@ yes ipv6lib=inet6 ipv6libdir=/usr/inet6/lib ipv6trylibc=yes; - CFLAGS="-DINET6 -I/usr/inet6/include $CFLAGS" + AC_DEFINE(INET6, 1, [true if you have IPv6]) + CFLAGS="-I/usr/inet6/include $CFLAGS" fi ;; toshiba) @@ -181,7 +167,7 @@ yes [ipv6type=$i; ipv6lib=inet6; ipv6libdir=/usr/local/v6/lib; - CFLAGS="-DINET6 $CFLAGS"]) + AC_DEFINE(INET6, 1, [true if you have IPv6])]) ;; v6d) AC_EGREP_CPP(yes, [ @@ -192,7 +178,7 @@ yes [ipv6type=$i; ipv6lib=v6; ipv6libdir=/usr/local/v6/lib; - CFLAGS="-I/usr/local/v6/include $CFLAGS"]) + AC_DEFINE(INET6, 1, [true if you have IPv6])]) ;; zeta) AC_EGREP_CPP(yes, [ @@ -203,7 +189,7 @@ yes [ipv6type=$i; ipv6lib=inet6; ipv6libdir=/usr/local/v6/lib; - CFLAGS="-DINET6 $CFLAGS"]) + AC_DEFINE(INET6, 1, [true if you have IPv6])]) ;; esac if test "$ipv6type" != "unknown"; then @@ -349,21 +335,13 @@ if test "$buggygetaddrinfo" = "yes"; then fi AC_REPLACE_FUNCS(getaddrinfo getnameinfo) -AC_MSG_CHECKING([whether struct sockaddr has sa_len]) -AC_TRY_COMPILE([ +AC_CHECK_MEMBER([struct sockaddr.sa_len], + [ AC_DEFINE(HAVE_SOCKADDR_LEN) ], + [], + [ #include #include -],[ -struct sockaddr s; -int i = s.sa_len; -], -[ AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SOCKADDR_LEN)], -[ AC_MSG_RESULT(no), - ], -[ AC_MSG_RESULT(unknown), - ]) - +]) AC_C_BIGENDIAN AC_HEADER_DIRENT @@ -387,7 +365,8 @@ AC_TYPE_OFF_T AC_TYPE_SIZE_T AC_TYPE_PID_T AC_TYPE_GETGROUPS -AC_STRUCT_ST_RDEV +AC_CHECK_MEMBERS([struct stat.st_rdev]) + AC_CHECK_TYPE([ino_t], [unsigned]) TYPE_SOCKLEN_T @@ -659,4 +638,5 @@ AC_SUBST(OBJ_RESTORE) AC_SUBST(CC_SHOBJ_FLAG) AC_SUBST(BUILD_POPT) -AC_OUTPUT(Makefile lib/dummy zlib/dummy popt/dummy shconfig) +AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig]) +AC_OUTPUT