diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-02-17 20:56:53 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-02-17 20:56:53 +0100 |
| commit | 2adeca46f677bacad1914a3a1eedabaf710c71ad (patch) | |
| tree | 71028a415516aa9c702e86a6959cb9d2101229a6 /configure.ac | |
| parent | 842dcead48ee80a10afa6e03667e9bf74cb8f2ab (diff) | |
| parent | d3c90cdcdf56146af89056ed36bfcc7b4d4956c5 (diff) | |
Merge tag 'upstream/2.9.8'
Upstream version 2.9.8
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 344b27a..345a344 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(ipmiutil,2.9.7) +AC_INIT(ipmiutil,2.9.8) AC_CONFIG_SRCDIR(util/ipmiutil.c) echo "ipmiutil version ${PACKAGE_VERSION}" AM_CONFIG_HEADER(config.h) @@ -26,6 +26,7 @@ AC_C_CONST AC_TYPE_OFF_T AC_HEADER_TIME AC_STRUCT_TM +AC_CHECK_TYPES(wchar_t) dnl Checks for library functions. AC_PROG_GCC_TRADITIONAL @@ -331,10 +332,10 @@ else else echo "ok, suppress excess warnings" fi - rm -f $tmpc $tmpo >/dev/null 2>&1 + rm -f $tmpc $tmpo >/dev/null 2>&1 echo $ECHO_N "checking compile fortify flags ... $ECHO_C" cfhard="-fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" - echo "int main() { return(1); }" >$tmpc + echo "int main() { alloca(100); return(1); }" >$tmpc $CC -o $tmpo $cfhard $tmpc >/dev/null 2>&1 if test $? -ne 0 ; then cfhard= @@ -342,7 +343,7 @@ else else echo "ok, add" fi - rm -f $tmpc $tmpo >/dev/null 2>&1 + rm -f $tmpc $tmpo >/dev/null 2>&1 if test -f "/etc/debian_version"; then echo "Detected Debian Linux" os=debian @@ -432,9 +433,15 @@ else SHR_LINK="" else if test $bsd -eq 0; then - echo "Detected BSD" + # FreeBSD uname -K shows 903000 for 9.3 os=bsd - OS_CFLAGS="-DBSD -fPIC" + osver=`uname -K |cut -c1` + echo "Detected BSD $osver" + if [ $osver -eq 7 ]; then + OS_CFLAGS="-DBSD7 -DBSD -fPIC" + else + OS_CFLAGS="-DBSD -fPIC" + fi OS_LFLAGS="" OS_DRIVERS="ipmimv.c ipmidir.c" drivers="open direct" @@ -512,8 +519,11 @@ if test "x$sysname" = "xSunOS"; then cp -f /tmp/make util/Makefile fi if test "x$os" = "xhpux" ; then - sed -e 's/^.NOEXPORT:/#.NOEXPORT:/' util/Makefile >/tmp/make - cp -f /tmp/make util/Makefile + for mk in Makefile util/Makefile lib/Makefile lib/libipmiutil.pc lib/lanplus/Makefile doc/Makefile scripts/Makefile + do + sed -e 's/^.NOEXPORT:/#.NOEXPORT:/' $mk >/tmp/make + cp -f /tmp/make $mk + done fi AC_MSG_RESULT([]) |