diff -Nurd arj-3.10.21.orig/environ.c arj-3.10.21/environ.c
--- arj-3.10.21.orig/environ.c	2004-06-18 12:19:36.000000000 -0400
+++ arj-3.10.21/environ.c	2006-02-15 21:19:12.000000000 -0500
@@ -58,7 +58,7 @@
   #include <sys/ioctl.h>
   #include <sys/statfs.h>
   #include <sys/statvfs.h>
- #elif defined(__FreeBSD__)||defined(__NetBSD__)
+ #elif defined(__APPLE__)||defined(__NetBSD__)
   #include <sys/param.h>
   #include <sys/mount.h>
  #elif defined(__QNXNTO__)
diff -Nurd arj-3.10.21.orig/gnu/configure.in arj-3.10.21/gnu/configure.in
--- arj-3.10.21.orig/gnu/configure.in	2004-04-17 07:28:06.000000000 -0400
+++ arj-3.10.21/gnu/configure.in	2006-02-15 21:38:40.000000000 -0500
@@ -84,7 +84,7 @@
 
 case $host_cpu in
 alpha*)
-	AC_DEFINE(ALIGN_POINTERS)
+	AC_DEFINE(ALIGN_POINTERS, 1, [Used by encode.c])
 	;;
 sparc*)
 	AC_DEFINE(ALIGN_POINTERS)
@@ -166,7 +166,7 @@
         [color_output=yes],
         [color_output=no])
 AC_MSG_RESULT($color_output)
-test "$color_output" = "yes" && AC_DEFINE(USE_COLORS)
+AC_DEFINE(USE_COLORS, test "$color_output" = "yes", [Enable color output])
 
 AC_SUBST(HAVE_MKDTEMP)
 AC_SUBST(HAVE_FCLOSEALL)