diff --git a/ipmitool/configure.in b/ipmitool/configure.in
index 021053e..2b91bb3 100644
--- a/ipmitool/configure.in
+++ b/ipmitool/configure.in
@@ -51,6 +51,8 @@ if test "x$exec_prefix" = "xNONE"; then
   exec_prefix="$prefix"
 fi
 
+enable_all_options=yes
+
 dnl set some things so we build with GNU tools on Solaris
 case "$host_os" in
 solaris*)
@@ -69,8 +71,10 @@ solaris*)
 	fi
 	enable_intf_imb=no
 	enable_intf_open=no
+	enable_intf_lipmi=no
 	enable_ipmishell=no
 	enable_ipmievd=yes
+	enable_all_options=no
 	;;
 *cygwin*)
 	# disable the linux and solaris-specific interfaces
@@ -97,6 +101,15 @@ AC_SUBST(OS, $host_os)
 AC_SUBST(PSTAMP, $host)
 AC_SUBST(BASEDIR, $prefix)
 
+dnl allow solaris builds to include all options
+AC_ARG_ENABLE([solaris-opt],
+	[AC_HELP_STRING([--enable-solaris-opt],
+			[enable all options for Solaris [default=no]])],
+	[], [enable_solaris_opt=no])
+if test "x$enable_all_options" = "xyes" || test "x$enable_solaris_opt" = "xyes"; then
+   AC_DEFINE(ENABLE_ALL_OPTIONS, [1], [Define to 1 to enable all command line options.])
+fi
+
 dnl check for OpenSSL functionality
 AC_ARG_ENABLE([internal-md5],
 	[AC_HELP_STRING([--enable-internal-md5],
@@ -279,7 +292,7 @@ AC_ARG_ENABLE([buildcheck],
 	[AC_HELP_STRING([--enable-buildcheck],
 			[enable -Wall -Werror for build testing [default=no]])],
 	[if test "x$enable_buildcheck" != "xno"; then
-	    CFLAGS="$CFLAGS -Wall -Werror"
+	    CFLAGS="$CFLAGS -Wall -Werror -Wpointer-arith -Wstrict-prototypes"
 	fi], [])
 
 AC_SUBST(CFLAGS)