lagertonne/nut
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Imported Upstream version 2.6.3

Browse source
This commit is contained in:
Arnaud Quette 2012-01-24 11:22:33 +01:00
parent 45043b58d0
commit fad6ced6f6
255 changed files with 11081 additions and 4629 deletions
Download patch file Download diff file Expand all files Collapse all files

100
configure.in
View file

@ -3,7 +3,7 @@ dnl | Network UPS Tools: configure.in |
dnl +------------------------------------------------------------------+
dnl NUT version number is defined here and *only* here (no more include/version)
AC_INIT(nut, 2.6.2)
AC_INIT(nut, 2.6.3)
AC_CONFIG_SRCDIR(server/upsd.c)
AC_CONFIG_MACRO_DIR([m4])
echo "Network UPS Tools version ${PACKAGE_VERSION}"
@ -35,6 +35,11 @@ dnl # reason is that the SVN revision should be computed at compile time,
dnl # not configure time.
dnl AC_DEFINE_UNQUOTED(UPS_VERSION, "${PACKAGE_VERSION}", [NUT version])
dnl However, automatically define the tree version (mostly for AC_SUBST)
TREE_VERSION="`echo ${PACKAGE_VERSION} | awk '{ print substr($0,1,3) }'`"
AC_DEFINE_UNQUOTED(TREE_VERSION, "${TREE_VERSION}", [NUT tree version])
dnl Fix this early so we can expand with eval later
test "${prefix}" = "NONE" && prefix="${ac_default_prefix}"
test "${exec_prefix}" = "NONE" && exec_prefix='${prefix}'
@ -210,6 +215,7 @@ NUT_ARG_WITH([dev], [build and install the development files], [no])
NUT_ARG_WITH([serial], [build and install serial drivers], [yes])
NUT_ARG_WITH([usb], [build and install USB drivers], [auto])
NUT_ARG_WITH([doc], [build and install documentation], [no])
NUT_ARG_WITH([avahi], [build and install Avahi support], [auto])
dnl ----------------------------------------------------------------------
dnl Check for presence and compiler flags of various libraries
@ -255,8 +261,9 @@ dnl ${nut_with_serial}: any value except "yes" or "no" is treated as "auto".
if test "${nut_with_serial}" != "no"; then
nut_with_serial="yes"
fi
AM_CONDITIONAL(WITH_SERIAL, test "${nut_with_serial}" = "yes")
NUT_REPORT_FEATURE([build serial drivers], [${nut_with_serial}])
NUT_REPORT_FEATURE([build serial drivers], [${nut_with_serial}], [],
[WITH_SERIAL], [Define to enable serial support])
dnl ----------------------------------------------------------------------
dnl checks related to --with-usb
@ -270,8 +277,8 @@ if test "${nut_with_usb}" != "no"; then
nut_with_usb="${nut_have_libusb}"
fi
AM_CONDITIONAL(WITH_USB, test "${nut_with_usb}" = "yes")
NUT_REPORT_FEATURE([build USB drivers], [${nut_with_usb}])
NUT_REPORT_FEATURE([build USB drivers], [${nut_with_usb}], [],
[WITH_USB], [Define to enable USB support])
dnl ----------------------------------------------------------------------
dnl checks related to --with-snmp
@ -285,8 +292,8 @@ if test "${nut_with_snmp}" != "no"; then
nut_with_snmp="${nut_have_libnetsnmp}"
fi
AM_CONDITIONAL(WITH_SNMP, test "${nut_with_snmp}" = "yes")
NUT_REPORT_FEATURE([build SNMP drivers], [${nut_with_snmp}])
NUT_REPORT_FEATURE([build SNMP drivers], [${nut_with_snmp}], [],
[WITH_SNMP], [Define to enable SNMP support])
dnl ----------------------------------------------------------------------
dnl checks related to --with-neon
@ -300,11 +307,8 @@ if test "${nut_with_neon}" != "no"; then
nut_with_neon="${nut_have_neon}"
fi
AM_CONDITIONAL(WITH_NEONXML, test "${nut_with_neon}" = "yes")
NUT_REPORT_FEATURE([build neon based XML driver], [${nut_with_neon}])
if test "${nut_with_neon}" = "yes"; then
AC_DEFINE_UNQUOTED(WITH_NEON, 1, [Define to enable Neon XML/HTTP support])
fi
NUT_REPORT_FEATURE([build neon based XML driver], [${nut_with_neon}], [],
[WITH_NEON], [Define to enable Neon HTTP support])
dnl ----------------------------------------------------------------------
dnl checks related to --with-avahi
@ -318,10 +322,8 @@ if test "${nut_with_avahi}" != "no"; then
nut_with_avahi="${nut_have_avahi}"
fi
AM_CONDITIONAL(WITH_AVAHI, test "${nut_with_avahi}" = "yes")
if test "${nut_with_avahi}" = "yes"; then
AC_DEFINE_UNQUOTED(WITH_AVAHI, 1, [Define to enable avahi support])
fi
NUT_REPORT_FEATURE([enable Avahi support], [${nut_with_avahi}], [],
[WITH_AVAHI], [Define to enable Avahi support])
dnl ----------------------------------------------------------------------
@ -336,8 +338,8 @@ if test "${nut_with_powerman}" != "no"; then
nut_with_powerman="${nut_have_libpowerman}"
fi
AM_CONDITIONAL(WITH_LIBPOWERMAN, test "${nut_with_powerman}" = "yes")
NUT_REPORT_FEATURE([build Powerman PDU client driver], [${nut_with_powerman}])
NUT_REPORT_FEATURE([build Powerman PDU client driver], [${nut_with_powerman}], [],
[WITH_LIBPOWERMAN], [Define to enable Powerman PDU support])
dnl ----------------------------------------------------------------------
dnl Check for with-ipmi, and --with-freeipmi (or --with-openipmi)
@ -368,6 +370,7 @@ if test "${nut_with_ipmi}" != "no"; then
dnl fi
dnl Implies --with-ipmi
dnl nut_with_ipmi="yes"
dnl AC_DEFINE(WITH_OPENIPMI, 1, [Define to enable IPMI support using OpenIPMI])
else
dnl Prefer FreeIPMI over OpenIPMI otherwise
NUT_CHECK_LIBFREEIPMI
@ -391,15 +394,20 @@ if test "${nut_with_ipmi}" != "no"; then
dnl Implies --with-ipmi
nut_with_ipmi="yes"
nut_with_freeipmi="yes"
AC_DEFINE(WITH_FREEIPMI, 1, [Define to enable IPMI support using FreeIPMI])
fi
fi
fi
AM_CONDITIONAL(WITH_IPMI, test "${nut_with_ipmi}" = "yes")
NUT_REPORT_FEATURE([build IPMI driver], [${nut_with_ipmi}], [${nut_ipmi_lib}],
[WITH_IPMI], [Define to enable IPMI support])
dnl Note: we still have to manually enable complementary AC_DEFINEs (see above)
dnl and AM_CONDITIONALs (see below)...
AM_CONDITIONAL(WITH_FREEIPMI, test "${nut_with_freeipmi}" = "yes")
dnl AM_CONDITIONAL(WITH_OPENIPMI, test "${nut_with_openipmi}" = "yes")
NUT_REPORT_FEATURE([build IPMI driver], [${nut_with_ipmi} ${nut_ipmi_lib}])
dnl ----------------------------------------------------------------------
dnl Check for --with-ssl
@ -420,8 +428,8 @@ if test "${nut_with_ssl}" != "no"; then
nut_with_ssl="${nut_have_libssl}"
fi
AM_CONDITIONAL(WITH_SSL, test "${nut_with_ssl}" = "yes")
NUT_REPORT_FEATURE([enable SSL development code], [${nut_with_ssl}])
NUT_REPORT_FEATURE([enable SSL development code], [${nut_with_ssl}], [],
[WITH_SSL], [Define to enable SSL development code])
dnl ----------------------------------------------------------------------
dnl Check for --with-wrap
@ -442,8 +450,31 @@ if test "${nut_with_wrap}" != "no"; then
nut_with_wrap="${nut_have_libwrap}"
fi
AM_CONDITIONAL(WITH_WRAP, test "${nut_with_wrap}" = "yes")
NUT_REPORT_FEATURE([enable libwrap (tcp-wrappers) support], [${nut_with_wrap}])
NUT_REPORT_FEATURE([enable libwrap (tcp-wrappers) support], [${nut_with_wrap}], [],
[WITH_WRAP], [Define to enable libwrap (tcp-wrappers) support])
dnl ----------------------------------------------------------------------
dnl Check for --with-libltdl
NUT_ARG_WITH([libltdl], [enable libltdl (Libtool dlopen abstraction) support], [auto])
dnl ${nut_with_libltdl}: any value except "yes" or "no" is treated as "auto".
if test "${nut_with_libltdl}" != "no"; then
dnl check for libltdl compiler flags
NUT_CHECK_LIBLTDL
fi
if test "${nut_with_libltdl}" = "yes" -a "${nut_have_libltdl}" != "yes"; then
AC_MSG_ERROR(["libltdl not found"])
fi
if test "${nut_with_libltdl}" != "no"; then
nut_with_libltdl="${nut_have_libltdl}"
fi
NUT_REPORT_FEATURE([enable libltdl (Libtool dlopen abstraction) support], [${nut_with_libltdl}], [],
[WITH_LIBLTDL], [Define to enable libltdl (Libtool dlopen abstraction) support])
dnl ----------------------------------------------------------------------
dnl checks related to --with-cgi
@ -464,8 +495,8 @@ if test "${nut_with_cgi}" != "no"; then
nut_with_cgi="${nut_have_libgd}"
fi
AM_CONDITIONAL(WITH_CGI, test "${nut_with_cgi}" = "yes")
NUT_REPORT_FEATURE([build CGI programs], [${nut_with_cgi}])
NUT_REPORT_FEATURE([build CGI programs], [${nut_with_cgi}], [],
[WITH_CGI], [Define to enable CGI (HTTP) support])
dnl ----------------------------------------------------------------------
dnl checks related to --with-hal
@ -488,7 +519,8 @@ if test "${nut_with_hal}" != "no"; then
fi
AM_CONDITIONAL(WITH_HAL, test "${nut_with_hal}" = "yes")
NUT_REPORT_FEATURE([enable HAL support], [${nut_with_hal}])
NUT_REPORT_FEATURE([enable HAL support], [${nut_with_hal}], [],
[WITH_HAL], [Define to enable HAL support])
dnl ----------------------------------------------------------------------
@ -584,8 +616,12 @@ AX_COMPARE_VERSION([${A2X_VERSION}], [ge], [8.6.3], [
nut_have_asciidoc="no"
])
NUT_REPORT_FEATURE([build and install documentation], [${nut_with_doc}], [],
[WITH_ASCIIDOC], [Define to enable Asciidoc support])
dnl Notes: we also keep HAVE_ASCIIDOC for implicit targets, such as manpage
dnl building
AM_CONDITIONAL([HAVE_ASCIIDOC], [test "${nut_have_asciidoc}" = "yes"])
NUT_REPORT_FEATURE([build and install documentation], [${nut_with_doc}])
if test "${nut_with_doc}" = "yes"; then
NUT_REPORT([only build specific documentation format], [${DOC_BUILD_LIST}])
@ -604,7 +640,8 @@ else
AC_DISABLE_STATIC
fi
AM_CONDITIONAL(WITH_DEV, test "${nut_with_dev}" = "yes")
NUT_REPORT_FEATURE([build and install the development files], [${nut_with_dev}])
NUT_REPORT_FEATURE([build and install the development files], [${nut_with_dev}], [],
[WITH_DEV], [Define to enable development files support])
dnl ----------------------------------------------------------------------
@ -992,6 +1029,7 @@ BINDIR=${conftemp}
AC_DEFINE_UNQUOTED(BINDIR, "${conftemp}", [Default path for user executables])
AC_SUBST(OS_NAME)
AC_SUBST(TREE_VERSION)
AC_SUBST(LIBSSL_CFLAGS)
AC_SUBST(LIBSSL_LIBS)
AC_SUBST(LIBGD_CFLAGS)
@ -1011,6 +1049,8 @@ AC_SUBST(LIBIPMI_LIBS)
AC_SUBST(DOC_BUILD_LIST)
AC_SUBST(LIBWRAP_CFLAGS)
AC_SUBST(LIBWRAP_LIBS)
AC_SUBST(LIBLTDL_CFLAGS)
AC_SUBST(LIBLTDL_LIBS)
AC_SUBST(HAL_USER)
AC_SUBST(HAL_DEVICE_MATCH_KEY)
AC_SUBST(HAL_FDI_PATH)
@ -1055,6 +1095,7 @@ AC_OUTPUT([
include/Makefile
lib/libupsclient-config
lib/libupsclient.pc
lib/libnutscan.pc
lib/Makefile
scripts/augeas/Makefile
scripts/augeas/nutnutconf.aug
@ -1070,6 +1111,7 @@ AC_OUTPUT([
scripts/hal/ups-nut-device.fdi
scripts/hotplug/Makefile
scripts/hotplug/libhidups
scripts/HP-UX/nut.psf
scripts/java/Makefile
scripts/python/Makefile
scripts/systemd/Makefile