diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 5ee9c32..77595d2 100644 --- a/configure.ac +++ b/configure.ac @@ -3,8 +3,9 @@ # vim:tw=0:ts=8:sw=8:et AC_PREREQ(2.59) -AC_INIT([biosdevname],[0.2.4],[Matt_Domsch@dell.com]) +AC_INIT([biosdevname],[0.3.6],[Matt_Domsch@dell.com]) AC_LANG([C]) +AC_USE_SYSTEM_EXTENSIONS AC_CONFIG_SRCDIR([src/read_proc.c]) AC_CONFIG_HEADER([config.h]) AC_PREFIX_DEFAULT() @@ -16,15 +17,17 @@ AC_PROG_AWK AC_PROG_CC AM_PROG_CC_C_O AC_PROG_LN_S +AC_PROG_CXX +AC_PROG_RANLIB AC_CHECK_PROGS([READELF], [readelf]) - +AC_CHECK_FUNCS([realpath]) # Checks for libraries. AC_CHECK_LIB([c], [snprintf]) # libz has to come before libpci because libpci needs it now. -AC_CHECK_LIB([z], [gzopen], [], - [AC_MSG_ERROR([You must install zlib-devel or equivalent])]) -AC_CHECK_LIB([pci], [pci_alloc], [], - [AC_MSG_ERROR([You must install pciutils or equivalent])], +AC_CHECK_LIB([z], [gzopen], [true], + [AC_MSG_ERROR([You must install zlib-devel (Fedora/Red Hat/SuSE), libzip-dev (Debian/Ubuntu), or equivalent])]) +AC_CHECK_LIB([pci], [pci_alloc], [true], + [AC_MSG_ERROR([You must install pciutils-devel (Fedora/Red Hat/SuSE), pciutils-dev (Debian/Ubuntu), or equivalent])], -lz) # Checks for header files. @@ -44,6 +47,9 @@ AC_C_CONST AC_C_INLINE AC_TYPE_OFF_T AC_TYPE_SIZE_T +AC_TYPE_SSIZE_T +AC_TYPE_UINT8_T +AC_TYPE_UINT16_T AC_HEADER_TIME AC_STRUCT_TM @@ -62,18 +68,21 @@ AC_CHECK_FUNCS([dup2 gettimeofday memset munmap select socket strcasecmp strchr # this is ugly, but accounts for SLES 10, Red Hat/Fedora, and Ubuntu # handles default udev rules as of udev 114 or thereabouts -RULEDEST=71-biosdevname.rules +RULEDEST=/lib/udev/rules.d/71-biosdevname.rules + if [[ -e /etc/udev/rules.d/60-net.rules ]]; then - # RHEL / Fedora - RULEDEST=60-biosdevname.rules + # RHEL 5 / Fedora + RULEDEST=/etc/udev/rules.d/60-biosdevname.rules elif [[ -e /etc/udev/rules.d/31-network.rules ]]; then # SLES 10 - RULEDEST=31-biosdevname.rules + RULEDEST=/etc/udev/rules.d/31-biosdevname.rules elif [[ -e /etc/udev/rules.d/25-iftab.rules ]]; then - # Ubuntu - RULEDEST=25-biosdevname.rules + # older Ubuntu + RULEDEST=/etc/udev/rules.d/25-biosdevname.rules fi +RULEDIR=$(dirname $RULEDEST) AC_SUBST(RULEDEST, $RULEDEST) +AC_SUBST(RULEDIR, $RULEDIR) echo "PACKAGE_NAME='$PACKAGE_NAME'" > version echo "PACKAGE_VERSION='$PACKAGE_VERSION'" >> version |