More autoconf fixes.

2 files changed, 47 insertions, 44 deletions

diff --git a/aclocal.m4 b/aclocal.m4
index 7f252eee..e83a8bf4 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -67,3 +67,5 @@ AC_DEFUN([TYPE_SOCKLEN_T],
       [#include <sys/types.h>
 #include <sys/socket.h>])
 ])
+
+
diff --git a/configure.in b/configure.in
index c55b07f5..7e592a48 100644
--- a/configure.in
+++ b/configure.in
@@ -1,30 +1,38 @@
 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)
 
 # 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 +46,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,10 +88,11 @@ 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_MSG_CHECKING([whether IPv6 is explicitly enabled])
 AC_ARG_ENABLE(ipv6,
 [  --enable-ipv6		Enable ipv6 (with ipv4) support
   --disable-ipv6		Disable ipv6 support],
@@ -98,15 +101,21 @@ AC_ARG_ENABLE(ipv6,
        AC_MSG_RESULT(no)
        ipv6=no
        ;;
-  *)   AC_MSG_RESULT(yes)
+  *)   
+       AC_MSG_RESULT(yes)
        AC_DEFINE(ENABLE_IPV6)
        ipv6=yes
        ;;
   esac ],
-
-  AC_TRY_COMPILE([ /* AF_INET6 avalable check */
+  [
+  AC_MSG_RESULT(no)
+  dnl not specified; let's try
+  AC_MSG_CHECKING([whether IPv6 works anyhow])
+  AC_TRY_COMPILE([ 
 #include <sys/types.h>
 #include <sys/socket.h>
+], 
+[
 main()
 {
  if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
@@ -115,14 +124,12 @@ main()
    exit(0);
 }
 ],
+  [ 
   AC_MSG_RESULT(yes)
   AC_DEFINE(ENABLE_IPV6)
-  ipv6=yes,
-  AC_MSG_RESULT(no)
-  ipv6=no,
-  AC_MSG_RESULT(no)
-  ipv6=no
-))
+  ipv6=yes],
+  [AC_MSG_RESULT(no)
+  ipv6=no])])
 
 ipv6type=unknown
 ipv6lib=none
@@ -349,21 +356,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 <sys/types.h>
 #include <sys/socket.h>
-],[
-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 +386,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 +659,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