Merge lp:~dev-nigelj/ubuntu/oneiric/zabbix/721707 into lp:ubuntu/oneiric/zabbix

Proposed by Nigel Jones
Status: Superseded
Proposed branch: lp:~dev-nigelj/ubuntu/oneiric/zabbix/721707
Merge into: lp:ubuntu/oneiric/zabbix
Diff against target: 97354 lines (+31754/-35008)
578 files modified
.pc/applied-patches (+1/-0)
.pc/configure-no-lcrypt/configure (+2315/-2026)
.pc/ldap-linker-lp722300.patch/configure.in (+1492/-0)
.pc/ldap-linker-lp722300.patch/m4/ax_lib_postgresql.m4 (+182/-0)
.pc/ldap-linker-lp722300.patch/m4/ldap.m4 (+97/-0)
.pc/no-swf-clock/frontends/php/include/screens.inc.php (+11/-2)
ChangeLog (+217/-13)
Makefile.am (+3/-8)
Makefile.in (+5/-9)
aclocal.m4 (+1/-0)
build/win32/project/Makefile_agent (+1/-10)
build/win32/project/Makefile_agent_x64 (+1/-10)
build/win64/README (+1/-1)
configure (+2315/-2026)
configure.in (+500/-449)
create/Makefile.am (+3/-1)
create/Makefile.in (+5/-2)
create/data/data.sql (+9/-0)
create/data/images_ibm_db2.sql (+25/-0)
create/schema/ibm_db2.sql (+1075/-0)
debian/changelog (+40/-0)
debian/control (+5/-5)
debian/patches/ldap-linker-lp722300.patch (+54/-0)
debian/patches/series (+1/-0)
debian/po/cs.po (+1/-1)
debian/po/da.po (+105/-0)
debian/po/de.po (+1/-1)
debian/po/es.po (+1/-1)
debian/po/eu.po (+8/-1)
debian/po/fi.po (+1/-1)
debian/po/fr.po (+1/-1)
debian/po/it.po (+1/-1)
debian/po/ja.po (+1/-1)
debian/po/nb.po (+8/-1)
debian/po/nl.po (+16/-1)
debian/po/pl.po (+16/-1)
debian/po/pt.po (+1/-1)
debian/po/pt_BR.po (+1/-1)
debian/po/ru.po (+3/-3)
debian/po/sv.po (+1/-1)
debian/rules (+3/-4)
debian/watch (+1/-0)
frontends/php/acknow.php (+17/-22)
frontends/php/actionconf.php (+107/-136)
frontends/php/api/classes/class.caction.php (+109/-69)
frontends/php/api/classes/class.calert.php (+40/-31)
frontends/php/api/classes/class.capplication.php (+50/-35)
frontends/php/api/classes/class.cdcheck.php (+14/-43)
frontends/php/api/classes/class.cdhost.php (+15/-62)
frontends/php/api/classes/class.cdrule.php (+50/-70)
frontends/php/api/classes/class.cdservice.php (+15/-70)
frontends/php/api/classes/class.cevent.php (+65/-52)
frontends/php/api/classes/class.cgraph.php (+270/-275)
frontends/php/api/classes/class.cgraphitem.php (+36/-11)
frontends/php/api/classes/class.chistory.php (+22/-26)
frontends/php/api/classes/class.chost.php (+141/-118)
frontends/php/api/classes/class.chostgroup.php (+135/-72)
frontends/php/api/classes/class.cimage.php (+70/-36)
frontends/php/api/classes/class.citem.php (+38/-85)
frontends/php/api/classes/class.cmaintenance.php (+149/-49)
frontends/php/api/classes/class.cmap.php (+276/-226)
frontends/php/api/classes/class.cmediatype.php (+50/-87)
frontends/php/api/classes/class.cproxy.php (+32/-20)
frontends/php/api/classes/class.cscreen.php (+63/-41)
frontends/php/api/classes/class.cscript.php (+171/-40)
frontends/php/api/classes/class.ctemplate.php (+198/-117)
frontends/php/api/classes/class.ctrigger.php (+148/-116)
frontends/php/api/classes/class.cuser.php (+119/-125)
frontends/php/api/classes/class.cusergroup.php (+67/-44)
frontends/php/api/classes/class.cusermacro.php (+407/-379)
frontends/php/api/classes/class.czbxapi.php (+3/-2)
frontends/php/api/rpc/class.cjsonrpc.php (+2/-2)
frontends/php/api/rpc/class.czbxrpc.php (+16/-10)
frontends/php/api_jsonrpc.php (+1/-1)
frontends/php/applications.php (+2/-2)
frontends/php/auditacts.php (+4/-3)
frontends/php/auditlogs.php (+2/-30)
frontends/php/chart.php (+0/-1)
frontends/php/chart2.php (+4/-4)
frontends/php/chart3.php (+9/-9)
frontends/php/conf/zabbix.conf.php.example (+13/-28)
frontends/php/config.php (+87/-46)
frontends/php/discovery.php (+21/-3)
frontends/php/discoveryconf.php (+212/-20)
frontends/php/events.php (+7/-6)
frontends/php/graphs.php (+3/-3)
frontends/php/history.php (+2/-2)
frontends/php/hostgroups.php (+73/-28)
frontends/php/hosts.php (+145/-43)
frontends/php/httpconf.php (+225/-21)
frontends/php/httpdetails.php (+13/-12)
frontends/php/imgstore.php (+8/-7)
frontends/php/include/acknow.inc.php (+2/-2)
frontends/php/include/actions.inc.php (+22/-14)
frontends/php/include/audit.inc.php (+39/-31)
frontends/php/include/blocks.inc.php (+13/-9)
frontends/php/include/classes/class.cbutton.php (+1/-1)
frontends/php/include/classes/class.cchart.php (+105/-90)
frontends/php/include/classes/class.ccombobox.php (+26/-9)
frontends/php/include/classes/class.ccomboitem.php (+3/-5)
frontends/php/include/classes/class.cconfigfile.php (+163/-0)
frontends/php/include/classes/class.cformelement.php (+50/-50)
frontends/php/include/classes/class.cformtable.php (+16/-42)
frontends/php/include/classes/class.clabel.php (+30/-0)
frontends/php/include/classes/class.cpagefilter.php (+467/-451)
frontends/php/include/classes/class.cpie.php (+4/-0)
frontends/php/include/classes/class.cstringparser.php (+43/-40)
frontends/php/include/classes/class.ctag.php (+1/-1)
frontends/php/include/classes/class.ctextarea.php (+1/-1)
frontends/php/include/classes/class.ctriggersinfo.php (+4/-11)
frontends/php/include/classes/class.cwidget.php (+1/-1)
frontends/php/include/config.inc.php (+42/-29)
frontends/php/include/db.inc.php (+214/-66)
frontends/php/include/debug.inc.php (+44/-44)
frontends/php/include/defines.inc.php (+26/-8)
frontends/php/include/discovery.inc.php (+55/-48)
frontends/php/include/events.inc.php (+88/-53)
frontends/php/include/export.inc.php (+115/-80)
frontends/php/include/forms.inc.php (+73/-595)
frontends/php/include/func.inc.php (+97/-64)
frontends/php/include/hosts.inc.php (+71/-93)
frontends/php/include/httptest.inc.php (+19/-5)
frontends/php/include/items.inc.php (+253/-12)
frontends/php/include/js.inc.php (+10/-2)
frontends/php/include/locales/en_gb.inc.php (+121/-15)
frontends/php/include/locales/fr_fr.inc.php (+51/-7)
frontends/php/include/locales/lv_lv.inc.php (+169/-0)
frontends/php/include/locales/ru_ru.inc.php (+135/-83)
frontends/php/include/locales/ua_ua.inc.php (+104/-36)
frontends/php/include/maps.inc.php (+674/-985)
frontends/php/include/media.inc.php (+17/-10)
frontends/php/include/menu.inc.php (+2/-1)
frontends/php/include/nodes.inc.php (+0/-1)
frontends/php/include/page_header.php (+15/-6)
frontends/php/include/profiles.inc.php (+1/-1)
frontends/php/include/requirements.inc.php (+17/-0)
frontends/php/include/schema.inc.php (+4302/-651)
frontends/php/include/screens.inc.php (+11/-2)
frontends/php/include/scripts.inc.php (+0/-72)
frontends/php/include/services.inc.php (+3/-41)
frontends/php/include/setup.inc.php (+177/-423)
frontends/php/include/triggers.inc.php (+109/-249)
frontends/php/include/users.inc.php (+1/-1)
frontends/php/include/validate.inc.php (+1/-1)
frontends/php/include/xmlschemas/screens.rng (+135/-0)
frontends/php/index.php (+4/-2)
frontends/php/items.php (+12/-15)
frontends/php/js/class.cmap.js (+59/-75)
frontends/php/js/class.cmessages.js (+2/-2)
frontends/php/js/class.csuggest.js (+2/-2)
frontends/php/js/class.pmaster.js (+2/-2)
frontends/php/js/common.js (+61/-72)
frontends/php/js/functions.js (+45/-9)
frontends/php/js/ie6fix.js (+1/-1)
frontends/php/js/main.js (+91/-91)
frontends/php/js/prototype.js (+2/-3)
frontends/php/jsLoader.php (+118/-107)
frontends/php/jsrpc.php (+3/-3)
frontends/php/locales.php (+13/-61)
frontends/php/maps.php (+7/-10)
frontends/php/media_types.php (+115/-78)
frontends/php/popup.php (+22/-13)
frontends/php/popup_trexpr.php (+172/-105)
frontends/php/proxies.php (+3/-2)
frontends/php/queue.php (+3/-3)
frontends/php/report4.php (+40/-21)
frontends/php/report5.php (+1/-0)
frontends/php/screenconf.php (+21/-11)
frontends/php/screenedit.php (+10/-15)
frontends/php/screens.php (+70/-21)
frontends/php/scripts.php (+9/-9)
frontends/php/scripts_exec.php (+32/-33)
frontends/php/search.php (+17/-21)
frontends/php/services_form.php (+16/-4)
frontends/php/setup.php (+14/-8)
frontends/php/slides.php (+9/-3)
frontends/php/styles/css_od.css (+8/-0)
frontends/php/styles/table.css (+31/-33)
frontends/php/sysmap.php (+1/-2)
frontends/php/sysmaps.php (+16/-25)
frontends/php/templates.php (+26/-27)
frontends/php/tr_comments.php (+30/-6)
frontends/php/tr_events.php (+18/-8)
frontends/php/tr_logform.php (+27/-31)
frontends/php/tr_status.php (+45/-15)
frontends/php/triggers.php (+58/-34)
frontends/php/users.php (+8/-6)
include/common.h (+67/-73)
include/comms.h (+1/-0)
include/config.h.in (+47/-38)
include/daemon.h (+3/-3)
include/db.h (+94/-104)
include/dbcache.h (+6/-5)
include/dbschema.h (+16/-25)
include/email.h (+0/-28)
include/jabber.h (+0/-27)
include/mutexs.h (+3/-0)
include/sms.h (+0/-26)
include/sysinc.h (+3/-0)
include/sysinfo.h (+158/-127)
include/threads.h (+3/-1)
include/zbxdb.h (+128/-104)
include/zbxicmpping.h (+11/-9)
include/zbxmacros.h (+0/-1)
include/zbxmedia.h (+37/-0)
include/zbxodbc.h (+1/-1)
include/zbxserver.h (+5/-9)
m4/ax_lib_ibm_db2.m4 (+64/-0)
m4/ax_lib_oracle_oci.m4 (+2/-2)
m4/ax_lib_postgresql.m4 (+3/-1)
m4/ldap.m4 (+3/-1)
m4/libcurl.m4 (+6/-2)
man/Makefile.in (+2/-1)
man/zabbix_sender.man (+12/-8)
misc/Makefile.in (+2/-1)
misc/conf/zabbix_agent.conf (+0/-1)
misc/conf/zabbix_agentd.conf (+19/-21)
misc/conf/zabbix_agentd.win.conf (+42/-11)
misc/conf/zabbix_agentd/userparameter_examples.conf (+2/-0)
misc/conf/zabbix_agentd/userparameter_mysql.conf (+14/-0)
misc/conf/zabbix_proxy.conf (+20/-12)
misc/conf/zabbix_server.conf (+15/-3)
misc/init.d/debian/zabbix-agent (+3/-19)
misc/init.d/debian/zabbix-server (+2/-18)
misc/init.d/fedora/core/zabbix_agentd (+1/-1)
misc/init.d/fedora/core/zabbix_server (+1/-2)
misc/init.d/fedora/core5/zabbix_agentd (+2/-3)
misc/init.d/fedora/core5/zabbix_server (+2/-3)
misc/init.d/gentoo/zabbix-agentd (+4/-7)
misc/init.d/gentoo/zabbix-server (+4/-9)
misc/init.d/redhat/zabbix_agentd_ctl (+1/-1)
misc/init.d/redhat/zabbix_server_ctl (+1/-1)
misc/init.d/suse/9.1/zabbix_agentd (+1/-1)
misc/init.d/suse/9.1/zabbix_server (+1/-1)
misc/init.d/suse/9.2/zabbix_agentd (+1/-1)
misc/init.d/suse/9.2/zabbix_server (+1/-1)
misc/init.d/suse/9.3/zabbix_agentd (+1/-1)
misc/init.d/suse/9.3/zabbix_server (+1/-1)
misc/init.d/tru64/zabbix_agentd (+3/-3)
misc/init.d/tru64/zabbix_server (+3/-3)
misc/snmptrap/snmptrap.sh (+1/-2)
src/Makefile.in (+2/-1)
src/libs/Makefile.am (+3/-11)
src/libs/Makefile.in (+5/-9)
src/libs/zbxalgo/Makefile.in (+2/-1)
src/libs/zbxalgo/binaryheap.c (+6/-6)
src/libs/zbxalgo/hashmap.c (+4/-4)
src/libs/zbxalgo/vector.c (+1/-1)
src/libs/zbxcommon/Makefile.in (+2/-1)
src/libs/zbxcommon/comms.c (+22/-112)
src/libs/zbxcommon/file.c (+1/-2)
src/libs/zbxcommon/misc.c (+219/-64)
src/libs/zbxcommon/str.c (+352/-114)
src/libs/zbxcomms/Makefile.in (+2/-1)
src/libs/zbxcomms/comms.c (+46/-19)
src/libs/zbxcommshigh/Makefile.in (+2/-1)
src/libs/zbxconf/Makefile.in (+2/-1)
src/libs/zbxconf/cfg.c (+2/-2)
src/libs/zbxcrypto/Makefile.in (+2/-1)
src/libs/zbxdb/Makefile.in (+2/-1)
src/libs/zbxdb/db.c (+793/-528)
src/libs/zbxdbcache/Makefile.in (+2/-1)
src/libs/zbxdbcache/dbcache.c (+70/-51)
src/libs/zbxdbcache/dbconfig.c (+148/-132)
src/libs/zbxdbcache/nextchecks.c (+23/-9)
src/libs/zbxdbhigh/Makefile.in (+2/-1)
src/libs/zbxdbhigh/db.c (+139/-136)
src/libs/zbxdbhigh/dbschema.c (+1/-3699)
src/libs/zbxdbhigh/discovery.c (+1/-1)
src/libs/zbxdbhigh/host.c (+28/-22)
src/libs/zbxdbhigh/macro.c (+2/-0)
src/libs/zbxdbhigh/odbc.c (+10/-10)
src/libs/zbxdbhigh/proxy.c (+1/-1)
src/libs/zbxemail/Makefile.am (+0/-5)
src/libs/zbxemail/Makefile.in (+0/-468)
src/libs/zbxemail/email.c (+0/-278)
src/libs/zbxicmpping/Makefile.in (+2/-1)
src/libs/zbxicmpping/icmpping.c (+179/-120)
src/libs/zbxjabber/Makefile.am (+0/-5)
src/libs/zbxjabber/Makefile.in (+0/-468)
src/libs/zbxjabber/jabber.c (+0/-541)
src/libs/zbxjson/Makefile.in (+2/-1)
src/libs/zbxlog/Makefile.in (+2/-1)
src/libs/zbxlog/log.c (+1/-3)
src/libs/zbxmedia/Makefile.am (+13/-0)
src/libs/zbxmedia/Makefile.in (+481/-0)
src/libs/zbxmedia/email.c (+290/-0)
src/libs/zbxmedia/eztexting.c (+291/-0)
src/libs/zbxmedia/jabber.c (+542/-0)
src/libs/zbxmedia/sms.c (+269/-0)
src/libs/zbxmemory/Makefile.in (+2/-1)
src/libs/zbxmemory/memalloc.c (+18/-15)
src/libs/zbxmemory/strpool.c (+3/-3)
src/libs/zbxnix/Makefile.in (+2/-1)
src/libs/zbxnix/daemon.c (+16/-6)
src/libs/zbxnix/pid.c (+6/-2)
src/libs/zbxplugin/Makefile.in (+2/-1)
src/libs/zbxserver/Makefile.in (+2/-1)
src/libs/zbxserver/evalfunc.c (+476/-384)
src/libs/zbxserver/evalfunc.h (+7/-6)
src/libs/zbxserver/expression.c (+394/-252)
src/libs/zbxsms/Makefile.am (+0/-5)
src/libs/zbxsms/Makefile.in (+0/-468)
src/libs/zbxsms/sms.c (+0/-280)
src/libs/zbxsys/Makefile.in (+2/-1)
src/libs/zbxsys/mutexs.c (+3/-3)
src/libs/zbxsys/symbols.c (+0/-1)
src/libs/zbxsys/threads.c (+2/-2)
src/libs/zbxsysinfo/Makefile.in (+2/-1)
src/libs/zbxsysinfo/aix/Makefile.am (+0/-3)
src/libs/zbxsysinfo/aix/Makefile.in (+2/-52)
src/libs/zbxsysinfo/aix/aix.c (+5/-17)
src/libs/zbxsysinfo/aix/cpu.c (+11/-46)
src/libs/zbxsysinfo/aix/diskio.c (+0/-157)
src/libs/zbxsysinfo/aix/diskspace.c (+1/-12)
src/libs/zbxsysinfo/aix/inodes.c (+12/-51)
src/libs/zbxsysinfo/aix/kernel.c (+0/-78)
src/libs/zbxsysinfo/aix/memory.c (+4/-17)
src/libs/zbxsysinfo/aix/net.c (+4/-27)
src/libs/zbxsysinfo/aix/proc.c (+30/-35)
src/libs/zbxsysinfo/aix/sensors.c (+0/-116)
src/libs/zbxsysinfo/aix/swap.c (+0/-333)
src/libs/zbxsysinfo/aix/uptime.c (+1/-8)
src/libs/zbxsysinfo/aix/vmstats.c (+24/-30)
src/libs/zbxsysinfo/common/Makefile.in (+2/-1)
src/libs/zbxsysinfo/common/common.c (+38/-46)
src/libs/zbxsysinfo/common/common.h (+4/-2)
src/libs/zbxsysinfo/common/file.c (+2/-30)
src/libs/zbxsysinfo/common/file.h (+4/-3)
src/libs/zbxsysinfo/common/http.c (+101/-164)
src/libs/zbxsysinfo/common/http.h (+3/-2)
src/libs/zbxsysinfo/common/net.c (+34/-111)
src/libs/zbxsysinfo/common/net.h (+7/-7)
src/libs/zbxsysinfo/common/system.c (+2/-18)
src/libs/zbxsysinfo/common/system.h (+6/-5)
src/libs/zbxsysinfo/freebsd/Makefile.am (+2/-3)
src/libs/zbxsysinfo/freebsd/Makefile.in (+21/-37)
src/libs/zbxsysinfo/freebsd/boottime.c (+0/-4)
src/libs/zbxsysinfo/freebsd/cpu.c (+6/-31)
src/libs/zbxsysinfo/freebsd/diskio.c (+28/-57)
src/libs/zbxsysinfo/freebsd/diskspace.c (+1/-12)
src/libs/zbxsysinfo/freebsd/freebsd.c (+5/-8)
src/libs/zbxsysinfo/freebsd/inodes.c (+1/-15)
src/libs/zbxsysinfo/freebsd/kernel.c (+2/-11)
src/libs/zbxsysinfo/freebsd/memory.c (+2/-14)
src/libs/zbxsysinfo/freebsd/net.c (+9/-34)
src/libs/zbxsysinfo/freebsd/proc.c (+70/-53)
src/libs/zbxsysinfo/freebsd/sensors.c (+0/-116)
src/libs/zbxsysinfo/freebsd/swap.c (+5/-17)
src/libs/zbxsysinfo/freebsd/uptime.c (+3/-24)
src/libs/zbxsysinfo/hpux/Makefile.am (+1/-7)
src/libs/zbxsysinfo/hpux/Makefile.in (+4/-104)
src/libs/zbxsysinfo/hpux/cpu.c (+22/-77)
src/libs/zbxsysinfo/hpux/diskio.c (+0/-157)
src/libs/zbxsysinfo/hpux/diskspace.c (+1/-12)
src/libs/zbxsysinfo/hpux/hpux.c (+4/-29)
src/libs/zbxsysinfo/hpux/inodes.c (+8/-52)
src/libs/zbxsysinfo/hpux/kernel.c (+0/-78)
src/libs/zbxsysinfo/hpux/memory.c (+10/-97)
src/libs/zbxsysinfo/hpux/net.c (+0/-67)
src/libs/zbxsysinfo/hpux/proc.c (+0/-500)
src/libs/zbxsysinfo/hpux/sensors.c (+0/-116)
src/libs/zbxsysinfo/hpux/swap.c (+0/-333)
src/libs/zbxsysinfo/hpux/uptime.c (+0/-120)
src/libs/zbxsysinfo/linux/Makefile.am (+2/-2)
src/libs/zbxsysinfo/linux/Makefile.in (+21/-20)
src/libs/zbxsysinfo/linux/boottime.c (+2/-7)
src/libs/zbxsysinfo/linux/cpu.c (+8/-29)
src/libs/zbxsysinfo/linux/diskio.c (+30/-57)
src/libs/zbxsysinfo/linux/diskspace.c (+1/-12)
src/libs/zbxsysinfo/linux/inodes.c (+15/-61)
src/libs/zbxsysinfo/linux/kernel.c (+0/-7)
src/libs/zbxsysinfo/linux/linux.c (+8/-6)
src/libs/zbxsysinfo/linux/memory.c (+23/-80)
src/libs/zbxsysinfo/linux/net.c (+123/-62)
src/libs/zbxsysinfo/linux/proc.c (+32/-37)
src/libs/zbxsysinfo/linux/sensors.c (+141/-96)
src/libs/zbxsysinfo/linux/swap.c (+34/-45)
src/libs/zbxsysinfo/linux/uptime.c (+0/-4)
src/libs/zbxsysinfo/netbsd/Makefile.am (+2/-4)
src/libs/zbxsysinfo/netbsd/Makefile.in (+21/-54)
src/libs/zbxsysinfo/netbsd/boottime.c (+0/-4)
src/libs/zbxsysinfo/netbsd/cpu.c (+9/-37)
src/libs/zbxsysinfo/netbsd/diskio.c (+0/-157)
src/libs/zbxsysinfo/netbsd/diskspace.c (+1/-12)
src/libs/zbxsysinfo/netbsd/inodes.c (+1/-15)
src/libs/zbxsysinfo/netbsd/kernel.c (+2/-11)
src/libs/zbxsysinfo/netbsd/memory.c (+2/-14)
src/libs/zbxsysinfo/netbsd/net.c (+65/-261)
src/libs/zbxsysinfo/netbsd/netbsd.c (+5/-15)
src/libs/zbxsysinfo/netbsd/proc.c (+56/-38)
src/libs/zbxsysinfo/netbsd/sensors.c (+0/-116)
src/libs/zbxsysinfo/netbsd/swap.c (+0/-333)
src/libs/zbxsysinfo/netbsd/uptime.c (+1/-20)
src/libs/zbxsysinfo/openbsd/Makefile.am (+2/-2)
src/libs/zbxsysinfo/openbsd/Makefile.in (+21/-20)
src/libs/zbxsysinfo/openbsd/boottime.c (+0/-4)
src/libs/zbxsysinfo/openbsd/cpu.c (+5/-26)
src/libs/zbxsysinfo/openbsd/diskio.c (+9/-33)
src/libs/zbxsysinfo/openbsd/diskspace.c (+1/-12)
src/libs/zbxsysinfo/openbsd/inodes.c (+1/-15)
src/libs/zbxsysinfo/openbsd/kernel.c (+2/-11)
src/libs/zbxsysinfo/openbsd/memory.c (+2/-14)
src/libs/zbxsysinfo/openbsd/net.c (+146/-294)
src/libs/zbxsysinfo/openbsd/openbsd.c (+7/-8)
src/libs/zbxsysinfo/openbsd/proc.c (+65/-43)
src/libs/zbxsysinfo/openbsd/sensors.c (+175/-87)
src/libs/zbxsysinfo/openbsd/swap.c (+16/-30)
src/libs/zbxsysinfo/openbsd/uptime.c (+0/-5)
src/libs/zbxsysinfo/osf/Makefile.am (+0/-2)
src/libs/zbxsysinfo/osf/Makefile.in (+3/-35)
src/libs/zbxsysinfo/osf/cpu.c (+20/-78)
src/libs/zbxsysinfo/osf/diskio.c (+0/-157)
src/libs/zbxsysinfo/osf/diskspace.c (+1/-12)
src/libs/zbxsysinfo/osf/inodes.c (+7/-53)
src/libs/zbxsysinfo/osf/kernel.c (+3/-17)
src/libs/zbxsysinfo/osf/memory.c (+6/-70)
src/libs/zbxsysinfo/osf/net.c (+0/-67)
src/libs/zbxsysinfo/osf/osf.c (+5/-21)
src/libs/zbxsysinfo/osf/proc.c (+61/-72)
src/libs/zbxsysinfo/osf/sensors.c (+0/-116)
src/libs/zbxsysinfo/osf/swap.c (+22/-92)
src/libs/zbxsysinfo/osf/uptime.c (+2/-26)
src/libs/zbxsysinfo/osx/Makefile.am (+0/-2)
src/libs/zbxsysinfo/osx/Makefile.in (+3/-35)
src/libs/zbxsysinfo/osx/cpu.c (+26/-131)
src/libs/zbxsysinfo/osx/diskio.c (+0/-157)
src/libs/zbxsysinfo/osx/diskspace.c (+1/-12)
src/libs/zbxsysinfo/osx/inodes.c (+9/-50)
src/libs/zbxsysinfo/osx/kernel.c (+4/-19)
src/libs/zbxsysinfo/osx/memory.c (+10/-91)
src/libs/zbxsysinfo/osx/net.c (+0/-67)
src/libs/zbxsysinfo/osx/osx.c (+5/-21)
src/libs/zbxsysinfo/osx/proc.c (+18/-28)
src/libs/zbxsysinfo/osx/sensors.c (+0/-116)
src/libs/zbxsysinfo/osx/swap.c (+22/-90)
src/libs/zbxsysinfo/osx/uptime.c (+1/-23)
src/libs/zbxsysinfo/simple/Makefile.in (+2/-1)
src/libs/zbxsysinfo/simple/ntp.h (+3/-2)
src/libs/zbxsysinfo/simple/simple.c (+8/-8)
src/libs/zbxsysinfo/simple/simple.h (+3/-2)
src/libs/zbxsysinfo/solaris/Makefile.am (+1/-2)
src/libs/zbxsysinfo/solaris/Makefile.in (+19/-35)
src/libs/zbxsysinfo/solaris/boottime.c (+0/-5)
src/libs/zbxsysinfo/solaris/cpu.c (+58/-84)
src/libs/zbxsysinfo/solaris/diskio.c (+69/-109)
src/libs/zbxsysinfo/solaris/diskspace.c (+1/-12)
src/libs/zbxsysinfo/solaris/inodes.c (+6/-47)
src/libs/zbxsysinfo/solaris/kernel.c (+4/-19)
src/libs/zbxsysinfo/solaris/memory.c (+16/-42)
src/libs/zbxsysinfo/solaris/net.c (+28/-129)
src/libs/zbxsysinfo/solaris/proc.c (+29/-33)
src/libs/zbxsysinfo/solaris/sensors.c (+0/-116)
src/libs/zbxsysinfo/solaris/solaris.c (+5/-7)
src/libs/zbxsysinfo/solaris/swap.c (+26/-72)
src/libs/zbxsysinfo/solaris/uptime.c (+0/-5)
src/libs/zbxsysinfo/specsysinfo.h (+6/-5)
src/libs/zbxsysinfo/sysinfo.c (+50/-67)
src/libs/zbxsysinfo/unknown/Makefile.am (+1/-12)
src/libs/zbxsysinfo/unknown/Makefile.in (+4/-174)
src/libs/zbxsysinfo/unknown/cpu.c (+0/-465)
src/libs/zbxsysinfo/unknown/diskio.c (+0/-157)
src/libs/zbxsysinfo/unknown/diskspace.c (+0/-171)
src/libs/zbxsysinfo/unknown/inodes.c (+0/-237)
src/libs/zbxsysinfo/unknown/kernel.c (+0/-78)
src/libs/zbxsysinfo/unknown/memory.c (+0/-408)
src/libs/zbxsysinfo/unknown/net.c (+0/-67)
src/libs/zbxsysinfo/unknown/proc.c (+0/-500)
src/libs/zbxsysinfo/unknown/sensors.c (+0/-116)
src/libs/zbxsysinfo/unknown/swap.c (+0/-333)
src/libs/zbxsysinfo/unknown/unknown.c (+4/-38)
src/libs/zbxsysinfo/unknown/uptime.c (+0/-120)
src/libs/zbxsysinfo/win32/cpu.c (+3/-34)
src/libs/zbxsysinfo/win32/diskio.c (+0/-24)
src/libs/zbxsysinfo/win32/diskspace.c (+5/-5)
src/libs/zbxsysinfo/win32/inodes.c (+0/-33)
src/libs/zbxsysinfo/win32/kernel.c (+0/-40)
src/libs/zbxsysinfo/win32/memory.c (+0/-2)
src/libs/zbxsysinfo/win32/net.c (+5/-32)
src/libs/zbxsysinfo/win32/pdhmon.c (+4/-4)
src/libs/zbxsysinfo/win32/proc.c (+20/-30)
src/libs/zbxsysinfo/win32/sensors.c (+0/-34)
src/libs/zbxsysinfo/win32/swap.c (+0/-22)
src/libs/zbxsysinfo/win32/win32.c (+4/-18)
src/libs/zbxwin32/service.c (+0/-1)
src/zabbix_agent/Makefile.am (+1/-1)
src/zabbix_agent/Makefile.in (+3/-2)
src/zabbix_agent/active.c (+1/-1)
src/zabbix_agent/cpustat.c (+109/-110)
src/zabbix_agent/cpustat.h (+23/-12)
src/zabbix_agent/diskdevices.c (+20/-8)
src/zabbix_agent/eventlog.c (+14/-12)
src/zabbix_agent/eventlog.h (+4/-4)
src/zabbix_agent/interfaces.c (+0/-1)
src/zabbix_agent/interfaces.h (+0/-1)
src/zabbix_agent/listener.c (+1/-1)
src/zabbix_agent/logfiles.c (+2/-2)
src/zabbix_agent/stats.c (+11/-16)
src/zabbix_agent/stats.h (+3/-3)
src/zabbix_agent/zabbix_agent.c (+9/-8)
src/zabbix_agent/zabbix_agent.h (+0/-23)
src/zabbix_agent/zabbix_agentd.c (+16/-12)
src/zabbix_agent/zbxconf.c (+27/-13)
src/zabbix_agent/zbxconf.h (+4/-2)
src/zabbix_get/Makefile.am (+2/-2)
src/zabbix_get/Makefile.in (+6/-5)
src/zabbix_get/zabbix_get.c (+15/-14)
src/zabbix_proxy/Makefile.in (+2/-1)
src/zabbix_proxy/datasender/Makefile.in (+2/-1)
src/zabbix_proxy/events.c (+1/-1)
src/zabbix_proxy/events.h (+1/-2)
src/zabbix_proxy/heart/Makefile.in (+2/-1)
src/zabbix_proxy/heart/heart.c (+9/-11)
src/zabbix_proxy/housekeeper/Makefile.in (+2/-1)
src/zabbix_proxy/housekeeper/housekeeper.c (+28/-12)
src/zabbix_proxy/proxy.c (+91/-65)
src/zabbix_proxy/proxyconfig/Makefile.in (+2/-1)
src/zabbix_sender/Makefile.am (+2/-2)
src/zabbix_sender/Makefile.in (+6/-5)
src/zabbix_sender/zabbix_sender.c (+89/-45)
src/zabbix_server/Makefile.am (+1/-7)
src/zabbix_server/Makefile.in (+5/-8)
src/zabbix_server/actions.c (+107/-104)
src/zabbix_server/actions.h (+0/-1)
src/zabbix_server/alerter/Makefile.in (+2/-1)
src/zabbix_server/alerter/alerter.c (+7/-5)
src/zabbix_server/dbconfig/Makefile.in (+2/-1)
src/zabbix_server/dbsyncer/Makefile.in (+2/-1)
src/zabbix_server/discoverer/Makefile.in (+2/-1)
src/zabbix_server/discoverer/discoverer.c (+63/-26)
src/zabbix_server/escalator/Makefile.in (+2/-1)
src/zabbix_server/escalator/escalator.c (+28/-86)
src/zabbix_server/events.c (+3/-3)
src/zabbix_server/events.h (+1/-2)
src/zabbix_server/housekeeper/Makefile.in (+2/-1)
src/zabbix_server/httppoller/Makefile.in (+2/-1)
src/zabbix_server/httppoller/httpmacro.c (+1/-4)
src/zabbix_server/httppoller/httpmacro.h (+1/-1)
src/zabbix_server/httppoller/httppoller.c (+11/-31)
src/zabbix_server/httppoller/httptest.c (+286/-362)
src/zabbix_server/httppoller/httptest.h (+23/-27)
src/zabbix_server/nodewatcher/Makefile.in (+2/-1)
src/zabbix_server/nodewatcher/history.c (+3/-2)
src/zabbix_server/nodewatcher/nodecomms.c (+0/-21)
src/zabbix_server/nodewatcher/nodecomms.h (+0/-1)
src/zabbix_server/nodewatcher/nodesender.c (+72/-41)
src/zabbix_server/nodewatcher/nodewatcher.c (+93/-13)
src/zabbix_server/nodewatcher/nodewatcher.h (+4/-1)
src/zabbix_server/operations.c (+27/-38)
src/zabbix_server/operations.h (+4/-7)
src/zabbix_server/pinger/Makefile.in (+2/-1)
src/zabbix_server/pinger/pinger.c (+109/-85)
src/zabbix_server/pinger/pinger.h (+1/-1)
src/zabbix_server/poller/Makefile.in (+2/-1)
src/zabbix_server/poller/checks_calculated.c (+27/-19)
src/zabbix_server/poller/checks_internal.c (+22/-22)
src/zabbix_server/poller/checks_ipmi.c (+46/-103)
src/zabbix_server/poller/checks_snmp.c (+8/-7)
src/zabbix_server/poller/checks_ssh.c (+32/-32)
src/zabbix_server/poller/checks_telnet.c (+5/-5)
src/zabbix_server/poller/poller.c (+174/-119)
src/zabbix_server/poller/poller.h (+1/-0)
src/zabbix_server/proxypoller/Makefile.in (+2/-1)
src/zabbix_server/proxypoller/proxypoller.c (+34/-10)
src/zabbix_server/server.c (+177/-124)
src/zabbix_server/timer/Makefile.in (+2/-1)
src/zabbix_server/timer/timer.c (+131/-55)
src/zabbix_server/trapper/Makefile.in (+2/-1)
src/zabbix_server/trapper/active.c (+0/-1)
src/zabbix_server/trapper/nodecommand.c (+1/-1)
src/zabbix_server/trapper/nodehistory.c (+67/-27)
src/zabbix_server/trapper/nodesync.c (+26/-0)
src/zabbix_server/trapper/trapper.c (+12/-11)
src/zabbix_server/utils/Makefile.in (+2/-1)
src/zabbix_server/watchdog/Makefile.in (+2/-1)
src/zabbix_server/watchdog/watchdog.c (+57/-40)
src/zabbix_server/watchdog/watchdog.h (+1/-1)
upgrades/Makefile.in (+2/-1)
To merge this branch: bzr merge lp:~dev-nigelj/ubuntu/oneiric/zabbix/721707
Reviewer Review Type Date Requested Status
Micah Gersten (community) Needs Fixing
Ubuntu branches Pending
Review via email: mp+59773@code.launchpad.net

This proposal has been superseded by a proposal from 2011-05-21.

Description of the change

Proposed Debian/Ubuntu merge, plus FTBFS fix that I've got from Gentoo's BTS & Upstream's BTS.

FTBFS patch will be sent to Debian shortly.

To post a comment you must log in.
Revision history for this message
Micah Gersten (micahg) wrote :

Thank you for contributing to Ubuntu Development. Could you please rebase this merge against 1.8.5-1 from Debian unstable? Also, could you please make one change per commit to make the review easier (i.e. merge from Debian in the first, then each change you make on top in separate commits)?

review: Needs Fixing

Unmerged revisions

36. By Nigel Jones

* ldap-linker-lp722300.patch: Fix FTBFS issues due to incorrect placement of
  linker arguments. (LP: #722300)
* Merge from debian unstable (LP: #721707). Remaining changes:
  - update build depend for mysql-transition
* Ignore release candidates via 'uscan' in debian/watch
  (closes: #599921)
* Added --with-ssh2 for SSH2 support during ./configure
  (closes: #609744)
* Fixed typo in debian/rules to properly build with libcurl support
  (closes: #613322)
* New upstream release
* Packaging repository moved to git.debian.org
* zabbix-proxy-pgsql and -mysql: Fix package description (Closes: #586961)
* debian/po/da.po: added (Closes: #585485)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.pc/applied-patches'
2--- .pc/applied-patches 2010-08-21 15:41:19 +0000
3+++ .pc/applied-patches 2011-05-03 12:56:01 +0000
4@@ -1,3 +1,4 @@
5 configure-no-lcrypt
6 nocrypto
7 no-swf-clock
8+ldap-linker-lp722300.patch
9
10=== modified file '.pc/configure-no-lcrypt/configure'
11--- .pc/configure-no-lcrypt/configure 2010-08-21 15:41:19 +0000
12+++ .pc/configure-no-lcrypt/configure 2011-05-03 12:56:01 +0000
13@@ -707,6 +707,11 @@
14 PROXY_FALSE
15 AGENT_TRUE
16 AGENT_FALSE
17+MYSQL_CONFIG
18+MYSQL_VERSION
19+MYSQL_CFLAGS
20+MYSQL_LDFLAGS
21+MYSQL_LIBS
22 ORACLE_OCI_VERSION
23 ORACLE_OCI_CFLAGS
24 ORACLE_OCI_LDFLAGS
25@@ -714,18 +719,13 @@
26 ORACLE_CPPFLAGS
27 ORACLE_LDFLAGS
28 ORACLE_LIBS
29-SQLITE3_CPPFLAGS
30-SQLITE3_LDFLAGS
31-SQLITE3_VERSION
32-MYSQL_CONFIG
33-MYSQL_VERSION
34-MYSQL_CFLAGS
35-MYSQL_LDFLAGS
36-MYSQL_LIBS
37 PG_CONFIG
38 POSTGRESQL_VERSION
39 POSTGRESQL_CPPFLAGS
40 POSTGRESQL_LDFLAGS
41+SQLITE3_CPPFLAGS
42+SQLITE3_LDFLAGS
43+SQLITE3_VERSION
44 DB_CPPFLAGS
45 DB_LDFLAGS
46 DB_LIBS
47@@ -1369,31 +1369,38 @@
48 --enable-dependency-tracking do not reject slow dependency extractors
49 --enable-static Build statically linked binaries
50 --enable-server Turn on build of server
51- --enable-proxy Turn on build of proxy server
52- --enable-agent Turn on build of agent
53+ --enable-proxy Turn on build of Zabbix proxy
54+ --enable-agent Turn on build of agent and client utilities
55 --enable-ipv6 Turn on support of IPv6
56
57 Optional Packages:
58 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
59 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
60+ --with-ibm-db2=[ARG] use IBM DB2 CLI from given sqllib directory
61+ (ARG=path); use /home/db2inst1/sqllib (ARG=yes);
62+ disable IBM DB2 support (ARG=no)
63+ --with-ibm-db2-include=[DIR]
64+ use IBM DB2 CLI headers from given path
65+ --with-ibm-db2-lib=[DIR]
66+ use IBM DB2 CLI libraries from given path
67+ --with-mysql[=ARG] use MySQL client library [default=no], optionally
68+ specify path to mysql_config
69 --with-oracle=[ARG] use Oracle OCI API from given Oracle home
70 (ARG=path); use existing ORACLE_HOME (ARG=yes);
71 disable Oracle OCI support (ARG=no)
72 --with-oracle-include=[DIR]
73 use Oracle OCI API headers from given path
74 --with-oracle-lib=[DIR] use Oracle OCI API libraries from given path
75+ --with-pgsql[=ARG] use PostgreSQL library [default=no], optionally
76+ specify path to pg_config
77 --with-sqlite3[=ARG] use SQLite 3 library [default=no], optionally
78 specify the prefix for sqlite3 library
79- --with-mysql[=ARG] use MySQL client library [default=no], optionally
80- specify path to mysql_config
81- --with-pgsql[=ARG] use PostgreSQL library [default=no], optionally
82- specify path to pg_config
83
84 If you want to use Jabber protocol for messaging:
85 --with-jabber[=DIR] Include Jabber support [default=no]. DIR is the
86 iksemel library install directory.
87 If you want to use cURL library:
88- --with-libcurl[=DIR] use cURL package [default=yes], optionally specify
89+ --with-libcurl[=DIR] use cURL package [default=no], optionally specify
90 path to curl-config
91
92 What ODBC driver do you want to use (please select only one):
93@@ -2204,7 +2211,7 @@
94
95 # Define the identity of the package.
96 PACKAGE=zabbix
97- VERSION=1.8.3
98+ VERSION=1.8.4
99
100
101 cat >>confdefs.h <<_ACEOF
102@@ -2472,6 +2479,7 @@
103
104
105
106+
107 ac_ext=c
108 ac_cpp='$CPP $CPPFLAGS'
109 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
110@@ -3689,6 +3697,7 @@
111
112
113
114+
115 ac_ext=c
116 ac_cpp='$CPP $CPPFLAGS'
117 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
118@@ -4959,175 +4968,6 @@
119 done
120
121
122-{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
123-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
124-if test "${ac_cv_c_const+set}" = set; then
125- echo $ECHO_N "(cached) $ECHO_C" >&6
126-else
127- cat >conftest.$ac_ext <<_ACEOF
128-/* confdefs.h. */
129-_ACEOF
130-cat confdefs.h >>conftest.$ac_ext
131-cat >>conftest.$ac_ext <<_ACEOF
132-/* end confdefs.h. */
133-
134-int
135-main ()
136-{
137-/* FIXME: Include the comments suggested by Paul. */
138-#ifndef __cplusplus
139- /* Ultrix mips cc rejects this. */
140- typedef int charset[2];
141- const charset cs;
142- /* SunOS 4.1.1 cc rejects this. */
143- char const *const *pcpcc;
144- char **ppc;
145- /* NEC SVR4.0.2 mips cc rejects this. */
146- struct point {int x, y;};
147- static struct point const zero = {0,0};
148- /* AIX XL C 1.02.0.0 rejects this.
149- It does not let you subtract one const X* pointer from another in
150- an arm of an if-expression whose if-part is not a constant
151- expression */
152- const char *g = "string";
153- pcpcc = &g + (g ? g-g : 0);
154- /* HPUX 7.0 cc rejects these. */
155- ++pcpcc;
156- ppc = (char**) pcpcc;
157- pcpcc = (char const *const *) ppc;
158- { /* SCO 3.2v4 cc rejects this. */
159- char *t;
160- char const *s = 0 ? (char *) 0 : (char const *) 0;
161-
162- *t++ = 0;
163- if (s) return 0;
164- }
165- { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
166- int x[] = {25, 17};
167- const int *foo = &x[0];
168- ++foo;
169- }
170- { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
171- typedef const int *iptr;
172- iptr p = 0;
173- ++p;
174- }
175- { /* AIX XL C 1.02.0.0 rejects this saying
176- "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
177- struct s { int j; const int *ap[3]; };
178- struct s *b; b->j = 5;
179- }
180- { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
181- const int foo = 10;
182- if (!foo) return 0;
183- }
184- return !cs[0] && !zero.x;
185-#endif
186-
187- ;
188- return 0;
189-}
190-_ACEOF
191-rm -f conftest.$ac_objext
192-if { (ac_try="$ac_compile"
193-case "(($ac_try" in
194- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
195- *) ac_try_echo=$ac_try;;
196-esac
197-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
198- (eval "$ac_compile") 2>conftest.er1
199- ac_status=$?
200- grep -v '^ *+' conftest.er1 >conftest.err
201- rm -f conftest.er1
202- cat conftest.err >&5
203- echo "$as_me:$LINENO: \$? = $ac_status" >&5
204- (exit $ac_status); } && {
205- test -z "$ac_c_werror_flag" ||
206- test ! -s conftest.err
207- } && test -s conftest.$ac_objext; then
208- ac_cv_c_const=yes
209-else
210- echo "$as_me: failed program was:" >&5
211-sed 's/^/| /' conftest.$ac_ext >&5
212-
213- ac_cv_c_const=no
214-fi
215-
216-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
217-fi
218-{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
219-echo "${ECHO_T}$ac_cv_c_const" >&6; }
220-if test $ac_cv_c_const = no; then
221-
222-cat >>confdefs.h <<\_ACEOF
223-#define const
224-_ACEOF
225-
226-fi
227-
228-{ echo "$as_me:$LINENO: checking for pid_t" >&5
229-echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; }
230-if test "${ac_cv_type_pid_t+set}" = set; then
231- echo $ECHO_N "(cached) $ECHO_C" >&6
232-else
233- cat >conftest.$ac_ext <<_ACEOF
234-/* confdefs.h. */
235-_ACEOF
236-cat confdefs.h >>conftest.$ac_ext
237-cat >>conftest.$ac_ext <<_ACEOF
238-/* end confdefs.h. */
239-$ac_includes_default
240-typedef pid_t ac__type_new_;
241-int
242-main ()
243-{
244-if ((ac__type_new_ *) 0)
245- return 0;
246-if (sizeof (ac__type_new_))
247- return 0;
248- ;
249- return 0;
250-}
251-_ACEOF
252-rm -f conftest.$ac_objext
253-if { (ac_try="$ac_compile"
254-case "(($ac_try" in
255- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
256- *) ac_try_echo=$ac_try;;
257-esac
258-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
259- (eval "$ac_compile") 2>conftest.er1
260- ac_status=$?
261- grep -v '^ *+' conftest.er1 >conftest.err
262- rm -f conftest.er1
263- cat conftest.err >&5
264- echo "$as_me:$LINENO: \$? = $ac_status" >&5
265- (exit $ac_status); } && {
266- test -z "$ac_c_werror_flag" ||
267- test ! -s conftest.err
268- } && test -s conftest.$ac_objext; then
269- ac_cv_type_pid_t=yes
270-else
271- echo "$as_me: failed program was:" >&5
272-sed 's/^/| /' conftest.$ac_ext >&5
273-
274- ac_cv_type_pid_t=no
275-fi
276-
277-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
278-fi
279-{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
280-echo "${ECHO_T}$ac_cv_type_pid_t" >&6; }
281-if test $ac_cv_type_pid_t = yes; then
282- :
283-else
284-
285-cat >>confdefs.h <<_ACEOF
286-#define pid_t int
287-_ACEOF
288-
289-fi
290-
291
292 { echo "$as_me:$LINENO: checking for library containing socket" >&5
293 echo $ECHO_N "checking for library containing socket... $ECHO_C" >&6; }
294@@ -5212,7 +5052,6 @@
295
296 fi
297
298-#Solaris SNMP requires this
299 { echo "$as_me:$LINENO: checking for library containing kstat_open" >&5
300 echo $ECHO_N "checking for library containing kstat_open... $ECHO_C" >&6; }
301 if test "${ac_cv_search_kstat_open+set}" = set; then
302@@ -5379,10 +5218,7 @@
303
304 fi
305
306-#AC_SEARCH_LIBS(__res_query, resolv bind socket)
307-#Solaris 8 requires this. It does not have symbol __res_query.
308-#AC_SEARCH_LIBS(res_query, resolv bind socket)
309-#Aix 6.x requires this
310+
311 { echo "$as_me:$LINENO: checking for library containing perfstat_memory_total" >&5
312 echo $ECHO_N "checking for library containing perfstat_memory_total... $ECHO_C" >&6; }
313 if test "${ac_cv_search_perfstat_memory_total+set}" = set; then
314@@ -5552,7 +5388,7 @@
315 test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
316
317 cat >>confdefs.h <<\_ACEOF
318-#define HAVE_DEVSTAT 1
319+#define HAVE_LIBDEVSTAT 1
320 _ACEOF
321
322 fi
323@@ -5639,10 +5475,99 @@
324 test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
325
326 cat >>confdefs.h <<\_ACEOF
327-#define HAVE_DEVSTAT 1
328-_ACEOF
329-
330-fi
331+#define HAVE_LIBDEVSTAT 1
332+_ACEOF
333+
334+fi
335+
336+
337+{ echo "$as_me:$LINENO: checking for library containing backtrace_symbols" >&5
338+echo $ECHO_N "checking for library containing backtrace_symbols... $ECHO_C" >&6; }
339+if test "${ac_cv_search_backtrace_symbols+set}" = set; then
340+ echo $ECHO_N "(cached) $ECHO_C" >&6
341+else
342+ ac_func_search_save_LIBS=$LIBS
343+cat >conftest.$ac_ext <<_ACEOF
344+/* confdefs.h. */
345+_ACEOF
346+cat confdefs.h >>conftest.$ac_ext
347+cat >>conftest.$ac_ext <<_ACEOF
348+/* end confdefs.h. */
349+
350+/* Override any GCC internal prototype to avoid an error.
351+ Use char because int might match the return type of a GCC
352+ builtin and then its argument prototype would still apply. */
353+#ifdef __cplusplus
354+extern "C"
355+#endif
356+char backtrace_symbols ();
357+int
358+main ()
359+{
360+return backtrace_symbols ();
361+ ;
362+ return 0;
363+}
364+_ACEOF
365+for ac_lib in '' execinfo; do
366+ if test -z "$ac_lib"; then
367+ ac_res="none required"
368+ else
369+ ac_res=-l$ac_lib
370+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
371+ fi
372+ rm -f conftest.$ac_objext conftest$ac_exeext
373+if { (ac_try="$ac_link"
374+case "(($ac_try" in
375+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
376+ *) ac_try_echo=$ac_try;;
377+esac
378+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
379+ (eval "$ac_link") 2>conftest.er1
380+ ac_status=$?
381+ grep -v '^ *+' conftest.er1 >conftest.err
382+ rm -f conftest.er1
383+ cat conftest.err >&5
384+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
385+ (exit $ac_status); } && {
386+ test -z "$ac_c_werror_flag" ||
387+ test ! -s conftest.err
388+ } && test -s conftest$ac_exeext &&
389+ $as_test_x conftest$ac_exeext; then
390+ ac_cv_search_backtrace_symbols=$ac_res
391+else
392+ echo "$as_me: failed program was:" >&5
393+sed 's/^/| /' conftest.$ac_ext >&5
394+
395+
396+fi
397+
398+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
399+ conftest$ac_exeext
400+ if test "${ac_cv_search_backtrace_symbols+set}" = set; then
401+ break
402+fi
403+done
404+if test "${ac_cv_search_backtrace_symbols+set}" = set; then
405+ :
406+else
407+ ac_cv_search_backtrace_symbols=no
408+fi
409+rm conftest.$ac_ext
410+LIBS=$ac_func_search_save_LIBS
411+fi
412+{ echo "$as_me:$LINENO: result: $ac_cv_search_backtrace_symbols" >&5
413+echo "${ECHO_T}$ac_cv_search_backtrace_symbols" >&6; }
414+ac_res=$ac_cv_search_backtrace_symbols
415+if test "$ac_res" != no; then
416+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
417+
418+cat >>confdefs.h <<\_ACEOF
419+#define HAVE_LIBEXECINFO 1
420+_ACEOF
421+
422+fi
423+
424
425
426 { echo "$as_me:$LINENO: checking for main in -lm" >&5
427@@ -6103,123 +6028,175 @@
428 fi
429 LIBS="${LIBS} ${RESOLV_LIBS}"
430
431-{ echo "$as_me:$LINENO: checking for union semun" >&5
432-echo $ECHO_N "checking for union semun... $ECHO_C" >&6; }
433-cat >conftest.$ac_ext <<_ACEOF
434-/* confdefs.h. */
435-_ACEOF
436-cat confdefs.h >>conftest.$ac_ext
437-cat >>conftest.$ac_ext <<_ACEOF
438-/* end confdefs.h. */
439-
440-#include <sys/types.h>
441-#include <sys/ipc.h>
442-#include <sys/sem.h>
443-
444-int
445-main ()
446-{
447-union semun foo;
448- ;
449- return 0;
450-}
451-_ACEOF
452-rm -f conftest.$ac_objext
453-if { (ac_try="$ac_compile"
454-case "(($ac_try" in
455- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
456- *) ac_try_echo=$ac_try;;
457-esac
458-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
459- (eval "$ac_compile") 2>conftest.er1
460- ac_status=$?
461- grep -v '^ *+' conftest.er1 >conftest.err
462- rm -f conftest.er1
463- cat conftest.err >&5
464- echo "$as_me:$LINENO: \$? = $ac_status" >&5
465- (exit $ac_status); } && {
466- test -z "$ac_c_werror_flag" ||
467- test ! -s conftest.err
468- } && test -s conftest.$ac_objext; then
469-
470-cat >>confdefs.h <<\_ACEOF
471-#define HAVE_SEMUN 1
472-_ACEOF
473-
474-{ echo "$as_me:$LINENO: result: yes" >&5
475-echo "${ECHO_T}yes" >&6; }
476-else
477- echo "$as_me: failed program was:" >&5
478-sed 's/^/| /' conftest.$ac_ext >&5
479-
480- { echo "$as_me:$LINENO: result: no" >&5
481-echo "${ECHO_T}no" >&6; }
482-fi
483-
484-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
485-
486-{ echo "$as_me:$LINENO: checking for long long format" >&5
487-echo $ECHO_N "checking for long long format... $ECHO_C" >&6; }
488-if test "$cross_compiling" = yes; then
489- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
490-See \`config.log' for more details." >&5
491-echo "$as_me: error: cannot run test program while cross compiling
492-See \`config.log' for more details." >&2;}
493- { (exit 1); exit 1; }; }
494-else
495- cat >conftest.$ac_ext <<_ACEOF
496-
497-#include <sys/types.h>
498-int main()
499-{
500- uint64_t i;
501-
502- sscanf("200000000010020" ,"%qu" ,&i);
503-
504- if(i == 200000000010020) return 0;
505- else return -1;
506-}
507-
508-_ACEOF
509-rm -f conftest$ac_exeext
510-if { (ac_try="$ac_link"
511-case "(($ac_try" in
512- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
513- *) ac_try_echo=$ac_try;;
514-esac
515-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
516- (eval "$ac_link") 2>&5
517- ac_status=$?
518- echo "$as_me:$LINENO: \$? = $ac_status" >&5
519- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
520- { (case "(($ac_try" in
521- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
522- *) ac_try_echo=$ac_try;;
523-esac
524-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
525- (eval "$ac_try") 2>&5
526- ac_status=$?
527- echo "$as_me:$LINENO: \$? = $ac_status" >&5
528- (exit $ac_status); }; }; then
529-
530-cat >>confdefs.h <<\_ACEOF
531-#define HAVE_LONG_LONG_QU 1
532-_ACEOF
533-
534-{ echo "$as_me:$LINENO: result: yes" >&5
535-echo "${ECHO_T}yes" >&6; }
536-else
537- echo "$as_me: program exited with status $ac_status" >&5
538-echo "$as_me: failed program was:" >&5
539-sed 's/^/| /' conftest.$ac_ext >&5
540-
541-( exit $ac_status )
542-{ echo "$as_me:$LINENO: result: no" >&5
543-echo "${ECHO_T}no" >&6; }
544-fi
545-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
546-fi
547-
548+
549+{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
550+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
551+if test "${ac_cv_c_const+set}" = set; then
552+ echo $ECHO_N "(cached) $ECHO_C" >&6
553+else
554+ cat >conftest.$ac_ext <<_ACEOF
555+/* confdefs.h. */
556+_ACEOF
557+cat confdefs.h >>conftest.$ac_ext
558+cat >>conftest.$ac_ext <<_ACEOF
559+/* end confdefs.h. */
560+
561+int
562+main ()
563+{
564+/* FIXME: Include the comments suggested by Paul. */
565+#ifndef __cplusplus
566+ /* Ultrix mips cc rejects this. */
567+ typedef int charset[2];
568+ const charset cs;
569+ /* SunOS 4.1.1 cc rejects this. */
570+ char const *const *pcpcc;
571+ char **ppc;
572+ /* NEC SVR4.0.2 mips cc rejects this. */
573+ struct point {int x, y;};
574+ static struct point const zero = {0,0};
575+ /* AIX XL C 1.02.0.0 rejects this.
576+ It does not let you subtract one const X* pointer from another in
577+ an arm of an if-expression whose if-part is not a constant
578+ expression */
579+ const char *g = "string";
580+ pcpcc = &g + (g ? g-g : 0);
581+ /* HPUX 7.0 cc rejects these. */
582+ ++pcpcc;
583+ ppc = (char**) pcpcc;
584+ pcpcc = (char const *const *) ppc;
585+ { /* SCO 3.2v4 cc rejects this. */
586+ char *t;
587+ char const *s = 0 ? (char *) 0 : (char const *) 0;
588+
589+ *t++ = 0;
590+ if (s) return 0;
591+ }
592+ { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
593+ int x[] = {25, 17};
594+ const int *foo = &x[0];
595+ ++foo;
596+ }
597+ { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
598+ typedef const int *iptr;
599+ iptr p = 0;
600+ ++p;
601+ }
602+ { /* AIX XL C 1.02.0.0 rejects this saying
603+ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
604+ struct s { int j; const int *ap[3]; };
605+ struct s *b; b->j = 5;
606+ }
607+ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
608+ const int foo = 10;
609+ if (!foo) return 0;
610+ }
611+ return !cs[0] && !zero.x;
612+#endif
613+
614+ ;
615+ return 0;
616+}
617+_ACEOF
618+rm -f conftest.$ac_objext
619+if { (ac_try="$ac_compile"
620+case "(($ac_try" in
621+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
622+ *) ac_try_echo=$ac_try;;
623+esac
624+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
625+ (eval "$ac_compile") 2>conftest.er1
626+ ac_status=$?
627+ grep -v '^ *+' conftest.er1 >conftest.err
628+ rm -f conftest.er1
629+ cat conftest.err >&5
630+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
631+ (exit $ac_status); } && {
632+ test -z "$ac_c_werror_flag" ||
633+ test ! -s conftest.err
634+ } && test -s conftest.$ac_objext; then
635+ ac_cv_c_const=yes
636+else
637+ echo "$as_me: failed program was:" >&5
638+sed 's/^/| /' conftest.$ac_ext >&5
639+
640+ ac_cv_c_const=no
641+fi
642+
643+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
644+fi
645+{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
646+echo "${ECHO_T}$ac_cv_c_const" >&6; }
647+if test $ac_cv_c_const = no; then
648+
649+cat >>confdefs.h <<\_ACEOF
650+#define const
651+_ACEOF
652+
653+fi
654+
655+{ echo "$as_me:$LINENO: checking for pid_t" >&5
656+echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; }
657+if test "${ac_cv_type_pid_t+set}" = set; then
658+ echo $ECHO_N "(cached) $ECHO_C" >&6
659+else
660+ cat >conftest.$ac_ext <<_ACEOF
661+/* confdefs.h. */
662+_ACEOF
663+cat confdefs.h >>conftest.$ac_ext
664+cat >>conftest.$ac_ext <<_ACEOF
665+/* end confdefs.h. */
666+$ac_includes_default
667+typedef pid_t ac__type_new_;
668+int
669+main ()
670+{
671+if ((ac__type_new_ *) 0)
672+ return 0;
673+if (sizeof (ac__type_new_))
674+ return 0;
675+ ;
676+ return 0;
677+}
678+_ACEOF
679+rm -f conftest.$ac_objext
680+if { (ac_try="$ac_compile"
681+case "(($ac_try" in
682+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
683+ *) ac_try_echo=$ac_try;;
684+esac
685+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
686+ (eval "$ac_compile") 2>conftest.er1
687+ ac_status=$?
688+ grep -v '^ *+' conftest.er1 >conftest.err
689+ rm -f conftest.er1
690+ cat conftest.err >&5
691+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
692+ (exit $ac_status); } && {
693+ test -z "$ac_c_werror_flag" ||
694+ test ! -s conftest.err
695+ } && test -s conftest.$ac_objext; then
696+ ac_cv_type_pid_t=yes
697+else
698+ echo "$as_me: failed program was:" >&5
699+sed 's/^/| /' conftest.$ac_ext >&5
700+
701+ ac_cv_type_pid_t=no
702+fi
703+
704+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
705+fi
706+{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
707+echo "${ECHO_T}$ac_cv_type_pid_t" >&6; }
708+if test $ac_cv_type_pid_t = yes; then
709+ :
710+else
711+
712+cat >>confdefs.h <<_ACEOF
713+#define pid_t int
714+_ACEOF
715+
716+fi
717
718
719 { echo "$as_me:$LINENO: checking for socklen_t" >&5
720@@ -6352,448 +6329,63 @@
721 echo "${ECHO_T}leaving undefined" >&6; }
722 fi
723
724-{ echo "$as_me:$LINENO: checking for /proc filesystem" >&5
725-echo $ECHO_N "checking for /proc filesystem... $ECHO_C" >&6; }
726-if test -d /proc; then
727- { echo "$as_me:$LINENO: result: yes" >&5
728-echo "${ECHO_T}yes" >&6; }
729-
730-cat >>confdefs.h <<\_ACEOF
731-#define HAVE_PROC 1
732-_ACEOF
733-
734-else
735- { echo "$as_me:$LINENO: result: no" >&5
736-echo "${ECHO_T}no" >&6; }
737-fi
738-
739-{ echo "$as_me:$LINENO: checking for file /proc/stat" >&5
740-echo $ECHO_N "checking for file /proc/stat... $ECHO_C" >&6; }
741-if test -r /proc/stat; then
742- { echo "$as_me:$LINENO: result: yes" >&5
743-echo "${ECHO_T}yes" >&6; }
744-
745-cat >>confdefs.h <<\_ACEOF
746-#define HAVE_PROC_STAT 1
747-_ACEOF
748-
749-else
750- { echo "$as_me:$LINENO: result: no" >&5
751-echo "${ECHO_T}no" >&6; }
752-fi
753-
754-{ echo "$as_me:$LINENO: checking for file /proc/cpuinfo" >&5
755-echo $ECHO_N "checking for file /proc/cpuinfo... $ECHO_C" >&6; }
756-if test -r /proc/cpuinfo; then
757- { echo "$as_me:$LINENO: result: yes" >&5
758-echo "${ECHO_T}yes" >&6; }
759-
760-cat >>confdefs.h <<\_ACEOF
761-#define HAVE_PROC_CPUINFO 1
762-_ACEOF
763-
764-else
765- { echo "$as_me:$LINENO: result: no" >&5
766-echo "${ECHO_T}no" >&6; }
767-fi
768-
769-{ echo "$as_me:$LINENO: checking for file /proc/1/status" >&5
770-echo $ECHO_N "checking for file /proc/1/status... $ECHO_C" >&6; }
771-if test -r /proc/1/status; then
772- { echo "$as_me:$LINENO: result: yes" >&5
773-echo "${ECHO_T}yes" >&6; }
774-
775-cat >>confdefs.h <<\_ACEOF
776-#define HAVE_PROC_1_STATUS 1
777-_ACEOF
778-
779-else
780- { echo "$as_me:$LINENO: result: no" >&5
781-echo "${ECHO_T}no" >&6; }
782-fi
783-
784-{ echo "$as_me:$LINENO: checking for file /proc/0/psinfo" >&5
785-echo $ECHO_N "checking for file /proc/0/psinfo... $ECHO_C" >&6; }
786-if test -r /proc/0/psinfo; then
787- { echo "$as_me:$LINENO: result: yes" >&5
788-echo "${ECHO_T}yes" >&6; }
789-
790-cat >>confdefs.h <<\_ACEOF
791-#define HAVE_PROC_0_PSINFO 1
792-_ACEOF
793-
794-else
795- { echo "$as_me:$LINENO: result: no" >&5
796-echo "${ECHO_T}no" >&6; }
797-fi
798-
799-{ echo "$as_me:$LINENO: checking for file /proc/loadavg" >&5
800-echo $ECHO_N "checking for file /proc/loadavg... $ECHO_C" >&6; }
801-if test -r /proc/loadavg; then
802- { echo "$as_me:$LINENO: result: yes" >&5
803-echo "${ECHO_T}yes" >&6; }
804-
805-cat >>confdefs.h <<\_ACEOF
806-#define HAVE_PROC_LOADAVG 1
807-_ACEOF
808-
809-else
810- { echo "$as_me:$LINENO: result: no" >&5
811-echo "${ECHO_T}no" >&6; }
812-fi
813-
814-{ echo "$as_me:$LINENO: checking for file /proc/net/dev" >&5
815-echo $ECHO_N "checking for file /proc/net/dev... $ECHO_C" >&6; }
816-if test -r /proc/net/dev; then
817- { echo "$as_me:$LINENO: result: yes" >&5
818-echo "${ECHO_T}yes" >&6; }
819-
820-cat >>confdefs.h <<\_ACEOF
821-#define HAVE_PROC_NET_DEV 1
822-_ACEOF
823-
824-else
825- { echo "$as_me:$LINENO: result: no" >&5
826-echo "${ECHO_T}no" >&6; }
827-fi
828-
829-{ echo "$as_me:$LINENO: checking for mem_unit in struct sysinfo" >&5
830-echo $ECHO_N "checking for mem_unit in struct sysinfo... $ECHO_C" >&6; }
831-cat >conftest.$ac_ext <<_ACEOF
832-/* confdefs.h. */
833-_ACEOF
834-cat confdefs.h >>conftest.$ac_ext
835-cat >>conftest.$ac_ext <<_ACEOF
836-/* end confdefs.h. */
837-#include <sys/sysinfo.h>
838-int
839-main ()
840-{
841-struct sysinfo sysinfo;
842-sysinfo.mem_unit=0;
843-
844- ;
845- return 0;
846-}
847-_ACEOF
848-rm -f conftest.$ac_objext
849-if { (ac_try="$ac_compile"
850-case "(($ac_try" in
851- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
852- *) ac_try_echo=$ac_try;;
853-esac
854-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
855- (eval "$ac_compile") 2>conftest.er1
856- ac_status=$?
857- grep -v '^ *+' conftest.er1 >conftest.err
858- rm -f conftest.er1
859- cat conftest.err >&5
860- echo "$as_me:$LINENO: \$? = $ac_status" >&5
861- (exit $ac_status); } && {
862- test -z "$ac_c_werror_flag" ||
863- test ! -s conftest.err
864- } && test -s conftest.$ac_objext; then
865-
866-cat >>confdefs.h <<\_ACEOF
867-#define HAVE_SYSINFO_MEM_UNIT 1
868-_ACEOF
869-
870-{ echo "$as_me:$LINENO: result: yes" >&5
871-echo "${ECHO_T}yes" >&6; }
872-else
873- echo "$as_me: failed program was:" >&5
874-sed 's/^/| /' conftest.$ac_ext >&5
875-
876- { echo "$as_me:$LINENO: result: no" >&5
877-echo "${ECHO_T}no" >&6; }
878-fi
879-
880-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
881-
882-{ echo "$as_me:$LINENO: checking for freeswap in struct sysinfo" >&5
883-echo $ECHO_N "checking for freeswap in struct sysinfo... $ECHO_C" >&6; }
884-cat >conftest.$ac_ext <<_ACEOF
885-/* confdefs.h. */
886-_ACEOF
887-cat confdefs.h >>conftest.$ac_ext
888-cat >>conftest.$ac_ext <<_ACEOF
889-/* end confdefs.h. */
890-#include <sys/sysinfo.h>
891-int
892-main ()
893-{
894-struct sysinfo sysinfo;
895-sysinfo.freeswap=0;
896-
897- ;
898- return 0;
899-}
900-_ACEOF
901-rm -f conftest.$ac_objext
902-if { (ac_try="$ac_compile"
903-case "(($ac_try" in
904- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
905- *) ac_try_echo=$ac_try;;
906-esac
907-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
908- (eval "$ac_compile") 2>conftest.er1
909- ac_status=$?
910- grep -v '^ *+' conftest.er1 >conftest.err
911- rm -f conftest.er1
912- cat conftest.err >&5
913- echo "$as_me:$LINENO: \$? = $ac_status" >&5
914- (exit $ac_status); } && {
915- test -z "$ac_c_werror_flag" ||
916- test ! -s conftest.err
917- } && test -s conftest.$ac_objext; then
918-
919-cat >>confdefs.h <<\_ACEOF
920-#define HAVE_SYSINFO_FREESWAP 1
921-_ACEOF
922-
923-{ echo "$as_me:$LINENO: result: yes" >&5
924-echo "${ECHO_T}yes" >&6; }
925-else
926- echo "$as_me: failed program was:" >&5
927-sed 's/^/| /' conftest.$ac_ext >&5
928-
929- { echo "$as_me:$LINENO: result: no" >&5
930-echo "${ECHO_T}no" >&6; }
931-fi
932-
933-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
934-
935-{ echo "$as_me:$LINENO: checking for AIX OS level 5300-06" >&5
936-echo $ECHO_N "checking for AIX OS level 5300-06... $ECHO_C" >&6; }
937-cat >conftest.$ac_ext <<_ACEOF
938-/* confdefs.h. */
939-_ACEOF
940-cat confdefs.h >>conftest.$ac_ext
941-cat >>conftest.$ac_ext <<_ACEOF
942-/* end confdefs.h. */
943-#include <libperfstat.h>
944-int
945-main ()
946-{
947-perfstat_partition_total_t lparstats;
948-lparstats.type.b.donate_enabled = 0;
949-lparstats.idle_donated_purr = 0;
950-lparstats.busy_donated_purr = 0;
951-lparstats.idle_stolen_purr = 0;
952-lparstats.busy_stolen_purr = 0;
953-
954- ;
955- return 0;
956-}
957-_ACEOF
958-rm -f conftest.$ac_objext
959-if { (ac_try="$ac_compile"
960-case "(($ac_try" in
961- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
962- *) ac_try_echo=$ac_try;;
963-esac
964-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
965- (eval "$ac_compile") 2>conftest.er1
966- ac_status=$?
967- grep -v '^ *+' conftest.er1 >conftest.err
968- rm -f conftest.er1
969- cat conftest.err >&5
970- echo "$as_me:$LINENO: \$? = $ac_status" >&5
971- (exit $ac_status); } && {
972- test -z "$ac_c_werror_flag" ||
973- test ! -s conftest.err
974- } && test -s conftest.$ac_objext; then
975-
976-cat >>confdefs.h <<\_ACEOF
977-#define HAVE_AIXOSLEVEL_530006 1
978-_ACEOF
979-
980-{ echo "$as_me:$LINENO: result: yes" >&5
981-echo "${ECHO_T}yes" >&6; }
982-else
983- echo "$as_me: failed program was:" >&5
984-sed 's/^/| /' conftest.$ac_ext >&5
985-
986- { echo "$as_me:$LINENO: result: no" >&5
987-echo "${ECHO_T}no" >&6; }
988-fi
989-
990-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
991-
992-{ echo "$as_me:$LINENO: checking for function setpriority() in sys/resource.h" >&5
993-echo $ECHO_N "checking for function setpriority() in sys/resource.h... $ECHO_C" >&6; }
994-cat >conftest.$ac_ext <<_ACEOF
995-/* confdefs.h. */
996-_ACEOF
997-cat confdefs.h >>conftest.$ac_ext
998-cat >>conftest.$ac_ext <<_ACEOF
999-/* end confdefs.h. */
1000-
1001-#include <sys/time.h>
1002-#include <sys/resource.h>
1003-
1004-int
1005-main ()
1006-{
1007- int i;
1008-
1009- i=setpriority(PRIO_PROCESS,0,5);
1010-
1011- ;
1012- return 0;
1013-}
1014-_ACEOF
1015-rm -f conftest.$ac_objext
1016-if { (ac_try="$ac_compile"
1017-case "(($ac_try" in
1018- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1019- *) ac_try_echo=$ac_try;;
1020-esac
1021-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1022- (eval "$ac_compile") 2>conftest.er1
1023- ac_status=$?
1024- grep -v '^ *+' conftest.er1 >conftest.err
1025- rm -f conftest.er1
1026- cat conftest.err >&5
1027- echo "$as_me:$LINENO: \$? = $ac_status" >&5
1028- (exit $ac_status); } && {
1029- test -z "$ac_c_werror_flag" ||
1030- test ! -s conftest.err
1031- } && test -s conftest.$ac_objext; then
1032-
1033-cat >>confdefs.h <<\_ACEOF
1034-#define HAVE_SYS_RESOURCE_SETPRIORITY 1
1035-_ACEOF
1036-
1037-{ echo "$as_me:$LINENO: result: yes" >&5
1038-echo "${ECHO_T}yes" >&6; }
1039-else
1040- echo "$as_me: failed program was:" >&5
1041-sed 's/^/| /' conftest.$ac_ext >&5
1042-
1043- { echo "$as_me:$LINENO: result: no" >&5
1044-echo "${ECHO_T}no" >&6; }
1045-fi
1046-
1047-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1048-
1049-{ echo "$as_me:$LINENO: checking for function sysconf() in unistd.h" >&5
1050-echo $ECHO_N "checking for function sysconf() in unistd.h... $ECHO_C" >&6; }
1051-cat >conftest.$ac_ext <<_ACEOF
1052-/* confdefs.h. */
1053-_ACEOF
1054-cat confdefs.h >>conftest.$ac_ext
1055-cat >>conftest.$ac_ext <<_ACEOF
1056-/* end confdefs.h. */
1057-
1058-#include <unistd.h>
1059-
1060-int
1061-main ()
1062-{
1063- int i;
1064-
1065- i=sysconf(_SC_PHYS_PAGES)*sysconf(_SC_PHYS_PAGES);
1066- i=sysconf(_SC_AVPHYS_PAGES)*sysconf(_SC_PHYS_PAGES);
1067-
1068- ;
1069- return 0;
1070-}
1071-_ACEOF
1072-rm -f conftest.$ac_objext
1073-if { (ac_try="$ac_compile"
1074-case "(($ac_try" in
1075- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1076- *) ac_try_echo=$ac_try;;
1077-esac
1078-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1079- (eval "$ac_compile") 2>conftest.er1
1080- ac_status=$?
1081- grep -v '^ *+' conftest.er1 >conftest.err
1082- rm -f conftest.er1
1083- cat conftest.err >&5
1084- echo "$as_me:$LINENO: \$? = $ac_status" >&5
1085- (exit $ac_status); } && {
1086- test -z "$ac_c_werror_flag" ||
1087- test ! -s conftest.err
1088- } && test -s conftest.$ac_objext; then
1089-
1090-cat >>confdefs.h <<\_ACEOF
1091-#define HAVE_UNISTD_SYSCONF 1
1092-_ACEOF
1093-
1094-{ echo "$as_me:$LINENO: result: yes" >&5
1095-echo "${ECHO_T}yes" >&6; }
1096-else
1097- echo "$as_me: failed program was:" >&5
1098-sed 's/^/| /' conftest.$ac_ext >&5
1099-
1100- { echo "$as_me:$LINENO: result: no" >&5
1101-echo "${ECHO_T}no" >&6; }
1102-fi
1103-
1104-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1105-
1106-{ echo "$as_me:$LINENO: checking for macro __va_copy() in stdarg.h" >&5
1107-echo $ECHO_N "checking for macro __va_copy() in stdarg.h... $ECHO_C" >&6; }
1108-cat >conftest.$ac_ext <<_ACEOF
1109-/* confdefs.h. */
1110-_ACEOF
1111-cat confdefs.h >>conftest.$ac_ext
1112-cat >>conftest.$ac_ext <<_ACEOF
1113-/* end confdefs.h. */
1114-
1115-#include <stdarg.h>
1116-
1117-int
1118-main ()
1119-{
1120-
1121- va_list src,dst;
1122-
1123-
1124- __va_copy(dst,src);
1125-
1126- ;
1127- return 0;
1128-}
1129-_ACEOF
1130-rm -f conftest.$ac_objext
1131-if { (ac_try="$ac_compile"
1132-case "(($ac_try" in
1133- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1134- *) ac_try_echo=$ac_try;;
1135-esac
1136-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1137- (eval "$ac_compile") 2>conftest.er1
1138- ac_status=$?
1139- grep -v '^ *+' conftest.er1 >conftest.err
1140- rm -f conftest.er1
1141- cat conftest.err >&5
1142- echo "$as_me:$LINENO: \$? = $ac_status" >&5
1143- (exit $ac_status); } && {
1144- test -z "$ac_c_werror_flag" ||
1145- test ! -s conftest.err
1146- } && test -s conftest.$ac_objext; then
1147-
1148-cat >>confdefs.h <<\_ACEOF
1149-#define HAVE___VA_COPY 1
1150-_ACEOF
1151-
1152-{ echo "$as_me:$LINENO: result: yes" >&5
1153-echo "${ECHO_T}yes" >&6; }
1154-else
1155- echo "$as_me: failed program was:" >&5
1156-sed 's/^/| /' conftest.$ac_ext >&5
1157-
1158- { echo "$as_me:$LINENO: result: no" >&5
1159-echo "${ECHO_T}no" >&6; }
1160-fi
1161-
1162-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1163-
1164-{ echo "$as_me:$LINENO: checking for vmtotal in struct sys/vmmeter.h" >&5
1165-echo $ECHO_N "checking for vmtotal in struct sys/vmmeter.h... $ECHO_C" >&6; }
1166+{ echo "$as_me:$LINENO: checking for union semun" >&5
1167+echo $ECHO_N "checking for union semun... $ECHO_C" >&6; }
1168+cat >conftest.$ac_ext <<_ACEOF
1169+/* confdefs.h. */
1170+_ACEOF
1171+cat confdefs.h >>conftest.$ac_ext
1172+cat >>conftest.$ac_ext <<_ACEOF
1173+/* end confdefs.h. */
1174+
1175+#include <sys/types.h>
1176+#include <sys/ipc.h>
1177+#include <sys/sem.h>
1178+
1179+int
1180+main ()
1181+{
1182+union semun foo;
1183+ ;
1184+ return 0;
1185+}
1186+_ACEOF
1187+rm -f conftest.$ac_objext
1188+if { (ac_try="$ac_compile"
1189+case "(($ac_try" in
1190+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1191+ *) ac_try_echo=$ac_try;;
1192+esac
1193+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1194+ (eval "$ac_compile") 2>conftest.er1
1195+ ac_status=$?
1196+ grep -v '^ *+' conftest.er1 >conftest.err
1197+ rm -f conftest.er1
1198+ cat conftest.err >&5
1199+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
1200+ (exit $ac_status); } && {
1201+ test -z "$ac_c_werror_flag" ||
1202+ test ! -s conftest.err
1203+ } && test -s conftest.$ac_objext; then
1204+
1205+cat >>confdefs.h <<\_ACEOF
1206+#define HAVE_SEMUN 1
1207+_ACEOF
1208+
1209+{ echo "$as_me:$LINENO: result: yes" >&5
1210+echo "${ECHO_T}yes" >&6; }
1211+else
1212+ echo "$as_me: failed program was:" >&5
1213+sed 's/^/| /' conftest.$ac_ext >&5
1214+
1215+ { echo "$as_me:$LINENO: result: no" >&5
1216+echo "${ECHO_T}no" >&6; }
1217+fi
1218+
1219+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1220+
1221+{ echo "$as_me:$LINENO: checking for struct vmtotal in sys/vmmeter.h" >&5
1222+echo $ECHO_N "checking for struct vmtotal in sys/vmmeter.h... $ECHO_C" >&6; }
1223 cat >conftest.$ac_ext <<_ACEOF
1224 /* confdefs.h. */
1225 _ACEOF
1226@@ -6873,8 +6465,8 @@
1227
1228 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1229
1230-{ echo "$as_me:$LINENO: checking for uvmexp_sysctl in struct uvm/uvm_extern.h" >&5
1231-echo $ECHO_N "checking for uvmexp_sysctl in struct uvm/uvm_extern.h... $ECHO_C" >&6; }
1232+{ echo "$as_me:$LINENO: checking for struct uvmexp_sysctl in uvm/uvm_extern.h" >&5
1233+echo $ECHO_N "checking for struct uvmexp_sysctl in uvm/uvm_extern.h... $ECHO_C" >&6; }
1234 cat >conftest.$ac_ext <<_ACEOF
1235 /* confdefs.h. */
1236 _ACEOF
1237@@ -6954,8 +6546,8 @@
1238
1239 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1240
1241-{ echo "$as_me:$LINENO: checking for uvmexp in struct uvm/uvm_extern.h" >&5
1242-echo $ECHO_N "checking for uvmexp in struct uvm/uvm_extern.h... $ECHO_C" >&6; }
1243+{ echo "$as_me:$LINENO: checking for struct uvmexp in uvm/uvm_extern.h" >&5
1244+echo $ECHO_N "checking for struct uvmexp in uvm/uvm_extern.h... $ECHO_C" >&6; }
1245 cat >conftest.$ac_ext <<_ACEOF
1246 /* confdefs.h. */
1247 _ACEOF
1248@@ -7075,7 +6667,7 @@
1249 }
1250 swt->swt_n = cnt;
1251
1252- /* fill in ste_path pointers: we don't care about the paths, so we
1253+ /* fill in ste_path pointers: we do not care about the paths, so we
1254 point
1255 them all to the same buffer */
1256 ste = &(swt->swt_ent[0]);
1257@@ -7094,7 +6686,7 @@
1258 i = cnt;
1259 while (--i >= 0)
1260 {
1261- /* don't count slots being deleted */
1262+ /* do not count slots being deleted */
1263 if (!(ste->ste_flags & ST_INDEL) &&
1264 !(ste->ste_flags & ST_DOINGDEL))
1265 {
1266@@ -7145,8 +6737,171 @@
1267
1268 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1269
1270-{ echo "$as_me:$LINENO: checking for totalswap in struct sysinfo" >&5
1271-echo $ECHO_N "checking for totalswap in struct sysinfo... $ECHO_C" >&6; }
1272+{ echo "$as_me:$LINENO: checking for struct sensordev in sys/sensors.h" >&5
1273+echo $ECHO_N "checking for struct sensordev in sys/sensors.h... $ECHO_C" >&6; }
1274+cat >conftest.$ac_ext <<_ACEOF
1275+/* confdefs.h. */
1276+_ACEOF
1277+cat confdefs.h >>conftest.$ac_ext
1278+cat >>conftest.$ac_ext <<_ACEOF
1279+/* end confdefs.h. */
1280+
1281+#include <stdlib.h>
1282+#include <sys/queue.h>
1283+#include <sys/sensors.h>
1284+int
1285+main ()
1286+{
1287+struct sensordev sensordev;
1288+sensordev.xname[0]='\0';
1289+sensordev.maxnumt[0]=0;
1290+
1291+ ;
1292+ return 0;
1293+}
1294+_ACEOF
1295+rm -f conftest.$ac_objext
1296+if { (ac_try="$ac_compile"
1297+case "(($ac_try" in
1298+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1299+ *) ac_try_echo=$ac_try;;
1300+esac
1301+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1302+ (eval "$ac_compile") 2>conftest.er1
1303+ ac_status=$?
1304+ grep -v '^ *+' conftest.er1 >conftest.err
1305+ rm -f conftest.er1
1306+ cat conftest.err >&5
1307+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
1308+ (exit $ac_status); } && {
1309+ test -z "$ac_c_werror_flag" ||
1310+ test ! -s conftest.err
1311+ } && test -s conftest.$ac_objext; then
1312+
1313+cat >>confdefs.h <<\_ACEOF
1314+#define HAVE_SENSORDEV 1
1315+_ACEOF
1316+
1317+{ echo "$as_me:$LINENO: result: yes" >&5
1318+echo "${ECHO_T}yes" >&6; }
1319+else
1320+ echo "$as_me: failed program was:" >&5
1321+sed 's/^/| /' conftest.$ac_ext >&5
1322+
1323+ { echo "$as_me:$LINENO: result: no" >&5
1324+echo "${ECHO_T}no" >&6; }
1325+fi
1326+
1327+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1328+
1329+{ echo "$as_me:$LINENO: checking for field mem_unit in struct sysinfo" >&5
1330+echo $ECHO_N "checking for field mem_unit in struct sysinfo... $ECHO_C" >&6; }
1331+cat >conftest.$ac_ext <<_ACEOF
1332+/* confdefs.h. */
1333+_ACEOF
1334+cat confdefs.h >>conftest.$ac_ext
1335+cat >>conftest.$ac_ext <<_ACEOF
1336+/* end confdefs.h. */
1337+#include <sys/sysinfo.h>
1338+int
1339+main ()
1340+{
1341+struct sysinfo sysinfo;
1342+sysinfo.mem_unit=0;
1343+
1344+ ;
1345+ return 0;
1346+}
1347+_ACEOF
1348+rm -f conftest.$ac_objext
1349+if { (ac_try="$ac_compile"
1350+case "(($ac_try" in
1351+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1352+ *) ac_try_echo=$ac_try;;
1353+esac
1354+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1355+ (eval "$ac_compile") 2>conftest.er1
1356+ ac_status=$?
1357+ grep -v '^ *+' conftest.er1 >conftest.err
1358+ rm -f conftest.er1
1359+ cat conftest.err >&5
1360+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
1361+ (exit $ac_status); } && {
1362+ test -z "$ac_c_werror_flag" ||
1363+ test ! -s conftest.err
1364+ } && test -s conftest.$ac_objext; then
1365+
1366+cat >>confdefs.h <<\_ACEOF
1367+#define HAVE_SYSINFO_MEM_UNIT 1
1368+_ACEOF
1369+
1370+{ echo "$as_me:$LINENO: result: yes" >&5
1371+echo "${ECHO_T}yes" >&6; }
1372+else
1373+ echo "$as_me: failed program was:" >&5
1374+sed 's/^/| /' conftest.$ac_ext >&5
1375+
1376+ { echo "$as_me:$LINENO: result: no" >&5
1377+echo "${ECHO_T}no" >&6; }
1378+fi
1379+
1380+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1381+
1382+{ echo "$as_me:$LINENO: checking for field freeswap in struct sysinfo" >&5
1383+echo $ECHO_N "checking for field freeswap in struct sysinfo... $ECHO_C" >&6; }
1384+cat >conftest.$ac_ext <<_ACEOF
1385+/* confdefs.h. */
1386+_ACEOF
1387+cat confdefs.h >>conftest.$ac_ext
1388+cat >>conftest.$ac_ext <<_ACEOF
1389+/* end confdefs.h. */
1390+#include <sys/sysinfo.h>
1391+int
1392+main ()
1393+{
1394+struct sysinfo sysinfo;
1395+sysinfo.freeswap=0;
1396+
1397+ ;
1398+ return 0;
1399+}
1400+_ACEOF
1401+rm -f conftest.$ac_objext
1402+if { (ac_try="$ac_compile"
1403+case "(($ac_try" in
1404+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1405+ *) ac_try_echo=$ac_try;;
1406+esac
1407+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1408+ (eval "$ac_compile") 2>conftest.er1
1409+ ac_status=$?
1410+ grep -v '^ *+' conftest.er1 >conftest.err
1411+ rm -f conftest.er1
1412+ cat conftest.err >&5
1413+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
1414+ (exit $ac_status); } && {
1415+ test -z "$ac_c_werror_flag" ||
1416+ test ! -s conftest.err
1417+ } && test -s conftest.$ac_objext; then
1418+
1419+cat >>confdefs.h <<\_ACEOF
1420+#define HAVE_SYSINFO_FREESWAP 1
1421+_ACEOF
1422+
1423+{ echo "$as_me:$LINENO: result: yes" >&5
1424+echo "${ECHO_T}yes" >&6; }
1425+else
1426+ echo "$as_me: failed program was:" >&5
1427+sed 's/^/| /' conftest.$ac_ext >&5
1428+
1429+ { echo "$as_me:$LINENO: result: no" >&5
1430+echo "${ECHO_T}no" >&6; }
1431+fi
1432+
1433+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1434+
1435+{ echo "$as_me:$LINENO: checking for field totalswap in struct sysinfo" >&5
1436+echo $ECHO_N "checking for field totalswap in struct sysinfo... $ECHO_C" >&6; }
1437 cat >conftest.$ac_ext <<_ACEOF
1438 /* confdefs.h. */
1439 _ACEOF
1440@@ -7198,6 +6953,680 @@
1441
1442 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1443
1444+{ echo "$as_me:$LINENO: checking for field totalram in struct sysinfo" >&5
1445+echo $ECHO_N "checking for field totalram in struct sysinfo... $ECHO_C" >&6; }
1446+cat >conftest.$ac_ext <<_ACEOF
1447+/* confdefs.h. */
1448+_ACEOF
1449+cat confdefs.h >>conftest.$ac_ext
1450+cat >>conftest.$ac_ext <<_ACEOF
1451+/* end confdefs.h. */
1452+#include <sys/sysinfo.h>
1453+int
1454+main ()
1455+{
1456+struct sysinfo sysinfo;
1457+sysinfo.totalram=0;
1458+
1459+ ;
1460+ return 0;
1461+}
1462+_ACEOF
1463+rm -f conftest.$ac_objext
1464+if { (ac_try="$ac_compile"
1465+case "(($ac_try" in
1466+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1467+ *) ac_try_echo=$ac_try;;
1468+esac
1469+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1470+ (eval "$ac_compile") 2>conftest.er1
1471+ ac_status=$?
1472+ grep -v '^ *+' conftest.er1 >conftest.err
1473+ rm -f conftest.er1
1474+ cat conftest.err >&5
1475+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
1476+ (exit $ac_status); } && {
1477+ test -z "$ac_c_werror_flag" ||
1478+ test ! -s conftest.err
1479+ } && test -s conftest.$ac_objext; then
1480+
1481+cat >>confdefs.h <<\_ACEOF
1482+#define HAVE_SYSINFO_TOTALRAM 1
1483+_ACEOF
1484+
1485+{ echo "$as_me:$LINENO: result: yes" >&5
1486+echo "${ECHO_T}yes" >&6; }
1487+else
1488+ echo "$as_me: failed program was:" >&5
1489+sed 's/^/| /' conftest.$ac_ext >&5
1490+
1491+ { echo "$as_me:$LINENO: result: no" >&5
1492+echo "${ECHO_T}no" >&6; }
1493+fi
1494+
1495+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1496+
1497+{ echo "$as_me:$LINENO: checking for field sharedram in struct sysinfo" >&5
1498+echo $ECHO_N "checking for field sharedram in struct sysinfo... $ECHO_C" >&6; }
1499+cat >conftest.$ac_ext <<_ACEOF
1500+/* confdefs.h. */
1501+_ACEOF
1502+cat confdefs.h >>conftest.$ac_ext
1503+cat >>conftest.$ac_ext <<_ACEOF
1504+/* end confdefs.h. */
1505+#include <sys/sysinfo.h>
1506+int
1507+main ()
1508+{
1509+struct sysinfo sysinfo;
1510+sysinfo.sharedram=0;
1511+
1512+ ;
1513+ return 0;
1514+}
1515+_ACEOF
1516+rm -f conftest.$ac_objext
1517+if { (ac_try="$ac_compile"
1518+case "(($ac_try" in
1519+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1520+ *) ac_try_echo=$ac_try;;
1521+esac
1522+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1523+ (eval "$ac_compile") 2>conftest.er1
1524+ ac_status=$?
1525+ grep -v '^ *+' conftest.er1 >conftest.err
1526+ rm -f conftest.er1
1527+ cat conftest.err >&5
1528+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
1529+ (exit $ac_status); } && {
1530+ test -z "$ac_c_werror_flag" ||
1531+ test ! -s conftest.err
1532+ } && test -s conftest.$ac_objext; then
1533+
1534+cat >>confdefs.h <<\_ACEOF
1535+#define HAVE_SYSINFO_SHAREDRAM 1
1536+_ACEOF
1537+
1538+{ echo "$as_me:$LINENO: result: yes" >&5
1539+echo "${ECHO_T}yes" >&6; }
1540+else
1541+ echo "$as_me: failed program was:" >&5
1542+sed 's/^/| /' conftest.$ac_ext >&5
1543+
1544+ { echo "$as_me:$LINENO: result: no" >&5
1545+echo "${ECHO_T}no" >&6; }
1546+fi
1547+
1548+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1549+
1550+{ echo "$as_me:$LINENO: checking for field bufferram in struct sysinfo" >&5
1551+echo $ECHO_N "checking for field bufferram in struct sysinfo... $ECHO_C" >&6; }
1552+cat >conftest.$ac_ext <<_ACEOF
1553+/* confdefs.h. */
1554+_ACEOF
1555+cat confdefs.h >>conftest.$ac_ext
1556+cat >>conftest.$ac_ext <<_ACEOF
1557+/* end confdefs.h. */
1558+#include <sys/sysinfo.h>
1559+int
1560+main ()
1561+{
1562+struct sysinfo sysinfo;
1563+sysinfo.bufferram=0;
1564+
1565+ ;
1566+ return 0;
1567+}
1568+_ACEOF
1569+rm -f conftest.$ac_objext
1570+if { (ac_try="$ac_compile"
1571+case "(($ac_try" in
1572+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1573+ *) ac_try_echo=$ac_try;;
1574+esac
1575+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1576+ (eval "$ac_compile") 2>conftest.er1
1577+ ac_status=$?
1578+ grep -v '^ *+' conftest.er1 >conftest.err
1579+ rm -f conftest.er1
1580+ cat conftest.err >&5
1581+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
1582+ (exit $ac_status); } && {
1583+ test -z "$ac_c_werror_flag" ||
1584+ test ! -s conftest.err
1585+ } && test -s conftest.$ac_objext; then
1586+
1587+cat >>confdefs.h <<\_ACEOF
1588+#define HAVE_SYSINFO_BUFFERRAM 1
1589+_ACEOF
1590+
1591+{ echo "$as_me:$LINENO: result: yes" >&5
1592+echo "${ECHO_T}yes" >&6; }
1593+else
1594+ echo "$as_me: failed program was:" >&5
1595+sed 's/^/| /' conftest.$ac_ext >&5
1596+
1597+ { echo "$as_me:$LINENO: result: no" >&5
1598+echo "${ECHO_T}no" >&6; }
1599+fi
1600+
1601+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1602+
1603+{ echo "$as_me:$LINENO: checking for field freeram in struct sysinfo" >&5
1604+echo $ECHO_N "checking for field freeram in struct sysinfo... $ECHO_C" >&6; }
1605+cat >conftest.$ac_ext <<_ACEOF
1606+/* confdefs.h. */
1607+_ACEOF
1608+cat confdefs.h >>conftest.$ac_ext
1609+cat >>conftest.$ac_ext <<_ACEOF
1610+/* end confdefs.h. */
1611+#include <sys/sysinfo.h>
1612+int
1613+main ()
1614+{
1615+struct sysinfo sysinfo;
1616+sysinfo.freeram=0;
1617+
1618+ ;
1619+ return 0;
1620+}
1621+_ACEOF
1622+rm -f conftest.$ac_objext
1623+if { (ac_try="$ac_compile"
1624+case "(($ac_try" in
1625+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1626+ *) ac_try_echo=$ac_try;;
1627+esac
1628+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1629+ (eval "$ac_compile") 2>conftest.er1
1630+ ac_status=$?
1631+ grep -v '^ *+' conftest.er1 >conftest.err
1632+ rm -f conftest.er1
1633+ cat conftest.err >&5
1634+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
1635+ (exit $ac_status); } && {
1636+ test -z "$ac_c_werror_flag" ||
1637+ test ! -s conftest.err
1638+ } && test -s conftest.$ac_objext; then
1639+
1640+cat >>confdefs.h <<\_ACEOF
1641+#define HAVE_SYSINFO_FREERAM 1
1642+_ACEOF
1643+
1644+{ echo "$as_me:$LINENO: result: yes" >&5
1645+echo "${ECHO_T}yes" >&6; }
1646+else
1647+ echo "$as_me: failed program was:" >&5
1648+sed 's/^/| /' conftest.$ac_ext >&5
1649+
1650+ { echo "$as_me:$LINENO: result: no" >&5
1651+echo "${ECHO_T}no" >&6; }
1652+fi
1653+
1654+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1655+
1656+{ echo "$as_me:$LINENO: checking for field uptime in struct sysinfo" >&5
1657+echo $ECHO_N "checking for field uptime in struct sysinfo... $ECHO_C" >&6; }
1658+cat >conftest.$ac_ext <<_ACEOF
1659+/* confdefs.h. */
1660+_ACEOF
1661+cat confdefs.h >>conftest.$ac_ext
1662+cat >>conftest.$ac_ext <<_ACEOF
1663+/* end confdefs.h. */
1664+#include <sys/sysinfo.h>
1665+int
1666+main ()
1667+{
1668+struct sysinfo sysinfo;
1669+sysinfo.uptime=0;
1670+
1671+ ;
1672+ return 0;
1673+}
1674+_ACEOF
1675+rm -f conftest.$ac_objext
1676+if { (ac_try="$ac_compile"
1677+case "(($ac_try" in
1678+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1679+ *) ac_try_echo=$ac_try;;
1680+esac
1681+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1682+ (eval "$ac_compile") 2>conftest.er1
1683+ ac_status=$?
1684+ grep -v '^ *+' conftest.er1 >conftest.err
1685+ rm -f conftest.er1
1686+ cat conftest.err >&5
1687+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
1688+ (exit $ac_status); } && {
1689+ test -z "$ac_c_werror_flag" ||
1690+ test ! -s conftest.err
1691+ } && test -s conftest.$ac_objext; then
1692+
1693+cat >>confdefs.h <<\_ACEOF
1694+#define HAVE_SYSINFO_UPTIME 1
1695+_ACEOF
1696+
1697+{ echo "$as_me:$LINENO: result: yes" >&5
1698+echo "${ECHO_T}yes" >&6; }
1699+else
1700+ echo "$as_me: failed program was:" >&5
1701+sed 's/^/| /' conftest.$ac_ext >&5
1702+
1703+ { echo "$as_me:$LINENO: result: no" >&5
1704+echo "${ECHO_T}no" >&6; }
1705+fi
1706+
1707+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1708+
1709+{ echo "$as_me:$LINENO: checking for field procs in struct sysinfo" >&5
1710+echo $ECHO_N "checking for field procs in struct sysinfo... $ECHO_C" >&6; }
1711+cat >conftest.$ac_ext <<_ACEOF
1712+/* confdefs.h. */
1713+_ACEOF
1714+cat confdefs.h >>conftest.$ac_ext
1715+cat >>conftest.$ac_ext <<_ACEOF
1716+/* end confdefs.h. */
1717+#include <sys/sysinfo.h>
1718+int
1719+main ()
1720+{
1721+struct sysinfo sysinfo;
1722+sysinfo.procs=0;
1723+
1724+ ;
1725+ return 0;
1726+}
1727+_ACEOF
1728+rm -f conftest.$ac_objext
1729+if { (ac_try="$ac_compile"
1730+case "(($ac_try" in
1731+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1732+ *) ac_try_echo=$ac_try;;
1733+esac
1734+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1735+ (eval "$ac_compile") 2>conftest.er1
1736+ ac_status=$?
1737+ grep -v '^ *+' conftest.er1 >conftest.err
1738+ rm -f conftest.er1
1739+ cat conftest.err >&5
1740+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
1741+ (exit $ac_status); } && {
1742+ test -z "$ac_c_werror_flag" ||
1743+ test ! -s conftest.err
1744+ } && test -s conftest.$ac_objext; then
1745+
1746+cat >>confdefs.h <<\_ACEOF
1747+#define HAVE_SYSINFO_PROCS 1
1748+_ACEOF
1749+
1750+{ echo "$as_me:$LINENO: result: yes" >&5
1751+echo "${ECHO_T}yes" >&6; }
1752+else
1753+ echo "$as_me: failed program was:" >&5
1754+sed 's/^/| /' conftest.$ac_ext >&5
1755+
1756+ { echo "$as_me:$LINENO: result: no" >&5
1757+echo "${ECHO_T}no" >&6; }
1758+fi
1759+
1760+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1761+
1762+
1763+{ echo "$as_me:$LINENO: checking for function setpriority() in sys/resource.h" >&5
1764+echo $ECHO_N "checking for function setpriority() in sys/resource.h... $ECHO_C" >&6; }
1765+cat >conftest.$ac_ext <<_ACEOF
1766+/* confdefs.h. */
1767+_ACEOF
1768+cat confdefs.h >>conftest.$ac_ext
1769+cat >>conftest.$ac_ext <<_ACEOF
1770+/* end confdefs.h. */
1771+
1772+#include <sys/time.h>
1773+#include <sys/resource.h>
1774+
1775+int
1776+main ()
1777+{
1778+ int i;
1779+
1780+ i=setpriority(PRIO_PROCESS,0,5);
1781+
1782+ ;
1783+ return 0;
1784+}
1785+_ACEOF
1786+rm -f conftest.$ac_objext
1787+if { (ac_try="$ac_compile"
1788+case "(($ac_try" in
1789+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1790+ *) ac_try_echo=$ac_try;;
1791+esac
1792+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1793+ (eval "$ac_compile") 2>conftest.er1
1794+ ac_status=$?
1795+ grep -v '^ *+' conftest.er1 >conftest.err
1796+ rm -f conftest.er1
1797+ cat conftest.err >&5
1798+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
1799+ (exit $ac_status); } && {
1800+ test -z "$ac_c_werror_flag" ||
1801+ test ! -s conftest.err
1802+ } && test -s conftest.$ac_objext; then
1803+
1804+cat >>confdefs.h <<\_ACEOF
1805+#define HAVE_SYS_RESOURCE_SETPRIORITY 1
1806+_ACEOF
1807+
1808+{ echo "$as_me:$LINENO: result: yes" >&5
1809+echo "${ECHO_T}yes" >&6; }
1810+else
1811+ echo "$as_me: failed program was:" >&5
1812+sed 's/^/| /' conftest.$ac_ext >&5
1813+
1814+ { echo "$as_me:$LINENO: result: no" >&5
1815+echo "${ECHO_T}no" >&6; }
1816+fi
1817+
1818+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1819+
1820+{ echo "$as_me:$LINENO: checking for function sysconf() in unistd.h" >&5
1821+echo $ECHO_N "checking for function sysconf() in unistd.h... $ECHO_C" >&6; }
1822+cat >conftest.$ac_ext <<_ACEOF
1823+/* confdefs.h. */
1824+_ACEOF
1825+cat confdefs.h >>conftest.$ac_ext
1826+cat >>conftest.$ac_ext <<_ACEOF
1827+/* end confdefs.h. */
1828+
1829+#include <unistd.h>
1830+
1831+int
1832+main ()
1833+{
1834+ int i;
1835+
1836+ i=sysconf(_SC_PHYS_PAGES)*sysconf(_SC_PHYS_PAGES);
1837+ i=sysconf(_SC_AVPHYS_PAGES)*sysconf(_SC_PHYS_PAGES);
1838+
1839+ ;
1840+ return 0;
1841+}
1842+_ACEOF
1843+rm -f conftest.$ac_objext
1844+if { (ac_try="$ac_compile"
1845+case "(($ac_try" in
1846+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1847+ *) ac_try_echo=$ac_try;;
1848+esac
1849+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1850+ (eval "$ac_compile") 2>conftest.er1
1851+ ac_status=$?
1852+ grep -v '^ *+' conftest.er1 >conftest.err
1853+ rm -f conftest.er1
1854+ cat conftest.err >&5
1855+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
1856+ (exit $ac_status); } && {
1857+ test -z "$ac_c_werror_flag" ||
1858+ test ! -s conftest.err
1859+ } && test -s conftest.$ac_objext; then
1860+
1861+cat >>confdefs.h <<\_ACEOF
1862+#define HAVE_UNISTD_SYSCONF 1
1863+_ACEOF
1864+
1865+{ echo "$as_me:$LINENO: result: yes" >&5
1866+echo "${ECHO_T}yes" >&6; }
1867+else
1868+ echo "$as_me: failed program was:" >&5
1869+sed 's/^/| /' conftest.$ac_ext >&5
1870+
1871+ { echo "$as_me:$LINENO: result: no" >&5
1872+echo "${ECHO_T}no" >&6; }
1873+fi
1874+
1875+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1876+
1877+{ echo "$as_me:$LINENO: checking for function initgroups()" >&5
1878+echo $ECHO_N "checking for function initgroups()... $ECHO_C" >&6; }
1879+cat >conftest.$ac_ext <<_ACEOF
1880+/* confdefs.h. */
1881+_ACEOF
1882+cat confdefs.h >>conftest.$ac_ext
1883+cat >>conftest.$ac_ext <<_ACEOF
1884+/* end confdefs.h. */
1885+
1886+#include <sys/types.h>
1887+#include <grp.h>
1888+
1889+int
1890+main ()
1891+{
1892+
1893+ char *user = "zabbix";
1894+ initgroups(user, 0);
1895+
1896+ ;
1897+ return 0;
1898+}
1899+_ACEOF
1900+rm -f conftest.$ac_objext conftest$ac_exeext
1901+if { (ac_try="$ac_link"
1902+case "(($ac_try" in
1903+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1904+ *) ac_try_echo=$ac_try;;
1905+esac
1906+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1907+ (eval "$ac_link") 2>conftest.er1
1908+ ac_status=$?
1909+ grep -v '^ *+' conftest.er1 >conftest.err
1910+ rm -f conftest.er1
1911+ cat conftest.err >&5
1912+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
1913+ (exit $ac_status); } && {
1914+ test -z "$ac_c_werror_flag" ||
1915+ test ! -s conftest.err
1916+ } && test -s conftest$ac_exeext &&
1917+ $as_test_x conftest$ac_exeext; then
1918+
1919+cat >>confdefs.h <<\_ACEOF
1920+#define HAVE_FUNCTION_INITGROUPS 1
1921+_ACEOF
1922+
1923+{ echo "$as_me:$LINENO: result: yes" >&5
1924+echo "${ECHO_T}yes" >&6; }
1925+else
1926+ echo "$as_me: failed program was:" >&5
1927+sed 's/^/| /' conftest.$ac_ext >&5
1928+
1929+ { echo "$as_me:$LINENO: result: no" >&5
1930+echo "${ECHO_T}no" >&6; }
1931+fi
1932+
1933+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1934+ conftest$ac_exeext conftest.$ac_ext
1935+
1936+{ echo "$as_me:$LINENO: checking for functions seteuid() and setegid()" >&5
1937+echo $ECHO_N "checking for functions seteuid() and setegid()... $ECHO_C" >&6; }
1938+cat >conftest.$ac_ext <<_ACEOF
1939+/* confdefs.h. */
1940+_ACEOF
1941+cat confdefs.h >>conftest.$ac_ext
1942+cat >>conftest.$ac_ext <<_ACEOF
1943+/* end confdefs.h. */
1944+
1945+#include <sys/types.h>
1946+#include <unistd.h>
1947+
1948+int
1949+main ()
1950+{
1951+
1952+ seteuid(0);
1953+ setegid(0);
1954+
1955+ ;
1956+ return 0;
1957+}
1958+_ACEOF
1959+rm -f conftest.$ac_objext conftest$ac_exeext
1960+if { (ac_try="$ac_link"
1961+case "(($ac_try" in
1962+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1963+ *) ac_try_echo=$ac_try;;
1964+esac
1965+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1966+ (eval "$ac_link") 2>conftest.er1
1967+ ac_status=$?
1968+ grep -v '^ *+' conftest.er1 >conftest.err
1969+ rm -f conftest.er1
1970+ cat conftest.err >&5
1971+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
1972+ (exit $ac_status); } && {
1973+ test -z "$ac_c_werror_flag" ||
1974+ test ! -s conftest.err
1975+ } && test -s conftest$ac_exeext &&
1976+ $as_test_x conftest$ac_exeext; then
1977+
1978+cat >>confdefs.h <<\_ACEOF
1979+#define HAVE_FUNCTION_SETEUID 1
1980+_ACEOF
1981+
1982+{ echo "$as_me:$LINENO: result: yes" >&5
1983+echo "${ECHO_T}yes" >&6; }
1984+else
1985+ echo "$as_me: failed program was:" >&5
1986+sed 's/^/| /' conftest.$ac_ext >&5
1987+
1988+ { echo "$as_me:$LINENO: result: no" >&5
1989+echo "${ECHO_T}no" >&6; }
1990+fi
1991+
1992+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1993+ conftest$ac_exeext conftest.$ac_ext
1994+
1995+{ echo "$as_me:$LINENO: checking for function setproctitle()" >&5
1996+echo $ECHO_N "checking for function setproctitle()... $ECHO_C" >&6; }
1997+cat >conftest.$ac_ext <<_ACEOF
1998+/* confdefs.h. */
1999+_ACEOF
2000+cat confdefs.h >>conftest.$ac_ext
2001+cat >>conftest.$ac_ext <<_ACEOF
2002+/* end confdefs.h. */
2003+
2004+#include <sys/types.h>
2005+#include <unistd.h>
2006+
2007+int
2008+main ()
2009+{
2010+
2011+ setproctitle("Test %d", 1);
2012+
2013+ ;
2014+ return 0;
2015+}
2016+_ACEOF
2017+rm -f conftest.$ac_objext conftest$ac_exeext
2018+if { (ac_try="$ac_link"
2019+case "(($ac_try" in
2020+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2021+ *) ac_try_echo=$ac_try;;
2022+esac
2023+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2024+ (eval "$ac_link") 2>conftest.er1
2025+ ac_status=$?
2026+ grep -v '^ *+' conftest.er1 >conftest.err
2027+ rm -f conftest.er1
2028+ cat conftest.err >&5
2029+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
2030+ (exit $ac_status); } && {
2031+ test -z "$ac_c_werror_flag" ||
2032+ test ! -s conftest.err
2033+ } && test -s conftest$ac_exeext &&
2034+ $as_test_x conftest$ac_exeext; then
2035+
2036+cat >>confdefs.h <<\_ACEOF
2037+#define HAVE_FUNCTION_SETPROCTITLE 1
2038+_ACEOF
2039+
2040+{ echo "$as_me:$LINENO: result: yes" >&5
2041+echo "${ECHO_T}yes" >&6; }
2042+else
2043+ echo "$as_me: failed program was:" >&5
2044+sed 's/^/| /' conftest.$ac_ext >&5
2045+
2046+ { echo "$as_me:$LINENO: result: no" >&5
2047+echo "${ECHO_T}no" >&6; }
2048+fi
2049+
2050+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
2051+ conftest$ac_exeext conftest.$ac_ext
2052+
2053+{ echo "$as_me:$LINENO: checking for function sysctlbyname()" >&5
2054+echo $ECHO_N "checking for function sysctlbyname()... $ECHO_C" >&6; }
2055+cat >conftest.$ac_ext <<_ACEOF
2056+/* confdefs.h. */
2057+_ACEOF
2058+cat confdefs.h >>conftest.$ac_ext
2059+cat >>conftest.$ac_ext <<_ACEOF
2060+/* end confdefs.h. */
2061+
2062+#ifdef HAVE_SYS_TYPES_H
2063+#include <sys/types.h>
2064+#endif /* HAVE_SYS_TYPES_H */
2065+
2066+#ifdef HAVE_SYS_PARAM_H
2067+#include <sys/param.h>
2068+#endif /* HAVE_SYS_PARAM_H */
2069+
2070+#include <sys/sysctl.h>
2071+
2072+int
2073+main ()
2074+{
2075+
2076+ sysctlbyname("", 0, 0, 0, 0);
2077+
2078+ ;
2079+ return 0;
2080+}
2081+_ACEOF
2082+rm -f conftest.$ac_objext conftest$ac_exeext
2083+if { (ac_try="$ac_link"
2084+case "(($ac_try" in
2085+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2086+ *) ac_try_echo=$ac_try;;
2087+esac
2088+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2089+ (eval "$ac_link") 2>conftest.er1
2090+ ac_status=$?
2091+ grep -v '^ *+' conftest.er1 >conftest.err
2092+ rm -f conftest.er1
2093+ cat conftest.err >&5
2094+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
2095+ (exit $ac_status); } && {
2096+ test -z "$ac_c_werror_flag" ||
2097+ test ! -s conftest.err
2098+ } && test -s conftest$ac_exeext &&
2099+ $as_test_x conftest$ac_exeext; then
2100+
2101+cat >>confdefs.h <<\_ACEOF
2102+#define HAVE_FUNCTION_SYSCTLBYNAME 1
2103+_ACEOF
2104+
2105+{ echo "$as_me:$LINENO: result: yes" >&5
2106+echo "${ECHO_T}yes" >&6; }
2107+else
2108+ echo "$as_me: failed program was:" >&5
2109+sed 's/^/| /' conftest.$ac_ext >&5
2110+
2111+ { echo "$as_me:$LINENO: result: no" >&5
2112+echo "${ECHO_T}no" >&6; }
2113+fi
2114+
2115+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
2116+ conftest$ac_exeext conftest.$ac_ext
2117+
2118 { echo "$as_me:$LINENO: checking for function sysctl (KERN_BOOTTIME)" >&5
2119 echo $ECHO_N "checking for function sysctl (KERN_BOOTTIME)... $ECHO_C" >&6; }
2120 cat >conftest.$ac_ext <<_ACEOF
2121@@ -7342,71 +7771,6 @@
2122
2123 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2124
2125-{ echo "$as_me:$LINENO: checking for function sysctlbyname()" >&5
2126-echo $ECHO_N "checking for function sysctlbyname()... $ECHO_C" >&6; }
2127-cat >conftest.$ac_ext <<_ACEOF
2128-/* confdefs.h. */
2129-_ACEOF
2130-cat confdefs.h >>conftest.$ac_ext
2131-cat >>conftest.$ac_ext <<_ACEOF
2132-/* end confdefs.h. */
2133-
2134-#ifdef HAVE_SYS_TYPES_H
2135-#include <sys/types.h>
2136-#endif /* HAVE_SYS_TYPES_H */
2137-
2138-#ifdef HAVE_SYS_PARAM_H
2139-#include <sys/param.h>
2140-#endif /* HAVE_SYS_PARAM_H */
2141-
2142-#include <sys/sysctl.h>
2143-
2144-int
2145-main ()
2146-{
2147-
2148- sysctlbyname("", 0, 0, 0, 0);
2149-
2150- ;
2151- return 0;
2152-}
2153-_ACEOF
2154-rm -f conftest.$ac_objext conftest$ac_exeext
2155-if { (ac_try="$ac_link"
2156-case "(($ac_try" in
2157- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2158- *) ac_try_echo=$ac_try;;
2159-esac
2160-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2161- (eval "$ac_link") 2>conftest.er1
2162- ac_status=$?
2163- grep -v '^ *+' conftest.er1 >conftest.err
2164- rm -f conftest.er1
2165- cat conftest.err >&5
2166- echo "$as_me:$LINENO: \$? = $ac_status" >&5
2167- (exit $ac_status); } && {
2168- test -z "$ac_c_werror_flag" ||
2169- test ! -s conftest.err
2170- } && test -s conftest$ac_exeext &&
2171- $as_test_x conftest$ac_exeext; then
2172-
2173-cat >>confdefs.h <<\_ACEOF
2174-#define HAVE_FUNCTION_SYSCTLBYNAME 1
2175-_ACEOF
2176-
2177-{ echo "$as_me:$LINENO: result: yes" >&5
2178-echo "${ECHO_T}yes" >&6; }
2179-else
2180- echo "$as_me: failed program was:" >&5
2181-sed 's/^/| /' conftest.$ac_ext >&5
2182-
2183- { echo "$as_me:$LINENO: result: no" >&5
2184-echo "${ECHO_T}no" >&6; }
2185-fi
2186-
2187-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
2188- conftest$ac_exeext conftest.$ac_ext
2189-
2190 { echo "$as_me:$LINENO: checking for function sysctl (KERN_MAXFILES)" >&5
2191 echo $ECHO_N "checking for function sysctl (KERN_MAXFILES)... $ECHO_C" >&6; }
2192 cat >conftest.$ac_ext <<_ACEOF
2193@@ -7621,196 +7985,25 @@
2194
2195 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2196
2197-{ echo "$as_me:$LINENO: checking for function initgroups()" >&5
2198-echo $ECHO_N "checking for function initgroups()... $ECHO_C" >&6; }
2199-cat >conftest.$ac_ext <<_ACEOF
2200-/* confdefs.h. */
2201-_ACEOF
2202-cat confdefs.h >>conftest.$ac_ext
2203-cat >>conftest.$ac_ext <<_ACEOF
2204-/* end confdefs.h. */
2205-
2206-#include <sys/types.h>
2207-#include <grp.h>
2208-
2209-int
2210-main ()
2211-{
2212-
2213- char *user = "zabbix";
2214- initgroups(user, 0);
2215-
2216- ;
2217- return 0;
2218-}
2219-_ACEOF
2220-rm -f conftest.$ac_objext conftest$ac_exeext
2221-if { (ac_try="$ac_link"
2222-case "(($ac_try" in
2223- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2224- *) ac_try_echo=$ac_try;;
2225-esac
2226-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2227- (eval "$ac_link") 2>conftest.er1
2228- ac_status=$?
2229- grep -v '^ *+' conftest.er1 >conftest.err
2230- rm -f conftest.er1
2231- cat conftest.err >&5
2232- echo "$as_me:$LINENO: \$? = $ac_status" >&5
2233- (exit $ac_status); } && {
2234- test -z "$ac_c_werror_flag" ||
2235- test ! -s conftest.err
2236- } && test -s conftest$ac_exeext &&
2237- $as_test_x conftest$ac_exeext; then
2238-
2239-cat >>confdefs.h <<\_ACEOF
2240-#define HAVE_FUNCTION_INITGROUPS 1
2241-_ACEOF
2242-
2243-{ echo "$as_me:$LINENO: result: yes" >&5
2244-echo "${ECHO_T}yes" >&6; }
2245-else
2246- echo "$as_me: failed program was:" >&5
2247-sed 's/^/| /' conftest.$ac_ext >&5
2248-
2249- { echo "$as_me:$LINENO: result: no" >&5
2250-echo "${ECHO_T}no" >&6; }
2251-fi
2252-
2253-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
2254- conftest$ac_exeext conftest.$ac_ext
2255-
2256-{ echo "$as_me:$LINENO: checking for function seteuid()" >&5
2257-echo $ECHO_N "checking for function seteuid()... $ECHO_C" >&6; }
2258-cat >conftest.$ac_ext <<_ACEOF
2259-/* confdefs.h. */
2260-_ACEOF
2261-cat confdefs.h >>conftest.$ac_ext
2262-cat >>conftest.$ac_ext <<_ACEOF
2263-/* end confdefs.h. */
2264-
2265-#include <sys/types.h>
2266-#include <unistd.h>
2267-
2268-int
2269-main ()
2270-{
2271-
2272- seteuid(0);
2273- setegid(0);
2274-
2275- ;
2276- return 0;
2277-}
2278-_ACEOF
2279-rm -f conftest.$ac_objext conftest$ac_exeext
2280-if { (ac_try="$ac_link"
2281-case "(($ac_try" in
2282- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2283- *) ac_try_echo=$ac_try;;
2284-esac
2285-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2286- (eval "$ac_link") 2>conftest.er1
2287- ac_status=$?
2288- grep -v '^ *+' conftest.er1 >conftest.err
2289- rm -f conftest.er1
2290- cat conftest.err >&5
2291- echo "$as_me:$LINENO: \$? = $ac_status" >&5
2292- (exit $ac_status); } && {
2293- test -z "$ac_c_werror_flag" ||
2294- test ! -s conftest.err
2295- } && test -s conftest$ac_exeext &&
2296- $as_test_x conftest$ac_exeext; then
2297-
2298-cat >>confdefs.h <<\_ACEOF
2299-#define HAVE_FUNCTION_SETEUID 1
2300-_ACEOF
2301-
2302-{ echo "$as_me:$LINENO: result: yes" >&5
2303-echo "${ECHO_T}yes" >&6; }
2304-else
2305- echo "$as_me: failed program was:" >&5
2306-sed 's/^/| /' conftest.$ac_ext >&5
2307-
2308- { echo "$as_me:$LINENO: result: no" >&5
2309-echo "${ECHO_T}no" >&6; }
2310-fi
2311-
2312-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
2313- conftest$ac_exeext conftest.$ac_ext
2314-
2315-{ echo "$as_me:$LINENO: checking for function setproctitle()" >&5
2316-echo $ECHO_N "checking for function setproctitle()... $ECHO_C" >&6; }
2317-cat >conftest.$ac_ext <<_ACEOF
2318-/* confdefs.h. */
2319-_ACEOF
2320-cat confdefs.h >>conftest.$ac_ext
2321-cat >>conftest.$ac_ext <<_ACEOF
2322-/* end confdefs.h. */
2323-
2324-#include <sys/types.h>
2325-#include <unistd.h>
2326-
2327-int
2328-main ()
2329-{
2330-
2331- setproctitle("Test %d", 1);
2332-
2333- ;
2334- return 0;
2335-}
2336-_ACEOF
2337-rm -f conftest.$ac_objext conftest$ac_exeext
2338-if { (ac_try="$ac_link"
2339-case "(($ac_try" in
2340- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2341- *) ac_try_echo=$ac_try;;
2342-esac
2343-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2344- (eval "$ac_link") 2>conftest.er1
2345- ac_status=$?
2346- grep -v '^ *+' conftest.er1 >conftest.err
2347- rm -f conftest.er1
2348- cat conftest.err >&5
2349- echo "$as_me:$LINENO: \$? = $ac_status" >&5
2350- (exit $ac_status); } && {
2351- test -z "$ac_c_werror_flag" ||
2352- test ! -s conftest.err
2353- } && test -s conftest$ac_exeext &&
2354- $as_test_x conftest$ac_exeext; then
2355-
2356-cat >>confdefs.h <<\_ACEOF
2357-#define HAVE_FUNCTION_SETPROCTITLE 1
2358-_ACEOF
2359-
2360-{ echo "$as_me:$LINENO: result: yes" >&5
2361-echo "${ECHO_T}yes" >&6; }
2362-else
2363- echo "$as_me: failed program was:" >&5
2364-sed 's/^/| /' conftest.$ac_ext >&5
2365-
2366- { echo "$as_me:$LINENO: result: no" >&5
2367-echo "${ECHO_T}no" >&6; }
2368-fi
2369-
2370-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
2371- conftest$ac_exeext conftest.$ac_ext
2372-
2373-{ echo "$as_me:$LINENO: checking for totalram in struct sysinfo" >&5
2374-echo $ECHO_N "checking for totalram in struct sysinfo... $ECHO_C" >&6; }
2375-cat >conftest.$ac_ext <<_ACEOF
2376-/* confdefs.h. */
2377-_ACEOF
2378-cat confdefs.h >>conftest.$ac_ext
2379-cat >>conftest.$ac_ext <<_ACEOF
2380-/* end confdefs.h. */
2381-#include <sys/sysinfo.h>
2382-int
2383-main ()
2384-{
2385-struct sysinfo sysinfo;
2386-sysinfo.totalram=0;
2387+
2388+{ echo "$as_me:$LINENO: checking for macro __va_copy() in stdarg.h" >&5
2389+echo $ECHO_N "checking for macro __va_copy() in stdarg.h... $ECHO_C" >&6; }
2390+cat >conftest.$ac_ext <<_ACEOF
2391+/* confdefs.h. */
2392+_ACEOF
2393+cat confdefs.h >>conftest.$ac_ext
2394+cat >>conftest.$ac_ext <<_ACEOF
2395+/* end confdefs.h. */
2396+
2397+#include <stdarg.h>
2398+
2399+int
2400+main ()
2401+{
2402+
2403+ va_list src,dst;
2404+
2405+ __va_copy(dst,src);
2406
2407 ;
2408 return 0;
2409@@ -7835,7 +8028,7 @@
2410 } && test -s conftest.$ac_objext; then
2411
2412 cat >>confdefs.h <<\_ACEOF
2413-#define HAVE_SYSINFO_TOTALRAM 1
2414+#define HAVE___VA_COPY 1
2415 _ACEOF
2416
2417 { echo "$as_me:$LINENO: result: yes" >&5
2418@@ -7850,8 +8043,8 @@
2419
2420 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2421
2422-{ echo "$as_me:$LINENO: checking for __VA_ARGS__" >&5
2423-echo $ECHO_N "checking for __VA_ARGS__... $ECHO_C" >&6; }
2424+{ echo "$as_me:$LINENO: checking for macro __VA_ARGS__" >&5
2425+echo $ECHO_N "checking for macro __VA_ARGS__... $ECHO_C" >&6; }
2426 cat >conftest.$ac_ext <<_ACEOF
2427 /* confdefs.h. */
2428 _ACEOF
2429@@ -7907,270 +8100,7 @@
2430 fi
2431
2432 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2433-{ echo "$as_me:$LINENO: checking for sharedram in struct sysinfo" >&5
2434-echo $ECHO_N "checking for sharedram in struct sysinfo... $ECHO_C" >&6; }
2435-cat >conftest.$ac_ext <<_ACEOF
2436-/* confdefs.h. */
2437-_ACEOF
2438-cat confdefs.h >>conftest.$ac_ext
2439-cat >>conftest.$ac_ext <<_ACEOF
2440-/* end confdefs.h. */
2441-#include <sys/sysinfo.h>
2442-int
2443-main ()
2444-{
2445-struct sysinfo sysinfo;
2446-sysinfo.sharedram=0;
2447-
2448- ;
2449- return 0;
2450-}
2451-_ACEOF
2452-rm -f conftest.$ac_objext
2453-if { (ac_try="$ac_compile"
2454-case "(($ac_try" in
2455- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2456- *) ac_try_echo=$ac_try;;
2457-esac
2458-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2459- (eval "$ac_compile") 2>conftest.er1
2460- ac_status=$?
2461- grep -v '^ *+' conftest.er1 >conftest.err
2462- rm -f conftest.er1
2463- cat conftest.err >&5
2464- echo "$as_me:$LINENO: \$? = $ac_status" >&5
2465- (exit $ac_status); } && {
2466- test -z "$ac_c_werror_flag" ||
2467- test ! -s conftest.err
2468- } && test -s conftest.$ac_objext; then
2469-
2470-cat >>confdefs.h <<\_ACEOF
2471-#define HAVE_SYSINFO_SHAREDRAM 1
2472-_ACEOF
2473-
2474-{ echo "$as_me:$LINENO: result: yes" >&5
2475-echo "${ECHO_T}yes" >&6; }
2476-else
2477- echo "$as_me: failed program was:" >&5
2478-sed 's/^/| /' conftest.$ac_ext >&5
2479-
2480- { echo "$as_me:$LINENO: result: no" >&5
2481-echo "${ECHO_T}no" >&6; }
2482-fi
2483-
2484-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2485-
2486-{ echo "$as_me:$LINENO: checking for bufferram in struct sysinfo" >&5
2487-echo $ECHO_N "checking for bufferram in struct sysinfo... $ECHO_C" >&6; }
2488-cat >conftest.$ac_ext <<_ACEOF
2489-/* confdefs.h. */
2490-_ACEOF
2491-cat confdefs.h >>conftest.$ac_ext
2492-cat >>conftest.$ac_ext <<_ACEOF
2493-/* end confdefs.h. */
2494-#include <sys/sysinfo.h>
2495-int
2496-main ()
2497-{
2498-struct sysinfo sysinfo;
2499-sysinfo.bufferram=0;
2500-
2501- ;
2502- return 0;
2503-}
2504-_ACEOF
2505-rm -f conftest.$ac_objext
2506-if { (ac_try="$ac_compile"
2507-case "(($ac_try" in
2508- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2509- *) ac_try_echo=$ac_try;;
2510-esac
2511-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2512- (eval "$ac_compile") 2>conftest.er1
2513- ac_status=$?
2514- grep -v '^ *+' conftest.er1 >conftest.err
2515- rm -f conftest.er1
2516- cat conftest.err >&5
2517- echo "$as_me:$LINENO: \$? = $ac_status" >&5
2518- (exit $ac_status); } && {
2519- test -z "$ac_c_werror_flag" ||
2520- test ! -s conftest.err
2521- } && test -s conftest.$ac_objext; then
2522-
2523-cat >>confdefs.h <<\_ACEOF
2524-#define HAVE_SYSINFO_BUFFERRAM 1
2525-_ACEOF
2526-
2527-{ echo "$as_me:$LINENO: result: yes" >&5
2528-echo "${ECHO_T}yes" >&6; }
2529-else
2530- echo "$as_me: failed program was:" >&5
2531-sed 's/^/| /' conftest.$ac_ext >&5
2532-
2533- { echo "$as_me:$LINENO: result: no" >&5
2534-echo "${ECHO_T}no" >&6; }
2535-fi
2536-
2537-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2538-
2539-{ echo "$as_me:$LINENO: checking for freeram in struct sysinfo" >&5
2540-echo $ECHO_N "checking for freeram in struct sysinfo... $ECHO_C" >&6; }
2541-cat >conftest.$ac_ext <<_ACEOF
2542-/* confdefs.h. */
2543-_ACEOF
2544-cat confdefs.h >>conftest.$ac_ext
2545-cat >>conftest.$ac_ext <<_ACEOF
2546-/* end confdefs.h. */
2547-#include <sys/sysinfo.h>
2548-int
2549-main ()
2550-{
2551-struct sysinfo sysinfo;
2552-sysinfo.freeram=0;
2553-
2554- ;
2555- return 0;
2556-}
2557-_ACEOF
2558-rm -f conftest.$ac_objext
2559-if { (ac_try="$ac_compile"
2560-case "(($ac_try" in
2561- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2562- *) ac_try_echo=$ac_try;;
2563-esac
2564-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2565- (eval "$ac_compile") 2>conftest.er1
2566- ac_status=$?
2567- grep -v '^ *+' conftest.er1 >conftest.err
2568- rm -f conftest.er1
2569- cat conftest.err >&5
2570- echo "$as_me:$LINENO: \$? = $ac_status" >&5
2571- (exit $ac_status); } && {
2572- test -z "$ac_c_werror_flag" ||
2573- test ! -s conftest.err
2574- } && test -s conftest.$ac_objext; then
2575-
2576-cat >>confdefs.h <<\_ACEOF
2577-#define HAVE_SYSINFO_FREERAM 1
2578-_ACEOF
2579-
2580-{ echo "$as_me:$LINENO: result: yes" >&5
2581-echo "${ECHO_T}yes" >&6; }
2582-else
2583- echo "$as_me: failed program was:" >&5
2584-sed 's/^/| /' conftest.$ac_ext >&5
2585-
2586- { echo "$as_me:$LINENO: result: no" >&5
2587-echo "${ECHO_T}no" >&6; }
2588-fi
2589-
2590-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2591-
2592-{ echo "$as_me:$LINENO: checking for uptime in struct sysinfo" >&5
2593-echo $ECHO_N "checking for uptime in struct sysinfo... $ECHO_C" >&6; }
2594-cat >conftest.$ac_ext <<_ACEOF
2595-/* confdefs.h. */
2596-_ACEOF
2597-cat confdefs.h >>conftest.$ac_ext
2598-cat >>conftest.$ac_ext <<_ACEOF
2599-/* end confdefs.h. */
2600-#include <sys/sysinfo.h>
2601-int
2602-main ()
2603-{
2604-struct sysinfo sysinfo;
2605-sysinfo.uptime=0;
2606-
2607- ;
2608- return 0;
2609-}
2610-_ACEOF
2611-rm -f conftest.$ac_objext
2612-if { (ac_try="$ac_compile"
2613-case "(($ac_try" in
2614- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2615- *) ac_try_echo=$ac_try;;
2616-esac
2617-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2618- (eval "$ac_compile") 2>conftest.er1
2619- ac_status=$?
2620- grep -v '^ *+' conftest.er1 >conftest.err
2621- rm -f conftest.er1
2622- cat conftest.err >&5
2623- echo "$as_me:$LINENO: \$? = $ac_status" >&5
2624- (exit $ac_status); } && {
2625- test -z "$ac_c_werror_flag" ||
2626- test ! -s conftest.err
2627- } && test -s conftest.$ac_objext; then
2628-
2629-cat >>confdefs.h <<\_ACEOF
2630-#define HAVE_SYSINFO_UPTIME 1
2631-_ACEOF
2632-
2633-{ echo "$as_me:$LINENO: result: yes" >&5
2634-echo "${ECHO_T}yes" >&6; }
2635-else
2636- echo "$as_me: failed program was:" >&5
2637-sed 's/^/| /' conftest.$ac_ext >&5
2638-
2639- { echo "$as_me:$LINENO: result: no" >&5
2640-echo "${ECHO_T}no" >&6; }
2641-fi
2642-
2643-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2644-
2645-{ echo "$as_me:$LINENO: checking for procs in struct sysinfo" >&5
2646-echo $ECHO_N "checking for procs in struct sysinfo... $ECHO_C" >&6; }
2647-cat >conftest.$ac_ext <<_ACEOF
2648-/* confdefs.h. */
2649-_ACEOF
2650-cat confdefs.h >>conftest.$ac_ext
2651-cat >>conftest.$ac_ext <<_ACEOF
2652-/* end confdefs.h. */
2653-#include <sys/sysinfo.h>
2654-int
2655-main ()
2656-{
2657-struct sysinfo sysinfo;
2658-sysinfo.procs=0;
2659-
2660- ;
2661- return 0;
2662-}
2663-_ACEOF
2664-rm -f conftest.$ac_objext
2665-if { (ac_try="$ac_compile"
2666-case "(($ac_try" in
2667- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2668- *) ac_try_echo=$ac_try;;
2669-esac
2670-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2671- (eval "$ac_compile") 2>conftest.er1
2672- ac_status=$?
2673- grep -v '^ *+' conftest.er1 >conftest.err
2674- rm -f conftest.er1
2675- cat conftest.err >&5
2676- echo "$as_me:$LINENO: \$? = $ac_status" >&5
2677- (exit $ac_status); } && {
2678- test -z "$ac_c_werror_flag" ||
2679- test ! -s conftest.err
2680- } && test -s conftest.$ac_objext; then
2681-
2682-cat >>confdefs.h <<\_ACEOF
2683-#define HAVE_SYSINFO_PROCS 1
2684-_ACEOF
2685-
2686-{ echo "$as_me:$LINENO: result: yes" >&5
2687-echo "${ECHO_T}yes" >&6; }
2688-else
2689- echo "$as_me: failed program was:" >&5
2690-sed 's/^/| /' conftest.$ac_ext >&5
2691-
2692- { echo "$as_me:$LINENO: result: no" >&5
2693-echo "${ECHO_T}no" >&6; }
2694-fi
2695-
2696-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2697+
2698
2699 { echo "$as_me:$LINENO: checking return type of signal handlers" >&5
2700 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
2701@@ -8229,7 +8159,6 @@
2702 _ACEOF
2703
2704
2705-#AC_FUNC_GETLOADAVG
2706
2707 for ac_func in getloadavg
2708 do
2709@@ -8992,100 +8921,6 @@
2710 done
2711
2712
2713-for ac_func in strcasestr
2714-do
2715-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
2716-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
2717-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
2718-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
2719- echo $ECHO_N "(cached) $ECHO_C" >&6
2720-else
2721- cat >conftest.$ac_ext <<_ACEOF
2722-/* confdefs.h. */
2723-_ACEOF
2724-cat confdefs.h >>conftest.$ac_ext
2725-cat >>conftest.$ac_ext <<_ACEOF
2726-/* end confdefs.h. */
2727-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
2728- For example, HP-UX 11i <limits.h> declares gettimeofday. */
2729-#define $ac_func innocuous_$ac_func
2730-
2731-/* System header to define __stub macros and hopefully few prototypes,
2732- which can conflict with char $ac_func (); below.
2733- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
2734- <limits.h> exists even on freestanding compilers. */
2735-
2736-#ifdef __STDC__
2737-# include <limits.h>
2738-#else
2739-# include <assert.h>
2740-#endif
2741-
2742-#undef $ac_func
2743-
2744-/* Override any GCC internal prototype to avoid an error.
2745- Use char because int might match the return type of a GCC
2746- builtin and then its argument prototype would still apply. */
2747-#ifdef __cplusplus
2748-extern "C"
2749-#endif
2750-char $ac_func ();
2751-/* The GNU C library defines this for functions which it implements
2752- to always fail with ENOSYS. Some functions are actually named
2753- something starting with __ and the normal name is an alias. */
2754-#if defined __stub_$ac_func || defined __stub___$ac_func
2755-choke me
2756-#endif
2757-
2758-int
2759-main ()
2760-{
2761-return $ac_func ();
2762- ;
2763- return 0;
2764-}
2765-_ACEOF
2766-rm -f conftest.$ac_objext conftest$ac_exeext
2767-if { (ac_try="$ac_link"
2768-case "(($ac_try" in
2769- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2770- *) ac_try_echo=$ac_try;;
2771-esac
2772-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2773- (eval "$ac_link") 2>conftest.er1
2774- ac_status=$?
2775- grep -v '^ *+' conftest.er1 >conftest.err
2776- rm -f conftest.er1
2777- cat conftest.err >&5
2778- echo "$as_me:$LINENO: \$? = $ac_status" >&5
2779- (exit $ac_status); } && {
2780- test -z "$ac_c_werror_flag" ||
2781- test ! -s conftest.err
2782- } && test -s conftest$ac_exeext &&
2783- $as_test_x conftest$ac_exeext; then
2784- eval "$as_ac_var=yes"
2785-else
2786- echo "$as_me: failed program was:" >&5
2787-sed 's/^/| /' conftest.$ac_ext >&5
2788-
2789- eval "$as_ac_var=no"
2790-fi
2791-
2792-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
2793- conftest$ac_exeext conftest.$ac_ext
2794-fi
2795-ac_res=`eval echo '${'$as_ac_var'}'`
2796- { echo "$as_me:$LINENO: result: $ac_res" >&5
2797-echo "${ECHO_T}$ac_res" >&6; }
2798-if test `eval echo '${'$as_ac_var'}'` = yes; then
2799- cat >>confdefs.h <<_ACEOF
2800-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
2801-_ACEOF
2802-
2803-fi
2804-done
2805-
2806-
2807 for ac_func in getenv
2808 do
2809 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
2810@@ -9274,10 +9109,181 @@
2811 done
2812
2813
2814+
2815+{ echo "$as_me:$LINENO: checking for /proc filesystem" >&5
2816+echo $ECHO_N "checking for /proc filesystem... $ECHO_C" >&6; }
2817+if test -d /proc; then
2818+ { echo "$as_me:$LINENO: result: yes" >&5
2819+echo "${ECHO_T}yes" >&6; }
2820+
2821+cat >>confdefs.h <<\_ACEOF
2822+#define HAVE_PROC 1
2823+_ACEOF
2824+
2825+else
2826+ { echo "$as_me:$LINENO: result: no" >&5
2827+echo "${ECHO_T}no" >&6; }
2828+fi
2829+
2830+{ echo "$as_me:$LINENO: checking for file /proc/stat" >&5
2831+echo $ECHO_N "checking for file /proc/stat... $ECHO_C" >&6; }
2832+if test -r /proc/stat; then
2833+ { echo "$as_me:$LINENO: result: yes" >&5
2834+echo "${ECHO_T}yes" >&6; }
2835+
2836+cat >>confdefs.h <<\_ACEOF
2837+#define HAVE_PROC_STAT 1
2838+_ACEOF
2839+
2840+else
2841+ { echo "$as_me:$LINENO: result: no" >&5
2842+echo "${ECHO_T}no" >&6; }
2843+fi
2844+
2845+{ echo "$as_me:$LINENO: checking for file /proc/cpuinfo" >&5
2846+echo $ECHO_N "checking for file /proc/cpuinfo... $ECHO_C" >&6; }
2847+if test -r /proc/cpuinfo; then
2848+ { echo "$as_me:$LINENO: result: yes" >&5
2849+echo "${ECHO_T}yes" >&6; }
2850+
2851+cat >>confdefs.h <<\_ACEOF
2852+#define HAVE_PROC_CPUINFO 1
2853+_ACEOF
2854+
2855+else
2856+ { echo "$as_me:$LINENO: result: no" >&5
2857+echo "${ECHO_T}no" >&6; }
2858+fi
2859+
2860+{ echo "$as_me:$LINENO: checking for file /proc/1/status" >&5
2861+echo $ECHO_N "checking for file /proc/1/status... $ECHO_C" >&6; }
2862+if test -r /proc/1/status; then
2863+ { echo "$as_me:$LINENO: result: yes" >&5
2864+echo "${ECHO_T}yes" >&6; }
2865+
2866+cat >>confdefs.h <<\_ACEOF
2867+#define HAVE_PROC_1_STATUS 1
2868+_ACEOF
2869+
2870+else
2871+ { echo "$as_me:$LINENO: result: no" >&5
2872+echo "${ECHO_T}no" >&6; }
2873+fi
2874+
2875+{ echo "$as_me:$LINENO: checking for file /proc/0/psinfo" >&5
2876+echo $ECHO_N "checking for file /proc/0/psinfo... $ECHO_C" >&6; }
2877+if test -r /proc/0/psinfo; then
2878+ { echo "$as_me:$LINENO: result: yes" >&5
2879+echo "${ECHO_T}yes" >&6; }
2880+
2881+cat >>confdefs.h <<\_ACEOF
2882+#define HAVE_PROC_0_PSINFO 1
2883+_ACEOF
2884+
2885+else
2886+ { echo "$as_me:$LINENO: result: no" >&5
2887+echo "${ECHO_T}no" >&6; }
2888+fi
2889+
2890+{ echo "$as_me:$LINENO: checking for file /proc/loadavg" >&5
2891+echo $ECHO_N "checking for file /proc/loadavg... $ECHO_C" >&6; }
2892+if test -r /proc/loadavg; then
2893+ { echo "$as_me:$LINENO: result: yes" >&5
2894+echo "${ECHO_T}yes" >&6; }
2895+
2896+cat >>confdefs.h <<\_ACEOF
2897+#define HAVE_PROC_LOADAVG 1
2898+_ACEOF
2899+
2900+else
2901+ { echo "$as_me:$LINENO: result: no" >&5
2902+echo "${ECHO_T}no" >&6; }
2903+fi
2904+
2905+{ echo "$as_me:$LINENO: checking for file /proc/net/dev" >&5
2906+echo $ECHO_N "checking for file /proc/net/dev... $ECHO_C" >&6; }
2907+if test -r /proc/net/dev; then
2908+ { echo "$as_me:$LINENO: result: yes" >&5
2909+echo "${ECHO_T}yes" >&6; }
2910+
2911+cat >>confdefs.h <<\_ACEOF
2912+#define HAVE_PROC_NET_DEV 1
2913+_ACEOF
2914+
2915+else
2916+ { echo "$as_me:$LINENO: result: no" >&5
2917+echo "${ECHO_T}no" >&6; }
2918+fi
2919+
2920+
2921+{ echo "$as_me:$LINENO: checking for long long format" >&5
2922+echo $ECHO_N "checking for long long format... $ECHO_C" >&6; }
2923+if test "$cross_compiling" = yes; then
2924+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
2925+See \`config.log' for more details." >&5
2926+echo "$as_me: error: cannot run test program while cross compiling
2927+See \`config.log' for more details." >&2;}
2928+ { (exit 1); exit 1; }; }
2929+else
2930+ cat >conftest.$ac_ext <<_ACEOF
2931+
2932+#include <sys/types.h>
2933+int main()
2934+{
2935+ uint64_t i;
2936+
2937+ sscanf("200000000010020", "%qu", &i);
2938+
2939+ if (i == 200000000010020) return 0;
2940+ else return -1;
2941+}
2942+
2943+_ACEOF
2944+rm -f conftest$ac_exeext
2945+if { (ac_try="$ac_link"
2946+case "(($ac_try" in
2947+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2948+ *) ac_try_echo=$ac_try;;
2949+esac
2950+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2951+ (eval "$ac_link") 2>&5
2952+ ac_status=$?
2953+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
2954+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
2955+ { (case "(($ac_try" in
2956+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2957+ *) ac_try_echo=$ac_try;;
2958+esac
2959+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2960+ (eval "$ac_try") 2>&5
2961+ ac_status=$?
2962+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
2963+ (exit $ac_status); }; }; then
2964+
2965+cat >>confdefs.h <<\_ACEOF
2966+#define HAVE_LONG_LONG_QU 1
2967+_ACEOF
2968+
2969+{ echo "$as_me:$LINENO: result: yes" >&5
2970+echo "${ECHO_T}yes" >&6; }
2971+else
2972+ echo "$as_me: program exited with status $ac_status" >&5
2973+echo "$as_me: failed program was:" >&5
2974+sed 's/^/| /' conftest.$ac_ext >&5
2975+
2976+( exit $ac_status )
2977+{ echo "$as_me:$LINENO: result: no" >&5
2978+echo "${ECHO_T}no" >&6; }
2979+fi
2980+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
2981+fi
2982+
2983+
2984+
2985 { echo "$as_me:$LINENO: checking for -rdynamic linking option" >&5
2986 echo $ECHO_N "checking for -rdynamic linking option... $ECHO_C" >&6; }
2987 saved_LDFLAGS="$LDFLAGS"
2988-LDFLAGS="-rdynamic"
2989+LDFLAGS="-rdynamic $LDFLAGS"
2990 cat >conftest.$ac_ext <<_ACEOF
2991 /* confdefs.h. */
2992 _ACEOF
2993@@ -9313,7 +9319,7 @@
2994 test ! -s conftest.err
2995 } && test -s conftest$ac_exeext &&
2996 $as_test_x conftest$ac_exeext; then
2997- LDFLAGS="$saved_LDFLAGS -rdynamic"
2998+ LDFLAGS="-rdynamic $saved_LDFLAGS"
2999 { echo "$as_me:$LINENO: result: yes" >&5
3000 echo "${ECHO_T}yes" >&6; }
3001 else
3002@@ -9328,10 +9334,16 @@
3003 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3004 conftest$ac_exeext conftest.$ac_ext
3005
3006+
3007 # Check whether --enable-static was given.
3008 if test "${enable_static+set}" = set; then
3009- enableval=$enable_static; LDFLAGS="${LDFLAGS} -static";
3010- enable_static=yes
3011+ enableval=$enable_static; case "${enableval}" in
3012+ yes) LDFLAGS="${LDFLAGS} -static" ;;
3013+ no) ;;
3014+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-static" >&5
3015+echo "$as_me: error: bad value ${enableval} for --enable-static" >&2;}
3016+ { (exit 1); exit 1; }; } ;;
3017+esac
3018 fi
3019
3020
3021@@ -9422,6 +9434,7 @@
3022 have_snmp="no"
3023 have_ipmi="no"
3024 have_ipv6="no"
3025+have_ssh2="no"
3026
3027 if test "$ipv6" = "yes"; then
3028
3029@@ -9438,6 +9451,466 @@
3030
3031
3032
3033+# Check whether --with-ibm-db2 was given.
3034+if test "${with_ibm_db2+set}" = set; then
3035+ withval=$with_ibm_db2;
3036+ if test "$withval" != "no"; then
3037+ want_ibm_db2="yes"
3038+ if test "$withval" != "yes"; then
3039+ ibm_db2_include_dir="$withval/include"
3040+ ibm_db2_lib_dir="$withval/lib"
3041+ else
3042+ ibm_db2_include_dir=/home/db2inst1/sqllib/include
3043+ ibm_db2_lib_dir=/home/db2inst1/sqllib/lib
3044+ fi
3045+ fi
3046+
3047+
3048+fi
3049+
3050+
3051+# Check whether --with-ibm-db2-include was given.
3052+if test "${with_ibm_db2_include+set}" = set; then
3053+ withval=$with_ibm_db2_include;
3054+ if test "$withval" != "no"; then
3055+ want_ibm_db2="yes"
3056+ ibm_db2_include_dir="$withval"
3057+ fi
3058+
3059+
3060+fi
3061+
3062+
3063+# Check whether --with-ibm-db2-lib was given.
3064+if test "${with_ibm_db2_lib+set}" = set; then
3065+ withval=$with_ibm_db2_lib;
3066+ if test "$withval" != "no"; then
3067+ want_ibm_db2="yes"
3068+ ibm_db2_lib_dir="$withval"
3069+ fi
3070+
3071+
3072+fi
3073+
3074+
3075+ if test "x$want_ibm_db2" = "xyes"; then
3076+ IBM_DB2_CPPFLAGS="-I$ibm_db2_include_dir"
3077+ IBM_DB2_LDFLAGS="-L$ibm_db2_lib_dir"
3078+ IBM_DB2_LIBS="-ldb2"
3079+
3080+ saved_CPPFLAGS="$CPPFLAGS"
3081+ CPPFLAGS="$CPPFLAGS $IBM_DB2_CPPFLAGS $IBM_DB2_LDFLAGS $IBM_DB2_LIBS"
3082+
3083+ { echo "$as_me:$LINENO: checking for IBM DB2 CLI libraries" >&5
3084+echo $ECHO_N "checking for IBM DB2 CLI libraries... $ECHO_C" >&6; }
3085+ cat >conftest.$ac_ext <<_ACEOF
3086+/* confdefs.h. */
3087+_ACEOF
3088+cat confdefs.h >>conftest.$ac_ext
3089+cat >>conftest.$ac_ext <<_ACEOF
3090+/* end confdefs.h. */
3091+#include <sqlcli1.h>
3092+int
3093+main ()
3094+{
3095+SQLHANDLE hdbc;
3096+ SQLRETURN sqlr;
3097+ sqlr = SQLDriverConnect(hdbc, 0, "", SQL_NTS, 0, 0, 0, SQL_DRIVER_NOPROMPT);
3098+
3099+ ;
3100+ return 0;
3101+}
3102+_ACEOF
3103+rm -f conftest.$ac_objext conftest$ac_exeext
3104+if { (ac_try="$ac_link"
3105+case "(($ac_try" in
3106+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3107+ *) ac_try_echo=$ac_try;;
3108+esac
3109+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3110+ (eval "$ac_link") 2>conftest.er1
3111+ ac_status=$?
3112+ grep -v '^ *+' conftest.er1 >conftest.err
3113+ rm -f conftest.er1
3114+ cat conftest.err >&5
3115+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
3116+ (exit $ac_status); } && {
3117+ test -z "$ac_c_werror_flag" ||
3118+ test ! -s conftest.err
3119+ } && test -s conftest$ac_exeext &&
3120+ $as_test_x conftest$ac_exeext; then
3121+
3122+cat >>confdefs.h <<\_ACEOF
3123+#define HAVE_IBM_DB2 1
3124+_ACEOF
3125+
3126+ found_ibm_db2="yes"
3127+ { echo "$as_me:$LINENO: result: yes" >&5
3128+echo "${ECHO_T}yes" >&6; }
3129+else
3130+ echo "$as_me: failed program was:" >&5
3131+sed 's/^/| /' conftest.$ac_ext >&5
3132+
3133+ { echo "$as_me:$LINENO: result: no" >&5
3134+echo "${ECHO_T}no" >&6; }
3135+fi
3136+
3137+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3138+ conftest$ac_exeext conftest.$ac_ext
3139+
3140+ CPPFLAGS="$saved_CPPFLAGS"
3141+ fi
3142+
3143+ if test "x$want_ibm_db2" = "xyes"; then
3144+ if test "x$have_db" != "xno"; then
3145+ { { echo "$as_me:$LINENO: error: You can configure for only one database." >&5
3146+echo "$as_me: error: You can configure for only one database." >&2;}
3147+ { (exit 1); exit 1; }; }
3148+ fi
3149+
3150+ if test "x$found_ibm_db2" = "xyes"; then
3151+ have_db="IBM DB2"
3152+ have_multirow_insert="yes"
3153+ else
3154+ { { echo "$as_me:$LINENO: error: IBM DB2 library not found" >&5
3155+echo "$as_me: error: IBM DB2 library not found" >&2;}
3156+ { (exit 1); exit 1; }; }
3157+ fi
3158+ fi
3159+
3160+
3161+ MYSQL_CONFIG="no"
3162+
3163+
3164+# Check whether --with-mysql was given.
3165+if test "${with_mysql+set}" = set; then
3166+ withval=$with_mysql;
3167+ if test "$withval" = "no"; then
3168+ want_mysql="no"
3169+ elif test "$withval" = "yes"; then
3170+ want_mysql="yes"
3171+ else
3172+ want_mysql="yes"
3173+ MYSQL_CONFIG="$withval"
3174+ fi
3175+
3176+else
3177+ want_mysql="no"
3178+
3179+fi
3180+
3181+
3182+ MYSQL_CFLAGS=""
3183+ MYSQL_LDFLAGS=""
3184+ MYSQL_LIBS=""
3185+ MYSQL_VERSION=""
3186+
3187+
3188+ if test "$want_mysql" = "yes"; then
3189+
3190+ if test -z "$MYSQL_CONFIG" -o test; then
3191+ # Extract the first word of "mysql_config", so it can be a program name with args.
3192+set dummy mysql_config; ac_word=$2
3193+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3194+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3195+if test "${ac_cv_path_MYSQL_CONFIG+set}" = set; then
3196+ echo $ECHO_N "(cached) $ECHO_C" >&6
3197+else
3198+ case $MYSQL_CONFIG in
3199+ [\\/]* | ?:[\\/]*)
3200+ ac_cv_path_MYSQL_CONFIG="$MYSQL_CONFIG" # Let the user override the test with a path.
3201+ ;;
3202+ *)
3203+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3204+for as_dir in $PATH
3205+do
3206+ IFS=$as_save_IFS
3207+ test -z "$as_dir" && as_dir=.
3208+ for ac_exec_ext in '' $ac_executable_extensions; do
3209+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3210+ ac_cv_path_MYSQL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
3211+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3212+ break 2
3213+ fi
3214+done
3215+done
3216+IFS=$as_save_IFS
3217+
3218+ test -z "$ac_cv_path_MYSQL_CONFIG" && ac_cv_path_MYSQL_CONFIG="no"
3219+ ;;
3220+esac
3221+fi
3222+MYSQL_CONFIG=$ac_cv_path_MYSQL_CONFIG
3223+if test -n "$MYSQL_CONFIG"; then
3224+ { echo "$as_me:$LINENO: result: $MYSQL_CONFIG" >&5
3225+echo "${ECHO_T}$MYSQL_CONFIG" >&6; }
3226+else
3227+ { echo "$as_me:$LINENO: result: no" >&5
3228+echo "${ECHO_T}no" >&6; }
3229+fi
3230+
3231+
3232+ fi
3233+
3234+ if test -f "$MYSQL_CONFIG"; then
3235+
3236+ MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`"
3237+
3238+ _full_libmysql_libs="`$MYSQL_CONFIG --libs`"
3239+
3240+ for i in $_full_libmysql_libs; do
3241+ case $i in
3242+ -lmysqlclient)
3243+ ;;
3244+ -L*)
3245+ MYSQL_LDFLAGS="${MYSQL_LDFLAGS} $i"
3246+ ;;
3247+ esac
3248+ done
3249+
3250+ if test "x$enable_static" = "xyes"; then
3251+
3252+ for i in $_full_libmysql_libs; do
3253+ case $i in
3254+ -lmysqlclient)
3255+ ;;
3256+ -l*)
3257+ _lib_name="`echo "$i" | cut -b3-`"
3258+ as_ac_Lib=`echo "ac_cv_lib_$_lib_name ''_main" | $as_tr_sh`
3259+{ echo "$as_me:$LINENO: checking for main in -l$_lib_name " >&5
3260+echo $ECHO_N "checking for main in -l$_lib_name ... $ECHO_C" >&6; }
3261+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
3262+ echo $ECHO_N "(cached) $ECHO_C" >&6
3263+else
3264+ ac_check_lib_save_LIBS=$LIBS
3265+LIBS="-l$_lib_name $LIBS"
3266+cat >conftest.$ac_ext <<_ACEOF
3267+/* confdefs.h. */
3268+_ACEOF
3269+cat confdefs.h >>conftest.$ac_ext
3270+cat >>conftest.$ac_ext <<_ACEOF
3271+/* end confdefs.h. */
3272+
3273+
3274+int
3275+main ()
3276+{
3277+return main ();
3278+ ;
3279+ return 0;
3280+}
3281+_ACEOF
3282+rm -f conftest.$ac_objext conftest$ac_exeext
3283+if { (ac_try="$ac_link"
3284+case "(($ac_try" in
3285+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3286+ *) ac_try_echo=$ac_try;;
3287+esac
3288+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3289+ (eval "$ac_link") 2>conftest.er1
3290+ ac_status=$?
3291+ grep -v '^ *+' conftest.er1 >conftest.err
3292+ rm -f conftest.er1
3293+ cat conftest.err >&5
3294+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
3295+ (exit $ac_status); } && {
3296+ test -z "$ac_c_werror_flag" ||
3297+ test ! -s conftest.err
3298+ } && test -s conftest$ac_exeext &&
3299+ $as_test_x conftest$ac_exeext; then
3300+ eval "$as_ac_Lib=yes"
3301+else
3302+ echo "$as_me: failed program was:" >&5
3303+sed 's/^/| /' conftest.$ac_ext >&5
3304+
3305+ eval "$as_ac_Lib=no"
3306+fi
3307+
3308+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3309+ conftest$ac_exeext conftest.$ac_ext
3310+LIBS=$ac_check_lib_save_LIBS
3311+fi
3312+ac_res=`eval echo '${'$as_ac_Lib'}'`
3313+ { echo "$as_me:$LINENO: result: $ac_res" >&5
3314+echo "${ECHO_T}$ac_res" >&6; }
3315+if test `eval echo '${'$as_ac_Lib'}'` = yes; then
3316+
3317+ MYSQL_LIBS="$MYSQL_LIBS $i"
3318+
3319+else
3320+
3321+ { { echo "$as_me:$LINENO: error: Not found $_lib_name library" >&5
3322+echo "$as_me: error: Not found $_lib_name library" >&2;}
3323+ { (exit 1); exit 1; }; }
3324+
3325+fi
3326+
3327+ ;;
3328+ esac
3329+ done
3330+ fi
3331+
3332+ _save_mysql_libs="${LIBS}"
3333+ _save_mysql_ldflags="${LDFLAGS}"
3334+ _save_mysql_cflags="${CFLAGS}"
3335+ LIBS="${LIBS} ${MYSQL_LIBS}"
3336+ LDFLAGS="${LDFLAGS} ${MYSQL_LDFLAGS}"
3337+ CFLAGS="${CFLAGS} ${MYSQL_CFLAGS}"
3338+
3339+ { echo "$as_me:$LINENO: checking for main in -lmysqlclient " >&5
3340+echo $ECHO_N "checking for main in -lmysqlclient ... $ECHO_C" >&6; }
3341+if test "${ac_cv_lib_mysqlclient__main+set}" = set; then
3342+ echo $ECHO_N "(cached) $ECHO_C" >&6
3343+else
3344+ ac_check_lib_save_LIBS=$LIBS
3345+LIBS="-lmysqlclient $LIBS"
3346+cat >conftest.$ac_ext <<_ACEOF
3347+/* confdefs.h. */
3348+_ACEOF
3349+cat confdefs.h >>conftest.$ac_ext
3350+cat >>conftest.$ac_ext <<_ACEOF
3351+/* end confdefs.h. */
3352+
3353+
3354+int
3355+main ()
3356+{
3357+return main ();
3358+ ;
3359+ return 0;
3360+}
3361+_ACEOF
3362+rm -f conftest.$ac_objext conftest$ac_exeext
3363+if { (ac_try="$ac_link"
3364+case "(($ac_try" in
3365+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3366+ *) ac_try_echo=$ac_try;;
3367+esac
3368+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3369+ (eval "$ac_link") 2>conftest.er1
3370+ ac_status=$?
3371+ grep -v '^ *+' conftest.er1 >conftest.err
3372+ rm -f conftest.er1
3373+ cat conftest.err >&5
3374+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
3375+ (exit $ac_status); } && {
3376+ test -z "$ac_c_werror_flag" ||
3377+ test ! -s conftest.err
3378+ } && test -s conftest$ac_exeext &&
3379+ $as_test_x conftest$ac_exeext; then
3380+ ac_cv_lib_mysqlclient__main=yes
3381+else
3382+ echo "$as_me: failed program was:" >&5
3383+sed 's/^/| /' conftest.$ac_ext >&5
3384+
3385+ ac_cv_lib_mysqlclient__main=no
3386+fi
3387+
3388+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3389+ conftest$ac_exeext conftest.$ac_ext
3390+LIBS=$ac_check_lib_save_LIBS
3391+fi
3392+{ echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient__main" >&5
3393+echo "${ECHO_T}$ac_cv_lib_mysqlclient__main" >&6; }
3394+if test $ac_cv_lib_mysqlclient__main = yes; then
3395+
3396+ MYSQL_LIBS="-lmysqlclient ${MYSQL_LIBS}"
3397+
3398+else
3399+
3400+ { { echo "$as_me:$LINENO: error: Not found mysqlclient library" >&5
3401+echo "$as_me: error: Not found mysqlclient library" >&2;}
3402+ { (exit 1); exit 1; }; }
3403+
3404+fi
3405+
3406+
3407+ LIBS="${_save_mysql_libs}"
3408+ LDFLAGS="${_save_mysql_ldflags}"
3409+ CFLAGS="${_save_mysql_cflags}"
3410+ unset _save_mysql_libs
3411+ unset _save_mysql_ldflags
3412+ unset _save_mysql_cflags
3413+
3414+ MYSQL_VERSION=`$MYSQL_CONFIG --version`
3415+
3416+
3417+cat >>confdefs.h <<\_ACEOF
3418+#define HAVE_MYSQL 1
3419+_ACEOF
3420+
3421+
3422+ found_mysql="yes"
3423+ else
3424+ found_mysql="no"
3425+ fi
3426+ fi
3427+
3428+
3429+
3430+ mysql_version_req=
3431+
3432+ if test "$found_mysql" = "yes" -a -n "$mysql_version_req"; then
3433+
3434+ { echo "$as_me:$LINENO: checking if MySQL version is >= $mysql_version_req" >&5
3435+echo $ECHO_N "checking if MySQL version is >= $mysql_version_req... $ECHO_C" >&6; }
3436+
3437+ mysql_version_req_major=`expr $mysql_version_req : '\([0-9]*\)'`
3438+ mysql_version_req_minor=`expr $mysql_version_req : '[0-9]*\.\([0-9]*\)'`
3439+ mysql_version_req_micro=`expr $mysql_version_req : '[0-9]*\.[0-9]*\.\([0-9]*\)'`
3440+ if test "x$mysql_version_req_micro" = "x"; then
3441+ mysql_version_req_micro="0"
3442+ fi
3443+
3444+ mysql_version_req_number=`expr $mysql_version_req_major \* 1000000 \
3445+ \+ $mysql_version_req_minor \* 1000 \
3446+ \+ $mysql_version_req_micro`
3447+
3448+ mysql_version_major=`expr $MYSQL_VERSION : '\([0-9]*\)'`
3449+ mysql_version_minor=`expr $MYSQL_VERSION : '[0-9]*\.\([0-9]*\)'`
3450+ mysql_version_micro=`expr $MYSQL_VERSION : '[0-9]*\.[0-9]*\.\([0-9]*\)'`
3451+ if test "x$mysql_version_micro" = "x"; then
3452+ mysql_version_micro="0"
3453+ fi
3454+
3455+ mysql_version_number=`expr $mysql_version_major \* 1000000 \
3456+ \+ $mysql_version_minor \* 1000 \
3457+ \+ $mysql_version_micro`
3458+
3459+ mysql_version_check=`expr $mysql_version_number \>\= $mysql_version_req_number`
3460+ if test "$mysql_version_check" = "1"; then
3461+ { echo "$as_me:$LINENO: result: yes" >&5
3462+echo "${ECHO_T}yes" >&6; }
3463+ else
3464+ { echo "$as_me:$LINENO: result: no" >&5
3465+echo "${ECHO_T}no" >&6; }
3466+ fi
3467+ fi
3468+
3469+
3470+
3471+
3472+
3473+
3474+ if test "x$want_mysql" = "xyes"; then
3475+ if test "x$have_db" != "xno"; then
3476+ { { echo "$as_me:$LINENO: error: You can configure for only one database." >&5
3477+echo "$as_me: error: You can configure for only one database." >&2;}
3478+ { (exit 1); exit 1; }; }
3479+ fi
3480+
3481+ if test "x$found_mysql" = "xyes"; then
3482+ have_db="MySQL"
3483+ have_multirow_insert="yes"
3484+ else
3485+ { { echo "$as_me:$LINENO: error: MySQL library not found" >&5
3486+echo "$as_me: error: MySQL library not found" >&2;}
3487+ { (exit 1); exit 1; }; }
3488+ fi
3489+ fi
3490+
3491+
3492+
3493 # Check whether --with-oracle was given.
3494 if test "${with_oracle+set}" = set; then
3495 withval=$with_oracle;
3496@@ -9826,570 +10299,6 @@
3497 fi
3498
3499
3500-
3501-# Check whether --with-sqlite3 was given.
3502-if test "${with_sqlite3+set}" = set; then
3503- withval=$with_sqlite3;
3504- if test "$withval" = "no"; then
3505- WANT_SQLITE3="no"
3506- elif test "$withval" = "yes"; then
3507- WANT_SQLITE3="yes"
3508- ac_sqlite3_path=""
3509- else
3510- WANT_SQLITE3="yes"
3511- ac_sqlite3_path="$withval"
3512- fi
3513-
3514-else
3515- WANT_SQLITE3="no"
3516-
3517-fi
3518-
3519-
3520- SQLITE3_CFLAGS=""
3521- SQLITE3_LDFLAGS=""
3522- SQLITE3_VERSION=""
3523-
3524- if test "x$WANT_SQLITE3" = "xyes"; then
3525-
3526- ac_sqlite3_header="sqlite3.h"
3527-
3528- sqlite3_version_req=3.0.0
3529- sqlite3_version_req_shorten=`expr $sqlite3_version_req : '\([0-9]*\.[0-9]*\)'`
3530- sqlite3_version_req_major=`expr $sqlite3_version_req : '\([0-9]*\)'`
3531- sqlite3_version_req_minor=`expr $sqlite3_version_req : '[0-9]*\.\([0-9]*\)'`
3532- sqlite3_version_req_micro=`expr $sqlite3_version_req : '[0-9]*\.[0-9]*\.\([0-9]*\)'`
3533- if test "x$sqlite3_version_req_micro" = "x" ; then
3534- sqlite3_version_req_micro="0"
3535- fi
3536-
3537- sqlite3_version_req_number=`expr $sqlite3_version_req_major \* 1000000 \
3538- \+ $sqlite3_version_req_minor \* 1000 \
3539- \+ $sqlite3_version_req_micro`
3540-
3541- { echo "$as_me:$LINENO: checking for SQLite3 library >= $sqlite3_version_req" >&5
3542-echo $ECHO_N "checking for SQLite3 library >= $sqlite3_version_req... $ECHO_C" >&6; }
3543-
3544- if test "$ac_sqlite3_path" != ""; then
3545- ac_sqlite3_ldflags="-L$ac_sqlite3_path/lib"
3546- ac_sqlite3_cppflags="-I$ac_sqlite3_path/include"
3547- else
3548- for ac_sqlite3_path_tmp in /usr /usr/local /opt ; do
3549- if test -f "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header" \
3550- && test -r "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header"; then
3551- ac_sqlite3_path=$ac_sqlite3_path_tmp
3552- ac_sqlite3_ldflags="-I$ac_sqlite3_path_tmp/include"
3553- ac_sqlite3_cppflags="-L$ac_sqlite3_path_tmp/lib"
3554- break;
3555- fi
3556- done
3557- fi
3558-
3559- ac_sqlite3_ldflags="$ac_sqlite3_ldflags -lsqlite3"
3560-
3561- saved_CPPFLAGS="$CPPFLAGS"
3562- CPPFLAGS="$CPPFLAGS $ac_sqlite3_cppflags"
3563-
3564- cat >conftest.$ac_ext <<_ACEOF
3565-
3566- /* confdefs.h. */
3567-_ACEOF
3568-cat confdefs.h >>conftest.$ac_ext
3569-cat >>conftest.$ac_ext <<_ACEOF
3570-/* end confdefs.h. */
3571-#include <sqlite3.h>
3572-int
3573-main ()
3574-{
3575-
3576-#if (SQLITE_VERSION_NUMBER >= $sqlite3_version_req_number)
3577-// Everything is okay
3578-#else
3579-# error SQLite version is too old
3580-#endif
3581-
3582-
3583- ;
3584- return 0;
3585-}
3586-
3587-_ACEOF
3588-rm -f conftest.$ac_objext
3589-if { (ac_try="$ac_compile"
3590-case "(($ac_try" in
3591- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3592- *) ac_try_echo=$ac_try;;
3593-esac
3594-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3595- (eval "$ac_compile") 2>conftest.er1
3596- ac_status=$?
3597- grep -v '^ *+' conftest.er1 >conftest.err
3598- rm -f conftest.er1
3599- cat conftest.err >&5
3600- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3601- (exit $ac_status); } && {
3602- test -z "$ac_c_werror_flag" ||
3603- test ! -s conftest.err
3604- } && test -s conftest.$ac_objext; then
3605-
3606- found_sqlite3="yes"
3607- { echo "$as_me:$LINENO: result: yes" >&5
3608-echo "${ECHO_T}yes" >&6; }
3609-
3610-else
3611- echo "$as_me: failed program was:" >&5
3612-sed 's/^/| /' conftest.$ac_ext >&5
3613-
3614-
3615- found_sqlite3="no"
3616- { echo "$as_me:$LINENO: result: no" >&5
3617-echo "${ECHO_T}no" >&6; }
3618-
3619-
3620-fi
3621-
3622-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3623-
3624- CPPFLAGS="$saved_CPPFLAGS"
3625-
3626- if test "$found_sqlite3" = "yes"; then
3627-
3628- SQLITE3_CPPFLAGS="$ac_sqlite3_cppflags"
3629- SQLITE3_LDFLAGS="$ac_sqlite3_ldflags"
3630-
3631- ac_sqlite3_header_path="$ac_sqlite3_path/include/$ac_sqlite3_header"
3632-
3633- if test "x$ac_sqlite3_header_path" != "x"; then
3634- ac_sqlite3_version=`cat $ac_sqlite3_header_path \
3635- | grep '#define.*SQLITE_VERSION.*\"' | sed -e 's/.* "//' \
3636- | sed -e 's/"//'`
3637- if test $ac_sqlite3_version != ""; then
3638- SQLITE3_VERSION=$ac_sqlite3_version
3639- else
3640- { echo "$as_me:$LINENO: WARNING: Can not find SQLITE_VERSION macro in sqlite3.h header to retrieve SQLite version!" >&5
3641-echo "$as_me: WARNING: Can not find SQLITE_VERSION macro in sqlite3.h header to retrieve SQLite version!" >&2;}
3642- fi
3643- fi
3644-
3645-
3646-
3647-
3648-
3649-cat >>confdefs.h <<\_ACEOF
3650-#define HAVE_SQLITE3 1
3651-_ACEOF
3652-
3653- fi
3654- fi
3655-
3656- if test "x$WANT_SQLITE3" = "xyes"; then
3657- if test "x$have_db" != "xno"; then
3658- { { echo "$as_me:$LINENO: error: You can configure for only one database." >&5
3659-echo "$as_me: error: You can configure for only one database." >&2;}
3660- { (exit 1); exit 1; }; }
3661- fi
3662-
3663- if test "x$found_sqlite3" = "xyes"; then
3664- have_db="SQLite v3.x"
3665-
3666- saved_CPPFLAGS="$CPPFLAGS"
3667- CPPFLAGS="$CPPFLAGS $SQLITE3_CPPFLAGS $SQLITE3_LDFLAGS"
3668-
3669- { echo "$as_me:$LINENO: checking for function sqlite3_open_v2() in sqlite3.h" >&5
3670-echo $ECHO_N "checking for function sqlite3_open_v2() in sqlite3.h... $ECHO_C" >&6; }
3671- cat >conftest.$ac_ext <<_ACEOF
3672-/* confdefs.h. */
3673-_ACEOF
3674-cat confdefs.h >>conftest.$ac_ext
3675-cat >>conftest.$ac_ext <<_ACEOF
3676-/* end confdefs.h. */
3677-#include <sqlite3.h>
3678-int
3679-main ()
3680-{
3681-sqlite3 *conn = 0;
3682- sqlite3_open_v2("dbname", &conn, SQLITE_OPEN_READWRITE, 0);
3683-
3684- ;
3685- return 0;
3686-}
3687-_ACEOF
3688-rm -f conftest.$ac_objext conftest$ac_exeext
3689-if { (ac_try="$ac_link"
3690-case "(($ac_try" in
3691- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3692- *) ac_try_echo=$ac_try;;
3693-esac
3694-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3695- (eval "$ac_link") 2>conftest.er1
3696- ac_status=$?
3697- grep -v '^ *+' conftest.er1 >conftest.err
3698- rm -f conftest.er1
3699- cat conftest.err >&5
3700- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3701- (exit $ac_status); } && {
3702- test -z "$ac_c_werror_flag" ||
3703- test ! -s conftest.err
3704- } && test -s conftest$ac_exeext &&
3705- $as_test_x conftest$ac_exeext; then
3706-
3707-cat >>confdefs.h <<\_ACEOF
3708-#define HAVE_FUNCTION_SQLITE3_OPEN_V2 1
3709-_ACEOF
3710-
3711- { echo "$as_me:$LINENO: result: yes" >&5
3712-echo "${ECHO_T}yes" >&6; }
3713-else
3714- echo "$as_me: failed program was:" >&5
3715-sed 's/^/| /' conftest.$ac_ext >&5
3716-
3717- { echo "$as_me:$LINENO: result: no" >&5
3718-echo "${ECHO_T}no" >&6; }
3719-fi
3720-
3721-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3722- conftest$ac_exeext conftest.$ac_ext
3723-
3724- CPPFLAGS="$saved_CPPFLAGS"
3725- else
3726- { { echo "$as_me:$LINENO: error: SQLite3 library not found" >&5
3727-echo "$as_me: error: SQLite3 library not found" >&2;}
3728- { (exit 1); exit 1; }; }
3729- fi
3730- fi
3731-
3732-
3733- MYSQL_CONFIG="no"
3734-
3735-
3736-# Check whether --with-mysql was given.
3737-if test "${with_mysql+set}" = set; then
3738- withval=$with_mysql;
3739- if test "$withval" = "no"; then
3740- want_mysql="no"
3741- elif test "$withval" = "yes"; then
3742- want_mysql="yes"
3743- else
3744- want_mysql="yes"
3745- MYSQL_CONFIG="$withval"
3746- fi
3747-
3748-else
3749- want_mysql="no"
3750-
3751-fi
3752-
3753-
3754- MYSQL_CFLAGS=""
3755- MYSQL_LDFLAGS=""
3756- MYSQL_LIBS=""
3757- MYSQL_VERSION=""
3758-
3759-
3760- if test "$want_mysql" = "yes"; then
3761-
3762- if test -z "$MYSQL_CONFIG" -o test; then
3763- # Extract the first word of "mysql_config", so it can be a program name with args.
3764-set dummy mysql_config; ac_word=$2
3765-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3766-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3767-if test "${ac_cv_path_MYSQL_CONFIG+set}" = set; then
3768- echo $ECHO_N "(cached) $ECHO_C" >&6
3769-else
3770- case $MYSQL_CONFIG in
3771- [\\/]* | ?:[\\/]*)
3772- ac_cv_path_MYSQL_CONFIG="$MYSQL_CONFIG" # Let the user override the test with a path.
3773- ;;
3774- *)
3775- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3776-for as_dir in $PATH
3777-do
3778- IFS=$as_save_IFS
3779- test -z "$as_dir" && as_dir=.
3780- for ac_exec_ext in '' $ac_executable_extensions; do
3781- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3782- ac_cv_path_MYSQL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
3783- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3784- break 2
3785- fi
3786-done
3787-done
3788-IFS=$as_save_IFS
3789-
3790- test -z "$ac_cv_path_MYSQL_CONFIG" && ac_cv_path_MYSQL_CONFIG="no"
3791- ;;
3792-esac
3793-fi
3794-MYSQL_CONFIG=$ac_cv_path_MYSQL_CONFIG
3795-if test -n "$MYSQL_CONFIG"; then
3796- { echo "$as_me:$LINENO: result: $MYSQL_CONFIG" >&5
3797-echo "${ECHO_T}$MYSQL_CONFIG" >&6; }
3798-else
3799- { echo "$as_me:$LINENO: result: no" >&5
3800-echo "${ECHO_T}no" >&6; }
3801-fi
3802-
3803-
3804- fi
3805-
3806- if test -f "$MYSQL_CONFIG"; then
3807-
3808- MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`"
3809-
3810- _full_libmysql_libs="`$MYSQL_CONFIG --libs`"
3811-
3812- for i in $_full_libmysql_libs; do
3813- case $i in
3814- -lmysqlclient)
3815- ;;
3816- -L*)
3817- MYSQL_LDFLAGS="${MYSQL_LDFLAGS} $i"
3818- ;;
3819- esac
3820- done
3821-
3822- if test "x$enable_static" = "xyes"; then
3823-
3824- for i in $_full_libmysql_libs; do
3825- case $i in
3826- -lmysqlclient)
3827- ;;
3828- -l*)
3829- _lib_name="`echo "$i" | cut -b3-`"
3830- as_ac_Lib=`echo "ac_cv_lib_$_lib_name ''_main" | $as_tr_sh`
3831-{ echo "$as_me:$LINENO: checking for main in -l$_lib_name " >&5
3832-echo $ECHO_N "checking for main in -l$_lib_name ... $ECHO_C" >&6; }
3833-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
3834- echo $ECHO_N "(cached) $ECHO_C" >&6
3835-else
3836- ac_check_lib_save_LIBS=$LIBS
3837-LIBS="-l$_lib_name $LIBS"
3838-cat >conftest.$ac_ext <<_ACEOF
3839-/* confdefs.h. */
3840-_ACEOF
3841-cat confdefs.h >>conftest.$ac_ext
3842-cat >>conftest.$ac_ext <<_ACEOF
3843-/* end confdefs.h. */
3844-
3845-
3846-int
3847-main ()
3848-{
3849-return main ();
3850- ;
3851- return 0;
3852-}
3853-_ACEOF
3854-rm -f conftest.$ac_objext conftest$ac_exeext
3855-if { (ac_try="$ac_link"
3856-case "(($ac_try" in
3857- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3858- *) ac_try_echo=$ac_try;;
3859-esac
3860-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3861- (eval "$ac_link") 2>conftest.er1
3862- ac_status=$?
3863- grep -v '^ *+' conftest.er1 >conftest.err
3864- rm -f conftest.er1
3865- cat conftest.err >&5
3866- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3867- (exit $ac_status); } && {
3868- test -z "$ac_c_werror_flag" ||
3869- test ! -s conftest.err
3870- } && test -s conftest$ac_exeext &&
3871- $as_test_x conftest$ac_exeext; then
3872- eval "$as_ac_Lib=yes"
3873-else
3874- echo "$as_me: failed program was:" >&5
3875-sed 's/^/| /' conftest.$ac_ext >&5
3876-
3877- eval "$as_ac_Lib=no"
3878-fi
3879-
3880-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3881- conftest$ac_exeext conftest.$ac_ext
3882-LIBS=$ac_check_lib_save_LIBS
3883-fi
3884-ac_res=`eval echo '${'$as_ac_Lib'}'`
3885- { echo "$as_me:$LINENO: result: $ac_res" >&5
3886-echo "${ECHO_T}$ac_res" >&6; }
3887-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
3888-
3889- MYSQL_LIBS="$MYSQL_LIBS $i"
3890-
3891-else
3892-
3893- { { echo "$as_me:$LINENO: error: Not found $_lib_name library" >&5
3894-echo "$as_me: error: Not found $_lib_name library" >&2;}
3895- { (exit 1); exit 1; }; }
3896-
3897-fi
3898-
3899- ;;
3900- esac
3901- done
3902- fi
3903-
3904- _save_mysql_libs="${LIBS}"
3905- _save_mysql_ldflags="${LDFLAGS}"
3906- _save_mysql_cflags="${CFLAGS}"
3907- LIBS="${LIBS} ${MYSQL_LIBS}"
3908- LDFLAGS="${LDFLAGS} ${MYSQL_LDFLAGS}"
3909- CFLAGS="${CFLAGS} ${MYSQL_CFLAGS}"
3910-
3911- { echo "$as_me:$LINENO: checking for main in -lmysqlclient " >&5
3912-echo $ECHO_N "checking for main in -lmysqlclient ... $ECHO_C" >&6; }
3913-if test "${ac_cv_lib_mysqlclient__main+set}" = set; then
3914- echo $ECHO_N "(cached) $ECHO_C" >&6
3915-else
3916- ac_check_lib_save_LIBS=$LIBS
3917-LIBS="-lmysqlclient $LIBS"
3918-cat >conftest.$ac_ext <<_ACEOF
3919-/* confdefs.h. */
3920-_ACEOF
3921-cat confdefs.h >>conftest.$ac_ext
3922-cat >>conftest.$ac_ext <<_ACEOF
3923-/* end confdefs.h. */
3924-
3925-
3926-int
3927-main ()
3928-{
3929-return main ();
3930- ;
3931- return 0;
3932-}
3933-_ACEOF
3934-rm -f conftest.$ac_objext conftest$ac_exeext
3935-if { (ac_try="$ac_link"
3936-case "(($ac_try" in
3937- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3938- *) ac_try_echo=$ac_try;;
3939-esac
3940-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3941- (eval "$ac_link") 2>conftest.er1
3942- ac_status=$?
3943- grep -v '^ *+' conftest.er1 >conftest.err
3944- rm -f conftest.er1
3945- cat conftest.err >&5
3946- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3947- (exit $ac_status); } && {
3948- test -z "$ac_c_werror_flag" ||
3949- test ! -s conftest.err
3950- } && test -s conftest$ac_exeext &&
3951- $as_test_x conftest$ac_exeext; then
3952- ac_cv_lib_mysqlclient__main=yes
3953-else
3954- echo "$as_me: failed program was:" >&5
3955-sed 's/^/| /' conftest.$ac_ext >&5
3956-
3957- ac_cv_lib_mysqlclient__main=no
3958-fi
3959-
3960-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3961- conftest$ac_exeext conftest.$ac_ext
3962-LIBS=$ac_check_lib_save_LIBS
3963-fi
3964-{ echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient__main" >&5
3965-echo "${ECHO_T}$ac_cv_lib_mysqlclient__main" >&6; }
3966-if test $ac_cv_lib_mysqlclient__main = yes; then
3967-
3968- MYSQL_LIBS="-lmysqlclient ${MYSQL_LIBS}"
3969-
3970-else
3971-
3972- { { echo "$as_me:$LINENO: error: Not found mysqlclient library" >&5
3973-echo "$as_me: error: Not found mysqlclient library" >&2;}
3974- { (exit 1); exit 1; }; }
3975-
3976-fi
3977-
3978-
3979- LIBS="${_save_mysql_libs}"
3980- LDFLAGS="${_save_mysql_ldflags}"
3981- CFLAGS="${_save_mysql_cflags}"
3982- unset _save_mysql_libs
3983- unset _save_mysql_ldflags
3984- unset _save_mysql_cflags
3985-
3986- MYSQL_VERSION=`$MYSQL_CONFIG --version`
3987-
3988-
3989-cat >>confdefs.h <<\_ACEOF
3990-#define HAVE_MYSQL 1
3991-_ACEOF
3992-
3993-
3994- found_mysql="yes"
3995- else
3996- found_mysql="no"
3997- fi
3998- fi
3999-
4000-
4001-
4002- mysql_version_req=
4003-
4004- if test "$found_mysql" = "yes" -a -n "$mysql_version_req"; then
4005-
4006- { echo "$as_me:$LINENO: checking if MySQL version is >= $mysql_version_req" >&5
4007-echo $ECHO_N "checking if MySQL version is >= $mysql_version_req... $ECHO_C" >&6; }
4008-
4009- mysql_version_req_major=`expr $mysql_version_req : '\([0-9]*\)'`
4010- mysql_version_req_minor=`expr $mysql_version_req : '[0-9]*\.\([0-9]*\)'`
4011- mysql_version_req_micro=`expr $mysql_version_req : '[0-9]*\.[0-9]*\.\([0-9]*\)'`
4012- if test "x$mysql_version_req_micro" = "x"; then
4013- mysql_version_req_micro="0"
4014- fi
4015-
4016- mysql_version_req_number=`expr $mysql_version_req_major \* 1000000 \
4017- \+ $mysql_version_req_minor \* 1000 \
4018- \+ $mysql_version_req_micro`
4019-
4020- mysql_version_major=`expr $MYSQL_VERSION : '\([0-9]*\)'`
4021- mysql_version_minor=`expr $MYSQL_VERSION : '[0-9]*\.\([0-9]*\)'`
4022- mysql_version_micro=`expr $MYSQL_VERSION : '[0-9]*\.[0-9]*\.\([0-9]*\)'`
4023- if test "x$mysql_version_micro" = "x"; then
4024- mysql_version_micro="0"
4025- fi
4026-
4027- mysql_version_number=`expr $mysql_version_major \* 1000000 \
4028- \+ $mysql_version_minor \* 1000 \
4029- \+ $mysql_version_micro`
4030-
4031- mysql_version_check=`expr $mysql_version_number \>\= $mysql_version_req_number`
4032- if test "$mysql_version_check" = "1"; then
4033- { echo "$as_me:$LINENO: result: yes" >&5
4034-echo "${ECHO_T}yes" >&6; }
4035- else
4036- { echo "$as_me:$LINENO: result: no" >&5
4037-echo "${ECHO_T}no" >&6; }
4038- fi
4039- fi
4040-
4041-
4042-
4043-
4044-
4045-
4046- if test "x$want_mysql" = "xyes"; then
4047- if test "x$have_db" != "xno"; then
4048- { { echo "$as_me:$LINENO: error: You can configure for only one database." >&5
4049-echo "$as_me: error: You can configure for only one database." >&2;}
4050- { (exit 1); exit 1; }; }
4051- fi
4052-
4053- if test "x$found_mysql" = "xyes"; then
4054- have_db="MySQL"
4055- have_multirow_insert="yes"
4056- else
4057- { { echo "$as_me:$LINENO: error: MySQL library not found" >&5
4058-echo "$as_me: error: MySQL library not found" >&2;}
4059- { (exit 1); exit 1; }; }
4060- fi
4061- fi
4062-
4063-
4064 PG_CONFIG="no"
4065
4066
4067@@ -10628,13 +10537,246 @@
4068 fi
4069 fi
4070
4071- { echo "$as_me:$LINENO: checking for Zabbix server database selection" >&5
4072-echo $ECHO_N "checking for Zabbix server database selection... $ECHO_C" >&6; }
4073+
4074+
4075+# Check whether --with-sqlite3 was given.
4076+if test "${with_sqlite3+set}" = set; then
4077+ withval=$with_sqlite3;
4078+ if test "$withval" = "no"; then
4079+ WANT_SQLITE3="no"
4080+ elif test "$withval" = "yes"; then
4081+ WANT_SQLITE3="yes"
4082+ ac_sqlite3_path=""
4083+ else
4084+ WANT_SQLITE3="yes"
4085+ ac_sqlite3_path="$withval"
4086+ fi
4087+
4088+else
4089+ WANT_SQLITE3="no"
4090+
4091+fi
4092+
4093+
4094+ SQLITE3_CFLAGS=""
4095+ SQLITE3_LDFLAGS=""
4096+ SQLITE3_VERSION=""
4097+
4098+ if test "x$WANT_SQLITE3" = "xyes"; then
4099+
4100+ ac_sqlite3_header="sqlite3.h"
4101+
4102+ sqlite3_version_req=3.0.0
4103+ sqlite3_version_req_shorten=`expr $sqlite3_version_req : '\([0-9]*\.[0-9]*\)'`
4104+ sqlite3_version_req_major=`expr $sqlite3_version_req : '\([0-9]*\)'`
4105+ sqlite3_version_req_minor=`expr $sqlite3_version_req : '[0-9]*\.\([0-9]*\)'`
4106+ sqlite3_version_req_micro=`expr $sqlite3_version_req : '[0-9]*\.[0-9]*\.\([0-9]*\)'`
4107+ if test "x$sqlite3_version_req_micro" = "x" ; then
4108+ sqlite3_version_req_micro="0"
4109+ fi
4110+
4111+ sqlite3_version_req_number=`expr $sqlite3_version_req_major \* 1000000 \
4112+ \+ $sqlite3_version_req_minor \* 1000 \
4113+ \+ $sqlite3_version_req_micro`
4114+
4115+ { echo "$as_me:$LINENO: checking for SQLite3 library >= $sqlite3_version_req" >&5
4116+echo $ECHO_N "checking for SQLite3 library >= $sqlite3_version_req... $ECHO_C" >&6; }
4117+
4118+ if test "$ac_sqlite3_path" != ""; then
4119+ ac_sqlite3_ldflags="-L$ac_sqlite3_path/lib"
4120+ ac_sqlite3_cppflags="-I$ac_sqlite3_path/include"
4121+ else
4122+ for ac_sqlite3_path_tmp in /usr /usr/local /opt ; do
4123+ if test -f "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header" \
4124+ && test -r "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header"; then
4125+ ac_sqlite3_path=$ac_sqlite3_path_tmp
4126+ ac_sqlite3_ldflags="-I$ac_sqlite3_path_tmp/include"
4127+ ac_sqlite3_cppflags="-L$ac_sqlite3_path_tmp/lib"
4128+ break;
4129+ fi
4130+ done
4131+ fi
4132+
4133+ ac_sqlite3_ldflags="$ac_sqlite3_ldflags -lsqlite3"
4134+
4135+ saved_CPPFLAGS="$CPPFLAGS"
4136+ CPPFLAGS="$CPPFLAGS $ac_sqlite3_cppflags"
4137+
4138+ cat >conftest.$ac_ext <<_ACEOF
4139+
4140+ /* confdefs.h. */
4141+_ACEOF
4142+cat confdefs.h >>conftest.$ac_ext
4143+cat >>conftest.$ac_ext <<_ACEOF
4144+/* end confdefs.h. */
4145+#include <sqlite3.h>
4146+int
4147+main ()
4148+{
4149+
4150+#if (SQLITE_VERSION_NUMBER >= $sqlite3_version_req_number)
4151+// Everything is okay
4152+#else
4153+# error SQLite version is too old
4154+#endif
4155+
4156+
4157+ ;
4158+ return 0;
4159+}
4160+
4161+_ACEOF
4162+rm -f conftest.$ac_objext
4163+if { (ac_try="$ac_compile"
4164+case "(($ac_try" in
4165+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4166+ *) ac_try_echo=$ac_try;;
4167+esac
4168+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4169+ (eval "$ac_compile") 2>conftest.er1
4170+ ac_status=$?
4171+ grep -v '^ *+' conftest.er1 >conftest.err
4172+ rm -f conftest.er1
4173+ cat conftest.err >&5
4174+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
4175+ (exit $ac_status); } && {
4176+ test -z "$ac_c_werror_flag" ||
4177+ test ! -s conftest.err
4178+ } && test -s conftest.$ac_objext; then
4179+
4180+ found_sqlite3="yes"
4181+ { echo "$as_me:$LINENO: result: yes" >&5
4182+echo "${ECHO_T}yes" >&6; }
4183+
4184+else
4185+ echo "$as_me: failed program was:" >&5
4186+sed 's/^/| /' conftest.$ac_ext >&5
4187+
4188+
4189+ found_sqlite3="no"
4190+ { echo "$as_me:$LINENO: result: no" >&5
4191+echo "${ECHO_T}no" >&6; }
4192+
4193+
4194+fi
4195+
4196+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4197+
4198+ CPPFLAGS="$saved_CPPFLAGS"
4199+
4200+ if test "$found_sqlite3" = "yes"; then
4201+
4202+ SQLITE3_CPPFLAGS="$ac_sqlite3_cppflags"
4203+ SQLITE3_LDFLAGS="$ac_sqlite3_ldflags"
4204+
4205+ ac_sqlite3_header_path="$ac_sqlite3_path/include/$ac_sqlite3_header"
4206+
4207+ if test "x$ac_sqlite3_header_path" != "x"; then
4208+ ac_sqlite3_version=`cat $ac_sqlite3_header_path \
4209+ | grep '#define.*SQLITE_VERSION.*\"' | sed -e 's/.* "//' \
4210+ | sed -e 's/"//'`
4211+ if test $ac_sqlite3_version != ""; then
4212+ SQLITE3_VERSION=$ac_sqlite3_version
4213+ else
4214+ { echo "$as_me:$LINENO: WARNING: Can not find SQLITE_VERSION macro in sqlite3.h header to retrieve SQLite version!" >&5
4215+echo "$as_me: WARNING: Can not find SQLITE_VERSION macro in sqlite3.h header to retrieve SQLite version!" >&2;}
4216+ fi
4217+ fi
4218+
4219+
4220+
4221+
4222+
4223+cat >>confdefs.h <<\_ACEOF
4224+#define HAVE_SQLITE3 1
4225+_ACEOF
4226+
4227+ fi
4228+ fi
4229+
4230+ if test "x$WANT_SQLITE3" = "xyes"; then
4231+ if test "x$have_db" != "xno"; then
4232+ { { echo "$as_me:$LINENO: error: You can configure for only one database." >&5
4233+echo "$as_me: error: You can configure for only one database." >&2;}
4234+ { (exit 1); exit 1; }; }
4235+ fi
4236+
4237+ if test "x$found_sqlite3" = "xyes"; then
4238+ have_db="SQLite v3.x"
4239+
4240+ saved_CPPFLAGS="$CPPFLAGS"
4241+ CPPFLAGS="$CPPFLAGS $SQLITE3_CPPFLAGS $SQLITE3_LDFLAGS"
4242+
4243+ { echo "$as_me:$LINENO: checking for function sqlite3_open_v2() in sqlite3.h" >&5
4244+echo $ECHO_N "checking for function sqlite3_open_v2() in sqlite3.h... $ECHO_C" >&6; }
4245+ cat >conftest.$ac_ext <<_ACEOF
4246+/* confdefs.h. */
4247+_ACEOF
4248+cat confdefs.h >>conftest.$ac_ext
4249+cat >>conftest.$ac_ext <<_ACEOF
4250+/* end confdefs.h. */
4251+#include <sqlite3.h>
4252+int
4253+main ()
4254+{
4255+sqlite3 *conn = 0;
4256+ sqlite3_open_v2("dbname", &conn, SQLITE_OPEN_READWRITE, 0);
4257+
4258+ ;
4259+ return 0;
4260+}
4261+_ACEOF
4262+rm -f conftest.$ac_objext conftest$ac_exeext
4263+if { (ac_try="$ac_link"
4264+case "(($ac_try" in
4265+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4266+ *) ac_try_echo=$ac_try;;
4267+esac
4268+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4269+ (eval "$ac_link") 2>conftest.er1
4270+ ac_status=$?
4271+ grep -v '^ *+' conftest.er1 >conftest.err
4272+ rm -f conftest.er1
4273+ cat conftest.err >&5
4274+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
4275+ (exit $ac_status); } && {
4276+ test -z "$ac_c_werror_flag" ||
4277+ test ! -s conftest.err
4278+ } && test -s conftest$ac_exeext &&
4279+ $as_test_x conftest$ac_exeext; then
4280+
4281+cat >>confdefs.h <<\_ACEOF
4282+#define HAVE_FUNCTION_SQLITE3_OPEN_V2 1
4283+_ACEOF
4284+
4285+ { echo "$as_me:$LINENO: result: yes" >&5
4286+echo "${ECHO_T}yes" >&6; }
4287+else
4288+ echo "$as_me: failed program was:" >&5
4289+sed 's/^/| /' conftest.$ac_ext >&5
4290+
4291+ { echo "$as_me:$LINENO: result: no" >&5
4292+echo "${ECHO_T}no" >&6; }
4293+fi
4294+
4295+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
4296+ conftest$ac_exeext conftest.$ac_ext
4297+
4298+ CPPFLAGS="$saved_CPPFLAGS"
4299+ else
4300+ { { echo "$as_me:$LINENO: error: SQLite3 library not found" >&5
4301+echo "$as_me: error: SQLite3 library not found" >&2;}
4302+ { (exit 1); exit 1; }; }
4303+ fi
4304+ fi
4305+
4306+ { echo "$as_me:$LINENO: checking for Zabbix server/proxy database selection" >&5
4307+echo $ECHO_N "checking for Zabbix server/proxy database selection... $ECHO_C" >&6; }
4308 if test "x$have_db" = "xno"; then
4309 { echo "$as_me:$LINENO: result: error" >&5
4310 echo "${ECHO_T}error" >&6; }
4311- { { echo "$as_me:$LINENO: error: No database selected for Zabbix server. Use --with-mysql or --with-oracle or --with-pgsql or --with-sqlite3." >&5
4312-echo "$as_me: error: No database selected for Zabbix server. Use --with-mysql or --with-oracle or --with-pgsql or --with-sqlite3." >&2;}
4313+ { { echo "$as_me:$LINENO: error: No database selected for Zabbix server/proxy. Use --with-ibm-db2 or --with-mysql or --with-oracle or --with-pgsql or --with-sqlite3." >&5
4314+echo "$as_me: error: No database selected for Zabbix server/proxy. Use --with-ibm-db2 or --with-mysql or --with-oracle or --with-pgsql or --with-sqlite3." >&2;}
4315 { (exit 1); exit 1; }; }
4316 else
4317 { echo "$as_me:$LINENO: result: ok" >&5
4318@@ -10656,9 +10798,9 @@
4319 echo "${ECHO_T}no" >&6; }
4320 fi
4321
4322- DB_CPPFLAGS="$ORACLE_CPPFLAGS $SQLITE3_CPPFLAGS $MYSQL_CFLAGS $POSTGRESQL_CPPFLAGS"
4323- DB_LDFLAGS="$ORACLE_LDFLAGS $SQLITE3_LDFLAGS $MYSQL_LDFLAGS $POSTGRESQL_LDFLAGS"
4324- DB_LIBS="$ORACLE_LIBS $SQLITE3_LIBS $MYSQL_LIBS $POSTGRESQL_LIBS"
4325+ DB_CPPFLAGS="$IBM_DB2_CPPFLAGS $MYSQL_CFLAGS $ORACLE_CPPFLAGS $POSTGRESQL_CPPFLAGS $SQLITE3_CPPFLAGS"
4326+ DB_LDFLAGS="$IBM_DB2_LDFLAGS $MYSQL_LDFLAGS $ORACLE_LDFLAGS $POSTGRESQL_LDFLAGS $SQLITE3_LDFLAGS"
4327+ DB_LIBS="$IBM_DB2_LIBS $MYSQL_LIBS $ORACLE_LIBS $POSTGRESQL_LIBS $SQLITE3_LIBS"
4328
4329
4330
4331@@ -11184,7 +11326,7 @@
4332 fi
4333
4334 else
4335- want_curl=try
4336+ want_curl=no
4337 fi
4338
4339
4340@@ -11710,6 +11852,96 @@
4341 fi
4342
4343
4344+ { echo "$as_me:$LINENO: checking for curl_easy_escape" >&5
4345+echo $ECHO_N "checking for curl_easy_escape... $ECHO_C" >&6; }
4346+if test "${ac_cv_func_curl_easy_escape+set}" = set; then
4347+ echo $ECHO_N "(cached) $ECHO_C" >&6
4348+else
4349+ cat >conftest.$ac_ext <<_ACEOF
4350+/* confdefs.h. */
4351+_ACEOF
4352+cat confdefs.h >>conftest.$ac_ext
4353+cat >>conftest.$ac_ext <<_ACEOF
4354+/* end confdefs.h. */
4355+/* Define curl_easy_escape to an innocuous variant, in case <limits.h> declares curl_easy_escape.
4356+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
4357+#define curl_easy_escape innocuous_curl_easy_escape
4358+
4359+/* System header to define __stub macros and hopefully few prototypes,
4360+ which can conflict with char curl_easy_escape (); below.
4361+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
4362+ <limits.h> exists even on freestanding compilers. */
4363+
4364+#ifdef __STDC__
4365+# include <limits.h>
4366+#else
4367+# include <assert.h>
4368+#endif
4369+
4370+#undef curl_easy_escape
4371+
4372+/* Override any GCC internal prototype to avoid an error.
4373+ Use char because int might match the return type of a GCC
4374+ builtin and then its argument prototype would still apply. */
4375+#ifdef __cplusplus
4376+extern "C"
4377+#endif
4378+char curl_easy_escape ();
4379+/* The GNU C library defines this for functions which it implements
4380+ to always fail with ENOSYS. Some functions are actually named
4381+ something starting with __ and the normal name is an alias. */
4382+#if defined __stub_curl_easy_escape || defined __stub___curl_easy_escape
4383+choke me
4384+#endif
4385+
4386+int
4387+main ()
4388+{
4389+return curl_easy_escape ();
4390+ ;
4391+ return 0;
4392+}
4393+_ACEOF
4394+rm -f conftest.$ac_objext conftest$ac_exeext
4395+if { (ac_try="$ac_link"
4396+case "(($ac_try" in
4397+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4398+ *) ac_try_echo=$ac_try;;
4399+esac
4400+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4401+ (eval "$ac_link") 2>conftest.er1
4402+ ac_status=$?
4403+ grep -v '^ *+' conftest.er1 >conftest.err
4404+ rm -f conftest.er1
4405+ cat conftest.err >&5
4406+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
4407+ (exit $ac_status); } && {
4408+ test -z "$ac_c_werror_flag" ||
4409+ test ! -s conftest.err
4410+ } && test -s conftest$ac_exeext &&
4411+ $as_test_x conftest$ac_exeext; then
4412+ ac_cv_func_curl_easy_escape=yes
4413+else
4414+ echo "$as_me: failed program was:" >&5
4415+sed 's/^/| /' conftest.$ac_ext >&5
4416+
4417+ ac_cv_func_curl_easy_escape=no
4418+fi
4419+
4420+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
4421+ conftest$ac_exeext conftest.$ac_ext
4422+fi
4423+{ echo "$as_me:$LINENO: result: $ac_cv_func_curl_easy_escape" >&5
4424+echo "${ECHO_T}$ac_cv_func_curl_easy_escape" >&6; }
4425+if test $ac_cv_func_curl_easy_escape = yes; then
4426+
4427+cat >>confdefs.h <<\_ACEOF
4428+#define HAVE_FUNCTION_CURL_EASY_ESCAPE 1
4429+_ACEOF
4430+
4431+fi
4432+
4433+
4434 LIBS="${_save_curl_libs}"
4435 LDFLAGS="${_save_curl_ldflags}"
4436 CFLAGS="${_save_curl_cflags}"
4437@@ -13631,10 +13863,66 @@
4438
4439
4440
4441+{ echo "$as_me:$LINENO: checking for AIX OS level 5300-06" >&5
4442+echo $ECHO_N "checking for AIX OS level 5300-06... $ECHO_C" >&6; }
4443+cat >conftest.$ac_ext <<_ACEOF
4444+/* confdefs.h. */
4445+_ACEOF
4446+cat confdefs.h >>conftest.$ac_ext
4447+cat >>conftest.$ac_ext <<_ACEOF
4448+/* end confdefs.h. */
4449+#include <libperfstat.h>
4450+int
4451+main ()
4452+{
4453+perfstat_partition_total_t lparstats;
4454+lparstats.type.b.donate_enabled = 0;
4455+lparstats.idle_donated_purr = 0;
4456+lparstats.busy_donated_purr = 0;
4457+lparstats.idle_stolen_purr = 0;
4458+lparstats.busy_stolen_purr = 0;
4459+
4460+ ;
4461+ return 0;
4462+}
4463+_ACEOF
4464+rm -f conftest.$ac_objext
4465+if { (ac_try="$ac_compile"
4466+case "(($ac_try" in
4467+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4468+ *) ac_try_echo=$ac_try;;
4469+esac
4470+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4471+ (eval "$ac_compile") 2>conftest.er1
4472+ ac_status=$?
4473+ grep -v '^ *+' conftest.er1 >conftest.err
4474+ rm -f conftest.er1
4475+ cat conftest.err >&5
4476+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
4477+ (exit $ac_status); } && {
4478+ test -z "$ac_c_werror_flag" ||
4479+ test ! -s conftest.err
4480+ } && test -s conftest.$ac_objext; then
4481+
4482+cat >>confdefs.h <<\_ACEOF
4483+#define HAVE_AIXOSLEVEL_530006 1
4484+_ACEOF
4485+
4486+{ echo "$as_me:$LINENO: result: yes" >&5
4487+echo "${ECHO_T}yes" >&6; }
4488+else
4489+ echo "$as_me: failed program was:" >&5
4490+sed 's/^/| /' conftest.$ac_ext >&5
4491+
4492+ { echo "$as_me:$LINENO: result: no" >&5
4493+echo "${ECHO_T}no" >&6; }
4494+fi
4495+
4496+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4497+
4498 { echo "$as_me:$LINENO: checking for architecture" >&5
4499 echo $ECHO_N "checking for architecture... $ECHO_C" >&6; }
4500
4501-# Cheks for host_os
4502 case "$host_os" in
4503 linux*)
4504 ARCH="linux"
4505@@ -13642,7 +13930,6 @@
4506 { echo "$as_me:$LINENO: result: ok (${host_os})" >&5
4507 echo "${ECHO_T}ok (${host_os})" >&6; }
4508
4509- # Ok, this is linux. Check the kernel version
4510 { echo "$as_me:$LINENO: checking for the kernel version" >&5
4511 echo $ECHO_N "checking for the kernel version... $ECHO_C" >&6; }
4512
4513@@ -13658,7 +13945,6 @@
4514 _ACEOF
4515
4516 ;;
4517-
4518 2.4.*)
4519 { echo "$as_me:$LINENO: result: 2.4 family (${kernel})" >&5
4520 echo "${ECHO_T}2.4 family (${kernel})" >&6; }
4521@@ -13731,6 +14017,7 @@
4522 ;;
4523 esac
4524
4525+
4526 cat >>confdefs.h <<_ACEOF
4527 #define ARCH "${ARCH}"
4528 _ACEOF
4529@@ -13738,7 +14025,7 @@
4530
4531
4532
4533-ac_config_files="$ac_config_files Makefile create/Makefile misc/Makefile src/Makefile src/libs/Makefile src/libs/zbxlog/Makefile src/libs/zbxalgo/Makefile src/libs/zbxmemory/Makefile src/libs/zbxcrypto/Makefile src/libs/zbxconf/Makefile src/libs/zbxdbcache/Makefile src/libs/zbxdbhigh/Makefile src/libs/zbxemail/Makefile src/libs/zbxsysinfo/Makefile src/libs/zbxsms/Makefile src/libs/zbxjabber/Makefile src/libs/zbxcommon/Makefile src/libs/zbxsysinfo/common/Makefile src/libs/zbxsysinfo/simple/Makefile src/libs/zbxsysinfo/linux/Makefile src/libs/zbxsysinfo/aix/Makefile src/libs/zbxsysinfo/freebsd/Makefile src/libs/zbxsysinfo/hpux/Makefile src/libs/zbxsysinfo/openbsd/Makefile src/libs/zbxsysinfo/osx/Makefile src/libs/zbxsysinfo/solaris/Makefile src/libs/zbxsysinfo/osf/Makefile src/libs/zbxsysinfo/netbsd/Makefile src/libs/zbxsysinfo/unknown/Makefile src/libs/zbxnix/Makefile src/libs/zbxplugin/Makefile src/libs/zbxsys/Makefile src/libs/zbxcomms/Makefile src/libs/zbxcommshigh/Makefile src/libs/zbxdb/Makefile src/libs/zbxjson/Makefile src/libs/zbxserver/Makefile src/libs/zbxicmpping/Makefile src/zabbix_agent/Makefile src/zabbix_get/Makefile src/zabbix_sender/Makefile src/zabbix_server/Makefile src/zabbix_server/alerter/Makefile src/zabbix_server/dbsyncer/Makefile src/zabbix_server/dbconfig/Makefile src/zabbix_server/discoverer/Makefile src/zabbix_server/housekeeper/Makefile src/zabbix_server/httppoller/Makefile src/zabbix_server/nodewatcher/Makefile src/zabbix_server/pinger/Makefile src/zabbix_server/poller/Makefile src/zabbix_server/timer/Makefile src/zabbix_server/trapper/Makefile src/zabbix_server/utils/Makefile src/zabbix_server/watchdog/Makefile src/zabbix_server/escalator/Makefile src/zabbix_server/proxypoller/Makefile src/zabbix_proxy/Makefile src/zabbix_proxy/heart/Makefile src/zabbix_proxy/housekeeper/Makefile src/zabbix_proxy/proxyconfig/Makefile src/zabbix_proxy/datasender/Makefile upgrades/Makefile man/Makefile"
4534+ac_config_files="$ac_config_files Makefile create/Makefile misc/Makefile src/Makefile src/libs/Makefile src/libs/zbxlog/Makefile src/libs/zbxalgo/Makefile src/libs/zbxmemory/Makefile src/libs/zbxcrypto/Makefile src/libs/zbxconf/Makefile src/libs/zbxdbcache/Makefile src/libs/zbxdbhigh/Makefile src/libs/zbxmedia/Makefile src/libs/zbxsysinfo/Makefile src/libs/zbxcommon/Makefile src/libs/zbxsysinfo/common/Makefile src/libs/zbxsysinfo/simple/Makefile src/libs/zbxsysinfo/linux/Makefile src/libs/zbxsysinfo/aix/Makefile src/libs/zbxsysinfo/freebsd/Makefile src/libs/zbxsysinfo/hpux/Makefile src/libs/zbxsysinfo/openbsd/Makefile src/libs/zbxsysinfo/osx/Makefile src/libs/zbxsysinfo/solaris/Makefile src/libs/zbxsysinfo/osf/Makefile src/libs/zbxsysinfo/netbsd/Makefile src/libs/zbxsysinfo/unknown/Makefile src/libs/zbxnix/Makefile src/libs/zbxplugin/Makefile src/libs/zbxsys/Makefile src/libs/zbxcomms/Makefile src/libs/zbxcommshigh/Makefile src/libs/zbxdb/Makefile src/libs/zbxjson/Makefile src/libs/zbxserver/Makefile src/libs/zbxicmpping/Makefile src/zabbix_agent/Makefile src/zabbix_get/Makefile src/zabbix_sender/Makefile src/zabbix_server/Makefile src/zabbix_server/alerter/Makefile src/zabbix_server/dbsyncer/Makefile src/zabbix_server/dbconfig/Makefile src/zabbix_server/discoverer/Makefile src/zabbix_server/housekeeper/Makefile src/zabbix_server/httppoller/Makefile src/zabbix_server/nodewatcher/Makefile src/zabbix_server/pinger/Makefile src/zabbix_server/poller/Makefile src/zabbix_server/timer/Makefile src/zabbix_server/trapper/Makefile src/zabbix_server/utils/Makefile src/zabbix_server/watchdog/Makefile src/zabbix_server/escalator/Makefile src/zabbix_server/proxypoller/Makefile src/zabbix_proxy/Makefile src/zabbix_proxy/heart/Makefile src/zabbix_proxy/housekeeper/Makefile src/zabbix_proxy/proxyconfig/Makefile src/zabbix_proxy/datasender/Makefile upgrades/Makefile man/Makefile"
4535
4536 cat >confcache <<\_ACEOF
4537 # This file is a shell script that caches the results of configure
4538@@ -14366,10 +14653,8 @@
4539 "src/libs/zbxconf/Makefile") CONFIG_FILES="$CONFIG_FILES src/libs/zbxconf/Makefile" ;;
4540 "src/libs/zbxdbcache/Makefile") CONFIG_FILES="$CONFIG_FILES src/libs/zbxdbcache/Makefile" ;;
4541 "src/libs/zbxdbhigh/Makefile") CONFIG_FILES="$CONFIG_FILES src/libs/zbxdbhigh/Makefile" ;;
4542- "src/libs/zbxemail/Makefile") CONFIG_FILES="$CONFIG_FILES src/libs/zbxemail/Makefile" ;;
4543+ "src/libs/zbxmedia/Makefile") CONFIG_FILES="$CONFIG_FILES src/libs/zbxmedia/Makefile" ;;
4544 "src/libs/zbxsysinfo/Makefile") CONFIG_FILES="$CONFIG_FILES src/libs/zbxsysinfo/Makefile" ;;
4545- "src/libs/zbxsms/Makefile") CONFIG_FILES="$CONFIG_FILES src/libs/zbxsms/Makefile" ;;
4546- "src/libs/zbxjabber/Makefile") CONFIG_FILES="$CONFIG_FILES src/libs/zbxjabber/Makefile" ;;
4547 "src/libs/zbxcommon/Makefile") CONFIG_FILES="$CONFIG_FILES src/libs/zbxcommon/Makefile" ;;
4548 "src/libs/zbxsysinfo/common/Makefile") CONFIG_FILES="$CONFIG_FILES src/libs/zbxsysinfo/common/Makefile" ;;
4549 "src/libs/zbxsysinfo/simple/Makefile") CONFIG_FILES="$CONFIG_FILES src/libs/zbxsysinfo/simple/Makefile" ;;
4550@@ -14574,66 +14859,66 @@
4551 PROXY_FALSE!$PROXY_FALSE$ac_delim
4552 AGENT_TRUE!$AGENT_TRUE$ac_delim
4553 AGENT_FALSE!$AGENT_FALSE$ac_delim
4554+MYSQL_CONFIG!$MYSQL_CONFIG$ac_delim
4555+MYSQL_VERSION!$MYSQL_VERSION$ac_delim
4556+MYSQL_CFLAGS!$MYSQL_CFLAGS$ac_delim
4557+_ACEOF
4558+
4559+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
4560+ break
4561+ elif $ac_last_try; then
4562+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
4563+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
4564+ { (exit 1); exit 1; }; }
4565+ else
4566+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
4567+ fi
4568+done
4569+
4570+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
4571+if test -n "$ac_eof"; then
4572+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
4573+ ac_eof=`expr $ac_eof + 1`
4574+fi
4575+
4576+cat >>$CONFIG_STATUS <<_ACEOF
4577+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
4578+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
4579+_ACEOF
4580+sed '
4581+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
4582+s/^/s,@/; s/!/@,|#_!!_#|/
4583+:n
4584+t n
4585+s/'"$ac_delim"'$/,g/; t
4586+s/$/\\/; p
4587+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
4588+' >>$CONFIG_STATUS <conf$$subs.sed
4589+rm -f conf$$subs.sed
4590+cat >>$CONFIG_STATUS <<_ACEOF
4591+CEOF$ac_eof
4592+_ACEOF
4593+
4594+
4595+ac_delim='%!_!# '
4596+for ac_last_try in false false false false false :; do
4597+ cat >conf$$subs.sed <<_ACEOF
4598+MYSQL_LDFLAGS!$MYSQL_LDFLAGS$ac_delim
4599+MYSQL_LIBS!$MYSQL_LIBS$ac_delim
4600 ORACLE_OCI_VERSION!$ORACLE_OCI_VERSION$ac_delim
4601 ORACLE_OCI_CFLAGS!$ORACLE_OCI_CFLAGS$ac_delim
4602 ORACLE_OCI_LDFLAGS!$ORACLE_OCI_LDFLAGS$ac_delim
4603-_ACEOF
4604-
4605- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
4606- break
4607- elif $ac_last_try; then
4608- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
4609-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
4610- { (exit 1); exit 1; }; }
4611- else
4612- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
4613- fi
4614-done
4615-
4616-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
4617-if test -n "$ac_eof"; then
4618- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
4619- ac_eof=`expr $ac_eof + 1`
4620-fi
4621-
4622-cat >>$CONFIG_STATUS <<_ACEOF
4623-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
4624-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
4625-_ACEOF
4626-sed '
4627-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
4628-s/^/s,@/; s/!/@,|#_!!_#|/
4629-:n
4630-t n
4631-s/'"$ac_delim"'$/,g/; t
4632-s/$/\\/; p
4633-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
4634-' >>$CONFIG_STATUS <conf$$subs.sed
4635-rm -f conf$$subs.sed
4636-cat >>$CONFIG_STATUS <<_ACEOF
4637-CEOF$ac_eof
4638-_ACEOF
4639-
4640-
4641-ac_delim='%!_!# '
4642-for ac_last_try in false false false false false :; do
4643- cat >conf$$subs.sed <<_ACEOF
4644 ORACLE_OCI_LIBS!$ORACLE_OCI_LIBS$ac_delim
4645 ORACLE_CPPFLAGS!$ORACLE_CPPFLAGS$ac_delim
4646 ORACLE_LDFLAGS!$ORACLE_LDFLAGS$ac_delim
4647 ORACLE_LIBS!$ORACLE_LIBS$ac_delim
4648-SQLITE3_CPPFLAGS!$SQLITE3_CPPFLAGS$ac_delim
4649-SQLITE3_LDFLAGS!$SQLITE3_LDFLAGS$ac_delim
4650-SQLITE3_VERSION!$SQLITE3_VERSION$ac_delim
4651-MYSQL_CONFIG!$MYSQL_CONFIG$ac_delim
4652-MYSQL_VERSION!$MYSQL_VERSION$ac_delim
4653-MYSQL_CFLAGS!$MYSQL_CFLAGS$ac_delim
4654-MYSQL_LDFLAGS!$MYSQL_LDFLAGS$ac_delim
4655-MYSQL_LIBS!$MYSQL_LIBS$ac_delim
4656 PG_CONFIG!$PG_CONFIG$ac_delim
4657 POSTGRESQL_VERSION!$POSTGRESQL_VERSION$ac_delim
4658 POSTGRESQL_CPPFLAGS!$POSTGRESQL_CPPFLAGS$ac_delim
4659 POSTGRESQL_LDFLAGS!$POSTGRESQL_LDFLAGS$ac_delim
4660+SQLITE3_CPPFLAGS!$SQLITE3_CPPFLAGS$ac_delim
4661+SQLITE3_LDFLAGS!$SQLITE3_LDFLAGS$ac_delim
4662+SQLITE3_VERSION!$SQLITE3_VERSION$ac_delim
4663 DB_CPPFLAGS!$DB_CPPFLAGS$ac_delim
4664 DB_LDFLAGS!$DB_LDFLAGS$ac_delim
4665 DB_LIBS!$DB_LIBS$ac_delim
4666@@ -15300,13 +15585,15 @@
4667
4668 if test "x$server" != "xno"; then
4669
4670-echo " With database: ${have_db}
4671- WEB Monitoring via: ${have_web_monitoring}
4672- Native Jabber: ${have_jabber}
4673- SNMP: ${have_snmp}
4674- IPMI: ${have_ipmi}
4675- Linker flags: ${LDFLAGS} ${SERVER_LDFLAGS}
4676- Libraries: ${LIBS} ${SERVER_LIBS}"
4677+echo " Server details:
4678+ With database: ${have_db}
4679+ WEB Monitoring via: ${have_web_monitoring}
4680+ Native Jabber: ${have_jabber}
4681+ SNMP: ${have_snmp}
4682+ IPMI: ${have_ipmi}
4683+ SSH: ${have_ssh2}
4684+ Linker flags: ${LDFLAGS} ${SERVER_LDFLAGS}
4685+ Libraries: ${LIBS} ${SERVER_LIBS}"
4686
4687 fi
4688
4689@@ -15315,12 +15602,13 @@
4690
4691 if test "x$proxy" != "xno"; then
4692
4693-echo " With database: ${have_db}
4694- WEB Monitoring via: ${have_web_monitoring}
4695- SNMP: ${have_snmp}
4696- IPMI: ${have_ipmi}
4697- Linker flags: ${LDFLAGS} ${PROXY_LDFLAGS}
4698- Libraries: ${LIBS} ${PROXY_LIBS}"
4699+echo " Proxy details:
4700+ With database: ${have_db}
4701+ SNMP: ${have_snmp}
4702+ IPMI: ${have_ipmi}
4703+ SSH: ${have_ssh2}
4704+ Linker flags: ${LDFLAGS} ${PROXY_LDFLAGS}
4705+ Libraries: ${LIBS} ${PROXY_LIBS}"
4706
4707 fi
4708
4709@@ -15329,8 +15617,9 @@
4710
4711 if test "x$agent" != "xno"; then
4712
4713-echo " Linker flags: ${LDFLAGS}
4714- Libraries: ${LIBS}"
4715+echo " Agent details:
4716+ Linker flags: ${LDFLAGS}
4717+ Libraries: ${LIBS}"
4718
4719 fi
4720
4721
4722=== added directory '.pc/ldap-linker-lp722300.patch'
4723=== added file '.pc/ldap-linker-lp722300.patch/configure.in'
4724--- .pc/ldap-linker-lp722300.patch/configure.in 1970-01-01 00:00:00 +0000
4725+++ .pc/ldap-linker-lp722300.patch/configure.in 2011-05-03 12:56:01 +0000
4726@@ -0,0 +1,1492 @@
4727+dnl
4728+dnl ZABBIX
4729+dnl Copyright (C) 2000-2008 SIA Zabbix
4730+dnl
4731+dnl This program is free software; you can redistribute it and/or modify
4732+dnl it under the terms of the GNU General Public License as published by
4733+dnl the Free Software Foundation; either version 2 of the License, or
4734+dnl (at your option) any later version.
4735+dnl
4736+dnl This program is distributed in the hope that it will be useful,
4737+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
4738+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4739+dnl GNU General Public License for more details.
4740+dnl
4741+dnl You should have received a copy of the GNU General Public License
4742+dnl along with this program; if not, write to the Free Software
4743+dnl Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
4744+dnl
4745+
4746+dnl Process this file with autoconf to produce a configure script.
4747+
4748+AC_INIT(src/zabbix_server/server.c)
4749+AM_INIT_AUTOMAKE([zabbix],[1.8.4])
4750+
4751+AC_MSG_NOTICE([Configuring $PACKAGE_NAME $PACKAGE_VERSION])
4752+
4753+AC_PROG_MAKE_SET
4754+
4755+AM_CONFIG_HEADER(include/config.h)
4756+
4757+AC_CANONICAL_HOST
4758+
4759+dnl *****************************************************************
4760+dnl * *
4761+dnl * Checks for programs *
4762+dnl * *
4763+dnl *****************************************************************
4764+
4765+AC_PROG_CC
4766+AM_PROG_CC_C_O
4767+
4768+dnl *****************************************************************
4769+dnl * *
4770+dnl * Checks for header files *
4771+dnl * *
4772+dnl *****************************************************************
4773+
4774+AC_HEADER_STDC
4775+AC_CHECK_HEADERS(stdio.h stdlib.h string.h unistd.h netdb.h signal.h \
4776+ syslog.h time.h errno.h sys/types.h sys/stat.h netinet/in.h \
4777+ math.h sys/socket.h dirent.h ctype.h \
4778+ mtent.h fcntl.h sys/param.h arpa/inet.h \
4779+ sys/vfs.h sys/pstat.h sys/sysinfo.h sys/statvfs.h \
4780+ sys/socket.h sys/loadavg.h arpa/inet.h \
4781+ sys/vmmeter.h strings.h vm/vm_param.h \
4782+ sys/time.h kstat.h sys/syscall.h sys/sysmacros.h sys/procfs.h \
4783+ stdint.h mach/host_info.h mach/mach_host.h knlist.h pwd.h \
4784+ sys/var.h arpa/nameser.h assert.h sys/dkstat.h sys/disk.h \
4785+ nlist.h kvm.h linux/kernel.h getopt.h procinfo.h sys/dk.h \
4786+ sys/resource.h pthread.h windows.h process.h conio.h sys/wait.h regex.h \
4787+ stdarg.h winsock2.h pdh.h psapi.h sys/sem.h sys/ipc.h sys/shm.h Winldap.h \
4788+ sys/timeb.h Winber.h lber.h ws2tcpip.h inttypes.h sys/file.h grp.h \
4789+ execinfo.h libperfstat.h sys/systemcfg.h)
4790+AC_CHECK_HEADERS(resolv.h, [], [], [
4791+ #ifdef HAVE_SYS_TYPES_H
4792+ # include <sys/types.h>
4793+ #endif
4794+ #ifdef HAVE_NETINET_IN_H
4795+ # include <netinet/in.h>
4796+ #endif
4797+ #ifdef HAVE_ARPA_NAMESER_H
4798+ # include <arpa/nameser.h>
4799+ #endif
4800+ #ifdef HAVE_NETDB_H
4801+ # include <netdb.h>
4802+ #endif
4803+])
4804+AC_CHECK_HEADERS(net/if.h net/if_mib.h, [], [], [
4805+ #include <stdio.h>
4806+ #ifdef STDC_HEADERS
4807+ # include <stdlib.h>
4808+ # include <stddef.h>
4809+ #else
4810+ # ifdef HAVE_STDLIB_H
4811+ # include <stdlib.h>
4812+ # endif
4813+ #endif
4814+ #ifdef HAVE_SYS_TYPES_H
4815+ # include <sys/types.h>
4816+ #endif
4817+ #ifdef HAVE_SYS_SOCKET_H
4818+ # include <sys/socket.h>
4819+ #endif
4820+ /* for net/if_mib.h */
4821+ #ifdef HAVE_NET_IF_H
4822+ # include <net/if.h>
4823+ #endif
4824+])
4825+AC_CHECK_HEADERS(sys/mount.h sys/proc.h sys/sysctl.h sys/user.h, [], [], [
4826+ #ifdef HAVE_SYS_TYPES_H
4827+ # include <sys/types.h>
4828+ #endif
4829+ #ifdef HAVE_SYS_PARAM_H
4830+ # include <sys/param.h>
4831+ #endif
4832+])
4833+AC_CHECK_HEADERS(sys/swap.h, [], [], [
4834+ #ifdef HAVE_SYS_PARAM_H
4835+ # include <sys/param.h>
4836+ #endif
4837+])
4838+AC_CHECK_HEADERS(sys/ucontext.h, [], [], [
4839+ #ifdef HAVE_SIGNAL_H
4840+ # include <signal.h>
4841+ #endif
4842+])
4843+AC_CHECK_HEADERS(devstat.h, [], [], [
4844+ #ifdef HAVE_SYS_DKSTAT_H
4845+ # include <sys/dkstat.h>
4846+ #endif
4847+])
4848+
4849+dnl *****************************************************************
4850+dnl * *
4851+dnl * Checks for libraries *
4852+dnl * *
4853+dnl *****************************************************************
4854+
4855+AC_SEARCH_LIBS(socket, socket)
4856+AC_SEARCH_LIBS(kstat_open, kstat)
4857+AC_SEARCH_LIBS(gethostbyname, nsl)
4858+
4859+dnl AIX
4860+AC_SEARCH_LIBS(perfstat_memory_total, perfstat, [AC_DEFINE([HAVE_LIBPERFSTAT], 1, [Define to 1 if you have the 'libperfstat' library (-lperfstat)])])
4861+AC_SEARCH_LIBS(devstat_getdevs, devstat, [AC_DEFINE([HAVE_LIBDEVSTAT], 1, [Define to 1 if you have the 'libdevstat' library (-ldevstat)])])
4862+AC_SEARCH_LIBS(getdevs, devstat, [AC_DEFINE([HAVE_LIBDEVSTAT], 1, [Define to 1 if you have the 'libdevstat' library (-ldevstat)])])
4863+
4864+dnl on FreeBSD we have to link with -lexecinfo to get backtraces
4865+AC_SEARCH_LIBS(backtrace_symbols, execinfo, [AC_DEFINE([HAVE_LIBEXECINFO], 1, [Define to 1 if you have the 'libexecinfo' library (-lexecinfo)])])
4866+
4867+AC_CHECK_LIB(m, main)
4868+AC_CHECK_LIB(kvm, main)
4869+
4870+dnl check for DNS lookup functions
4871+found_resolv="no"
4872+LIBRESOLV_CHECK_CONFIG([no])
4873+if test "x$found_resolv" != "xyes"; then
4874+ AC_MSG_ERROR([Unable to DNS lookup functions "${found_resolv}"])
4875+fi
4876+LIBS="${LIBS} ${RESOLV_LIBS}"
4877+
4878+dnl *****************************************************************
4879+dnl * *
4880+dnl * Checks for type definitions and structures *
4881+dnl * *
4882+dnl *****************************************************************
4883+
4884+AC_C_CONST
4885+AC_TYPE_PID_T
4886+
4887+AC_MSG_CHECKING(for socklen_t)
4888+AC_TRY_COMPILE([
4889+#include <sys/types.h>
4890+#include <unistd.h>
4891+#include <sys/socket.h>
4892+],[socklen_t s;],
4893+AC_MSG_RESULT(yes),
4894+[AC_DEFINE(socklen_t, int, [Define socklen_t type])
4895+AC_MSG_RESULT(no)])
4896+
4897+AC_MSG_CHECKING(for actual socklen_t parameter type in socket functions)
4898+zbx_socklen_t=
4899+for arg2 in "struct sockaddr" void; do
4900+ for arg3 in socklen_t size_t int; do
4901+ AC_TRY_COMPILE([
4902+ #ifdef HAVE_SYS_TYPES_H
4903+ # include <sys/types.h>
4904+ #endif
4905+ #ifdef HAVE_SYS_SOCKET_H
4906+ # include <sys/socket.h>
4907+ #endif
4908+ extern int getpeername(int sockfd, $arg2 *addr, $arg3 *addrlen);
4909+ ],[
4910+ $arg3 addrlen;
4911+ getpeername(0, 0, &addrlen);
4912+ ],[
4913+ zbx_socklen_t="$arg3"
4914+ break 2
4915+ ])
4916+ done
4917+done
4918+if test "x$zbx_socklen_t" != "x"; then
4919+ AC_MSG_RESULT($zbx_socklen_t)
4920+ AC_DEFINE_UNQUOTED(ZBX_SOCKLEN_T, $zbx_socklen_t, [Define actual socklen_t parameter type in socket functions])
4921+else
4922+ AC_MSG_RESULT(leaving undefined)
4923+fi
4924+
4925+AC_MSG_CHECKING(for union semun)
4926+AC_TRY_COMPILE(
4927+[
4928+#include <sys/types.h>
4929+#include <sys/ipc.h>
4930+#include <sys/sem.h>
4931+],
4932+[union semun foo;],
4933+AC_DEFINE(HAVE_SEMUN, 1, [Define to 1 if union 'semun' exists.])
4934+AC_MSG_RESULT(yes),
4935+AC_MSG_RESULT(no))
4936+
4937+AC_MSG_CHECKING(for struct vmtotal in sys/vmmeter.h)
4938+AC_TRY_COMPILE(
4939+[
4940+#ifdef HAVE_SYS_TYPES_H
4941+#include <sys/types.h>
4942+#endif /* HAVE_SYS_TYPES_H */
4943+
4944+#ifdef HAVE_SYS_PARAM_H
4945+#include <sys/param.h>
4946+#endif /* HAVE_SYS_PARAM_H */
4947+
4948+#include <sys/sysctl.h>
4949+
4950+#ifdef HAVE_VM_VM_PARAM_H
4951+#include <vm/vm_param.h>
4952+#endif /* HAVE_VM_VM_PARAM_H */
4953+
4954+#ifdef HAVE_SYS_VMMETER_H
4955+#include <sys/vmmeter.h>
4956+#endif /* HAVE_SYS_VMMETER_H */
4957+
4958+#ifndef NULL
4959+#define NULL (void *)0
4960+#endif
4961+],
4962+[
4963+ int mib[] = {CTL_VM, VM_METER};
4964+ size_t len;
4965+ struct vmtotal v;
4966+
4967+ len = sizeof(struct vmtotal);
4968+
4969+ sysctl(mib, 2, &v, &len, NULL, 0);
4970+],
4971+AC_DEFINE(HAVE_SYS_VMMETER_VMTOTAL,1,[Define to 1 if struct 'vmtotal' exists.])
4972+AC_MSG_RESULT(yes),
4973+AC_MSG_RESULT(no))
4974+
4975+AC_MSG_CHECKING(for struct uvmexp_sysctl in uvm/uvm_extern.h)
4976+AC_TRY_COMPILE(
4977+[
4978+#ifdef HAVE_SYS_TYPES_H
4979+#include <sys/types.h>
4980+#endif /* HAVE_SYS_TYPES_H */
4981+
4982+#ifdef HAVE_SYS_PARAM_H
4983+#include <sys/param.h>
4984+#endif /* HAVE_SYS_PARAM_H */
4985+
4986+#include <sys/sysctl.h>
4987+
4988+#ifdef HAVE_VM_VM_PARAM_H
4989+#include <vm/vm_param.h>
4990+#endif /* HAVE_VM_VM_PARAM_H */
4991+
4992+#ifdef HAVE_SYS_VMMETER_H
4993+#include <sys/vmmeter.h>
4994+#endif /* HAVE_SYS_VMMETER_H */
4995+
4996+#ifndef NULL
4997+#define NULL (void *)0
4998+#endif
4999+],
5000+[
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: