diff --git a/ipmitool/configure.in b/ipmitool/configure.in index c37889c..7568197 100644 --- a/ipmitool/configure.in +++ b/ipmitool/configure.in @@ -2,13 +2,11 @@ dnl dnl autoconf for ipmitool dnl AC_INIT([src/ipmitool.c]) +AC_CANONICAL_SYSTEM AM_INIT_AUTOMAKE([ipmitool], [1.5.9]) AM_CONFIG_HEADER(config.h) AC_CONFIG_SRCDIR([src/ipmitool.c]) AC_PREREQ(2.50) - -IPMITOOL_PKG=ipmitool -AC_SUBST(IPMITOOL_PKG) AC_SUBST(ac_configure_args) dnl check for programs @@ -68,6 +66,10 @@ AC_CHECK_HEADER([linux/ipmi.h], [have_openipmi=yes], [AC_MSG_WARN([Unable to find OpenIPMI header files])]) +have_lipmi=no +AC_CHECK_HEADER([sys/lipmi/lipmi_intf.h], + [have_lipmi=yes]) + if test "x$prefix" = "xNONE"; then prefix="$ac_default_prefix" fi @@ -76,6 +78,9 @@ if test "x$exec_prefix" = "xNONE"; then exec_prefix="$prefix" fi +AC_SUBST(ARCH, $host_cpu) +AC_SUBST(OS, $host_os) +AC_SUBST(PSTAMP, $host) dnl Solaris convention is command-line tools have *adm and GUIs have *tool suffix IPMITOOL_BIN="ipmitool" @@ -88,7 +93,6 @@ fi AC_DEFINE_UNQUOTED(IPMITOOL_BIN, "$IPMITOOL_BIN", "IPMItool binary name") AC_SUBST(IPMITOOL_BIN) - dnl enable plugins for interfaces AC_ARG_WITH([plugin-path], [[ --with-plugin-path=DIR Set plugin path to DIR]], @@ -98,7 +102,6 @@ AC_ARG_WITH([plugin-path], AC_DEFINE_UNQUOTED(PLUGIN_PATH, "$pluginpath", "IPMI interface plugin path") AC_SUBST(pluginpath) - STATIC_INTF_LIST= STATIC_INTF= STATIC_INTF_EXT= @@ -117,17 +120,14 @@ AC_ARG_ENABLE([intf-lan], PLUGIN_INTF_LAN="libintf_lan.la" LDFLAGS_INTF_LAN="-rpath $pluginpath -avoid-version" DYNAMIC_INTF_LIST="lan $DYNAMIC_INTF_LIST" - echo "Building dynamic IPMI-over-LAN interface plugin" elif test "x$enableval" = "xstatic" || test "x$enableval" = "xyes"; then AC_SUBST(INTF_LAN,lan) STATIC_INTF_LAN="libintf_lan.la" STATIC_INTF_LIST="lan $STATIC_INTF_LIST" - echo "Building statically linked IPMI-over-LAN interface" fi], [AC_SUBST(INTF_LAN,lan) STATIC_INTF_LAN="libintf_lan.la" STATIC_INTF_LIST="lan $STATIC_INTF_LIST" - echo "Building statically linked IPMI-over-LAN interface" ]) AC_SUBST(PLUGIN_INTF_LAN) AC_SUBST(STATIC_INTF_LAN) @@ -137,38 +137,64 @@ PLUGIN_INTF_OPEN= STATIC_INTF_OPEN= LDFLAGS_INTF_OPEN= AC_ARG_ENABLE([intf-open], -[[ --enable-intf-open enable OpenIPMI interface]] +[[ --enable-intf-open enable Linux OpenIPMI interface]] [[ plugin : build dynamic]] [[ static : link statically [default]]] -[[ --diable-intf-open disable OpenIPMI interface]], +[[ --diable-intf-open disable Linux OpenIPMI interface]], [if test "x$have_openipmi" = "xyes"; then if test "x$enableval" = "xplugin" || test "x$enableval" = "xdynamic"; then AC_SUBST(INTF_OPEN,open) PLUGIN_INTF_OPEN="libintf_open.la" LDFLAGS_INTF_OPEN="-rpath $pluginpath -avoid-version" DYNAMIC_INTF_LIST="open $DYNAMIC_INTF_LIST" - echo "Building dynamic OpenIPMI interface plugin" elif test "x$enableval" = "xstatic" || test "x$enableval" = "xyes"; then AC_SUBST(INTF_OPEN,open) STATIC_INTF_OPEN="libintf_open.la" STATIC_INTF_LIST="open $STATIC_INTF_LIST" - echo "Building statically linked OpenIPMI interface" fi else - echo "** Unable to build OpenIPMI interface support!" + echo "** Unable to build Linux OpenIPMI interface support!" fi], [if test "x$have_openipmi" = "xyes"; then AC_SUBST(INTF_OPEN,open) STATIC_INTF_OPEN="libintf_open.la" STATIC_INTF_LIST="open $STATIC_INTF_LIST" - echo "Building statically linked OpenIPMI interface" - else - echo "** Unable to build OpenIPMI interface support!" fi]) AC_SUBST(PLUGIN_INTF_OPEN) AC_SUBST(STATIC_INTF_OPEN) AC_SUBST(LDFLAGS_INTF_OPEN) +PLUGIN_INTF_LIPMI= +STATIC_INTF_LIPMI= +LDFLAGS_INTF_LIPMI= +AC_ARG_ENABLE([intf-lipmi], +[[ --enable-intf-lipmi enable Solaris Limited IPMI interface]] +[[ plugin : build dynamic]] +[[ static : link statically [default]]] +[[ --diable-intf-lipmi disable Solaris Limited IPMI interface]], + [if test "x$have_lipmi" = "xyes"; then + if test "x$enableval" = "xplugin" || test "x$enableval" = "xdynamic"; then + AC_SUBST(INTF_LIPMI,lipmi) + PLUGIN_INTF_LIPMI="libintf_lipmi.la" + LDFLAGS_INTF_LIPMI="-rpath $pluginpath -avoid-version" + DYNAMIC_INTF_LIST="lipmi $DYNAMIC_INTF_LIST" + elif test "x$enableval" = "xstatic" || test "x$enableval" = "xyes"; then + AC_SUBST(INTF_LIPMI,lipmi) + STATIC_INTF_LIPMI="libintf_lipmi.la" + STATIC_INTF_LIST="lipmi $STATIC_INTF_LIST" + fi + else + echo "** Unable to build Solaris Limited IPMI interface support!" + fi], + [if test "x$have_lipmi" = "xyes"; then + AC_SUBST(INTF_LIPMI,lipmi) + STATIC_INTF_LIPMI="libintf_lipmi.la" + STATIC_INTF_LIST="lipmi $STATIC_INTF_LIST" + fi]) +AC_SUBST(PLUGIN_INTF_LIPMI) +AC_SUBST(STATIC_INTF_LIPMI) +AC_SUBST(LDFLAGS_INTF_LIPMI) + for name in $STATIC_INTF_LIST; do STATIC_INTF="$STATIC_INTF { \"intf_${name}\", ${name}_intf_setup },"; STATIC_INTF_EXT="$STATIC_INTF_EXT extern int ${name}_intf_setup(struct ipmi_intf ** intf);"; @@ -181,21 +207,26 @@ AC_SUBST(STATIC_INTF_LIB) dnl Enable ipmi event daemon binary that requires OpenIPMI AC_ARG_ENABLE([ipmievd], - [[ --enable-ipmievd enable IPMI event daemon [default=no]]],,enable_ipmievd=no) + [[ --enable-ipmievd enable event daemon - requires OpenIPMI [default=no]]],,enable_ipmievd=no) AM_CONDITIONAL(IPMIEVD, test "x$enable_ipmievd" = "xyes") if test "x$enable_ipmievd" = "xyes"; then - IPMIEVD_SRC="ipmievd.c" - IPMIEVD_BIN="ipmievd" + if test "x$have_openipmi" = "xyes"; then + IPMIEVD_SRC="ipmievd.c" + IPMIEVD_BIN="ipmievd" + else + echo "** Unable to build IPMI event daemon: OpenIPMI not found!" + fi fi AC_SUBST(IPMIEVD_SRC) AC_SUBST(IPMIEVD_BIN) - AC_CONFIG_FILES([ipmitool.spec Makefile doc/Makefile doc/ipmitool.1 contrib/Makefile + control/Makefile + control/pkginfo lib/Makefile include/Makefile include/ipmitool/Makefile @@ -203,7 +234,8 @@ AC_CONFIG_FILES([ipmitool.spec src/plugins/ipmi_intf_static.c src/plugins/Makefile src/plugins/lan/Makefile - src/plugins/open/Makefile]) + src/plugins/open/Makefile + src/plugins/lipmi/Makefile]) AC_OUTPUT