diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-09-23 14:46:49 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-09-23 14:46:49 +0000 |
| commit | 1e71d462c6e3240297b52c6b393dfedbccbafcfe (patch) | |
| tree | 364784375520292c3f8d3e1f599dc520f93d2c41 | |
| parent | 42d8f51f9abbc4cc874372a86f5b6d8c646f567d (diff) | |
| download | zabbix-1e71d462c6e3240297b52c6b393dfedbccbafcfe.tar.gz zabbix-1e71d462c6e3240297b52c6b393dfedbccbafcfe.tar.xz zabbix-1e71d462c6e3240297b52c6b393dfedbccbafcfe.zip | |
Minor changes.
git-svn-id: svn://svn.zabbix.com/trunk@2073 97f52cf1-0a1b-0410-bd0e-c28be96e8082
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | src/libs/zbxsysinfo/Makefile.am | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/configure.in b/configure.in index fe8814c0..db94ff60 100644 --- a/configure.in +++ b/configure.in @@ -795,7 +795,8 @@ dnl AC_CONFIG_HEADER(include/config.h) # Cheks for host_os case "$host_os" in linux*) - ZBX_OS="linux" + arch="linux" + AM_CONDITIONAL(CONFIG_HOST_LINUX, test "x$arch" = "xlinux") AC_MSG_RESULT([ok (${host_os})]) diff --git a/src/libs/zbxsysinfo/Makefile.am b/src/libs/zbxsysinfo/Makefile.am index 238862e9..0ef7dc51 100644 --- a/src/libs/zbxsysinfo/Makefile.am +++ b/src/libs/zbxsysinfo/Makefile.am @@ -1,4 +1,8 @@ SUBDIRS= lib_LIBRARIES=libzbxsysinfo.a -libzbxsysinfo_a_SOURCES=@ZBX_OS@/cpu.c @ZBX_OS@/diskio.c @ZBX_OS@/diskspace.c @ZBX_OS@/file.c @ZBX_OS@/inodes.c @ZBX_OS@/memory.c @ZBX_OS@/sensors.c @ZBX_OS@/swap.c @ZBX_OS@/uptime.c sysinfo.c @ZBX_OS@/system.c +if CONFIG_HOST_LINUX + libzbxsysinfo_a_SOURCES=linux/cpu.c linux/diskio.c linux/diskspace.c linux/file.c linux/inodes.c linux/memory.c linux/sensors.c linux/swap.c linux/uptime.c sysinfo.c linux/system.c +else + libzbxsysinfo_a_SOURCES=@ZBX_OS@/cpu.c @ZBX_OS@/diskio.c @ZBX_OS@/diskspace.c @ZBX_OS@/file.c @ZBX_OS@/inodes.c @ZBX_OS@/memory.c @ZBX_OS@/sensors.c @ZBX_OS@/swap.c @ZBX_OS@/uptime.c sysinfo.c @ZBX_OS@/system.c +endif libzbxsysinfo_a_LIBADD = ../zbxcrypto/libzbxcrypto.a |