]> granicus.if.org Git - sysstat/blobdiff - configure.in
Merge branch 'scop-grep-E'
[sysstat] / configure.in
index 6e5a8f51eebef77d811d651da836e038cff3e339..7a42cf9d8950c8592b32a865d999764efe66a605 100644 (file)
@@ -4,7 +4,7 @@
 # Modified by Sebastien Godard (sysstat <at> orange.fr)
 
 # Initialization of $PACKAGE_VERSION and $PACKAGE_NAME variables
-AC_INIT(sysstat, 12.3.4)
+AC_INIT(sysstat, 12.5.5)
 
 # Ensure that a recent enough version of Autoconf is being used
 AC_PREREQ(2.53)
@@ -113,35 +113,6 @@ AC_CHECK_FUNCS(strcspn)
 AC_CHECK_FUNCS(strspn)
 AC_CHECK_FUNCS(strstr)
 
-# Should we check for lm_sensors?
-AC_MSG_CHECKING(for sensors support)
-AC_ARG_ENABLE(sensors,
-             AC_HELP_STRING([--disable-sensors],
-                            [disable sensors support]),
-                            SENSORS=$enableval,SENSORS=yes)
-if test $SENSORS != "yes"; then
-       HAVE_SENSORS="n"
-else
-       HAVE_SENSORS="y"
-fi
-AC_MSG_RESULT($SENSORS)
-
-# Check for lm_sensors
-LFSENSORS=""
-DFSENSORS=""
-if test $HAVE_SENSORS = "y"; then
-       SENSORS=no
-       AC_CHECK_LIB(sensors, sensors_get_detected_chips, LFSENSORS="-lsensors", HAVE_SENSORS="n")
-       AC_MSG_CHECKING(for sensors lib)
-       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sensors/sensors.h>
-                                            #include <sensors/error.h>]],
-                                          [[sensors_cleanup();]])],SENSORS=yes; DFSENSORS="-DHAVE_SENSORS", HAVE_SENSORS="n"; SENSORS=no)
-       AC_MSG_RESULT($SENSORS)
-fi
-AC_SUBST(HAVE_SENSORS)
-AC_SUBST(LFSENSORS)
-AC_SUBST(DFSENSORS)
-
 # Should we check for PCP support?
 AC_MSG_CHECKING(for PCP support)
 AC_ARG_ENABLE(pcp,
@@ -153,11 +124,12 @@ if test $PCP != "yes"; then
 else
        HAVE_PCP="y"
 fi
-AC_MSG_RESULT($PCP)
 
 if test ! $HAVE_PCP_PMAPI_H; then
        HAVE_PCP="n"
+       PCP=no
 fi
+AC_MSG_RESULT($PCP)
 
 # Check for PCP libraries
 LFPCP=""
@@ -182,6 +154,69 @@ else
 fi
 AC_SUBST(PCP_IMPL)
 
+# Should we check for lm_sensors?
+AC_MSG_CHECKING(for sensors support)
+AC_ARG_ENABLE(sensors,
+             AC_HELP_STRING([--disable-sensors],
+                            [disable sensors support]),
+                            SENSORS=$enableval,SENSORS=yes)
+if test $SENSORS != "yes"; then
+       SENSORS_SUPPORT="n"
+else
+       SENSORS_SUPPORT="y"
+fi
+AC_MSG_RESULT($SENSORS)
+
+# Check for lm_sensors library
+LFSENSORS=""
+DFSENSORS=""
+HAVE_SENSORS="n"
+if test $SENSORS_SUPPORT = "y"; then
+       SENSORS=no
+       AC_CHECK_LIB(sensors, sensors_get_detected_chips, LFSENSORS="-lsensors", HAVE_SENSORS="n")
+       AC_MSG_CHECKING(for sensors library)
+       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sensors/sensors.h>
+                                            #include <sensors/error.h>]],
+                                          [[sensors_cleanup();]])], SENSORS=yes; HAVE_SENSORS="y"; DFSENSORS="-DHAVE_SENSORS", HAVE_SENSORS="n"; SENSORS=no)
+       AC_MSG_RESULT($SENSORS)
+fi
+AC_SUBST(HAVE_SENSORS)
+AC_SUBST(LFSENSORS)
+AC_SUBST(DFSENSORS)
+
+# Check for 32-bit version of lm_sensors library
+LFSENSORS32=""
+DFSENSORS32=""
+HAVE_SENSORS32="n"
+if test $SENSORS_SUPPORT = "y"; then
+       CFLAGS_SAVE=$CFLAGS
+       CFLAGS+=" -m32"
+       LDFLAGS=" -lsensors"
+       SENSORS=no
+#      Check for another function to avoid using cached result
+       AC_CHECK_LIB(sensors, sensors_cleanup, LFSENSORS32="-lsensors", HAVE_SENSORS32="n")
+       AC_MSG_CHECKING(for sensors 32-bit library)
+       AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sensors/sensors.h>
+                                         #include <sensors/error.h>]],
+                                       [[sensors_cleanup();]])], SENSORS=yes; HAVE_SENSORS32="y"; DFSENSORS32="-DHAVE_SENSORS32", HAVE_SENSORS32="n"; SENSORS=no)
+       AC_MSG_RESULT($SENSORS)
+       CFLAGS=$CFLAGS_SAVE
+fi
+AC_SUBST(HAVE_SENSORS32)
+AC_SUBST(LFSENSORS32)
+AC_SUBST(DFSENSORS32)
+
+# Check for 32-bit system libraries
+TGLIB32=no
+CFLAGS_SAVE=$CFLAGS
+CFLAGS+=" -m32"
+AC_MSG_CHECKING(for 32-bit system libraries)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]],
+                                  [[printf("%d\n", sizeof(long));]])],TGLIB32=yes, TGLIB32=no)
+AC_MSG_RESULT($TGLIB32)
+CFLAGS=$CFLAGS_SAVE
+AC_SUBST(TGLIB32)
+
 echo .
 echo Check system services:
 echo .
@@ -209,6 +244,7 @@ echo .
 #  --disable-stripping      do not strip object files
 #  --enable-copy-only       only copy files when installing sysstat
 #  --enable-use-crond       use standard cron daemon
+#  --enable-lto                    compile with Link Time Optimizations
 #
 # Some influential environment variables:
 #  rcdir         directory where startup scripts are installed
@@ -416,6 +452,25 @@ if test $NLS = "y" && test $LACKING_GETTEXT = "y"; then
 fi
 AC_SUBST(NLS)
 
+# Link Time Optimization
+AC_MSG_CHECKING(Link Time Optimization support)
+AC_ARG_ENABLE(lto,
+             AC_HELP_STRING([--enable-lto],
+                            [enable Link Time Optimization]),
+                            AUX_LTO=$enableval,AUX_LTO=no)
+AC_MSG_RESULT($AUX_LTO)
+LTO="n"
+if test $AUX_LTO = "yes"; then
+       AC_CHECK_PROG(GCC_AR, gcc-ar, gcc-ar)
+       if test x$GCC_AR != x"gcc-ar"; then
+               echo "WARNING: gcc-ar command not found! Disabling LTO support"
+               AUX_LTO="no"
+       else
+               LTO="y"
+       fi
+fi
+AC_SUBST(LTO)
+
 # Data history to keep by sa2
 AC_MSG_CHECKING(number of daily data files to keep)
 AC_ARG_VAR([history],[number of daily data files to keep (default value is 7)]) 
@@ -492,14 +547,13 @@ AC_MSG_RESULT($AUX_IMG)
 AC_SUBST(IGNORE_FILE_ATTRIBUTES)
 
 # Compress manual pages?
-AC_MSG_CHECKING(whether manual pages should not be compressed)
+AC_MSG_CHECKING(whether manual pages should be compressed)
 AC_ARG_ENABLE(compress-manpg,
              AC_HELP_STRING([--disable-compress-manpg],
                             [do not compress sysstat manual pages]),
-                            AUX_MPG=$enableval,AUX_MPG=no)
+                            AUX_MPG=$enableval,AUX_MPG=yes)
 if test $AUX_MPG != "yes"; then
    COMPRESS_MANPG=n
-   AUX_MPG=no
 else
    COMPRESS_MANPG=y
 fi
@@ -673,13 +727,15 @@ AC_SUBST(INSTALL_DOC)
 # Set directory for installing manual pages (see comment in Makefile)
 AC_SUBST(mandir)
 
-# Check whether --debuginfo options should be allowed
+# Check whether debug mode should be activated
+AC_MSG_CHECKING(whether debug mode should be activated)
 AC_ARG_ENABLE(debuginfo, 
              AC_HELP_STRING([--enable-debuginfo],
                             [enable debug output (--debuginfo option)]),
                             WITH_DEBUG=yes ; DFLAGS="$DFLAGS -DDEBUG" , WITH_DEBUG=no)
-AC_SUBST(WITH_DEBUG)
+AC_MSG_RESULT($WITH_DEBUG)
 AC_SUBST(DFLAGS)
+AC_SUBST(WITH_DEBUG)
 
 # Check whether object files should be stripped
 AC_MSG_CHECKING(whether object files should be stripped)