Merge lp:~dev-nigelj/ubuntu/oneiric/zabbix/721707-v2 into lp:ubuntu/oneiric/zabbix
- Oneiric (11.10)
- 721707-v2
- Merge into oneiric
Status: | Merged |
---|---|
Merged at revision: | 36 |
Proposed branch: | lp:~dev-nigelj/ubuntu/oneiric/zabbix/721707-v2 |
Merge into: | lp:ubuntu/oneiric/zabbix |
Diff against target: |
178200 lines (+55095/-60844) 682 files modified
.pc/applied-patches (+1/-0) .pc/configure-no-lcrypt/configure (+5077/-8403) .pc/ldap-linker-lp722300.patch/configure.in (+1494/-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 (+69/-32) ChangeLog (+339/-19) Makefile.am (+3/-8) Makefile.in (+150/-73) aclocal.m4 (+198/-113) build/win32/project/Makefile_agent (+5/-18) build/win32/project/Makefile_agent_x64 (+5/-18) build/win32/project/Makefile_get (+1/-1) build/win32/project/Makefile_get_x64 (+1/-1) build/win32/project/Makefile_sender (+1/-1) build/win32/project/Makefile_sender_x64 (+1/-1) build/win64/README (+1/-1) compile (+11/-10) config.guess (+63/-56) config.sub (+51/-16) configure (+5076/-8402) configure.in (+504/-451) create/Makefile.am (+3/-1) create/Makefile.in (+41/-14) create/data/data.sql (+10/-0) create/data/images_ibm_db2.sql (+25/-0) create/schema/ibm_db2.sql (+1076/-0) create/schema/mysql.sql (+2/-1) create/schema/oracle.sql (+4/-1) create/schema/postgresql.sql (+2/-1) create/schema/sqlite.sql (+2/-1) debian/changelog (+46/-0) debian/control (+5/-5) debian/patches/configure-no-lcrypt (+13/-13) debian/patches/ldap-linker-lp722300.patch (+54/-0) debian/patches/series (+1/-0) debian/po/da.po (+105/-0) debian/rules (+3/-4) debian/watch (+1/-0) depcomp (+64/-23) frontends/php/acknow.php (+17/-22) frontends/php/actionconf.php (+108/-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 (+68/-39) 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 (+66/-53) frontends/php/api/classes/class.cgraph.php (+270/-276) frontends/php/api/classes/class.cgraphitem.php (+36/-11) frontends/php/api/classes/class.chistory.php (+23/-27) frontends/php/api/classes/class.chost.php (+149/-121) 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 (+49/-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 (+51/-88) 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 (+179/-136) frontends/php/api/classes/class.ctriggerexpression.php (+759/-0) frontends/php/api/classes/class.cuser.php (+116/-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 (+17/-11) frontends/php/api_jsonrpc.php (+1/-1) frontends/php/applications.php (+6/-16) frontends/php/auditacts.php (+4/-3) frontends/php/auditlogs.php (+3/-31) 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 (+243/-34) frontends/php/events.php (+87/-9) frontends/php/graphs.php (+3/-3) frontends/php/history.php (+33/-39) frontends/php/hostgroups.php (+73/-28) frontends/php/hosts.php (+147/-45) 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/-15) 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.ccheckbox.php (+1/-1) 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.cipbox.php (+0/-65) 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 (+23/-304) 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 (+3/-10) frontends/php/include/classes/class.curl.php (+8/-2) frontends/php/include/classes/class.cwidget.php (+1/-1) frontends/php/include/config.inc.php (+43/-29) frontends/php/include/db.inc.php (+270/-98) frontends/php/include/debug.inc.php (+44/-44) frontends/php/include/defines.inc.php (+26/-10) frontends/php/include/discovery.inc.php (+64/-48) frontends/php/include/events.inc.php (+89/-54) frontends/php/include/export.inc.php (+126/-84) frontends/php/include/forms.inc.php (+176/-726) frontends/php/include/func.inc.php (+122/-87) frontends/php/include/hosts.inc.php (+71/-93) frontends/php/include/httptest.inc.php (+19/-5) frontends/php/include/items.inc.php (+316/-102) frontends/php/include/js.inc.php (+21/-5) frontends/php/include/locales.inc.php (+1/-0) frontends/php/include/locales/cn_zh.inc.php (+2/-83) frontends/php/include/locales/cs_cz.inc.php (+2/-81) frontends/php/include/locales/de_de.inc.php (+1/-57) frontends/php/include/locales/en_gb.inc.php (+123/-99) frontends/php/include/locales/fr_fr.inc.php (+89/-88) frontends/php/include/locales/hu_hu.inc.php (+1/-82) frontends/php/include/locales/it_it.inc.php (+1/-10) frontends/php/include/locales/ja_jp.inc.php (+168/-170) frontends/php/include/locales/ko_kr.inc.php (+0/-21) frontends/php/include/locales/lv_lv.inc.php (+158/-4) frontends/php/include/locales/nl_nl.inc.php (+0/-12) frontends/php/include/locales/pl_pl.inc.php (+1/-29) frontends/php/include/locales/pt_br.inc.php (+121/-120) frontends/php/include/locales/ru_ru.inc.php (+172/-175) frontends/php/include/locales/sk_sk.inc.php (+2062/-0) frontends/php/include/locales/sp_sp.inc.php (+1/-22) frontends/php/include/locales/sv_se.inc.php (+0/-12) frontends/php/include/locales/ua_ua.inc.php (+118/-126) frontends/php/include/maps.inc.php (+797/-1162) frontends/php/include/media.inc.php (+17/-10) frontends/php/include/menu.inc.php (+3/-4) frontends/php/include/nodes.inc.php (+0/-1) frontends/php/include/page_footer.php (+12/-5) frontends/php/include/page_header.php (+15/-6) frontends/php/include/profiles.inc.php (+43/-43) frontends/php/include/requirements.inc.php (+17/-0) frontends/php/include/schema.inc.php (+4302/-651) frontends/php/include/screens.inc.php (+69/-32) 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 (+539/-822) frontends/php/include/users.inc.php (+1/-1) frontends/php/include/validate.inc.php (+22/-37) frontends/php/include/xmlschemas/screens.rng (+135/-0) frontends/php/index.php (+4/-2) frontends/php/items.php (+59/-34) frontends/php/js/class.calendar.js (+3/-3) frontends/php/js/class.cmap.js (+59/-75) frontends/php/js/class.cmessages.js (+5/-5) frontends/php/js/class.csuggest.js (+2/-2) frontends/php/js/class.cviewswitcher.js (+33/-50) frontends/php/js/class.pmaster.js (+2/-2) frontends/php/js/common.js (+62/-73) frontends/php/js/functions.js (+49/-13) 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/maintenance.php (+6/-6) frontends/php/maps.php (+92/-77) frontends/php/media_types.php (+115/-78) frontends/php/popup.php (+46/-32) frontends/php/popup_trexpr.php (+211/-104) frontends/php/profile.php (+7/-9) frontends/php/proxies.php (+3/-2) frontends/php/queue.php (+9/-7) frontends/php/report2.php (+73/-77) frontends/php/report4.php (+160/-127) frontends/php/report5.php (+1/-0) frontends/php/screenconf.php (+23/-12) frontends/php/screenedit.php (+10/-15) frontends/php/screens.php (+74/-27) 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/slideconf.php (+18/-13) frontends/php/slides.php (+10/-4) frontends/php/styles/calendar.css (+1/-1) frontends/php/styles/css_od.css (+10/-2) frontends/php/styles/table.css (+31/-33) frontends/php/sysmap.php (+3/-4) frontends/php/sysmaps.php (+18/-28) frontends/php/templates.php (+31/-27) frontends/php/tr_comments.php (+30/-6) frontends/php/tr_events.php (+18/-8) frontends/php/tr_logform.php (+33/-33) frontends/php/tr_status.php (+44/-14) frontends/php/tr_testexpr.php (+24/-35) frontends/php/triggers.php (+94/-65) frontends/php/users.php (+8/-6) include/cfg.h (+0/-9) include/common.h (+81/-83) include/comms.h (+11/-7) include/config.h.in (+53/-38) include/daemon.h (+4/-5) include/db.h (+108/-140) include/dbcache.h (+16/-8) include/dbschema.h (+16/-25) include/email.h (+0/-28) include/ipc.h (+1/-0) include/jabber.h (+0/-27) include/mutexs.h (+25/-30) include/service.h (+5/-5) include/sms.h (+0/-26) include/snprintf.c (+0/-983) include/sysinc.h (+7/-0) include/sysinfo.h (+180/-140) include/threads.h (+19/-10) include/zbxdb.h (+131/-104) include/zbxexec.h (+25/-0) include/zbxicmpping.h (+11/-9) include/zbxjson.h (+9/-6) include/zbxmacros.h (+0/-1) include/zbxmedia.h (+37/-0) include/zbxodbc.h (+1/-1) include/zbxplugin.h (+0/-61) include/zbxself.h (+68/-0) include/zbxserver.h (+4/-9) include/zlog.h (+1/-1) install-sh (+3/-2) m4/ax_lib_ibm_db2.m4 (+64/-0) m4/ax_lib_oracle_oci.m4 (+2/-2) m4/ax_lib_postgresql.m4 (+3/-1) m4/iconv.m4 (+1/-1) m4/ldap.m4 (+3/-1) m4/libcurl.m4 (+6/-2) m4/openipmi.m4 (+1/-1) m4/resolv.m4 (+1/-1) man/Makefile.in (+130/-93) man/zabbix_sender.man (+12/-8) misc/Makefile.in (+38/-13) misc/conf/zabbix_agent.conf (+0/-1) misc/conf/zabbix_agentd.conf (+20/-22) misc/conf/zabbix_agentd.win.conf (+43/-12) misc/conf/zabbix_agentd/userparameter_examples.conf (+8/-0) misc/conf/zabbix_agentd/userparameter_mysql.conf (+14/-0) misc/conf/zabbix_proxy.conf (+37/-28) misc/conf/zabbix_server.conf (+33/-12) 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/init.d/ubuntu/zabbix-agent.conf (+8/-0) misc/init.d/ubuntu/zabbix-server.conf (+9/-0) misc/snmptrap/snmptrap.sh (+1/-2) missing (+29/-20) src/Makefile.am (+1/-0) src/Makefile.in (+108/-38) src/libs/Makefile.am (+10/-15) src/libs/Makefile.in (+117/-50) src/libs/zbxalgo/Makefile.in (+56/-25) src/libs/zbxalgo/algodefs.c (+4/-4) src/libs/zbxalgo/binaryheap.c (+13/-57) src/libs/zbxalgo/hashmap.c (+10/-40) src/libs/zbxalgo/hashset.c (+2/-38) src/libs/zbxalgo/vector.c (+1/-1) src/libs/zbxcommon/Makefile.in (+56/-25) src/libs/zbxcommon/comms.c (+22/-112) src/libs/zbxcommon/file.c (+1/-2) src/libs/zbxcommon/misc.c (+286/-95) src/libs/zbxcommon/regexp.c (+38/-30) src/libs/zbxcommon/str.c (+672/-212) src/libs/zbxcomms/Makefile.in (+56/-25) src/libs/zbxcomms/comms.c (+103/-65) src/libs/zbxcommshigh/Makefile.in (+56/-25) src/libs/zbxcommshigh/comms.c (+0/-1) src/libs/zbxconf/Makefile.in (+56/-25) src/libs/zbxconf/cfg.c (+136/-143) src/libs/zbxcrypto/Makefile.in (+56/-25) src/libs/zbxdb/Makefile.in (+56/-25) src/libs/zbxdb/db.c (+833/-533) src/libs/zbxdbcache/Makefile.in (+56/-25) src/libs/zbxdbcache/dbcache.c (+106/-100) src/libs/zbxdbcache/dbconfig.c (+441/-331) src/libs/zbxdbcache/nextchecks.c (+25/-11) src/libs/zbxdbhigh/Makefile.in (+70/-39) src/libs/zbxdbhigh/db.c (+165/-188) src/libs/zbxdbhigh/dbschema.c (+9/-3706) src/libs/zbxdbhigh/discovery.c (+1/-1) src/libs/zbxdbhigh/host.c (+37/-35) src/libs/zbxdbhigh/macro.c (+12/-11) src/libs/zbxdbhigh/odbc.c (+10/-11) src/libs/zbxdbhigh/proxy.c (+33/-27) src/libs/zbxemail/Makefile.am (+0/-5) src/libs/zbxemail/Makefile.in (+0/-468) src/libs/zbxemail/email.c (+0/-278) src/libs/zbxexec/Makefile.am (+5/-0) src/libs/zbxexec/Makefile.in (+499/-0) src/libs/zbxexec/execute.c (+425/-0) src/libs/zbxicmpping/Makefile.in (+56/-25) src/libs/zbxicmpping/icmpping.c (+226/-155) 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 (+56/-25) src/libs/zbxjson/json.c (+311/-237) src/libs/zbxlog/Makefile.in (+56/-25) src/libs/zbxlog/log.c (+1/-3) src/libs/zbxmedia/Makefile.am (+13/-0) src/libs/zbxmedia/Makefile.in (+511/-0) src/libs/zbxmedia/email.c (+290/-0) src/libs/zbxmedia/eztexting.c (+291/-0) src/libs/zbxmedia/jabber.c (+541/-0) src/libs/zbxmedia/sms.c (+269/-0) src/libs/zbxmemory/Makefile.in (+56/-25) src/libs/zbxmemory/memalloc.c (+28/-37) src/libs/zbxmemory/strpool.c (+2/-20) src/libs/zbxnix/Makefile.in (+56/-25) src/libs/zbxnix/daemon.c (+37/-24) src/libs/zbxnix/ipc.c (+5/-5) src/libs/zbxnix/pid.c (+6/-2) src/libs/zbxplugin/Makefile.am (+0/-5) src/libs/zbxplugin/Makefile.in (+0/-468) src/libs/zbxplugin/zbxplugin.c (+0/-33) src/libs/zbxself/Makefile.am (+5/-0) src/libs/zbxself/Makefile.in (+499/-0) src/libs/zbxself/selfmon.c (+559/-0) src/libs/zbxserver/Makefile.in (+56/-25) src/libs/zbxserver/evalfunc.c (+726/-556) src/libs/zbxserver/evalfunc.h (+7/-6) src/libs/zbxserver/expression.c (+784/-919) 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 (+56/-25) src/libs/zbxsys/mutexs.c (+72/-69) src/libs/zbxsys/symbols.c (+0/-1) src/libs/zbxsys/threads.c (+39/-46) src/libs/zbxsysinfo/Makefile.in (+116/-46) src/libs/zbxsysinfo/aix/Makefile.am (+0/-3) src/libs/zbxsysinfo/aix/Makefile.in (+74/-94) src/libs/zbxsysinfo/aix/aix.c (+5/-17) src/libs/zbxsysinfo/aix/cpu.c (+25/-70) 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 (+56/-25) src/libs/zbxsysinfo/common/common.c (+95/-237) src/libs/zbxsysinfo/common/common.h (+5/-4) src/libs/zbxsysinfo/common/file.c (+2/-30) src/libs/zbxsysinfo/common/file.h (+4/-3) src/libs/zbxsysinfo/common/http.c (+102/-165) src/libs/zbxsysinfo/common/http.h (+3/-2) src/libs/zbxsysinfo/common/net.c (+40/-117) src/libs/zbxsysinfo/common/net.h (+7/-7) src/libs/zbxsysinfo/common/system.c (+3/-19) src/libs/zbxsysinfo/common/system.h (+6/-5) src/libs/zbxsysinfo/freebsd/Makefile.am (+2/-3) src/libs/zbxsysinfo/freebsd/Makefile.in (+95/-81) src/libs/zbxsysinfo/freebsd/boottime.c (+0/-4) src/libs/zbxsysinfo/freebsd/cpu.c (+22/-57) src/libs/zbxsysinfo/freebsd/diskio.c (+32/-61) 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 (+68/-138) src/libs/zbxsysinfo/hpux/cpu.c (+36/-101) 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 (+97/-66) src/libs/zbxsysinfo/linux/boottime.c (+2/-7) src/libs/zbxsysinfo/linux/cpu.c (+27/-58) src/libs/zbxsysinfo/linux/diskio.c (+34/-61) 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 (+93/-96) src/libs/zbxsysinfo/netbsd/boottime.c (+0/-4) src/libs/zbxsysinfo/netbsd/cpu.c (+23/-61) 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 (+97/-66) src/libs/zbxsysinfo/openbsd/boottime.c (+0/-4) src/libs/zbxsysinfo/openbsd/cpu.c (+21/-52) 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 (+75/-77) 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 (+75/-77) src/libs/zbxsysinfo/osx/cpu.c (+49/-207) 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 (+56/-25) src/libs/zbxsysinfo/simple/ntp.c (+128/-136) src/libs/zbxsysinfo/simple/ntp.h (+4/-3) src/libs/zbxsysinfo/simple/simple.c (+65/-79) src/libs/zbxsysinfo/simple/simple.h (+3/-2) src/libs/zbxsysinfo/solaris/Makefile.am (+1/-2) src/libs/zbxsysinfo/solaris/Makefile.in (+93/-79) src/libs/zbxsysinfo/solaris/boottime.c (+0/-5) src/libs/zbxsysinfo/solaris/cpu.c (+72/-108) 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 (+54/-69) src/libs/zbxsysinfo/unknown/Makefile.am (+1/-12) src/libs/zbxsysinfo/unknown/Makefile.in (+60/-200) 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 (+34/-27) 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/uptime.c (+1/-1) src/libs/zbxsysinfo/win32/win32.c (+9/-23) src/libs/zbxwin32/service.c (+11/-12) src/zabbix_agent/Makefile.am (+3/-4) src/zabbix_agent/Makefile.in (+111/-85) src/zabbix_agent/active.c (+192/-218) src/zabbix_agent/active.h (+44/-42) src/zabbix_agent/cpustat.c (+438/-479) src/zabbix_agent/cpustat.h (+47/-52) src/zabbix_agent/diskdevices.c (+21/-9) src/zabbix_agent/diskdevices.h (+6/-6) src/zabbix_agent/eventlog.c (+14/-12) src/zabbix_agent/eventlog.h (+4/-4) src/zabbix_agent/interfaces.c (+0/-406) src/zabbix_agent/interfaces.h (+0/-55) src/zabbix_agent/listener.c (+32/-42) src/zabbix_agent/logfiles.c (+2/-2) src/zabbix_agent/perfstat.c (+5/-4) src/zabbix_agent/perfstat.h (+20/-20) src/zabbix_agent/stats.c (+74/-113) src/zabbix_agent/stats.h (+7/-15) src/zabbix_agent/zabbix_agent.c (+12/-25) src/zabbix_agent/zabbix_agent.h (+0/-23) src/zabbix_agent/zabbix_agentd.c (+48/-45) src/zabbix_agent/zbxconf.c (+107/-85) src/zabbix_agent/zbxconf.h (+4/-2) src/zabbix_get/Makefile.am (+2/-2) src/zabbix_get/Makefile.in (+88/-44) src/zabbix_get/zabbix_get.c (+21/-26) src/zabbix_proxy/Makefile.am (+3/-0) src/zabbix_proxy/Makefile.in (+152/-63) src/zabbix_proxy/datasender/Makefile.in (+56/-25) src/zabbix_proxy/datasender/datasender.c (+64/-102) src/zabbix_proxy/datasender/datasender.h (+2/-2) src/zabbix_proxy/events.c (+1/-20) src/zabbix_proxy/events.h (+1/-2) src/zabbix_proxy/heart/Makefile.in (+56/-25) src/zabbix_proxy/heart/heart.c (+20/-35) src/zabbix_proxy/heart/heart.h (+2/-2) src/zabbix_proxy/housekeeper/Makefile.in (+56/-25) src/zabbix_proxy/housekeeper/housekeeper.c (+41/-32) src/zabbix_proxy/housekeeper/housekeeper.h (+4/-5) src/zabbix_proxy/proxy.c (+384/-254) src/zabbix_proxy/proxyconfig/Makefile.in (+56/-25) src/zabbix_proxy/proxyconfig/proxyconfig.c (+13/-28) src/zabbix_proxy/servercomms.c (+34/-19) src/zabbix_proxy/servercomms.h (+1/-1) src/zabbix_proxy/zlog.c (+2/-2) src/zabbix_sender/Makefile.am (+2/-2) src/zabbix_sender/Makefile.in (+88/-44) src/zabbix_sender/zabbix_sender.c (+122/-93) src/zabbix_server/Makefile.am (+6/-8) src/zabbix_server/Makefile.in (+159/-73) src/zabbix_server/actions.c (+112/-109) src/zabbix_server/actions.h (+0/-1) src/zabbix_server/alerter/Makefile.in (+56/-25) src/zabbix_server/alerter/alerter.c (+16/-19) src/zabbix_server/alerter/alerter.h (+1/-1) src/zabbix_server/dbconfig/Makefile.in (+56/-25) src/zabbix_server/dbconfig/dbconfig.c (+18/-16) src/zabbix_server/dbconfig/dbconfig.h (+1/-3) src/zabbix_server/dbsyncer/Makefile.in (+56/-25) src/zabbix_server/dbsyncer/dbsyncer.c (+24/-24) src/zabbix_server/dbsyncer/dbsyncer.h (+1/-5) src/zabbix_server/discoverer/Makefile.in (+56/-25) src/zabbix_server/discoverer/discoverer.c (+87/-72) src/zabbix_server/discoverer/discoverer.h (+1/-5) src/zabbix_server/escalator/Makefile.in (+56/-25) src/zabbix_server/escalator/escalator.c (+60/-125) src/zabbix_server/escalator/escalator.h (+1/-3) src/zabbix_server/events.c (+47/-83) src/zabbix_server/events.h (+1/-2) src/zabbix_server/housekeeper/Makefile.in (+56/-25) src/zabbix_server/housekeeper/housekeeper.c (+51/-76) src/zabbix_server/housekeeper/housekeeper.h (+3/-4) src/zabbix_server/httppoller/Makefile.in (+56/-25) src/zabbix_server/httppoller/httpmacro.c (+1/-4) src/zabbix_server/httppoller/httpmacro.h (+1/-1) src/zabbix_server/httppoller/httppoller.c (+35/-78) src/zabbix_server/httppoller/httppoller.h (+2/-2) src/zabbix_server/httppoller/httptest.c (+286/-362) src/zabbix_server/httppoller/httptest.h (+21/-27) src/zabbix_server/nodewatcher/Makefile.in (+58/-27) src/zabbix_server/nodewatcher/history.c (+15/-12) src/zabbix_server/nodewatcher/nodecomms.c (+20/-48) src/zabbix_server/nodewatcher/nodecomms.h (+0/-1) src/zabbix_server/nodewatcher/nodesender.c (+211/-142) src/zabbix_server/nodewatcher/nodewatcher.c (+110/-34) src/zabbix_server/nodewatcher/nodewatcher.h (+5/-2) src/zabbix_server/operations.c (+64/-68) src/zabbix_server/operations.h (+4/-7) src/zabbix_server/pinger/Makefile.in (+56/-25) src/zabbix_server/pinger/pinger.c (+126/-123) src/zabbix_server/pinger/pinger.h (+1/-5) src/zabbix_server/poller/Makefile.in (+56/-25) src/zabbix_server/poller/checks_agent.c (+2/-2) src/zabbix_server/poller/checks_aggregate.c (+27/-34) src/zabbix_server/poller/checks_calculated.c (+27/-19) src/zabbix_server/poller/checks_db.c (+8/-11) src/zabbix_server/poller/checks_external.c (+51/-72) src/zabbix_server/poller/checks_external.h (+0/-2) src/zabbix_server/poller/checks_internal.c (+129/-35) src/zabbix_server/poller/checks_ipmi.c (+46/-103) src/zabbix_server/poller/checks_simple.c (+9/-9) src/zabbix_server/poller/checks_snmp.c (+28/-14) src/zabbix_server/poller/checks_ssh.c (+35/-32) src/zabbix_server/poller/checks_telnet.c (+5/-5) src/zabbix_server/poller/poller.c (+331/-307) src/zabbix_server/poller/poller.h (+1/-9) src/zabbix_server/proxypoller/Makefile.in (+56/-25) src/zabbix_server/proxypoller/proxypoller.c (+55/-43) src/zabbix_server/proxypoller/proxypoller.h (+0/-1) src/zabbix_server/selfmon/Makefile.am (+5/-0) src/zabbix_server/selfmon/Makefile.in (+499/-0) src/zabbix_server/selfmon/selfmon.c (+43/-0) src/zabbix_server/selfmon/selfmon.h (+25/-0) src/zabbix_server/server.c (+529/-333) src/zabbix_server/timer/Makefile.in (+56/-25) src/zabbix_server/timer/timer.c (+152/-68) src/zabbix_server/timer/timer.h (+1/-1) src/zabbix_server/trapper/Makefile.in (+58/-27) src/zabbix_server/trapper/active.c (+10/-4) src/zabbix_server/trapper/nodecommand.c (+11/-28) src/zabbix_server/trapper/nodehistory.c (+76/-34) src/zabbix_server/trapper/nodesync.c (+30/-4) src/zabbix_server/trapper/proxyconfig.c (+2/-2) src/zabbix_server/trapper/trapper.c (+32/-37) src/zabbix_server/trapper/trapper.h (+1/-4) src/zabbix_server/utils/Makefile.in (+56/-25) src/zabbix_server/utils/nodechange.c (+1/-2) src/zabbix_server/watchdog/Makefile.in (+56/-25) src/zabbix_server/watchdog/watchdog.c (+71/-46) src/zabbix_server/watchdog/watchdog.h (+1/-1) src/zabbix_server/zlog.c (+2/-2) upgrades/Makefile.in (+38/-13) upgrades/dbpatches/1.6/mysql/patch.sql (+2/-0) upgrades/dbpatches/1.6/oracle/patch.sql (+2/-0) upgrades/dbpatches/1.6/postgresql/patch.sql (+2/-0) upgrades/dbpatches/1.8/mysql/patch.sql (+2/-1) upgrades/dbpatches/1.8/mysql/upgrade (+62/-19) upgrades/dbpatches/1.8/oracle/patch.sql (+2/-1) upgrades/dbpatches/1.8/postgresql/patch.sql (+2/-1) |
To merge this branch: | bzr merge lp:~dev-nigelj/ubuntu/oneiric/zabbix/721707-v2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Holbach (community) | Approve | ||
Micah Gersten | Pending | ||
Ubuntu branches | Pending | ||
Review via email: mp+61855@code.launchpad.net |
This proposal supersedes a proposal from 2011-05-03.
Commit message
* ldap-linker-
linker arguments. (LP: #722300)
* Merge from debian unstable (LP: #721707). Remaining changes:
- update build depend for mysql-transition
* New upstream release
* 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
[ Michael Ablassmeier ]
* zabbix-proxy-pgsql and -mysql: Fix package description (Closes: #586961)
* debian/po/da.po: added (Closes: #585485)
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.
Micah Gersten (micahg) wrote : Posted in a previous version of this proposal | # |
Nigel Jones (dev-nigelj) wrote : | # |
Hi Micah, thanks for the previous comment, I've resubmitted it as a new branch (I hope I've done it right!) taking into account your advice.
Before committing I would appreciate it if you could check to make sure I've done the tagging correct.
Daniel Holbach (dholbach) wrote : | # |
Good work!
I just took the liberty of adding the number of the Debian linker issue to debian/changelog as well.
Preview Diff
1 | === modified file '.pc/applied-patches' | |||
2 | --- .pc/applied-patches 2010-08-21 15:41:19 +0000 | |||
3 | +++ .pc/applied-patches 2011-05-21 10:38:25 +0000 | |||
4 | @@ -1,3 +1,4 @@ | |||
5 | 1 | configure-no-lcrypt | 1 | configure-no-lcrypt |
6 | 2 | nocrypto | 2 | nocrypto |
7 | 3 | no-swf-clock | 3 | no-swf-clock |
8 | 4 | ldap-linker-lp722300.patch | ||
9 | 4 | 5 | ||
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-21 10:38:25 +0000 | |||
13 | @@ -1,60 +1,83 @@ | |||
14 | 1 | #! /bin/sh | 1 | #! /bin/sh |
15 | 2 | # Guess values for system-dependent variables and create Makefiles. | 2 | # Guess values for system-dependent variables and create Makefiles. |
17 | 3 | # Generated by GNU Autoconf 2.61. | 3 | # Generated by GNU Autoconf 2.65. |
18 | 4 | # | ||
19 | 4 | # | 5 | # |
20 | 5 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | 6 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
22 | 6 | # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. | 7 | # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
23 | 8 | # Inc. | ||
24 | 9 | # | ||
25 | 10 | # | ||
26 | 7 | # This configure script is free software; the Free Software Foundation | 11 | # This configure script is free software; the Free Software Foundation |
27 | 8 | # gives unlimited permission to copy, distribute and modify it. | 12 | # gives unlimited permission to copy, distribute and modify it. |
31 | 9 | ## --------------------- ## | 13 | ## -------------------- ## |
32 | 10 | ## M4sh Initialization. ## | 14 | ## M4sh Initialization. ## |
33 | 11 | ## --------------------- ## | 15 | ## -------------------- ## |
34 | 12 | 16 | ||
35 | 13 | # Be more Bourne compatible | 17 | # Be more Bourne compatible |
36 | 14 | DUALCASE=1; export DUALCASE # for MKS sh | 18 | DUALCASE=1; export DUALCASE # for MKS sh |
38 | 15 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | 19 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : |
39 | 16 | emulate sh | 20 | emulate sh |
40 | 17 | NULLCMD=: | 21 | NULLCMD=: |
42 | 18 | # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which | 22 | # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which |
43 | 19 | # is contrary to our usage. Disable this feature. | 23 | # is contrary to our usage. Disable this feature. |
44 | 20 | alias -g '${1+"$@"}'='"$@"' | 24 | alias -g '${1+"$@"}'='"$@"' |
45 | 21 | setopt NO_GLOB_SUBST | 25 | setopt NO_GLOB_SUBST |
46 | 22 | else | 26 | else |
49 | 23 | case `(set -o) 2>/dev/null` in | 27 | case `(set -o) 2>/dev/null` in #( |
50 | 24 | *posix*) set -o posix ;; | 28 | *posix*) : |
51 | 29 | set -o posix ;; #( | ||
52 | 30 | *) : | ||
53 | 31 | ;; | ||
54 | 25 | esac | 32 | esac |
68 | 26 | 33 | fi | |
69 | 27 | fi | 34 | |
70 | 28 | 35 | ||
71 | 29 | 36 | as_nl=' | |
72 | 30 | 37 | ' | |
73 | 31 | 38 | export as_nl | |
74 | 32 | # PATH needs CR | 39 | # Printing a long string crashes Solaris 7 /usr/bin/printf. |
75 | 33 | # Avoid depending upon Character Ranges. | 40 | as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' |
76 | 34 | as_cr_letters='abcdefghijklmnopqrstuvwxyz' | 41 | as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo |
77 | 35 | as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' | 42 | as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo |
78 | 36 | as_cr_Letters=$as_cr_letters$as_cr_LETTERS | 43 | # Prefer a ksh shell builtin over an external printf program on Solaris, |
79 | 37 | as_cr_digits='0123456789' | 44 | # but without wasting forks for bash or zsh. |
80 | 38 | as_cr_alnum=$as_cr_Letters$as_cr_digits | 45 | if test -z "$BASH_VERSION$ZSH_VERSION" \ |
81 | 46 | && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then | ||
82 | 47 | as_echo='print -r --' | ||
83 | 48 | as_echo_n='print -rn --' | ||
84 | 49 | elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then | ||
85 | 50 | as_echo='printf %s\n' | ||
86 | 51 | as_echo_n='printf %s' | ||
87 | 52 | else | ||
88 | 53 | if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then | ||
89 | 54 | as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' | ||
90 | 55 | as_echo_n='/usr/ucb/echo -n' | ||
91 | 56 | else | ||
92 | 57 | as_echo_body='eval expr "X$1" : "X\\(.*\\)"' | ||
93 | 58 | as_echo_n_body='eval | ||
94 | 59 | arg=$1; | ||
95 | 60 | case $arg in #( | ||
96 | 61 | *"$as_nl"*) | ||
97 | 62 | expr "X$arg" : "X\\(.*\\)$as_nl"; | ||
98 | 63 | arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; | ||
99 | 64 | esac; | ||
100 | 65 | expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" | ||
101 | 66 | ' | ||
102 | 67 | export as_echo_n_body | ||
103 | 68 | as_echo_n='sh -c $as_echo_n_body as_echo' | ||
104 | 69 | fi | ||
105 | 70 | export as_echo_body | ||
106 | 71 | as_echo='sh -c $as_echo_body as_echo' | ||
107 | 72 | fi | ||
108 | 39 | 73 | ||
109 | 40 | # The user is always right. | 74 | # The user is always right. |
110 | 41 | if test "${PATH_SEPARATOR+set}" != set; then | 75 | if test "${PATH_SEPARATOR+set}" != set; then |
127 | 42 | echo "#! /bin/sh" >conf$$.sh | 76 | PATH_SEPARATOR=: |
128 | 43 | echo "exit 0" >>conf$$.sh | 77 | (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { |
129 | 44 | chmod +x conf$$.sh | 78 | (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || |
130 | 45 | if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then | 79 | PATH_SEPARATOR=';' |
131 | 46 | PATH_SEPARATOR=';' | 80 | } |
116 | 47 | else | ||
117 | 48 | PATH_SEPARATOR=: | ||
118 | 49 | fi | ||
119 | 50 | rm -f conf$$.sh | ||
120 | 51 | fi | ||
121 | 52 | |||
122 | 53 | # Support unset when possible. | ||
123 | 54 | if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then | ||
124 | 55 | as_unset=unset | ||
125 | 56 | else | ||
126 | 57 | as_unset=false | ||
132 | 58 | fi | 81 | fi |
133 | 59 | 82 | ||
134 | 60 | 83 | ||
135 | @@ -63,20 +86,18 @@ | |||
136 | 63 | # there to prevent editors from complaining about space-tab. | 86 | # there to prevent editors from complaining about space-tab. |
137 | 64 | # (If _AS_PATH_WALK were called with IFS unset, it would disable word | 87 | # (If _AS_PATH_WALK were called with IFS unset, it would disable word |
138 | 65 | # splitting by setting IFS to empty value.) | 88 | # splitting by setting IFS to empty value.) |
139 | 66 | as_nl=' | ||
140 | 67 | ' | ||
141 | 68 | IFS=" "" $as_nl" | 89 | IFS=" "" $as_nl" |
142 | 69 | 90 | ||
143 | 70 | # Find who we are. Look in the path if we contain no directory separator. | 91 | # Find who we are. Look in the path if we contain no directory separator. |
145 | 71 | case $0 in | 92 | case $0 in #(( |
146 | 72 | *[\\/]* ) as_myself=$0 ;; | 93 | *[\\/]* ) as_myself=$0 ;; |
147 | 73 | *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | 94 | *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
148 | 74 | for as_dir in $PATH | 95 | for as_dir in $PATH |
149 | 75 | do | 96 | do |
150 | 76 | IFS=$as_save_IFS | 97 | IFS=$as_save_IFS |
151 | 77 | test -z "$as_dir" && as_dir=. | 98 | test -z "$as_dir" && as_dir=. |
154 | 78 | test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break | 99 | test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break |
155 | 79 | done | 100 | done |
156 | 80 | IFS=$as_save_IFS | 101 | IFS=$as_save_IFS |
157 | 81 | 102 | ||
158 | 82 | ;; | 103 | ;; |
159 | @@ -87,354 +108,321 @@ | |||
160 | 87 | as_myself=$0 | 108 | as_myself=$0 |
161 | 88 | fi | 109 | fi |
162 | 89 | if test ! -f "$as_myself"; then | 110 | if test ! -f "$as_myself"; then |
165 | 90 | echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 | 111 | $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 |
166 | 91 | { (exit 1); exit 1; } | 112 | exit 1 |
167 | 92 | fi | 113 | fi |
168 | 93 | 114 | ||
172 | 94 | # Work around bugs in pre-3.0 UWIN ksh. | 115 | # Unset variables that we do not need and which cause bugs (e.g. in |
173 | 95 | for as_var in ENV MAIL MAILPATH | 116 | # pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" |
174 | 96 | do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var | 117 | # suppresses any "Segmentation fault" message there. '((' could |
175 | 118 | # trigger a bug in pdksh 5.2.14. | ||
176 | 119 | for as_var in BASH_ENV ENV MAIL MAILPATH | ||
177 | 120 | do eval test x\${$as_var+set} = xset \ | ||
178 | 121 | && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : | ||
179 | 97 | done | 122 | done |
180 | 98 | PS1='$ ' | 123 | PS1='$ ' |
181 | 99 | PS2='> ' | 124 | PS2='> ' |
182 | 100 | PS4='+ ' | 125 | PS4='+ ' |
183 | 101 | 126 | ||
184 | 102 | # NLS nuisances. | 127 | # NLS nuisances. |
231 | 103 | for as_var in \ | 128 | LC_ALL=C |
232 | 104 | LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ | 129 | export LC_ALL |
233 | 105 | LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ | 130 | LANGUAGE=C |
234 | 106 | LC_TELEPHONE LC_TIME | 131 | export LANGUAGE |
189 | 107 | do | ||
190 | 108 | if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then | ||
191 | 109 | eval $as_var=C; export $as_var | ||
192 | 110 | else | ||
193 | 111 | ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var | ||
194 | 112 | fi | ||
195 | 113 | done | ||
196 | 114 | |||
197 | 115 | # Required to use basename. | ||
198 | 116 | if expr a : '\(a\)' >/dev/null 2>&1 && | ||
199 | 117 | test "X`expr 00001 : '.*\(...\)'`" = X001; then | ||
200 | 118 | as_expr=expr | ||
201 | 119 | else | ||
202 | 120 | as_expr=false | ||
203 | 121 | fi | ||
204 | 122 | |||
205 | 123 | if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then | ||
206 | 124 | as_basename=basename | ||
207 | 125 | else | ||
208 | 126 | as_basename=false | ||
209 | 127 | fi | ||
210 | 128 | |||
211 | 129 | |||
212 | 130 | # Name of the executable. | ||
213 | 131 | as_me=`$as_basename -- "$0" || | ||
214 | 132 | $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ | ||
215 | 133 | X"$0" : 'X\(//\)$' \| \ | ||
216 | 134 | X"$0" : 'X\(/\)' \| . 2>/dev/null || | ||
217 | 135 | echo X/"$0" | | ||
218 | 136 | sed '/^.*\/\([^/][^/]*\)\/*$/{ | ||
219 | 137 | s//\1/ | ||
220 | 138 | q | ||
221 | 139 | } | ||
222 | 140 | /^X\/\(\/\/\)$/{ | ||
223 | 141 | s//\1/ | ||
224 | 142 | q | ||
225 | 143 | } | ||
226 | 144 | /^X\/\(\/\).*/{ | ||
227 | 145 | s//\1/ | ||
228 | 146 | q | ||
229 | 147 | } | ||
230 | 148 | s/.*/./; q'` | ||
235 | 149 | 132 | ||
236 | 150 | # CDPATH. | 133 | # CDPATH. |
239 | 151 | $as_unset CDPATH | 134 | (unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
238 | 152 | |||
240 | 153 | 135 | ||
241 | 154 | if test "x$CONFIG_SHELL" = x; then | 136 | if test "x$CONFIG_SHELL" = x; then |
243 | 155 | if (eval ":") 2>/dev/null; then | 137 | as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : |
244 | 138 | emulate sh | ||
245 | 139 | NULLCMD=: | ||
246 | 140 | # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which | ||
247 | 141 | # is contrary to our usage. Disable this feature. | ||
248 | 142 | alias -g '\${1+\"\$@\"}'='\"\$@\"' | ||
249 | 143 | setopt NO_GLOB_SUBST | ||
250 | 144 | else | ||
251 | 145 | case \`(set -o) 2>/dev/null\` in #( | ||
252 | 146 | *posix*) : | ||
253 | 147 | set -o posix ;; #( | ||
254 | 148 | *) : | ||
255 | 149 | ;; | ||
256 | 150 | esac | ||
257 | 151 | fi | ||
258 | 152 | " | ||
259 | 153 | as_required="as_fn_return () { (exit \$1); } | ||
260 | 154 | as_fn_success () { as_fn_return 0; } | ||
261 | 155 | as_fn_failure () { as_fn_return 1; } | ||
262 | 156 | as_fn_ret_success () { return 0; } | ||
263 | 157 | as_fn_ret_failure () { return 1; } | ||
264 | 158 | |||
265 | 159 | exitcode=0 | ||
266 | 160 | as_fn_success || { exitcode=1; echo as_fn_success failed.; } | ||
267 | 161 | as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } | ||
268 | 162 | as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } | ||
269 | 163 | as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } | ||
270 | 164 | if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : | ||
271 | 165 | |||
272 | 166 | else | ||
273 | 167 | exitcode=1; echo positional parameters were not saved. | ||
274 | 168 | fi | ||
275 | 169 | test x\$exitcode = x0 || exit 1" | ||
276 | 170 | as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO | ||
277 | 171 | as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO | ||
278 | 172 | eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && | ||
279 | 173 | test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 | ||
280 | 174 | test \$(( 1 + 1 )) = 2 || exit 1" | ||
281 | 175 | if (eval "$as_required") 2>/dev/null; then : | ||
282 | 156 | as_have_required=yes | 176 | as_have_required=yes |
283 | 157 | else | 177 | else |
284 | 158 | as_have_required=no | 178 | as_have_required=no |
285 | 159 | fi | 179 | fi |
348 | 160 | 180 | if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : | |
349 | 161 | if test $as_have_required = yes && (eval ": | 181 | |
350 | 162 | (as_func_return () { | 182 | else |
351 | 163 | (exit \$1) | 183 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
352 | 164 | } | 184 | as_found=false |
291 | 165 | as_func_success () { | ||
292 | 166 | as_func_return 0 | ||
293 | 167 | } | ||
294 | 168 | as_func_failure () { | ||
295 | 169 | as_func_return 1 | ||
296 | 170 | } | ||
297 | 171 | as_func_ret_success () { | ||
298 | 172 | return 0 | ||
299 | 173 | } | ||
300 | 174 | as_func_ret_failure () { | ||
301 | 175 | return 1 | ||
302 | 176 | } | ||
303 | 177 | |||
304 | 178 | exitcode=0 | ||
305 | 179 | if as_func_success; then | ||
306 | 180 | : | ||
307 | 181 | else | ||
308 | 182 | exitcode=1 | ||
309 | 183 | echo as_func_success failed. | ||
310 | 184 | fi | ||
311 | 185 | |||
312 | 186 | if as_func_failure; then | ||
313 | 187 | exitcode=1 | ||
314 | 188 | echo as_func_failure succeeded. | ||
315 | 189 | fi | ||
316 | 190 | |||
317 | 191 | if as_func_ret_success; then | ||
318 | 192 | : | ||
319 | 193 | else | ||
320 | 194 | exitcode=1 | ||
321 | 195 | echo as_func_ret_success failed. | ||
322 | 196 | fi | ||
323 | 197 | |||
324 | 198 | if as_func_ret_failure; then | ||
325 | 199 | exitcode=1 | ||
326 | 200 | echo as_func_ret_failure succeeded. | ||
327 | 201 | fi | ||
328 | 202 | |||
329 | 203 | if ( set x; as_func_ret_success y && test x = \"\$1\" ); then | ||
330 | 204 | : | ||
331 | 205 | else | ||
332 | 206 | exitcode=1 | ||
333 | 207 | echo positional parameters were not saved. | ||
334 | 208 | fi | ||
335 | 209 | |||
336 | 210 | test \$exitcode = 0) || { (exit 1); exit 1; } | ||
337 | 211 | |||
338 | 212 | ( | ||
339 | 213 | as_lineno_1=\$LINENO | ||
340 | 214 | as_lineno_2=\$LINENO | ||
341 | 215 | test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && | ||
342 | 216 | test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } | ||
343 | 217 | ") 2> /dev/null; then | ||
344 | 218 | : | ||
345 | 219 | else | ||
346 | 220 | as_candidate_shells= | ||
347 | 221 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
353 | 222 | for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH | 185 | for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH |
354 | 223 | do | 186 | do |
355 | 224 | IFS=$as_save_IFS | 187 | IFS=$as_save_IFS |
356 | 225 | test -z "$as_dir" && as_dir=. | 188 | test -z "$as_dir" && as_dir=. |
358 | 226 | case $as_dir in | 189 | as_found=: |
359 | 190 | case $as_dir in #( | ||
360 | 227 | /*) | 191 | /*) |
361 | 228 | for as_base in sh bash ksh sh5; do | 192 | for as_base in sh bash ksh sh5; do |
363 | 229 | as_candidate_shells="$as_candidate_shells $as_dir/$as_base" | 193 | # Try only shells that exist, to save several forks. |
364 | 194 | as_shell=$as_dir/$as_base | ||
365 | 195 | if { test -f "$as_shell" || test -f "$as_shell.exe"; } && | ||
366 | 196 | { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : | ||
367 | 197 | CONFIG_SHELL=$as_shell as_have_required=yes | ||
368 | 198 | if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : | ||
369 | 199 | break 2 | ||
370 | 200 | fi | ||
371 | 201 | fi | ||
372 | 230 | done;; | 202 | done;; |
373 | 231 | esac | 203 | esac |
374 | 204 | as_found=false | ||
375 | 232 | done | 205 | done |
376 | 206 | $as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && | ||
377 | 207 | { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : | ||
378 | 208 | CONFIG_SHELL=$SHELL as_have_required=yes | ||
379 | 209 | fi; } | ||
380 | 233 | IFS=$as_save_IFS | 210 | IFS=$as_save_IFS |
381 | 234 | 211 | ||
382 | 235 | 212 | ||
585 | 236 | for as_shell in $as_candidate_shells $SHELL; do | 213 | if test "x$CONFIG_SHELL" != x; then : |
586 | 237 | # Try only shells that exist, to save several forks. | 214 | # We cannot yet assume a decent shell, so we have to provide a |
587 | 238 | if { test -f "$as_shell" || test -f "$as_shell.exe"; } && | 215 | # neutralization value for shells without unset; and this also |
588 | 239 | { ("$as_shell") 2> /dev/null <<\_ASEOF | 216 | # works around shells that cannot unset nonexistent variables. |
589 | 240 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | 217 | BASH_ENV=/dev/null |
590 | 241 | emulate sh | 218 | ENV=/dev/null |
591 | 242 | NULLCMD=: | 219 | (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
592 | 243 | # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which | 220 | export CONFIG_SHELL |
593 | 244 | # is contrary to our usage. Disable this feature. | 221 | exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} |
594 | 245 | alias -g '${1+"$@"}'='"$@"' | 222 | fi |
595 | 246 | setopt NO_GLOB_SUBST | 223 | |
596 | 247 | else | 224 | if test x$as_have_required = xno; then : |
597 | 248 | case `(set -o) 2>/dev/null` in | 225 | $as_echo "$0: This script requires a shell more modern than all" |
598 | 249 | *posix*) set -o posix ;; | 226 | $as_echo "$0: the shells that I found on your system." |
599 | 250 | esac | 227 | if test x${ZSH_VERSION+set} = xset ; then |
600 | 251 | 228 | $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" | |
601 | 252 | fi | 229 | $as_echo "$0: be upgraded to zsh 4.3.4 or later." |
602 | 253 | 230 | else | |
603 | 254 | 231 | $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, | |
604 | 255 | : | 232 | $0: including any error possibly output before this |
605 | 256 | _ASEOF | 233 | $0: message. Then install a modern shell, or manually run |
606 | 257 | }; then | 234 | $0: the script under such a shell if you do have one." |
607 | 258 | CONFIG_SHELL=$as_shell | 235 | fi |
608 | 259 | as_have_required=yes | 236 | exit 1 |
609 | 260 | if { "$as_shell" 2> /dev/null <<\_ASEOF | 237 | fi |
610 | 261 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | 238 | fi |
611 | 262 | emulate sh | 239 | fi |
612 | 263 | NULLCMD=: | 240 | SHELL=${CONFIG_SHELL-/bin/sh} |
613 | 264 | # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which | 241 | export SHELL |
614 | 265 | # is contrary to our usage. Disable this feature. | 242 | # Unset more variables known to interfere with behavior of common tools. |
615 | 266 | alias -g '${1+"$@"}'='"$@"' | 243 | CLICOLOR_FORCE= GREP_OPTIONS= |
616 | 267 | setopt NO_GLOB_SUBST | 244 | unset CLICOLOR_FORCE GREP_OPTIONS |
617 | 268 | else | 245 | |
618 | 269 | case `(set -o) 2>/dev/null` in | 246 | ## --------------------- ## |
619 | 270 | *posix*) set -o posix ;; | 247 | ## M4sh Shell Functions. ## |
620 | 271 | esac | 248 | ## --------------------- ## |
621 | 272 | 249 | # as_fn_unset VAR | |
622 | 273 | fi | 250 | # --------------- |
623 | 274 | 251 | # Portably unset VAR. | |
624 | 275 | 252 | as_fn_unset () | |
625 | 276 | : | 253 | { |
626 | 277 | (as_func_return () { | 254 | { eval $1=; unset $1;} |
627 | 278 | (exit $1) | 255 | } |
628 | 279 | } | 256 | as_unset=as_fn_unset |
629 | 280 | as_func_success () { | 257 | |
630 | 281 | as_func_return 0 | 258 | # as_fn_set_status STATUS |
631 | 282 | } | 259 | # ----------------------- |
632 | 283 | as_func_failure () { | 260 | # Set $? to STATUS, without forking. |
633 | 284 | as_func_return 1 | 261 | as_fn_set_status () |
634 | 285 | } | 262 | { |
635 | 286 | as_func_ret_success () { | 263 | return $1 |
636 | 287 | return 0 | 264 | } # as_fn_set_status |
637 | 288 | } | 265 | |
638 | 289 | as_func_ret_failure () { | 266 | # as_fn_exit STATUS |
639 | 290 | return 1 | 267 | # ----------------- |
640 | 291 | } | 268 | # Exit the shell with STATUS, even in a "trap 0" or "set -e" context. |
641 | 292 | 269 | as_fn_exit () | |
642 | 293 | exitcode=0 | 270 | { |
643 | 294 | if as_func_success; then | 271 | set +e |
644 | 295 | : | 272 | as_fn_set_status $1 |
645 | 296 | else | 273 | exit $1 |
646 | 297 | exitcode=1 | 274 | } # as_fn_exit |
647 | 298 | echo as_func_success failed. | 275 | |
648 | 299 | fi | 276 | # as_fn_mkdir_p |
649 | 300 | 277 | # ------------- | |
650 | 301 | if as_func_failure; then | 278 | # Create "$as_dir" as a directory, including parents if necessary. |
651 | 302 | exitcode=1 | 279 | as_fn_mkdir_p () |
652 | 303 | echo as_func_failure succeeded. | 280 | { |
653 | 304 | fi | 281 | |
654 | 305 | 282 | case $as_dir in #( | |
655 | 306 | if as_func_ret_success; then | 283 | -*) as_dir=./$as_dir;; |
656 | 307 | : | 284 | esac |
657 | 308 | else | 285 | test -d "$as_dir" || eval $as_mkdir_p || { |
658 | 309 | exitcode=1 | 286 | as_dirs= |
659 | 310 | echo as_func_ret_success failed. | 287 | while :; do |
660 | 311 | fi | 288 | case $as_dir in #( |
661 | 312 | 289 | *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( | |
662 | 313 | if as_func_ret_failure; then | 290 | *) as_qdir=$as_dir;; |
663 | 314 | exitcode=1 | 291 | esac |
664 | 315 | echo as_func_ret_failure succeeded. | 292 | as_dirs="'$as_qdir' $as_dirs" |
665 | 316 | fi | 293 | as_dir=`$as_dirname -- "$as_dir" || |
666 | 317 | 294 | $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | |
667 | 318 | if ( set x; as_func_ret_success y && test x = "$1" ); then | 295 | X"$as_dir" : 'X\(//\)[^/]' \| \ |
668 | 319 | : | 296 | X"$as_dir" : 'X\(//\)$' \| \ |
669 | 320 | else | 297 | X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || |
670 | 321 | exitcode=1 | 298 | $as_echo X"$as_dir" | |
671 | 322 | echo positional parameters were not saved. | 299 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ |
672 | 323 | fi | 300 | s//\1/ |
673 | 324 | 301 | q | |
674 | 325 | test $exitcode = 0) || { (exit 1); exit 1; } | 302 | } |
675 | 326 | 303 | /^X\(\/\/\)[^/].*/{ | |
676 | 327 | ( | 304 | s//\1/ |
677 | 328 | as_lineno_1=$LINENO | 305 | q |
678 | 329 | as_lineno_2=$LINENO | 306 | } |
679 | 330 | test "x$as_lineno_1" != "x$as_lineno_2" && | 307 | /^X\(\/\/\)$/{ |
680 | 331 | test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } | 308 | s//\1/ |
681 | 332 | 309 | q | |
682 | 333 | _ASEOF | 310 | } |
683 | 334 | }; then | 311 | /^X\(\/\).*/{ |
684 | 335 | break | 312 | s//\1/ |
685 | 336 | fi | 313 | q |
686 | 337 | 314 | } | |
687 | 338 | fi | 315 | s/.*/./; q'` |
688 | 339 | 316 | test -d "$as_dir" && break | |
689 | 340 | done | 317 | done |
690 | 341 | 318 | test -z "$as_dirs" || eval "mkdir $as_dirs" | |
691 | 342 | if test "x$CONFIG_SHELL" != x; then | 319 | } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" |
692 | 343 | for as_var in BASH_ENV ENV | 320 | |
693 | 344 | do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var | 321 | |
694 | 345 | done | 322 | } # as_fn_mkdir_p |
695 | 346 | export CONFIG_SHELL | 323 | # as_fn_append VAR VALUE |
696 | 347 | exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} | 324 | # ---------------------- |
697 | 348 | fi | 325 | # Append the text in VALUE to the end of the definition contained in VAR. Take |
698 | 349 | 326 | # advantage of any shell optimizations that allow amortized linear growth over | |
699 | 350 | 327 | # repeated appends, instead of the typical quadratic growth present in naive | |
700 | 351 | if test $as_have_required = no; then | 328 | # implementations. |
701 | 352 | echo This script requires a shell more modern than all the | 329 | if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : |
702 | 353 | echo shells that I found on your system. Please install a | 330 | eval 'as_fn_append () |
703 | 354 | echo modern shell, or manually run the script under such a | 331 | { |
704 | 355 | echo shell if you do have one. | 332 | eval $1+=\$2 |
705 | 356 | { (exit 1); exit 1; } | 333 | }' |
706 | 357 | fi | 334 | else |
707 | 358 | 335 | as_fn_append () | |
708 | 359 | 336 | { | |
709 | 360 | fi | 337 | eval $1=\$$1\$2 |
710 | 361 | 338 | } | |
711 | 362 | fi | 339 | fi # as_fn_append |
712 | 363 | 340 | ||
713 | 364 | 341 | # as_fn_arith ARG... | |
714 | 365 | 342 | # ------------------ | |
715 | 366 | (eval "as_func_return () { | 343 | # Perform arithmetic evaluation on the ARGs, and store the result in the |
716 | 367 | (exit \$1) | 344 | # global $as_val. Take advantage of shells that can avoid forks. The arguments |
717 | 368 | } | 345 | # must be portable across $(()) and expr. |
718 | 369 | as_func_success () { | 346 | if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : |
719 | 370 | as_func_return 0 | 347 | eval 'as_fn_arith () |
720 | 371 | } | 348 | { |
721 | 372 | as_func_failure () { | 349 | as_val=$(( $* )) |
722 | 373 | as_func_return 1 | 350 | }' |
723 | 374 | } | 351 | else |
724 | 375 | as_func_ret_success () { | 352 | as_fn_arith () |
725 | 376 | return 0 | 353 | { |
726 | 377 | } | 354 | as_val=`expr "$@" || test $? -eq 1` |
727 | 378 | as_func_ret_failure () { | 355 | } |
728 | 379 | return 1 | 356 | fi # as_fn_arith |
729 | 380 | } | 357 | |
730 | 381 | 358 | ||
731 | 382 | exitcode=0 | 359 | # as_fn_error ERROR [LINENO LOG_FD] |
732 | 383 | if as_func_success; then | 360 | # --------------------------------- |
733 | 384 | : | 361 | # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are |
734 | 385 | else | 362 | # provided, also output the error to LOG_FD, referencing LINENO. Then exit the |
735 | 386 | exitcode=1 | 363 | # script with status $?, using 1 if that was 0. |
736 | 387 | echo as_func_success failed. | 364 | as_fn_error () |
737 | 388 | fi | 365 | { |
738 | 389 | 366 | as_status=$?; test $as_status -eq 0 && as_status=1 | |
739 | 390 | if as_func_failure; then | 367 | if test "$3"; then |
740 | 391 | exitcode=1 | 368 | as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
741 | 392 | echo as_func_failure succeeded. | 369 | $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 |
742 | 393 | fi | 370 | fi |
743 | 394 | 371 | $as_echo "$as_me: error: $1" >&2 | |
744 | 395 | if as_func_ret_success; then | 372 | as_fn_exit $as_status |
745 | 396 | : | 373 | } # as_fn_error |
746 | 397 | else | 374 | |
747 | 398 | exitcode=1 | 375 | if expr a : '\(a\)' >/dev/null 2>&1 && |
748 | 399 | echo as_func_ret_success failed. | 376 | test "X`expr 00001 : '.*\(...\)'`" = X001; then |
749 | 400 | fi | 377 | as_expr=expr |
750 | 401 | 378 | else | |
751 | 402 | if as_func_ret_failure; then | 379 | as_expr=false |
752 | 403 | exitcode=1 | 380 | fi |
753 | 404 | echo as_func_ret_failure succeeded. | 381 | |
754 | 405 | fi | 382 | if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then |
755 | 406 | 383 | as_basename=basename | |
756 | 407 | if ( set x; as_func_ret_success y && test x = \"\$1\" ); then | 384 | else |
757 | 408 | : | 385 | as_basename=false |
758 | 409 | else | 386 | fi |
759 | 410 | exitcode=1 | 387 | |
760 | 411 | echo positional parameters were not saved. | 388 | if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then |
761 | 412 | fi | 389 | as_dirname=dirname |
762 | 413 | 390 | else | |
763 | 414 | test \$exitcode = 0") || { | 391 | as_dirname=false |
764 | 415 | echo No shell found that supports shell functions. | 392 | fi |
765 | 416 | echo Please tell autoconf@gnu.org about your system, | 393 | |
766 | 417 | echo including any error possibly output before this | 394 | as_me=`$as_basename -- "$0" || |
767 | 418 | echo message | 395 | $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ |
768 | 419 | } | 396 | X"$0" : 'X\(//\)$' \| \ |
769 | 420 | 397 | X"$0" : 'X\(/\)' \| . 2>/dev/null || | |
770 | 421 | 398 | $as_echo X/"$0" | | |
771 | 422 | 399 | sed '/^.*\/\([^/][^/]*\)\/*$/{ | |
772 | 423 | as_lineno_1=$LINENO | 400 | s//\1/ |
773 | 424 | as_lineno_2=$LINENO | 401 | q |
774 | 425 | test "x$as_lineno_1" != "x$as_lineno_2" && | 402 | } |
775 | 426 | test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { | 403 | /^X\/\(\/\/\)$/{ |
776 | 427 | 404 | s//\1/ | |
777 | 428 | # Create $as_me.lineno as a copy of $as_myself, but with $LINENO | 405 | q |
778 | 429 | # uniformly replaced by the line number. The first 'sed' inserts a | 406 | } |
779 | 430 | # line-number line after each line using $LINENO; the second 'sed' | 407 | /^X\/\(\/\).*/{ |
780 | 431 | # does the real work. The second script uses 'N' to pair each | 408 | s//\1/ |
781 | 432 | # line-number line with the line containing $LINENO, and appends | 409 | q |
782 | 433 | # trailing '-' during substitution so that $LINENO is not a special | 410 | } |
783 | 434 | # case at line end. | 411 | s/.*/./; q'` |
784 | 435 | # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the | 412 | |
785 | 436 | # scripts with optimization help from Paolo Bonzini. Blame Lee | 413 | # Avoid depending upon Character Ranges. |
786 | 437 | # E. McMahon (1931-1989) for sed's syntax. :-) | 414 | as_cr_letters='abcdefghijklmnopqrstuvwxyz' |
787 | 415 | as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' | ||
788 | 416 | as_cr_Letters=$as_cr_letters$as_cr_LETTERS | ||
789 | 417 | as_cr_digits='0123456789' | ||
790 | 418 | as_cr_alnum=$as_cr_Letters$as_cr_digits | ||
791 | 419 | |||
792 | 420 | |||
793 | 421 | as_lineno_1=$LINENO as_lineno_1a=$LINENO | ||
794 | 422 | as_lineno_2=$LINENO as_lineno_2a=$LINENO | ||
795 | 423 | eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && | ||
796 | 424 | test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { | ||
797 | 425 | # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) | ||
798 | 438 | sed -n ' | 426 | sed -n ' |
799 | 439 | p | 427 | p |
800 | 440 | /[$]LINENO/= | 428 | /[$]LINENO/= |
801 | @@ -451,8 +439,7 @@ | |||
802 | 451 | s/-\n.*// | 439 | s/-\n.*// |
803 | 452 | ' >$as_me.lineno && | 440 | ' >$as_me.lineno && |
804 | 453 | chmod +x "$as_me.lineno" || | 441 | chmod +x "$as_me.lineno" || |
807 | 454 | { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 | 442 | { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } |
806 | 455 | { (exit 1); exit 1; }; } | ||
808 | 456 | 443 | ||
809 | 457 | # Don't try to exec as it changes $[0], causing all sort of problems | 444 | # Don't try to exec as it changes $[0], causing all sort of problems |
810 | 458 | # (the dirname of $[0] is not the place where we might find the | 445 | # (the dirname of $[0] is not the place where we might find the |
811 | @@ -462,49 +449,40 @@ | |||
812 | 462 | exit | 449 | exit |
813 | 463 | } | 450 | } |
814 | 464 | 451 | ||
815 | 465 | |||
816 | 466 | if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then | ||
817 | 467 | as_dirname=dirname | ||
818 | 468 | else | ||
819 | 469 | as_dirname=false | ||
820 | 470 | fi | ||
821 | 471 | |||
822 | 472 | ECHO_C= ECHO_N= ECHO_T= | 452 | ECHO_C= ECHO_N= ECHO_T= |
824 | 473 | case `echo -n x` in | 453 | case `echo -n x` in #((((( |
825 | 474 | -n*) | 454 | -n*) |
827 | 475 | case `echo 'x\c'` in | 455 | case `echo 'xy\c'` in |
828 | 476 | *c*) ECHO_T=' ';; # ECHO_T is single tab character. | 456 | *c*) ECHO_T=' ';; # ECHO_T is single tab character. |
830 | 477 | *) ECHO_C='\c';; | 457 | xy) ECHO_C='\c';; |
831 | 458 | *) echo `echo ksh88 bug on AIX 6.1` > /dev/null | ||
832 | 459 | ECHO_T=' ';; | ||
833 | 478 | esac;; | 460 | esac;; |
834 | 479 | *) | 461 | *) |
835 | 480 | ECHO_N='-n';; | 462 | ECHO_N='-n';; |
836 | 481 | esac | 463 | esac |
837 | 482 | 464 | ||
838 | 483 | if expr a : '\(a\)' >/dev/null 2>&1 && | ||
839 | 484 | test "X`expr 00001 : '.*\(...\)'`" = X001; then | ||
840 | 485 | as_expr=expr | ||
841 | 486 | else | ||
842 | 487 | as_expr=false | ||
843 | 488 | fi | ||
844 | 489 | |||
845 | 490 | rm -f conf$$ conf$$.exe conf$$.file | 465 | rm -f conf$$ conf$$.exe conf$$.file |
846 | 491 | if test -d conf$$.dir; then | 466 | if test -d conf$$.dir; then |
847 | 492 | rm -f conf$$.dir/conf$$.file | 467 | rm -f conf$$.dir/conf$$.file |
848 | 493 | else | 468 | else |
849 | 494 | rm -f conf$$.dir | 469 | rm -f conf$$.dir |
851 | 495 | mkdir conf$$.dir | 470 | mkdir conf$$.dir 2>/dev/null |
852 | 496 | fi | 471 | fi |
861 | 497 | echo >conf$$.file | 472 | if (echo >conf$$.file) 2>/dev/null; then |
862 | 498 | if ln -s conf$$.file conf$$ 2>/dev/null; then | 473 | if ln -s conf$$.file conf$$ 2>/dev/null; then |
863 | 499 | as_ln_s='ln -s' | 474 | as_ln_s='ln -s' |
864 | 500 | # ... but there are two gotchas: | 475 | # ... but there are two gotchas: |
865 | 501 | # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. | 476 | # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
866 | 502 | # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. | 477 | # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
867 | 503 | # In both cases, we have to default to `cp -p'. | 478 | # In both cases, we have to default to `cp -p'. |
868 | 504 | ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || | 479 | ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
869 | 480 | as_ln_s='cp -p' | ||
870 | 481 | elif ln conf$$.file conf$$ 2>/dev/null; then | ||
871 | 482 | as_ln_s=ln | ||
872 | 483 | else | ||
873 | 505 | as_ln_s='cp -p' | 484 | as_ln_s='cp -p' |
876 | 506 | elif ln conf$$.file conf$$ 2>/dev/null; then | 485 | fi |
875 | 507 | as_ln_s=ln | ||
877 | 508 | else | 486 | else |
878 | 509 | as_ln_s='cp -p' | 487 | as_ln_s='cp -p' |
879 | 510 | fi | 488 | fi |
880 | @@ -512,7 +490,7 @@ | |||
881 | 512 | rmdir conf$$.dir 2>/dev/null | 490 | rmdir conf$$.dir 2>/dev/null |
882 | 513 | 491 | ||
883 | 514 | if mkdir -p . 2>/dev/null; then | 492 | if mkdir -p . 2>/dev/null; then |
885 | 515 | as_mkdir_p=: | 493 | as_mkdir_p='mkdir -p "$as_dir"' |
886 | 516 | else | 494 | else |
887 | 517 | test -d ./-p && rmdir ./-p | 495 | test -d ./-p && rmdir ./-p |
888 | 518 | as_mkdir_p=false | 496 | as_mkdir_p=false |
889 | @@ -529,12 +507,12 @@ | |||
890 | 529 | as_test_x=' | 507 | as_test_x=' |
891 | 530 | eval sh -c '\'' | 508 | eval sh -c '\'' |
892 | 531 | if test -d "$1"; then | 509 | if test -d "$1"; then |
894 | 532 | test -d "$1/."; | 510 | test -d "$1/."; |
895 | 533 | else | 511 | else |
898 | 534 | case $1 in | 512 | case $1 in #( |
899 | 535 | -*)set "./$1";; | 513 | -*)set "./$1";; |
900 | 536 | esac; | 514 | esac; |
902 | 537 | case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in | 515 | case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( |
903 | 538 | ???[sx]*):;;*)false;;esac;fi | 516 | ???[sx]*):;;*)false;;esac;fi |
904 | 539 | '\'' sh | 517 | '\'' sh |
905 | 540 | ' | 518 | ' |
906 | @@ -548,8 +526,8 @@ | |||
907 | 548 | as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" | 526 | as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" |
908 | 549 | 527 | ||
909 | 550 | 528 | ||
912 | 551 | 529 | test -n "$DJDIR" || exec 7<&0 </dev/null | |
913 | 552 | exec 7<&0 </dev/null 6>&1 | 530 | exec 6>&1 |
914 | 553 | 531 | ||
915 | 554 | # Name of the host. | 532 | # Name of the host. |
916 | 555 | # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, | 533 | # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, |
917 | @@ -567,7 +545,6 @@ | |||
918 | 567 | subdirs= | 545 | subdirs= |
919 | 568 | MFLAGS= | 546 | MFLAGS= |
920 | 569 | MAKEFLAGS= | 547 | MAKEFLAGS= |
921 | 570 | SHELL=${CONFIG_SHELL-/bin/sh} | ||
922 | 571 | 548 | ||
923 | 572 | # Identity of this package. | 549 | # Identity of this package. |
924 | 573 | PACKAGE_NAME= | 550 | PACKAGE_NAME= |
925 | @@ -575,6 +552,7 @@ | |||
926 | 575 | PACKAGE_VERSION= | 552 | PACKAGE_VERSION= |
927 | 576 | PACKAGE_STRING= | 553 | PACKAGE_STRING= |
928 | 577 | PACKAGE_BUGREPORT= | 554 | PACKAGE_BUGREPORT= |
929 | 555 | PACKAGE_URL= | ||
930 | 578 | 556 | ||
931 | 579 | ac_unique_file="src/zabbix_server/server.c" | 557 | ac_unique_file="src/zabbix_server/server.c" |
932 | 580 | # Factoring default headers for most tests. | 558 | # Factoring default headers for most tests. |
933 | @@ -613,169 +591,200 @@ | |||
934 | 613 | # include <unistd.h> | 591 | # include <unistd.h> |
935 | 614 | #endif" | 592 | #endif" |
936 | 615 | 593 | ||
1031 | 616 | ac_subst_vars='SHELL | 594 | ac_subst_vars='am__EXEEXT_FALSE |
1032 | 617 | PATH_SEPARATOR | 595 | am__EXEEXT_TRUE |
1033 | 618 | PACKAGE_NAME | 596 | LTLIBOBJS |
1034 | 619 | PACKAGE_TARNAME | 597 | ARCH |
1035 | 620 | PACKAGE_VERSION | 598 | RANLIB |
1036 | 621 | PACKAGE_STRING | 599 | ICONV_LDFLAGS |
1037 | 622 | PACKAGE_BUGREPORT | 600 | ICONV_CFLAGS |
1038 | 623 | exec_prefix | 601 | LDAP_LDFLAGS |
1039 | 624 | prefix | 602 | LDAP_CPPFLAGS |
1040 | 625 | program_transform_name | 603 | WITH_ODBC_FALSE |
1041 | 626 | bindir | 604 | WITH_ODBC_TRUE |
1042 | 627 | sbindir | 605 | JABBER_FALSE |
1043 | 628 | libexecdir | 606 | JABBER_TRUE |
1044 | 629 | datarootdir | 607 | PROXY_LIBS |
1045 | 630 | datadir | 608 | PROXY_LDFLAGS |
1046 | 631 | sysconfdir | 609 | SERVER_LIBS |
1047 | 632 | sharedstatedir | 610 | SERVER_LDFLAGS |
1048 | 633 | localstatedir | 611 | OPENIPMI_LIBS |
1049 | 634 | includedir | 612 | OPENIPMI_LDFLAGS |
1050 | 635 | oldincludedir | 613 | OPENIPMI_CFLAGS |
1051 | 636 | docdir | 614 | SSH2_LIBS |
1052 | 637 | infodir | 615 | SSH2_LDFLAGS |
1053 | 638 | htmldir | 616 | SSH2_CFLAGS |
1054 | 639 | dvidir | 617 | SNMP_CPPFLAGS |
1055 | 640 | pdfdir | 618 | SNMP_LIBS |
1056 | 641 | psdir | 619 | SNMP_LDFLAGS |
1057 | 642 | libdir | 620 | SNMP_CFLAGS |
1058 | 643 | localedir | 621 | _libnetsnmp_config |
1059 | 644 | mandir | 622 | ODBC_LIBS |
1060 | 645 | DEFS | 623 | ODBC_LDFLAGS |
1061 | 646 | ECHO_C | 624 | ODBC_CFLAGS |
1062 | 647 | ECHO_N | 625 | UNIXODBC_LIBS |
1063 | 648 | ECHO_T | 626 | UNIXODBC_CFLAGS |
1064 | 649 | LIBS | 627 | UNIXODBC_LDFLAGS |
1065 | 650 | build_alias | 628 | _libodbc_config |
1066 | 651 | host_alias | 629 | IODBC_LIBS |
1067 | 652 | target_alias | 630 | IODBC_CFLAGS |
1068 | 653 | INSTALL_PROGRAM | 631 | IODBC_LDFLAGS |
1069 | 654 | INSTALL_SCRIPT | 632 | LIBCURL_LIBS |
1070 | 655 | INSTALL_DATA | 633 | LIBCURL_LDFLAGS |
1071 | 656 | am__isrc | 634 | LIBCURL_CFLAGS |
1072 | 657 | CYGPATH_W | 635 | _libcurl_config |
1073 | 658 | PACKAGE | 636 | JABBER_LIBS |
1074 | 659 | VERSION | 637 | JABBER_LDFLAGS |
1075 | 660 | ACLOCAL | 638 | JABBER_CPPFLAGS |
1076 | 661 | AUTOCONF | 639 | IKSEMEL_LIBS |
1077 | 662 | AUTOMAKE | 640 | IKSEMEL_CFLAGS |
1078 | 663 | AUTOHEADER | 641 | PKG_CONFIG |
1079 | 664 | MAKEINFO | 642 | DB_LIBS |
1080 | 665 | install_sh | 643 | DB_LDFLAGS |
1081 | 666 | STRIP | 644 | DB_CPPFLAGS |
1082 | 667 | INSTALL_STRIP_PROGRAM | 645 | SQLITE3_VERSION |
1083 | 668 | mkdir_p | 646 | SQLITE3_LDFLAGS |
1084 | 669 | AWK | 647 | SQLITE3_CPPFLAGS |
1085 | 670 | SET_MAKE | 648 | POSTGRESQL_LDFLAGS |
1086 | 671 | am__leading_dot | 649 | POSTGRESQL_CPPFLAGS |
1087 | 672 | AMTAR | 650 | POSTGRESQL_VERSION |
1088 | 673 | am__tar | 651 | PG_CONFIG |
1089 | 674 | am__untar | 652 | ORACLE_LIBS |
1090 | 675 | build | 653 | ORACLE_LDFLAGS |
1091 | 676 | build_cpu | 654 | ORACLE_CPPFLAGS |
1092 | 677 | build_vendor | 655 | ORACLE_OCI_LIBS |
1093 | 678 | build_os | 656 | ORACLE_OCI_LDFLAGS |
1094 | 679 | host | 657 | ORACLE_OCI_CFLAGS |
1001 | 680 | host_cpu | ||
1002 | 681 | host_vendor | ||
1003 | 682 | host_os | ||
1004 | 683 | CC | ||
1005 | 684 | CFLAGS | ||
1006 | 685 | LDFLAGS | ||
1007 | 686 | CPPFLAGS | ||
1008 | 687 | ac_ct_CC | ||
1009 | 688 | EXEEXT | ||
1010 | 689 | OBJEXT | ||
1011 | 690 | DEPDIR | ||
1012 | 691 | am__include | ||
1013 | 692 | am__quote | ||
1014 | 693 | AMDEP_TRUE | ||
1015 | 694 | AMDEP_FALSE | ||
1016 | 695 | AMDEPBACKSLASH | ||
1017 | 696 | CCDEPMODE | ||
1018 | 697 | am__fastdepCC_TRUE | ||
1019 | 698 | am__fastdepCC_FALSE | ||
1020 | 699 | CPP | ||
1021 | 700 | GREP | ||
1022 | 701 | EGREP | ||
1023 | 702 | RESOLV_LIBS | ||
1024 | 703 | LIBOBJS | ||
1025 | 704 | SERVER_TRUE | ||
1026 | 705 | SERVER_FALSE | ||
1027 | 706 | PROXY_TRUE | ||
1028 | 707 | PROXY_FALSE | ||
1029 | 708 | AGENT_TRUE | ||
1030 | 709 | AGENT_FALSE | ||
1095 | 710 | ORACLE_OCI_VERSION | 658 | ORACLE_OCI_VERSION |
1105 | 711 | ORACLE_OCI_CFLAGS | 659 | MYSQL_LIBS |
1106 | 712 | ORACLE_OCI_LDFLAGS | 660 | MYSQL_LDFLAGS |
1107 | 713 | ORACLE_OCI_LIBS | 661 | MYSQL_CFLAGS |
1108 | 714 | ORACLE_CPPFLAGS | 662 | MYSQL_VERSION |
1100 | 715 | ORACLE_LDFLAGS | ||
1101 | 716 | ORACLE_LIBS | ||
1102 | 717 | SQLITE3_CPPFLAGS | ||
1103 | 718 | SQLITE3_LDFLAGS | ||
1104 | 719 | SQLITE3_VERSION | ||
1109 | 720 | MYSQL_CONFIG | 663 | MYSQL_CONFIG |
1167 | 721 | MYSQL_VERSION | 664 | AGENT_FALSE |
1168 | 722 | MYSQL_CFLAGS | 665 | AGENT_TRUE |
1169 | 723 | MYSQL_LDFLAGS | 666 | PROXY_FALSE |
1170 | 724 | MYSQL_LIBS | 667 | PROXY_TRUE |
1171 | 725 | PG_CONFIG | 668 | SERVER_FALSE |
1172 | 726 | POSTGRESQL_VERSION | 669 | SERVER_TRUE |
1173 | 727 | POSTGRESQL_CPPFLAGS | 670 | LIBOBJS |
1174 | 728 | POSTGRESQL_LDFLAGS | 671 | RESOLV_LIBS |
1175 | 729 | DB_CPPFLAGS | 672 | EGREP |
1176 | 730 | DB_LDFLAGS | 673 | GREP |
1177 | 731 | DB_LIBS | 674 | CPP |
1178 | 732 | PKG_CONFIG | 675 | am__fastdepCC_FALSE |
1179 | 733 | IKSEMEL_CFLAGS | 676 | am__fastdepCC_TRUE |
1180 | 734 | IKSEMEL_LIBS | 677 | CCDEPMODE |
1181 | 735 | JABBER_CPPFLAGS | 678 | AMDEPBACKSLASH |
1182 | 736 | JABBER_LDFLAGS | 679 | AMDEP_FALSE |
1183 | 737 | JABBER_LIBS | 680 | AMDEP_TRUE |
1184 | 738 | _libcurl_config | 681 | am__quote |
1185 | 739 | LIBCURL_CFLAGS | 682 | am__include |
1186 | 740 | LIBCURL_LDFLAGS | 683 | DEPDIR |
1187 | 741 | LIBCURL_LIBS | 684 | OBJEXT |
1188 | 742 | IODBC_LDFLAGS | 685 | EXEEXT |
1189 | 743 | IODBC_CFLAGS | 686 | ac_ct_CC |
1190 | 744 | IODBC_LIBS | 687 | CPPFLAGS |
1191 | 745 | _libodbc_config | 688 | LDFLAGS |
1192 | 746 | UNIXODBC_LDFLAGS | 689 | CFLAGS |
1193 | 747 | UNIXODBC_CFLAGS | 690 | CC |
1194 | 748 | UNIXODBC_LIBS | 691 | host_os |
1195 | 749 | ODBC_CFLAGS | 692 | host_vendor |
1196 | 750 | ODBC_LDFLAGS | 693 | host_cpu |
1197 | 751 | ODBC_LIBS | 694 | host |
1198 | 752 | _libnetsnmp_config | 695 | build_os |
1199 | 753 | SNMP_CFLAGS | 696 | build_vendor |
1200 | 754 | SNMP_LDFLAGS | 697 | build_cpu |
1201 | 755 | SNMP_LIBS | 698 | build |
1202 | 756 | SNMP_CPPFLAGS | 699 | am__untar |
1203 | 757 | SSH2_CFLAGS | 700 | am__tar |
1204 | 758 | SSH2_LDFLAGS | 701 | AMTAR |
1205 | 759 | SSH2_LIBS | 702 | am__leading_dot |
1206 | 760 | OPENIPMI_CFLAGS | 703 | SET_MAKE |
1207 | 761 | OPENIPMI_LDFLAGS | 704 | AWK |
1208 | 762 | OPENIPMI_LIBS | 705 | mkdir_p |
1209 | 763 | SERVER_LDFLAGS | 706 | MKDIR_P |
1210 | 764 | SERVER_LIBS | 707 | INSTALL_STRIP_PROGRAM |
1211 | 765 | PROXY_LDFLAGS | 708 | STRIP |
1212 | 766 | PROXY_LIBS | 709 | install_sh |
1213 | 767 | JABBER_TRUE | 710 | MAKEINFO |
1214 | 768 | JABBER_FALSE | 711 | AUTOHEADER |
1215 | 769 | WITH_ODBC_TRUE | 712 | AUTOMAKE |
1216 | 770 | WITH_ODBC_FALSE | 713 | AUTOCONF |
1217 | 771 | LDAP_CPPFLAGS | 714 | ACLOCAL |
1218 | 772 | LDAP_LDFLAGS | 715 | VERSION |
1219 | 773 | ICONV_CFLAGS | 716 | PACKAGE |
1220 | 774 | ICONV_LDFLAGS | 717 | CYGPATH_W |
1221 | 775 | RANLIB | 718 | am__isrc |
1222 | 776 | ARCH | 719 | INSTALL_DATA |
1223 | 777 | LTLIBOBJS' | 720 | INSTALL_SCRIPT |
1224 | 721 | INSTALL_PROGRAM | ||
1225 | 722 | target_alias | ||
1226 | 723 | host_alias | ||
1227 | 724 | build_alias | ||
1228 | 725 | LIBS | ||
1229 | 726 | ECHO_T | ||
1230 | 727 | ECHO_N | ||
1231 | 728 | ECHO_C | ||
1232 | 729 | DEFS | ||
1233 | 730 | mandir | ||
1234 | 731 | localedir | ||
1235 | 732 | libdir | ||
1236 | 733 | psdir | ||
1237 | 734 | pdfdir | ||
1238 | 735 | dvidir | ||
1239 | 736 | htmldir | ||
1240 | 737 | infodir | ||
1241 | 738 | docdir | ||
1242 | 739 | oldincludedir | ||
1243 | 740 | includedir | ||
1244 | 741 | localstatedir | ||
1245 | 742 | sharedstatedir | ||
1246 | 743 | sysconfdir | ||
1247 | 744 | datadir | ||
1248 | 745 | datarootdir | ||
1249 | 746 | libexecdir | ||
1250 | 747 | sbindir | ||
1251 | 748 | bindir | ||
1252 | 749 | program_transform_name | ||
1253 | 750 | prefix | ||
1254 | 751 | exec_prefix | ||
1255 | 752 | PACKAGE_URL | ||
1256 | 753 | PACKAGE_BUGREPORT | ||
1257 | 754 | PACKAGE_STRING | ||
1258 | 755 | PACKAGE_VERSION | ||
1259 | 756 | PACKAGE_TARNAME | ||
1260 | 757 | PACKAGE_NAME | ||
1261 | 758 | PATH_SEPARATOR | ||
1262 | 759 | SHELL' | ||
1263 | 778 | ac_subst_files='' | 760 | ac_subst_files='' |
1264 | 761 | ac_user_opts=' | ||
1265 | 762 | enable_option_checking | ||
1266 | 763 | enable_dependency_tracking | ||
1267 | 764 | enable_static | ||
1268 | 765 | enable_server | ||
1269 | 766 | enable_proxy | ||
1270 | 767 | enable_agent | ||
1271 | 768 | enable_ipv6 | ||
1272 | 769 | with_ibm_db2 | ||
1273 | 770 | with_ibm_db2_include | ||
1274 | 771 | with_ibm_db2_lib | ||
1275 | 772 | with_mysql | ||
1276 | 773 | with_oracle | ||
1277 | 774 | with_oracle_include | ||
1278 | 775 | with_oracle_lib | ||
1279 | 776 | with_pgsql | ||
1280 | 777 | with_sqlite3 | ||
1281 | 778 | with_jabber | ||
1282 | 779 | with_libcurl | ||
1283 | 780 | with_iodbc | ||
1284 | 781 | with_unixodbc | ||
1285 | 782 | with_net_snmp | ||
1286 | 783 | with_ucd_snmp | ||
1287 | 784 | with_ssh2 | ||
1288 | 785 | with_openipmi | ||
1289 | 786 | with_ldap | ||
1290 | 787 | ' | ||
1291 | 779 | ac_precious_vars='build_alias | 788 | ac_precious_vars='build_alias |
1292 | 780 | host_alias | 789 | host_alias |
1293 | 781 | target_alias | 790 | target_alias |
1294 | @@ -793,6 +802,8 @@ | |||
1295 | 793 | # Initialize some variables set by options. | 802 | # Initialize some variables set by options. |
1296 | 794 | ac_init_help= | 803 | ac_init_help= |
1297 | 795 | ac_init_version=false | 804 | ac_init_version=false |
1298 | 805 | ac_unrecognized_opts= | ||
1299 | 806 | ac_unrecognized_sep= | ||
1300 | 796 | # The variables have the same names as the options, with | 807 | # The variables have the same names as the options, with |
1301 | 797 | # dashes changed to underlines. | 808 | # dashes changed to underlines. |
1302 | 798 | cache_file=/dev/null | 809 | cache_file=/dev/null |
1303 | @@ -891,13 +902,20 @@ | |||
1304 | 891 | datarootdir=$ac_optarg ;; | 902 | datarootdir=$ac_optarg ;; |
1305 | 892 | 903 | ||
1306 | 893 | -disable-* | --disable-*) | 904 | -disable-* | --disable-*) |
1308 | 894 | ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` | 905 | ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` |
1309 | 895 | # Reject names that are not valid shell variable names. | 906 | # Reject names that are not valid shell variable names. |
1315 | 896 | expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && | 907 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
1316 | 897 | { echo "$as_me: error: invalid feature name: $ac_feature" >&2 | 908 | as_fn_error "invalid feature name: $ac_useropt" |
1317 | 898 | { (exit 1); exit 1; }; } | 909 | ac_useropt_orig=$ac_useropt |
1318 | 899 | ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` | 910 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
1319 | 900 | eval enable_$ac_feature=no ;; | 911 | case $ac_user_opts in |
1320 | 912 | *" | ||
1321 | 913 | "enable_$ac_useropt" | ||
1322 | 914 | "*) ;; | ||
1323 | 915 | *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" | ||
1324 | 916 | ac_unrecognized_sep=', ';; | ||
1325 | 917 | esac | ||
1326 | 918 | eval enable_$ac_useropt=no ;; | ||
1327 | 901 | 919 | ||
1328 | 902 | -docdir | --docdir | --docdi | --doc | --do) | 920 | -docdir | --docdir | --docdi | --doc | --do) |
1329 | 903 | ac_prev=docdir ;; | 921 | ac_prev=docdir ;; |
1330 | @@ -910,13 +928,20 @@ | |||
1331 | 910 | dvidir=$ac_optarg ;; | 928 | dvidir=$ac_optarg ;; |
1332 | 911 | 929 | ||
1333 | 912 | -enable-* | --enable-*) | 930 | -enable-* | --enable-*) |
1335 | 913 | ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` | 931 | ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` |
1336 | 914 | # Reject names that are not valid shell variable names. | 932 | # Reject names that are not valid shell variable names. |
1342 | 915 | expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && | 933 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
1343 | 916 | { echo "$as_me: error: invalid feature name: $ac_feature" >&2 | 934 | as_fn_error "invalid feature name: $ac_useropt" |
1344 | 917 | { (exit 1); exit 1; }; } | 935 | ac_useropt_orig=$ac_useropt |
1345 | 918 | ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` | 936 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
1346 | 919 | eval enable_$ac_feature=\$ac_optarg ;; | 937 | case $ac_user_opts in |
1347 | 938 | *" | ||
1348 | 939 | "enable_$ac_useropt" | ||
1349 | 940 | "*) ;; | ||
1350 | 941 | *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" | ||
1351 | 942 | ac_unrecognized_sep=', ';; | ||
1352 | 943 | esac | ||
1353 | 944 | eval enable_$ac_useropt=\$ac_optarg ;; | ||
1354 | 920 | 945 | ||
1355 | 921 | -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | 946 | -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ |
1356 | 922 | | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ | 947 | | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ |
1357 | @@ -1107,22 +1132,36 @@ | |||
1358 | 1107 | ac_init_version=: ;; | 1132 | ac_init_version=: ;; |
1359 | 1108 | 1133 | ||
1360 | 1109 | -with-* | --with-*) | 1134 | -with-* | --with-*) |
1362 | 1110 | ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` | 1135 | ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` |
1363 | 1111 | # Reject names that are not valid shell variable names. | 1136 | # Reject names that are not valid shell variable names. |
1369 | 1112 | expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && | 1137 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
1370 | 1113 | { echo "$as_me: error: invalid package name: $ac_package" >&2 | 1138 | as_fn_error "invalid package name: $ac_useropt" |
1371 | 1114 | { (exit 1); exit 1; }; } | 1139 | ac_useropt_orig=$ac_useropt |
1372 | 1115 | ac_package=`echo $ac_package | sed 's/[-.]/_/g'` | 1140 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
1373 | 1116 | eval with_$ac_package=\$ac_optarg ;; | 1141 | case $ac_user_opts in |
1374 | 1142 | *" | ||
1375 | 1143 | "with_$ac_useropt" | ||
1376 | 1144 | "*) ;; | ||
1377 | 1145 | *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" | ||
1378 | 1146 | ac_unrecognized_sep=', ';; | ||
1379 | 1147 | esac | ||
1380 | 1148 | eval with_$ac_useropt=\$ac_optarg ;; | ||
1381 | 1117 | 1149 | ||
1382 | 1118 | -without-* | --without-*) | 1150 | -without-* | --without-*) |
1384 | 1119 | ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` | 1151 | ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` |
1385 | 1120 | # Reject names that are not valid shell variable names. | 1152 | # Reject names that are not valid shell variable names. |
1391 | 1121 | expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && | 1153 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
1392 | 1122 | { echo "$as_me: error: invalid package name: $ac_package" >&2 | 1154 | as_fn_error "invalid package name: $ac_useropt" |
1393 | 1123 | { (exit 1); exit 1; }; } | 1155 | ac_useropt_orig=$ac_useropt |
1394 | 1124 | ac_package=`echo $ac_package | sed 's/[-.]/_/g'` | 1156 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
1395 | 1125 | eval with_$ac_package=no ;; | 1157 | case $ac_user_opts in |
1396 | 1158 | *" | ||
1397 | 1159 | "with_$ac_useropt" | ||
1398 | 1160 | "*) ;; | ||
1399 | 1161 | *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" | ||
1400 | 1162 | ac_unrecognized_sep=', ';; | ||
1401 | 1163 | esac | ||
1402 | 1164 | eval with_$ac_useropt=no ;; | ||
1403 | 1126 | 1165 | ||
1404 | 1127 | --x) | 1166 | --x) |
1405 | 1128 | # Obsolete; use --with-x. | 1167 | # Obsolete; use --with-x. |
1406 | @@ -1142,25 +1181,25 @@ | |||
1407 | 1142 | | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) | 1181 | | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) |
1408 | 1143 | x_libraries=$ac_optarg ;; | 1182 | x_libraries=$ac_optarg ;; |
1409 | 1144 | 1183 | ||
1413 | 1145 | -*) { echo "$as_me: error: unrecognized option: $ac_option | 1184 | -*) as_fn_error "unrecognized option: \`$ac_option' |
1414 | 1146 | Try \`$0 --help' for more information." >&2 | 1185 | Try \`$0 --help' for more information." |
1412 | 1147 | { (exit 1); exit 1; }; } | ||
1415 | 1148 | ;; | 1186 | ;; |
1416 | 1149 | 1187 | ||
1417 | 1150 | *=*) | 1188 | *=*) |
1418 | 1151 | ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` | 1189 | ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` |
1419 | 1152 | # Reject names that are not valid shell variable names. | 1190 | # Reject names that are not valid shell variable names. |
1423 | 1153 | expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && | 1191 | case $ac_envvar in #( |
1424 | 1154 | { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 | 1192 | '' | [0-9]* | *[!_$as_cr_alnum]* ) |
1425 | 1155 | { (exit 1); exit 1; }; } | 1193 | as_fn_error "invalid variable name: \`$ac_envvar'" ;; |
1426 | 1194 | esac | ||
1427 | 1156 | eval $ac_envvar=\$ac_optarg | 1195 | eval $ac_envvar=\$ac_optarg |
1428 | 1157 | export $ac_envvar ;; | 1196 | export $ac_envvar ;; |
1429 | 1158 | 1197 | ||
1430 | 1159 | *) | 1198 | *) |
1431 | 1160 | # FIXME: should be removed in autoconf 3.0. | 1199 | # FIXME: should be removed in autoconf 3.0. |
1433 | 1161 | echo "$as_me: WARNING: you should use --build, --host, --target" >&2 | 1200 | $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 |
1434 | 1162 | expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && | 1201 | expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && |
1436 | 1163 | echo "$as_me: WARNING: invalid host type: $ac_option" >&2 | 1202 | $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 |
1437 | 1164 | : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} | 1203 | : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} |
1438 | 1165 | ;; | 1204 | ;; |
1439 | 1166 | 1205 | ||
1440 | @@ -1169,23 +1208,36 @@ | |||
1441 | 1169 | 1208 | ||
1442 | 1170 | if test -n "$ac_prev"; then | 1209 | if test -n "$ac_prev"; then |
1443 | 1171 | ac_option=--`echo $ac_prev | sed 's/_/-/g'` | 1210 | ac_option=--`echo $ac_prev | sed 's/_/-/g'` |
1449 | 1172 | { echo "$as_me: error: missing argument to $ac_option" >&2 | 1211 | as_fn_error "missing argument to $ac_option" |
1450 | 1173 | { (exit 1); exit 1; }; } | 1212 | fi |
1451 | 1174 | fi | 1213 | |
1452 | 1175 | 1214 | if test -n "$ac_unrecognized_opts"; then | |
1453 | 1176 | # Be sure to have absolute directory names. | 1215 | case $enable_option_checking in |
1454 | 1216 | no) ;; | ||
1455 | 1217 | fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; | ||
1456 | 1218 | *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; | ||
1457 | 1219 | esac | ||
1458 | 1220 | fi | ||
1459 | 1221 | |||
1460 | 1222 | # Check all directory arguments for consistency. | ||
1461 | 1177 | for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ | 1223 | for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ |
1462 | 1178 | datadir sysconfdir sharedstatedir localstatedir includedir \ | 1224 | datadir sysconfdir sharedstatedir localstatedir includedir \ |
1463 | 1179 | oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ | 1225 | oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ |
1464 | 1180 | libdir localedir mandir | 1226 | libdir localedir mandir |
1465 | 1181 | do | 1227 | do |
1466 | 1182 | eval ac_val=\$$ac_var | 1228 | eval ac_val=\$$ac_var |
1467 | 1229 | # Remove trailing slashes. | ||
1468 | 1230 | case $ac_val in | ||
1469 | 1231 | */ ) | ||
1470 | 1232 | ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` | ||
1471 | 1233 | eval $ac_var=\$ac_val;; | ||
1472 | 1234 | esac | ||
1473 | 1235 | # Be sure to have absolute directory names. | ||
1474 | 1183 | case $ac_val in | 1236 | case $ac_val in |
1475 | 1184 | [\\/$]* | ?:[\\/]* ) continue;; | 1237 | [\\/$]* | ?:[\\/]* ) continue;; |
1476 | 1185 | NONE | '' ) case $ac_var in *prefix ) continue;; esac;; | 1238 | NONE | '' ) case $ac_var in *prefix ) continue;; esac;; |
1477 | 1186 | esac | 1239 | esac |
1480 | 1187 | { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 | 1240 | as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" |
1479 | 1188 | { (exit 1); exit 1; }; } | ||
1481 | 1189 | done | 1241 | done |
1482 | 1190 | 1242 | ||
1483 | 1191 | # There might be people who depend on the old broken behavior: `$host' | 1243 | # There might be people who depend on the old broken behavior: `$host' |
1484 | @@ -1199,7 +1251,7 @@ | |||
1485 | 1199 | if test "x$host_alias" != x; then | 1251 | if test "x$host_alias" != x; then |
1486 | 1200 | if test "x$build_alias" = x; then | 1252 | if test "x$build_alias" = x; then |
1487 | 1201 | cross_compiling=maybe | 1253 | cross_compiling=maybe |
1489 | 1202 | echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. | 1254 | $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. |
1490 | 1203 | If a cross compiler is detected then cross compile mode will be used." >&2 | 1255 | If a cross compiler is detected then cross compile mode will be used." >&2 |
1491 | 1204 | elif test "x$build_alias" != "x$host_alias"; then | 1256 | elif test "x$build_alias" != "x$host_alias"; then |
1492 | 1205 | cross_compiling=yes | 1257 | cross_compiling=yes |
1493 | @@ -1215,23 +1267,21 @@ | |||
1494 | 1215 | ac_pwd=`pwd` && test -n "$ac_pwd" && | 1267 | ac_pwd=`pwd` && test -n "$ac_pwd" && |
1495 | 1216 | ac_ls_di=`ls -di .` && | 1268 | ac_ls_di=`ls -di .` && |
1496 | 1217 | ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || | 1269 | ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || |
1499 | 1218 | { echo "$as_me: error: Working directory cannot be determined" >&2 | 1270 | as_fn_error "working directory cannot be determined" |
1498 | 1219 | { (exit 1); exit 1; }; } | ||
1500 | 1220 | test "X$ac_ls_di" = "X$ac_pwd_ls_di" || | 1271 | test "X$ac_ls_di" = "X$ac_pwd_ls_di" || |
1503 | 1221 | { echo "$as_me: error: pwd does not report name of working directory" >&2 | 1272 | as_fn_error "pwd does not report name of working directory" |
1502 | 1222 | { (exit 1); exit 1; }; } | ||
1504 | 1223 | 1273 | ||
1505 | 1224 | 1274 | ||
1506 | 1225 | # Find the source files, if location was not specified. | 1275 | # Find the source files, if location was not specified. |
1507 | 1226 | if test -z "$srcdir"; then | 1276 | if test -z "$srcdir"; then |
1508 | 1227 | ac_srcdir_defaulted=yes | 1277 | ac_srcdir_defaulted=yes |
1509 | 1228 | # Try the directory containing this script, then the parent directory. | 1278 | # Try the directory containing this script, then the parent directory. |
1516 | 1229 | ac_confdir=`$as_dirname -- "$0" || | 1279 | ac_confdir=`$as_dirname -- "$as_myself" || |
1517 | 1230 | $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | 1280 | $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
1518 | 1231 | X"$0" : 'X\(//\)[^/]' \| \ | 1281 | X"$as_myself" : 'X\(//\)[^/]' \| \ |
1519 | 1232 | X"$0" : 'X\(//\)$' \| \ | 1282 | X"$as_myself" : 'X\(//\)$' \| \ |
1520 | 1233 | X"$0" : 'X\(/\)' \| . 2>/dev/null || | 1283 | X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || |
1521 | 1234 | echo X"$0" | | 1284 | $as_echo X"$as_myself" | |
1522 | 1235 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | 1285 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ |
1523 | 1236 | s//\1/ | 1286 | s//\1/ |
1524 | 1237 | q | 1287 | q |
1525 | @@ -1258,13 +1308,11 @@ | |||
1526 | 1258 | fi | 1308 | fi |
1527 | 1259 | if test ! -r "$srcdir/$ac_unique_file"; then | 1309 | if test ! -r "$srcdir/$ac_unique_file"; then |
1528 | 1260 | test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." | 1310 | test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." |
1531 | 1261 | { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 | 1311 | as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" |
1530 | 1262 | { (exit 1); exit 1; }; } | ||
1532 | 1263 | fi | 1312 | fi |
1533 | 1264 | ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" | 1313 | ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" |
1534 | 1265 | ac_abs_confdir=`( | 1314 | ac_abs_confdir=`( |
1537 | 1266 | cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 | 1315 | cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" |
1536 | 1267 | { (exit 1); exit 1; }; } | ||
1538 | 1268 | pwd)` | 1316 | pwd)` |
1539 | 1269 | # When building in place, set srcdir=. | 1317 | # When building in place, set srcdir=. |
1540 | 1270 | if test "$ac_abs_confdir" = "$ac_pwd"; then | 1318 | if test "$ac_abs_confdir" = "$ac_pwd"; then |
1541 | @@ -1312,9 +1360,9 @@ | |||
1542 | 1312 | 1360 | ||
1543 | 1313 | Installation directories: | 1361 | Installation directories: |
1544 | 1314 | --prefix=PREFIX install architecture-independent files in PREFIX | 1362 | --prefix=PREFIX install architecture-independent files in PREFIX |
1546 | 1315 | [$ac_default_prefix] | 1363 | [$ac_default_prefix] |
1547 | 1316 | --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX | 1364 | --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX |
1549 | 1317 | [PREFIX] | 1365 | [PREFIX] |
1550 | 1318 | 1366 | ||
1551 | 1319 | By default, \`make install' will install all the files in | 1367 | By default, \`make install' will install all the files in |
1552 | 1320 | \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify | 1368 | \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify |
1553 | @@ -1324,25 +1372,25 @@ | |||
1554 | 1324 | For better control, use the options below. | 1372 | For better control, use the options below. |
1555 | 1325 | 1373 | ||
1556 | 1326 | Fine tuning of the installation directories: | 1374 | Fine tuning of the installation directories: |
1576 | 1327 | --bindir=DIR user executables [EPREFIX/bin] | 1375 | --bindir=DIR user executables [EPREFIX/bin] |
1577 | 1328 | --sbindir=DIR system admin executables [EPREFIX/sbin] | 1376 | --sbindir=DIR system admin executables [EPREFIX/sbin] |
1578 | 1329 | --libexecdir=DIR program executables [EPREFIX/libexec] | 1377 | --libexecdir=DIR program executables [EPREFIX/libexec] |
1579 | 1330 | --sysconfdir=DIR read-only single-machine data [PREFIX/etc] | 1378 | --sysconfdir=DIR read-only single-machine data [PREFIX/etc] |
1580 | 1331 | --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] | 1379 | --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] |
1581 | 1332 | --localstatedir=DIR modifiable single-machine data [PREFIX/var] | 1380 | --localstatedir=DIR modifiable single-machine data [PREFIX/var] |
1582 | 1333 | --libdir=DIR object code libraries [EPREFIX/lib] | 1381 | --libdir=DIR object code libraries [EPREFIX/lib] |
1583 | 1334 | --includedir=DIR C header files [PREFIX/include] | 1382 | --includedir=DIR C header files [PREFIX/include] |
1584 | 1335 | --oldincludedir=DIR C header files for non-gcc [/usr/include] | 1383 | --oldincludedir=DIR C header files for non-gcc [/usr/include] |
1585 | 1336 | --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] | 1384 | --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] |
1586 | 1337 | --datadir=DIR read-only architecture-independent data [DATAROOTDIR] | 1385 | --datadir=DIR read-only architecture-independent data [DATAROOTDIR] |
1587 | 1338 | --infodir=DIR info documentation [DATAROOTDIR/info] | 1386 | --infodir=DIR info documentation [DATAROOTDIR/info] |
1588 | 1339 | --localedir=DIR locale-dependent data [DATAROOTDIR/locale] | 1387 | --localedir=DIR locale-dependent data [DATAROOTDIR/locale] |
1589 | 1340 | --mandir=DIR man documentation [DATAROOTDIR/man] | 1388 | --mandir=DIR man documentation [DATAROOTDIR/man] |
1590 | 1341 | --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] | 1389 | --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] |
1591 | 1342 | --htmldir=DIR html documentation [DOCDIR] | 1390 | --htmldir=DIR html documentation [DOCDIR] |
1592 | 1343 | --dvidir=DIR dvi documentation [DOCDIR] | 1391 | --dvidir=DIR dvi documentation [DOCDIR] |
1593 | 1344 | --pdfdir=DIR pdf documentation [DOCDIR] | 1392 | --pdfdir=DIR pdf documentation [DOCDIR] |
1594 | 1345 | --psdir=DIR ps documentation [DOCDIR] | 1393 | --psdir=DIR ps documentation [DOCDIR] |
1595 | 1346 | _ACEOF | 1394 | _ACEOF |
1596 | 1347 | 1395 | ||
1597 | 1348 | cat <<\_ACEOF | 1396 | cat <<\_ACEOF |
1598 | @@ -1363,37 +1411,45 @@ | |||
1599 | 1363 | cat <<\_ACEOF | 1411 | cat <<\_ACEOF |
1600 | 1364 | 1412 | ||
1601 | 1365 | Optional Features: | 1413 | Optional Features: |
1602 | 1414 | --disable-option-checking ignore unrecognized --enable/--with options | ||
1603 | 1366 | --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) | 1415 | --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) |
1604 | 1367 | --enable-FEATURE[=ARG] include FEATURE [ARG=yes] | 1416 | --enable-FEATURE[=ARG] include FEATURE [ARG=yes] |
1605 | 1368 | --disable-dependency-tracking speeds up one-time build | 1417 | --disable-dependency-tracking speeds up one-time build |
1606 | 1369 | --enable-dependency-tracking do not reject slow dependency extractors | 1418 | --enable-dependency-tracking do not reject slow dependency extractors |
1607 | 1370 | --enable-static Build statically linked binaries | 1419 | --enable-static Build statically linked binaries |
1608 | 1371 | --enable-server Turn on build of server | 1420 | --enable-server Turn on build of server |
1611 | 1372 | --enable-proxy Turn on build of proxy server | 1421 | --enable-proxy Turn on build of Zabbix proxy |
1612 | 1373 | --enable-agent Turn on build of agent | 1422 | --enable-agent Turn on build of agent and client utilities |
1613 | 1374 | --enable-ipv6 Turn on support of IPv6 | 1423 | --enable-ipv6 Turn on support of IPv6 |
1614 | 1375 | 1424 | ||
1615 | 1376 | Optional Packages: | 1425 | Optional Packages: |
1616 | 1377 | --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] | 1426 | --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] |
1617 | 1378 | --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) | 1427 | --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) |
1618 | 1428 | --with-ibm-db2=[ARG] use IBM DB2 CLI from given sqllib directory | ||
1619 | 1429 | (ARG=path); use /home/db2inst1/sqllib (ARG=yes); | ||
1620 | 1430 | disable IBM DB2 support (ARG=no) | ||
1621 | 1431 | --with-ibm-db2-include=[DIR] | ||
1622 | 1432 | use IBM DB2 CLI headers from given path | ||
1623 | 1433 | --with-ibm-db2-lib=[DIR] | ||
1624 | 1434 | use IBM DB2 CLI libraries from given path | ||
1625 | 1435 | --with-mysql[=ARG] use MySQL client library [default=no], optionally | ||
1626 | 1436 | specify path to mysql_config | ||
1627 | 1379 | --with-oracle=[ARG] use Oracle OCI API from given Oracle home | 1437 | --with-oracle=[ARG] use Oracle OCI API from given Oracle home |
1628 | 1380 | (ARG=path); use existing ORACLE_HOME (ARG=yes); | 1438 | (ARG=path); use existing ORACLE_HOME (ARG=yes); |
1629 | 1381 | disable Oracle OCI support (ARG=no) | 1439 | disable Oracle OCI support (ARG=no) |
1630 | 1382 | --with-oracle-include=[DIR] | 1440 | --with-oracle-include=[DIR] |
1631 | 1383 | use Oracle OCI API headers from given path | 1441 | use Oracle OCI API headers from given path |
1632 | 1384 | --with-oracle-lib=[DIR] use Oracle OCI API libraries from given path | 1442 | --with-oracle-lib=[DIR] use Oracle OCI API libraries from given path |
1633 | 1443 | --with-pgsql[=ARG] use PostgreSQL library [default=no], optionally | ||
1634 | 1444 | specify path to pg_config | ||
1635 | 1385 | --with-sqlite3[=ARG] use SQLite 3 library [default=no], optionally | 1445 | --with-sqlite3[=ARG] use SQLite 3 library [default=no], optionally |
1636 | 1386 | specify the prefix for sqlite3 library | 1446 | specify the prefix for sqlite3 library |
1637 | 1387 | --with-mysql[=ARG] use MySQL client library [default=no], optionally | ||
1638 | 1388 | specify path to mysql_config | ||
1639 | 1389 | --with-pgsql[=ARG] use PostgreSQL library [default=no], optionally | ||
1640 | 1390 | specify path to pg_config | ||
1641 | 1391 | 1447 | ||
1642 | 1392 | If you want to use Jabber protocol for messaging: | 1448 | If you want to use Jabber protocol for messaging: |
1643 | 1393 | --with-jabber[=DIR] Include Jabber support [default=no]. DIR is the | 1449 | --with-jabber[=DIR] Include Jabber support [default=no]. DIR is the |
1644 | 1394 | iksemel library install directory. | 1450 | iksemel library install directory. |
1645 | 1395 | If you want to use cURL library: | 1451 | If you want to use cURL library: |
1647 | 1396 | --with-libcurl[=DIR] use cURL package [default=yes], optionally specify | 1452 | --with-libcurl[=DIR] use cURL package [default=no], optionally specify |
1648 | 1397 | path to curl-config | 1453 | path to curl-config |
1649 | 1398 | 1454 | ||
1650 | 1399 | What ODBC driver do you want to use (please select only one): | 1455 | What ODBC driver do you want to use (please select only one): |
1651 | @@ -1436,7 +1492,7 @@ | |||
1652 | 1436 | LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a | 1492 | LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a |
1653 | 1437 | nonstandard directory <lib dir> | 1493 | nonstandard directory <lib dir> |
1654 | 1438 | LIBS libraries to pass to the linker, e.g. -l<library> | 1494 | LIBS libraries to pass to the linker, e.g. -l<library> |
1656 | 1439 | CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if | 1495 | CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if |
1657 | 1440 | you have headers in a nonstandard directory <include dir> | 1496 | you have headers in a nonstandard directory <include dir> |
1658 | 1441 | CPP C preprocessor | 1497 | CPP C preprocessor |
1659 | 1442 | PKG_CONFIG path to pkg-config utility | 1498 | PKG_CONFIG path to pkg-config utility |
1660 | @@ -1448,6 +1504,7 @@ | |||
1661 | 1448 | Use these variables to override the choices made by `configure' or to help | 1504 | Use these variables to override the choices made by `configure' or to help |
1662 | 1449 | it to find libraries and programs with nonstandard names/locations. | 1505 | it to find libraries and programs with nonstandard names/locations. |
1663 | 1450 | 1506 | ||
1664 | 1507 | Report bugs to the package provider. | ||
1665 | 1451 | _ACEOF | 1508 | _ACEOF |
1666 | 1452 | ac_status=$? | 1509 | ac_status=$? |
1667 | 1453 | fi | 1510 | fi |
1668 | @@ -1455,15 +1512,17 @@ | |||
1669 | 1455 | if test "$ac_init_help" = "recursive"; then | 1512 | if test "$ac_init_help" = "recursive"; then |
1670 | 1456 | # If there are subdirs, report their specific --help. | 1513 | # If there are subdirs, report their specific --help. |
1671 | 1457 | for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue | 1514 | for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue |
1673 | 1458 | test -d "$ac_dir" || continue | 1515 | test -d "$ac_dir" || |
1674 | 1516 | { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || | ||
1675 | 1517 | continue | ||
1676 | 1459 | ac_builddir=. | 1518 | ac_builddir=. |
1677 | 1460 | 1519 | ||
1678 | 1461 | case "$ac_dir" in | 1520 | case "$ac_dir" in |
1679 | 1462 | .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; | 1521 | .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; |
1680 | 1463 | *) | 1522 | *) |
1682 | 1464 | ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` | 1523 | ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` |
1683 | 1465 | # A ".." for each directory in $ac_dir_suffix. | 1524 | # A ".." for each directory in $ac_dir_suffix. |
1685 | 1466 | ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` | 1525 | ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` |
1686 | 1467 | case $ac_top_builddir_sub in | 1526 | case $ac_top_builddir_sub in |
1687 | 1468 | "") ac_top_builddir_sub=. ac_top_build_prefix= ;; | 1527 | "") ac_top_builddir_sub=. ac_top_build_prefix= ;; |
1688 | 1469 | *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; | 1528 | *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; |
1689 | @@ -1499,7 +1558,7 @@ | |||
1690 | 1499 | echo && | 1558 | echo && |
1691 | 1500 | $SHELL "$ac_srcdir/configure" --help=recursive | 1559 | $SHELL "$ac_srcdir/configure" --help=recursive |
1692 | 1501 | else | 1560 | else |
1694 | 1502 | echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 | 1561 | $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 |
1695 | 1503 | fi || ac_status=$? | 1562 | fi || ac_status=$? |
1696 | 1504 | cd "$ac_pwd" || { ac_status=$?; break; } | 1563 | cd "$ac_pwd" || { ac_status=$?; break; } |
1697 | 1505 | done | 1564 | done |
1698 | @@ -1509,21 +1568,426 @@ | |||
1699 | 1509 | if $ac_init_version; then | 1568 | if $ac_init_version; then |
1700 | 1510 | cat <<\_ACEOF | 1569 | cat <<\_ACEOF |
1701 | 1511 | configure | 1570 | configure |
1703 | 1512 | generated by GNU Autoconf 2.61 | 1571 | generated by GNU Autoconf 2.65 |
1704 | 1513 | 1572 | ||
1707 | 1514 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | 1573 | Copyright (C) 2009 Free Software Foundation, Inc. |
1706 | 1515 | 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. | ||
1708 | 1516 | This configure script is free software; the Free Software Foundation | 1574 | This configure script is free software; the Free Software Foundation |
1709 | 1517 | gives unlimited permission to copy, distribute and modify it. | 1575 | gives unlimited permission to copy, distribute and modify it. |
1710 | 1518 | _ACEOF | 1576 | _ACEOF |
1711 | 1519 | exit | 1577 | exit |
1712 | 1520 | fi | 1578 | fi |
1713 | 1579 | |||
1714 | 1580 | ## ------------------------ ## | ||
1715 | 1581 | ## Autoconf initialization. ## | ||
1716 | 1582 | ## ------------------------ ## | ||
1717 | 1583 | |||
1718 | 1584 | # ac_fn_c_try_compile LINENO | ||
1719 | 1585 | # -------------------------- | ||
1720 | 1586 | # Try to compile conftest.$ac_ext, and return whether this succeeded. | ||
1721 | 1587 | ac_fn_c_try_compile () | ||
1722 | 1588 | { | ||
1723 | 1589 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
1724 | 1590 | rm -f conftest.$ac_objext | ||
1725 | 1591 | if { { ac_try="$ac_compile" | ||
1726 | 1592 | case "(($ac_try" in | ||
1727 | 1593 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
1728 | 1594 | *) ac_try_echo=$ac_try;; | ||
1729 | 1595 | esac | ||
1730 | 1596 | eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
1731 | 1597 | $as_echo "$ac_try_echo"; } >&5 | ||
1732 | 1598 | (eval "$ac_compile") 2>conftest.err | ||
1733 | 1599 | ac_status=$? | ||
1734 | 1600 | if test -s conftest.err; then | ||
1735 | 1601 | grep -v '^ *+' conftest.err >conftest.er1 | ||
1736 | 1602 | cat conftest.er1 >&5 | ||
1737 | 1603 | mv -f conftest.er1 conftest.err | ||
1738 | 1604 | fi | ||
1739 | 1605 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
1740 | 1606 | test $ac_status = 0; } && { | ||
1741 | 1607 | test -z "$ac_c_werror_flag" || | ||
1742 | 1608 | test ! -s conftest.err | ||
1743 | 1609 | } && test -s conftest.$ac_objext; then : | ||
1744 | 1610 | ac_retval=0 | ||
1745 | 1611 | else | ||
1746 | 1612 | $as_echo "$as_me: failed program was:" >&5 | ||
1747 | 1613 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
1748 | 1614 | |||
1749 | 1615 | ac_retval=1 | ||
1750 | 1616 | fi | ||
1751 | 1617 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} | ||
1752 | 1618 | as_fn_set_status $ac_retval | ||
1753 | 1619 | |||
1754 | 1620 | } # ac_fn_c_try_compile | ||
1755 | 1621 | |||
1756 | 1622 | # ac_fn_c_try_cpp LINENO | ||
1757 | 1623 | # ---------------------- | ||
1758 | 1624 | # Try to preprocess conftest.$ac_ext, and return whether this succeeded. | ||
1759 | 1625 | ac_fn_c_try_cpp () | ||
1760 | 1626 | { | ||
1761 | 1627 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
1762 | 1628 | if { { ac_try="$ac_cpp conftest.$ac_ext" | ||
1763 | 1629 | case "(($ac_try" in | ||
1764 | 1630 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
1765 | 1631 | *) ac_try_echo=$ac_try;; | ||
1766 | 1632 | esac | ||
1767 | 1633 | eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
1768 | 1634 | $as_echo "$ac_try_echo"; } >&5 | ||
1769 | 1635 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err | ||
1770 | 1636 | ac_status=$? | ||
1771 | 1637 | if test -s conftest.err; then | ||
1772 | 1638 | grep -v '^ *+' conftest.err >conftest.er1 | ||
1773 | 1639 | cat conftest.er1 >&5 | ||
1774 | 1640 | mv -f conftest.er1 conftest.err | ||
1775 | 1641 | fi | ||
1776 | 1642 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
1777 | 1643 | test $ac_status = 0; } >/dev/null && { | ||
1778 | 1644 | test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | ||
1779 | 1645 | test ! -s conftest.err | ||
1780 | 1646 | }; then : | ||
1781 | 1647 | ac_retval=0 | ||
1782 | 1648 | else | ||
1783 | 1649 | $as_echo "$as_me: failed program was:" >&5 | ||
1784 | 1650 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
1785 | 1651 | |||
1786 | 1652 | ac_retval=1 | ||
1787 | 1653 | fi | ||
1788 | 1654 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} | ||
1789 | 1655 | as_fn_set_status $ac_retval | ||
1790 | 1656 | |||
1791 | 1657 | } # ac_fn_c_try_cpp | ||
1792 | 1658 | |||
1793 | 1659 | # ac_fn_c_try_run LINENO | ||
1794 | 1660 | # ---------------------- | ||
1795 | 1661 | # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes | ||
1796 | 1662 | # that executables *can* be run. | ||
1797 | 1663 | ac_fn_c_try_run () | ||
1798 | 1664 | { | ||
1799 | 1665 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
1800 | 1666 | if { { ac_try="$ac_link" | ||
1801 | 1667 | case "(($ac_try" in | ||
1802 | 1668 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
1803 | 1669 | *) ac_try_echo=$ac_try;; | ||
1804 | 1670 | esac | ||
1805 | 1671 | eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
1806 | 1672 | $as_echo "$ac_try_echo"; } >&5 | ||
1807 | 1673 | (eval "$ac_link") 2>&5 | ||
1808 | 1674 | ac_status=$? | ||
1809 | 1675 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
1810 | 1676 | test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' | ||
1811 | 1677 | { { case "(($ac_try" in | ||
1812 | 1678 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
1813 | 1679 | *) ac_try_echo=$ac_try;; | ||
1814 | 1680 | esac | ||
1815 | 1681 | eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
1816 | 1682 | $as_echo "$ac_try_echo"; } >&5 | ||
1817 | 1683 | (eval "$ac_try") 2>&5 | ||
1818 | 1684 | ac_status=$? | ||
1819 | 1685 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
1820 | 1686 | test $ac_status = 0; }; }; then : | ||
1821 | 1687 | ac_retval=0 | ||
1822 | 1688 | else | ||
1823 | 1689 | $as_echo "$as_me: program exited with status $ac_status" >&5 | ||
1824 | 1690 | $as_echo "$as_me: failed program was:" >&5 | ||
1825 | 1691 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
1826 | 1692 | |||
1827 | 1693 | ac_retval=$ac_status | ||
1828 | 1694 | fi | ||
1829 | 1695 | rm -rf conftest.dSYM conftest_ipa8_conftest.oo | ||
1830 | 1696 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} | ||
1831 | 1697 | as_fn_set_status $ac_retval | ||
1832 | 1698 | |||
1833 | 1699 | } # ac_fn_c_try_run | ||
1834 | 1700 | |||
1835 | 1701 | # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES | ||
1836 | 1702 | # ------------------------------------------------------- | ||
1837 | 1703 | # Tests whether HEADER exists, giving a warning if it cannot be compiled using | ||
1838 | 1704 | # the include files in INCLUDES and setting the cache variable VAR | ||
1839 | 1705 | # accordingly. | ||
1840 | 1706 | ac_fn_c_check_header_mongrel () | ||
1841 | 1707 | { | ||
1842 | 1708 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
1843 | 1709 | if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : | ||
1844 | 1710 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 | ||
1845 | 1711 | $as_echo_n "checking for $2... " >&6; } | ||
1846 | 1712 | if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : | ||
1847 | 1713 | $as_echo_n "(cached) " >&6 | ||
1848 | 1714 | fi | ||
1849 | 1715 | eval ac_res=\$$3 | ||
1850 | 1716 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | ||
1851 | 1717 | $as_echo "$ac_res" >&6; } | ||
1852 | 1718 | else | ||
1853 | 1719 | # Is the header compilable? | ||
1854 | 1720 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 | ||
1855 | 1721 | $as_echo_n "checking $2 usability... " >&6; } | ||
1856 | 1722 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
1857 | 1723 | /* end confdefs.h. */ | ||
1858 | 1724 | $4 | ||
1859 | 1725 | #include <$2> | ||
1860 | 1726 | _ACEOF | ||
1861 | 1727 | if ac_fn_c_try_compile "$LINENO"; then : | ||
1862 | 1728 | ac_header_compiler=yes | ||
1863 | 1729 | else | ||
1864 | 1730 | ac_header_compiler=no | ||
1865 | 1731 | fi | ||
1866 | 1732 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
1867 | 1733 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 | ||
1868 | 1734 | $as_echo "$ac_header_compiler" >&6; } | ||
1869 | 1735 | |||
1870 | 1736 | # Is the header present? | ||
1871 | 1737 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 | ||
1872 | 1738 | $as_echo_n "checking $2 presence... " >&6; } | ||
1873 | 1739 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
1874 | 1740 | /* end confdefs.h. */ | ||
1875 | 1741 | #include <$2> | ||
1876 | 1742 | _ACEOF | ||
1877 | 1743 | if ac_fn_c_try_cpp "$LINENO"; then : | ||
1878 | 1744 | ac_header_preproc=yes | ||
1879 | 1745 | else | ||
1880 | 1746 | ac_header_preproc=no | ||
1881 | 1747 | fi | ||
1882 | 1748 | rm -f conftest.err conftest.$ac_ext | ||
1883 | 1749 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 | ||
1884 | 1750 | $as_echo "$ac_header_preproc" >&6; } | ||
1885 | 1751 | |||
1886 | 1752 | # So? What about this header? | ||
1887 | 1753 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( | ||
1888 | 1754 | yes:no: ) | ||
1889 | 1755 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
1890 | 1756 | $as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
1891 | 1757 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 | ||
1892 | 1758 | $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} | ||
1893 | 1759 | ;; | ||
1894 | 1760 | no:yes:* ) | ||
1895 | 1761 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 | ||
1896 | 1762 | $as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} | ||
1897 | 1763 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 | ||
1898 | 1764 | $as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} | ||
1899 | 1765 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 | ||
1900 | 1766 | $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} | ||
1901 | 1767 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 | ||
1902 | 1768 | $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} | ||
1903 | 1769 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 | ||
1904 | 1770 | $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} | ||
1905 | 1771 | ;; | ||
1906 | 1772 | esac | ||
1907 | 1773 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 | ||
1908 | 1774 | $as_echo_n "checking for $2... " >&6; } | ||
1909 | 1775 | if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : | ||
1910 | 1776 | $as_echo_n "(cached) " >&6 | ||
1911 | 1777 | else | ||
1912 | 1778 | eval "$3=\$ac_header_compiler" | ||
1913 | 1779 | fi | ||
1914 | 1780 | eval ac_res=\$$3 | ||
1915 | 1781 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | ||
1916 | 1782 | $as_echo "$ac_res" >&6; } | ||
1917 | 1783 | fi | ||
1918 | 1784 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} | ||
1919 | 1785 | |||
1920 | 1786 | } # ac_fn_c_check_header_mongrel | ||
1921 | 1787 | |||
1922 | 1788 | # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES | ||
1923 | 1789 | # ------------------------------------------------------- | ||
1924 | 1790 | # Tests whether HEADER exists and can be compiled using the include files in | ||
1925 | 1791 | # INCLUDES, setting the cache variable VAR accordingly. | ||
1926 | 1792 | ac_fn_c_check_header_compile () | ||
1927 | 1793 | { | ||
1928 | 1794 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
1929 | 1795 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 | ||
1930 | 1796 | $as_echo_n "checking for $2... " >&6; } | ||
1931 | 1797 | if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : | ||
1932 | 1798 | $as_echo_n "(cached) " >&6 | ||
1933 | 1799 | else | ||
1934 | 1800 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
1935 | 1801 | /* end confdefs.h. */ | ||
1936 | 1802 | $4 | ||
1937 | 1803 | #include <$2> | ||
1938 | 1804 | _ACEOF | ||
1939 | 1805 | if ac_fn_c_try_compile "$LINENO"; then : | ||
1940 | 1806 | eval "$3=yes" | ||
1941 | 1807 | else | ||
1942 | 1808 | eval "$3=no" | ||
1943 | 1809 | fi | ||
1944 | 1810 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
1945 | 1811 | fi | ||
1946 | 1812 | eval ac_res=\$$3 | ||
1947 | 1813 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | ||
1948 | 1814 | $as_echo "$ac_res" >&6; } | ||
1949 | 1815 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} | ||
1950 | 1816 | |||
1951 | 1817 | } # ac_fn_c_check_header_compile | ||
1952 | 1818 | |||
1953 | 1819 | # ac_fn_c_try_link LINENO | ||
1954 | 1820 | # ----------------------- | ||
1955 | 1821 | # Try to link conftest.$ac_ext, and return whether this succeeded. | ||
1956 | 1822 | ac_fn_c_try_link () | ||
1957 | 1823 | { | ||
1958 | 1824 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
1959 | 1825 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
1960 | 1826 | if { { ac_try="$ac_link" | ||
1961 | 1827 | case "(($ac_try" in | ||
1962 | 1828 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
1963 | 1829 | *) ac_try_echo=$ac_try;; | ||
1964 | 1830 | esac | ||
1965 | 1831 | eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
1966 | 1832 | $as_echo "$ac_try_echo"; } >&5 | ||
1967 | 1833 | (eval "$ac_link") 2>conftest.err | ||
1968 | 1834 | ac_status=$? | ||
1969 | 1835 | if test -s conftest.err; then | ||
1970 | 1836 | grep -v '^ *+' conftest.err >conftest.er1 | ||
1971 | 1837 | cat conftest.er1 >&5 | ||
1972 | 1838 | mv -f conftest.er1 conftest.err | ||
1973 | 1839 | fi | ||
1974 | 1840 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
1975 | 1841 | test $ac_status = 0; } && { | ||
1976 | 1842 | test -z "$ac_c_werror_flag" || | ||
1977 | 1843 | test ! -s conftest.err | ||
1978 | 1844 | } && test -s conftest$ac_exeext && { | ||
1979 | 1845 | test "$cross_compiling" = yes || | ||
1980 | 1846 | $as_test_x conftest$ac_exeext | ||
1981 | 1847 | }; then : | ||
1982 | 1848 | ac_retval=0 | ||
1983 | 1849 | else | ||
1984 | 1850 | $as_echo "$as_me: failed program was:" >&5 | ||
1985 | 1851 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
1986 | 1852 | |||
1987 | 1853 | ac_retval=1 | ||
1988 | 1854 | fi | ||
1989 | 1855 | # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information | ||
1990 | 1856 | # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would | ||
1991 | 1857 | # interfere with the next link command; also delete a directory that is | ||
1992 | 1858 | # left behind by Apple's compiler. We do this before executing the actions. | ||
1993 | 1859 | rm -rf conftest.dSYM conftest_ipa8_conftest.oo | ||
1994 | 1860 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} | ||
1995 | 1861 | as_fn_set_status $ac_retval | ||
1996 | 1862 | |||
1997 | 1863 | } # ac_fn_c_try_link | ||
1998 | 1864 | |||
1999 | 1865 | # ac_fn_c_check_type LINENO TYPE VAR INCLUDES | ||
2000 | 1866 | # ------------------------------------------- | ||
2001 | 1867 | # Tests whether TYPE exists after having included INCLUDES, setting cache | ||
2002 | 1868 | # variable VAR accordingly. | ||
2003 | 1869 | ac_fn_c_check_type () | ||
2004 | 1870 | { | ||
2005 | 1871 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
2006 | 1872 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 | ||
2007 | 1873 | $as_echo_n "checking for $2... " >&6; } | ||
2008 | 1874 | if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : | ||
2009 | 1875 | $as_echo_n "(cached) " >&6 | ||
2010 | 1876 | else | ||
2011 | 1877 | eval "$3=no" | ||
2012 | 1878 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
2013 | 1879 | /* end confdefs.h. */ | ||
2014 | 1880 | $4 | ||
2015 | 1881 | int | ||
2016 | 1882 | main () | ||
2017 | 1883 | { | ||
2018 | 1884 | if (sizeof ($2)) | ||
2019 | 1885 | return 0; | ||
2020 | 1886 | ; | ||
2021 | 1887 | return 0; | ||
2022 | 1888 | } | ||
2023 | 1889 | _ACEOF | ||
2024 | 1890 | if ac_fn_c_try_compile "$LINENO"; then : | ||
2025 | 1891 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
2026 | 1892 | /* end confdefs.h. */ | ||
2027 | 1893 | $4 | ||
2028 | 1894 | int | ||
2029 | 1895 | main () | ||
2030 | 1896 | { | ||
2031 | 1897 | if (sizeof (($2))) | ||
2032 | 1898 | return 0; | ||
2033 | 1899 | ; | ||
2034 | 1900 | return 0; | ||
2035 | 1901 | } | ||
2036 | 1902 | _ACEOF | ||
2037 | 1903 | if ac_fn_c_try_compile "$LINENO"; then : | ||
2038 | 1904 | |||
2039 | 1905 | else | ||
2040 | 1906 | eval "$3=yes" | ||
2041 | 1907 | fi | ||
2042 | 1908 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2043 | 1909 | fi | ||
2044 | 1910 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2045 | 1911 | fi | ||
2046 | 1912 | eval ac_res=\$$3 | ||
2047 | 1913 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | ||
2048 | 1914 | $as_echo "$ac_res" >&6; } | ||
2049 | 1915 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} | ||
2050 | 1916 | |||
2051 | 1917 | } # ac_fn_c_check_type | ||
2052 | 1918 | |||
2053 | 1919 | # ac_fn_c_check_func LINENO FUNC VAR | ||
2054 | 1920 | # ---------------------------------- | ||
2055 | 1921 | # Tests whether FUNC exists, setting the cache variable VAR accordingly | ||
2056 | 1922 | ac_fn_c_check_func () | ||
2057 | 1923 | { | ||
2058 | 1924 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
2059 | 1925 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 | ||
2060 | 1926 | $as_echo_n "checking for $2... " >&6; } | ||
2061 | 1927 | if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : | ||
2062 | 1928 | $as_echo_n "(cached) " >&6 | ||
2063 | 1929 | else | ||
2064 | 1930 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
2065 | 1931 | /* end confdefs.h. */ | ||
2066 | 1932 | /* Define $2 to an innocuous variant, in case <limits.h> declares $2. | ||
2067 | 1933 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
2068 | 1934 | #define $2 innocuous_$2 | ||
2069 | 1935 | |||
2070 | 1936 | /* System header to define __stub macros and hopefully few prototypes, | ||
2071 | 1937 | which can conflict with char $2 (); below. | ||
2072 | 1938 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
2073 | 1939 | <limits.h> exists even on freestanding compilers. */ | ||
2074 | 1940 | |||
2075 | 1941 | #ifdef __STDC__ | ||
2076 | 1942 | # include <limits.h> | ||
2077 | 1943 | #else | ||
2078 | 1944 | # include <assert.h> | ||
2079 | 1945 | #endif | ||
2080 | 1946 | |||
2081 | 1947 | #undef $2 | ||
2082 | 1948 | |||
2083 | 1949 | /* Override any GCC internal prototype to avoid an error. | ||
2084 | 1950 | Use char because int might match the return type of a GCC | ||
2085 | 1951 | builtin and then its argument prototype would still apply. */ | ||
2086 | 1952 | #ifdef __cplusplus | ||
2087 | 1953 | extern "C" | ||
2088 | 1954 | #endif | ||
2089 | 1955 | char $2 (); | ||
2090 | 1956 | /* The GNU C library defines this for functions which it implements | ||
2091 | 1957 | to always fail with ENOSYS. Some functions are actually named | ||
2092 | 1958 | something starting with __ and the normal name is an alias. */ | ||
2093 | 1959 | #if defined __stub_$2 || defined __stub___$2 | ||
2094 | 1960 | choke me | ||
2095 | 1961 | #endif | ||
2096 | 1962 | |||
2097 | 1963 | int | ||
2098 | 1964 | main () | ||
2099 | 1965 | { | ||
2100 | 1966 | return $2 (); | ||
2101 | 1967 | ; | ||
2102 | 1968 | return 0; | ||
2103 | 1969 | } | ||
2104 | 1970 | _ACEOF | ||
2105 | 1971 | if ac_fn_c_try_link "$LINENO"; then : | ||
2106 | 1972 | eval "$3=yes" | ||
2107 | 1973 | else | ||
2108 | 1974 | eval "$3=no" | ||
2109 | 1975 | fi | ||
2110 | 1976 | rm -f core conftest.err conftest.$ac_objext \ | ||
2111 | 1977 | conftest$ac_exeext conftest.$ac_ext | ||
2112 | 1978 | fi | ||
2113 | 1979 | eval ac_res=\$$3 | ||
2114 | 1980 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | ||
2115 | 1981 | $as_echo "$ac_res" >&6; } | ||
2116 | 1982 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} | ||
2117 | 1983 | |||
2118 | 1984 | } # ac_fn_c_check_func | ||
2119 | 1521 | cat >config.log <<_ACEOF | 1985 | cat >config.log <<_ACEOF |
2120 | 1522 | This file contains any messages produced by compilers while | 1986 | This file contains any messages produced by compilers while |
2121 | 1523 | running configure, to aid debugging if configure makes a mistake. | 1987 | running configure, to aid debugging if configure makes a mistake. |
2122 | 1524 | 1988 | ||
2123 | 1525 | It was created by $as_me, which was | 1989 | It was created by $as_me, which was |
2125 | 1526 | generated by GNU Autoconf 2.61. Invocation command line was | 1990 | generated by GNU Autoconf 2.65. Invocation command line was |
2126 | 1527 | 1991 | ||
2127 | 1528 | $ $0 $@ | 1992 | $ $0 $@ |
2128 | 1529 | 1993 | ||
2129 | @@ -1559,8 +2023,8 @@ | |||
2130 | 1559 | do | 2023 | do |
2131 | 1560 | IFS=$as_save_IFS | 2024 | IFS=$as_save_IFS |
2132 | 1561 | test -z "$as_dir" && as_dir=. | 2025 | test -z "$as_dir" && as_dir=. |
2135 | 1562 | echo "PATH: $as_dir" | 2026 | $as_echo "PATH: $as_dir" |
2136 | 1563 | done | 2027 | done |
2137 | 1564 | IFS=$as_save_IFS | 2028 | IFS=$as_save_IFS |
2138 | 1565 | 2029 | ||
2139 | 1566 | } >&5 | 2030 | } >&5 |
2140 | @@ -1594,12 +2058,12 @@ | |||
2141 | 1594 | | -silent | --silent | --silen | --sile | --sil) | 2058 | | -silent | --silent | --silen | --sile | --sil) |
2142 | 1595 | continue ;; | 2059 | continue ;; |
2143 | 1596 | *\'*) | 2060 | *\'*) |
2145 | 1597 | ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; | 2061 | ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; |
2146 | 1598 | esac | 2062 | esac |
2147 | 1599 | case $ac_pass in | 2063 | case $ac_pass in |
2149 | 1600 | 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; | 2064 | 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; |
2150 | 1601 | 2) | 2065 | 2) |
2152 | 1602 | ac_configure_args1="$ac_configure_args1 '$ac_arg'" | 2066 | as_fn_append ac_configure_args1 " '$ac_arg'" |
2153 | 1603 | if test $ac_must_keep_next = true; then | 2067 | if test $ac_must_keep_next = true; then |
2154 | 1604 | ac_must_keep_next=false # Got value, back to normal. | 2068 | ac_must_keep_next=false # Got value, back to normal. |
2155 | 1605 | else | 2069 | else |
2156 | @@ -1615,13 +2079,13 @@ | |||
2157 | 1615 | -* ) ac_must_keep_next=true ;; | 2079 | -* ) ac_must_keep_next=true ;; |
2158 | 1616 | esac | 2080 | esac |
2159 | 1617 | fi | 2081 | fi |
2161 | 1618 | ac_configure_args="$ac_configure_args '$ac_arg'" | 2082 | as_fn_append ac_configure_args " '$ac_arg'" |
2162 | 1619 | ;; | 2083 | ;; |
2163 | 1620 | esac | 2084 | esac |
2164 | 1621 | done | 2085 | done |
2165 | 1622 | done | 2086 | done |
2168 | 1623 | $as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } | 2087 | { ac_configure_args0=; unset ac_configure_args0;} |
2169 | 1624 | $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } | 2088 | { ac_configure_args1=; unset ac_configure_args1;} |
2170 | 1625 | 2089 | ||
2171 | 1626 | # When interrupted or exit'd, cleanup temporary files, and complete | 2090 | # When interrupted or exit'd, cleanup temporary files, and complete |
2172 | 1627 | # config.log. We remove comments because anyway the quotes in there | 2091 | # config.log. We remove comments because anyway the quotes in there |
2173 | @@ -1646,12 +2110,13 @@ | |||
2174 | 1646 | case $ac_val in #( | 2110 | case $ac_val in #( |
2175 | 1647 | *${as_nl}*) | 2111 | *${as_nl}*) |
2176 | 1648 | case $ac_var in #( | 2112 | case $ac_var in #( |
2179 | 1649 | *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 | 2113 | *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 |
2180 | 1650 | echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; | 2114 | $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; |
2181 | 1651 | esac | 2115 | esac |
2182 | 1652 | case $ac_var in #( | 2116 | case $ac_var in #( |
2183 | 1653 | _ | IFS | as_nl) ;; #( | 2117 | _ | IFS | as_nl) ;; #( |
2185 | 1654 | *) $as_unset $ac_var ;; | 2118 | BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( |
2186 | 2119 | *) { eval $ac_var=; unset $ac_var;} ;; | ||
2187 | 1655 | esac ;; | 2120 | esac ;; |
2188 | 1656 | esac | 2121 | esac |
2189 | 1657 | done | 2122 | done |
2190 | @@ -1680,9 +2145,9 @@ | |||
2191 | 1680 | do | 2145 | do |
2192 | 1681 | eval ac_val=\$$ac_var | 2146 | eval ac_val=\$$ac_var |
2193 | 1682 | case $ac_val in | 2147 | case $ac_val in |
2195 | 1683 | *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; | 2148 | *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; |
2196 | 1684 | esac | 2149 | esac |
2198 | 1685 | echo "$ac_var='\''$ac_val'\''" | 2150 | $as_echo "$ac_var='\''$ac_val'\''" |
2199 | 1686 | done | sort | 2151 | done | sort |
2200 | 1687 | echo | 2152 | echo |
2201 | 1688 | 2153 | ||
2202 | @@ -1697,9 +2162,9 @@ | |||
2203 | 1697 | do | 2162 | do |
2204 | 1698 | eval ac_val=\$$ac_var | 2163 | eval ac_val=\$$ac_var |
2205 | 1699 | case $ac_val in | 2164 | case $ac_val in |
2207 | 1700 | *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; | 2165 | *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; |
2208 | 1701 | esac | 2166 | esac |
2210 | 1702 | echo "$ac_var='\''$ac_val'\''" | 2167 | $as_echo "$ac_var='\''$ac_val'\''" |
2211 | 1703 | done | sort | 2168 | done | sort |
2212 | 1704 | echo | 2169 | echo |
2213 | 1705 | fi | 2170 | fi |
2214 | @@ -1715,83 +2180,88 @@ | |||
2215 | 1715 | echo | 2180 | echo |
2216 | 1716 | fi | 2181 | fi |
2217 | 1717 | test "$ac_signal" != 0 && | 2182 | test "$ac_signal" != 0 && |
2220 | 1718 | echo "$as_me: caught signal $ac_signal" | 2183 | $as_echo "$as_me: caught signal $ac_signal" |
2221 | 1719 | echo "$as_me: exit $exit_status" | 2184 | $as_echo "$as_me: exit $exit_status" |
2222 | 1720 | } >&5 | 2185 | } >&5 |
2223 | 1721 | rm -f core *.core core.conftest.* && | 2186 | rm -f core *.core core.conftest.* && |
2224 | 1722 | rm -f -r conftest* confdefs* conf$$* $ac_clean_files && | 2187 | rm -f -r conftest* confdefs* conf$$* $ac_clean_files && |
2225 | 1723 | exit $exit_status | 2188 | exit $exit_status |
2226 | 1724 | ' 0 | 2189 | ' 0 |
2227 | 1725 | for ac_signal in 1 2 13 15; do | 2190 | for ac_signal in 1 2 13 15; do |
2229 | 1726 | trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal | 2191 | trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal |
2230 | 1727 | done | 2192 | done |
2231 | 1728 | ac_signal=0 | 2193 | ac_signal=0 |
2232 | 1729 | 2194 | ||
2233 | 1730 | # confdefs.h avoids OS command line length limits that DEFS can exceed. | 2195 | # confdefs.h avoids OS command line length limits that DEFS can exceed. |
2234 | 1731 | rm -f -r conftest* confdefs.h | 2196 | rm -f -r conftest* confdefs.h |
2235 | 1732 | 2197 | ||
2236 | 2198 | $as_echo "/* confdefs.h */" > confdefs.h | ||
2237 | 2199 | |||
2238 | 1733 | # Predefined preprocessor variables. | 2200 | # Predefined preprocessor variables. |
2239 | 1734 | 2201 | ||
2240 | 1735 | cat >>confdefs.h <<_ACEOF | 2202 | cat >>confdefs.h <<_ACEOF |
2241 | 1736 | #define PACKAGE_NAME "$PACKAGE_NAME" | 2203 | #define PACKAGE_NAME "$PACKAGE_NAME" |
2242 | 1737 | _ACEOF | 2204 | _ACEOF |
2243 | 1738 | 2205 | ||
2244 | 1739 | |||
2245 | 1740 | cat >>confdefs.h <<_ACEOF | 2206 | cat >>confdefs.h <<_ACEOF |
2246 | 1741 | #define PACKAGE_TARNAME "$PACKAGE_TARNAME" | 2207 | #define PACKAGE_TARNAME "$PACKAGE_TARNAME" |
2247 | 1742 | _ACEOF | 2208 | _ACEOF |
2248 | 1743 | 2209 | ||
2249 | 1744 | |||
2250 | 1745 | cat >>confdefs.h <<_ACEOF | 2210 | cat >>confdefs.h <<_ACEOF |
2251 | 1746 | #define PACKAGE_VERSION "$PACKAGE_VERSION" | 2211 | #define PACKAGE_VERSION "$PACKAGE_VERSION" |
2252 | 1747 | _ACEOF | 2212 | _ACEOF |
2253 | 1748 | 2213 | ||
2254 | 1749 | |||
2255 | 1750 | cat >>confdefs.h <<_ACEOF | 2214 | cat >>confdefs.h <<_ACEOF |
2256 | 1751 | #define PACKAGE_STRING "$PACKAGE_STRING" | 2215 | #define PACKAGE_STRING "$PACKAGE_STRING" |
2257 | 1752 | _ACEOF | 2216 | _ACEOF |
2258 | 1753 | 2217 | ||
2259 | 1754 | |||
2260 | 1755 | cat >>confdefs.h <<_ACEOF | 2218 | cat >>confdefs.h <<_ACEOF |
2261 | 1756 | #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" | 2219 | #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" |
2262 | 1757 | _ACEOF | 2220 | _ACEOF |
2263 | 1758 | 2221 | ||
2264 | 2222 | cat >>confdefs.h <<_ACEOF | ||
2265 | 2223 | #define PACKAGE_URL "$PACKAGE_URL" | ||
2266 | 2224 | _ACEOF | ||
2267 | 2225 | |||
2268 | 1759 | 2226 | ||
2269 | 1760 | # Let the site file select an alternate cache file if it wants to. | 2227 | # Let the site file select an alternate cache file if it wants to. |
2271 | 1761 | # Prefer explicitly selected file to automatically selected ones. | 2228 | # Prefer an explicitly selected file to automatically selected ones. |
2272 | 2229 | ac_site_file1=NONE | ||
2273 | 2230 | ac_site_file2=NONE | ||
2274 | 1762 | if test -n "$CONFIG_SITE"; then | 2231 | if test -n "$CONFIG_SITE"; then |
2276 | 1763 | set x "$CONFIG_SITE" | 2232 | ac_site_file1=$CONFIG_SITE |
2277 | 1764 | elif test "x$prefix" != xNONE; then | 2233 | elif test "x$prefix" != xNONE; then |
2279 | 1765 | set x "$prefix/share/config.site" "$prefix/etc/config.site" | 2234 | ac_site_file1=$prefix/share/config.site |
2280 | 2235 | ac_site_file2=$prefix/etc/config.site | ||
2281 | 1766 | else | 2236 | else |
2284 | 1767 | set x "$ac_default_prefix/share/config.site" \ | 2237 | ac_site_file1=$ac_default_prefix/share/config.site |
2285 | 1768 | "$ac_default_prefix/etc/config.site" | 2238 | ac_site_file2=$ac_default_prefix/etc/config.site |
2286 | 1769 | fi | 2239 | fi |
2289 | 1770 | shift | 2240 | for ac_site_file in "$ac_site_file1" "$ac_site_file2" |
2288 | 1771 | for ac_site_file | ||
2290 | 1772 | do | 2241 | do |
2294 | 1773 | if test -r "$ac_site_file"; then | 2242 | test "x$ac_site_file" = xNONE && continue |
2295 | 1774 | { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 | 2243 | if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then |
2296 | 1775 | echo "$as_me: loading site script $ac_site_file" >&6;} | 2244 | { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 |
2297 | 2245 | $as_echo "$as_me: loading site script $ac_site_file" >&6;} | ||
2298 | 1776 | sed 's/^/| /' "$ac_site_file" >&5 | 2246 | sed 's/^/| /' "$ac_site_file" >&5 |
2299 | 1777 | . "$ac_site_file" | 2247 | . "$ac_site_file" |
2300 | 1778 | fi | 2248 | fi |
2301 | 1779 | done | 2249 | done |
2302 | 1780 | 2250 | ||
2303 | 1781 | if test -r "$cache_file"; then | 2251 | if test -r "$cache_file"; then |
2309 | 1782 | # Some versions of bash will fail to source /dev/null (special | 2252 | # Some versions of bash will fail to source /dev/null (special files |
2310 | 1783 | # files actually), so we avoid doing that. | 2253 | # actually), so we avoid doing that. DJGPP emulates it as a regular file. |
2311 | 1784 | if test -f "$cache_file"; then | 2254 | if test /dev/null != "$cache_file" && test -f "$cache_file"; then |
2312 | 1785 | { echo "$as_me:$LINENO: loading cache $cache_file" >&5 | 2255 | { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 |
2313 | 1786 | echo "$as_me: loading cache $cache_file" >&6;} | 2256 | $as_echo "$as_me: loading cache $cache_file" >&6;} |
2314 | 1787 | case $cache_file in | 2257 | case $cache_file in |
2315 | 1788 | [\\/]* | ?:[\\/]* ) . "$cache_file";; | 2258 | [\\/]* | ?:[\\/]* ) . "$cache_file";; |
2316 | 1789 | *) . "./$cache_file";; | 2259 | *) . "./$cache_file";; |
2317 | 1790 | esac | 2260 | esac |
2318 | 1791 | fi | 2261 | fi |
2319 | 1792 | else | 2262 | else |
2322 | 1793 | { echo "$as_me:$LINENO: creating cache $cache_file" >&5 | 2263 | { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 |
2323 | 1794 | echo "$as_me: creating cache $cache_file" >&6;} | 2264 | $as_echo "$as_me: creating cache $cache_file" >&6;} |
2324 | 1795 | >$cache_file | 2265 | >$cache_file |
2325 | 1796 | fi | 2266 | fi |
2326 | 1797 | 2267 | ||
2327 | @@ -1805,60 +2275,56 @@ | |||
2328 | 1805 | eval ac_new_val=\$ac_env_${ac_var}_value | 2275 | eval ac_new_val=\$ac_env_${ac_var}_value |
2329 | 1806 | case $ac_old_set,$ac_new_set in | 2276 | case $ac_old_set,$ac_new_set in |
2330 | 1807 | set,) | 2277 | set,) |
2333 | 1808 | { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 | 2278 | { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 |
2334 | 1809 | echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} | 2279 | $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} |
2335 | 1810 | ac_cache_corrupted=: ;; | 2280 | ac_cache_corrupted=: ;; |
2336 | 1811 | ,set) | 2281 | ,set) |
2339 | 1812 | { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 | 2282 | { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 |
2340 | 1813 | echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} | 2283 | $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} |
2341 | 1814 | ac_cache_corrupted=: ;; | 2284 | ac_cache_corrupted=: ;; |
2342 | 1815 | ,);; | 2285 | ,);; |
2343 | 1816 | *) | 2286 | *) |
2344 | 1817 | if test "x$ac_old_val" != "x$ac_new_val"; then | 2287 | if test "x$ac_old_val" != "x$ac_new_val"; then |
2352 | 1818 | { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 | 2288 | # differences in whitespace do not lead to failure. |
2353 | 1819 | echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} | 2289 | ac_old_val_w=`echo x $ac_old_val` |
2354 | 1820 | { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 | 2290 | ac_new_val_w=`echo x $ac_new_val` |
2355 | 1821 | echo "$as_me: former value: $ac_old_val" >&2;} | 2291 | if test "$ac_old_val_w" != "$ac_new_val_w"; then |
2356 | 1822 | { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 | 2292 | { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 |
2357 | 1823 | echo "$as_me: current value: $ac_new_val" >&2;} | 2293 | $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} |
2358 | 1824 | ac_cache_corrupted=: | 2294 | ac_cache_corrupted=: |
2359 | 2295 | else | ||
2360 | 2296 | { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 | ||
2361 | 2297 | $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} | ||
2362 | 2298 | eval $ac_var=\$ac_old_val | ||
2363 | 2299 | fi | ||
2364 | 2300 | { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 | ||
2365 | 2301 | $as_echo "$as_me: former value: \`$ac_old_val'" >&2;} | ||
2366 | 2302 | { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 | ||
2367 | 2303 | $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} | ||
2368 | 1825 | fi;; | 2304 | fi;; |
2369 | 1826 | esac | 2305 | esac |
2370 | 1827 | # Pass precious variables to config.status. | 2306 | # Pass precious variables to config.status. |
2371 | 1828 | if test "$ac_new_set" = set; then | 2307 | if test "$ac_new_set" = set; then |
2372 | 1829 | case $ac_new_val in | 2308 | case $ac_new_val in |
2374 | 1830 | *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; | 2309 | *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; |
2375 | 1831 | *) ac_arg=$ac_var=$ac_new_val ;; | 2310 | *) ac_arg=$ac_var=$ac_new_val ;; |
2376 | 1832 | esac | 2311 | esac |
2377 | 1833 | case " $ac_configure_args " in | 2312 | case " $ac_configure_args " in |
2378 | 1834 | *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. | 2313 | *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. |
2380 | 1835 | *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; | 2314 | *) as_fn_append ac_configure_args " '$ac_arg'" ;; |
2381 | 1836 | esac | 2315 | esac |
2382 | 1837 | fi | 2316 | fi |
2383 | 1838 | done | 2317 | done |
2384 | 1839 | if $ac_cache_corrupted; then | 2318 | if $ac_cache_corrupted; then |
2390 | 1840 | { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 | 2319 | { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
2391 | 1841 | echo "$as_me: error: changes in the environment can compromise the build" >&2;} | 2320 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
2392 | 1842 | { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 | 2321 | { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 |
2393 | 1843 | echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} | 2322 | $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} |
2394 | 1844 | { (exit 1); exit 1; }; } | 2323 | as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 |
2395 | 1845 | fi | 2324 | fi |
2412 | 1846 | 2325 | ## -------------------- ## | |
2413 | 1847 | 2326 | ## Main body of script. ## | |
2414 | 1848 | 2327 | ## -------------------- ## | |
2399 | 1849 | |||
2400 | 1850 | |||
2401 | 1851 | |||
2402 | 1852 | |||
2403 | 1853 | |||
2404 | 1854 | |||
2405 | 1855 | |||
2406 | 1856 | |||
2407 | 1857 | |||
2408 | 1858 | |||
2409 | 1859 | |||
2410 | 1860 | |||
2411 | 1861 | |||
2415 | 1862 | 2328 | ||
2416 | 1863 | ac_ext=c | 2329 | ac_ext=c |
2417 | 1864 | ac_cpp='$CPP $CPPFLAGS' | 2330 | ac_cpp='$CPP $CPPFLAGS' |
2418 | @@ -1867,28 +2333,20 @@ | |||
2419 | 1867 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | 2333 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
2420 | 1868 | 2334 | ||
2421 | 1869 | 2335 | ||
2423 | 1870 | am__api_version='1.10' | 2336 | am__api_version='1.11' |
2424 | 1871 | 2337 | ||
2425 | 1872 | ac_aux_dir= | 2338 | ac_aux_dir= |
2426 | 1873 | for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do | 2339 | for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do |
2440 | 1874 | if test -f "$ac_dir/install-sh"; then | 2340 | for ac_t in install-sh install.sh shtool; do |
2441 | 1875 | ac_aux_dir=$ac_dir | 2341 | if test -f "$ac_dir/$ac_t"; then |
2442 | 1876 | ac_install_sh="$ac_aux_dir/install-sh -c" | 2342 | ac_aux_dir=$ac_dir |
2443 | 1877 | break | 2343 | ac_install_sh="$ac_aux_dir/$ac_t -c" |
2444 | 1878 | elif test -f "$ac_dir/install.sh"; then | 2344 | break 2 |
2445 | 1879 | ac_aux_dir=$ac_dir | 2345 | fi |
2446 | 1880 | ac_install_sh="$ac_aux_dir/install.sh -c" | 2346 | done |
2434 | 1881 | break | ||
2435 | 1882 | elif test -f "$ac_dir/shtool"; then | ||
2436 | 1883 | ac_aux_dir=$ac_dir | ||
2437 | 1884 | ac_install_sh="$ac_aux_dir/shtool install -c" | ||
2438 | 1885 | break | ||
2439 | 1886 | fi | ||
2447 | 1887 | done | 2347 | done |
2448 | 1888 | if test -z "$ac_aux_dir"; then | 2348 | if test -z "$ac_aux_dir"; then |
2452 | 1889 | { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 | 2349 | as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 |
2450 | 1890 | echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} | ||
2451 | 1891 | { (exit 1); exit 1; }; } | ||
2453 | 1892 | fi | 2350 | fi |
2454 | 1893 | 2351 | ||
2455 | 1894 | # These three variables are undocumented and unsupported, | 2352 | # These three variables are undocumented and unsupported, |
2456 | @@ -1913,22 +2371,23 @@ | |||
2457 | 1913 | # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" | 2371 | # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" |
2458 | 1914 | # OS/2's system install, which has a completely different semantic | 2372 | # OS/2's system install, which has a completely different semantic |
2459 | 1915 | # ./install, which can be erroneously created by make from ./install.sh. | 2373 | # ./install, which can be erroneously created by make from ./install.sh. |
2462 | 1916 | { echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 | 2374 | # Reject install programs that cannot install multiple files. |
2463 | 1917 | echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } | 2375 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 |
2464 | 2376 | $as_echo_n "checking for a BSD-compatible install... " >&6; } | ||
2465 | 1918 | if test -z "$INSTALL"; then | 2377 | if test -z "$INSTALL"; then |
2468 | 1919 | if test "${ac_cv_path_install+set}" = set; then | 2378 | if test "${ac_cv_path_install+set}" = set; then : |
2469 | 1920 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 2379 | $as_echo_n "(cached) " >&6 |
2470 | 1921 | else | 2380 | else |
2471 | 1922 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | 2381 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2472 | 1923 | for as_dir in $PATH | 2382 | for as_dir in $PATH |
2473 | 1924 | do | 2383 | do |
2474 | 1925 | IFS=$as_save_IFS | 2384 | IFS=$as_save_IFS |
2475 | 1926 | test -z "$as_dir" && as_dir=. | 2385 | test -z "$as_dir" && as_dir=. |
2479 | 1927 | # Account for people who put trailing slashes in PATH elements. | 2386 | # Account for people who put trailing slashes in PATH elements. |
2480 | 1928 | case $as_dir/ in | 2387 | case $as_dir/ in #(( |
2481 | 1929 | ./ | .// | /cC/* | \ | 2388 | ./ | .// | /[cC]/* | \ |
2482 | 1930 | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ | 2389 | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ |
2484 | 1931 | ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ | 2390 | ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ |
2485 | 1932 | /usr/ucb/* ) ;; | 2391 | /usr/ucb/* ) ;; |
2486 | 1933 | *) | 2392 | *) |
2487 | 1934 | # OSF1 and SCO ODT 3.0 have their own names for install. | 2393 | # OSF1 and SCO ODT 3.0 have their own names for install. |
2488 | @@ -1946,17 +2405,29 @@ | |||
2489 | 1946 | # program-specific install script used by HP pwplus--don't use. | 2405 | # program-specific install script used by HP pwplus--don't use. |
2490 | 1947 | : | 2406 | : |
2491 | 1948 | else | 2407 | else |
2494 | 1949 | ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" | 2408 | rm -rf conftest.one conftest.two conftest.dir |
2495 | 1950 | break 3 | 2409 | echo one > conftest.one |
2496 | 2410 | echo two > conftest.two | ||
2497 | 2411 | mkdir conftest.dir | ||
2498 | 2412 | if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && | ||
2499 | 2413 | test -s conftest.one && test -s conftest.two && | ||
2500 | 2414 | test -s conftest.dir/conftest.one && | ||
2501 | 2415 | test -s conftest.dir/conftest.two | ||
2502 | 2416 | then | ||
2503 | 2417 | ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" | ||
2504 | 2418 | break 3 | ||
2505 | 2419 | fi | ||
2506 | 1951 | fi | 2420 | fi |
2507 | 1952 | fi | 2421 | fi |
2508 | 1953 | done | 2422 | done |
2509 | 1954 | done | 2423 | done |
2510 | 1955 | ;; | 2424 | ;; |
2511 | 1956 | esac | 2425 | esac |
2513 | 1957 | done | 2426 | |
2514 | 2427 | done | ||
2515 | 1958 | IFS=$as_save_IFS | 2428 | IFS=$as_save_IFS |
2516 | 1959 | 2429 | ||
2517 | 2430 | rm -rf conftest.one conftest.two conftest.dir | ||
2518 | 1960 | 2431 | ||
2519 | 1961 | fi | 2432 | fi |
2520 | 1962 | if test "${ac_cv_path_install+set}" = set; then | 2433 | if test "${ac_cv_path_install+set}" = set; then |
2521 | @@ -1969,8 +2440,8 @@ | |||
2522 | 1969 | INSTALL=$ac_install_sh | 2440 | INSTALL=$ac_install_sh |
2523 | 1970 | fi | 2441 | fi |
2524 | 1971 | fi | 2442 | fi |
2527 | 1972 | { echo "$as_me:$LINENO: result: $INSTALL" >&5 | 2443 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 |
2528 | 1973 | echo "${ECHO_T}$INSTALL" >&6; } | 2444 | $as_echo "$INSTALL" >&6; } |
2529 | 1974 | 2445 | ||
2530 | 1975 | # Use test -z because SunOS4 sh mishandles braces in ${var-val}. | 2446 | # Use test -z because SunOS4 sh mishandles braces in ${var-val}. |
2531 | 1976 | # It thinks the first close brace ends the variable substitution. | 2447 | # It thinks the first close brace ends the variable substitution. |
2532 | @@ -1980,21 +2451,34 @@ | |||
2533 | 1980 | 2451 | ||
2534 | 1981 | test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' | 2452 | test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' |
2535 | 1982 | 2453 | ||
2538 | 1983 | { echo "$as_me:$LINENO: checking whether build environment is sane" >&5 | 2454 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 |
2539 | 1984 | echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } | 2455 | $as_echo_n "checking whether build environment is sane... " >&6; } |
2540 | 1985 | # Just in case | 2456 | # Just in case |
2541 | 1986 | sleep 1 | 2457 | sleep 1 |
2542 | 1987 | echo timestamp > conftest.file | 2458 | echo timestamp > conftest.file |
2543 | 2459 | # Reject unsafe characters in $srcdir or the absolute working directory | ||
2544 | 2460 | # name. Accept space and tab only in the latter. | ||
2545 | 2461 | am_lf=' | ||
2546 | 2462 | ' | ||
2547 | 2463 | case `pwd` in | ||
2548 | 2464 | *[\\\"\#\$\&\'\`$am_lf]*) | ||
2549 | 2465 | as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; | ||
2550 | 2466 | esac | ||
2551 | 2467 | case $srcdir in | ||
2552 | 2468 | *[\\\"\#\$\&\'\`$am_lf\ \ ]*) | ||
2553 | 2469 | as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; | ||
2554 | 2470 | esac | ||
2555 | 2471 | |||
2556 | 1988 | # Do `set' in a subshell so we don't clobber the current shell's | 2472 | # Do `set' in a subshell so we don't clobber the current shell's |
2557 | 1989 | # arguments. Must try -L first in case configure is actually a | 2473 | # arguments. Must try -L first in case configure is actually a |
2558 | 1990 | # symlink; some systems play weird games with the mod time of symlinks | 2474 | # symlink; some systems play weird games with the mod time of symlinks |
2559 | 1991 | # (eg FreeBSD returns the mod time of the symlink's containing | 2475 | # (eg FreeBSD returns the mod time of the symlink's containing |
2560 | 1992 | # directory). | 2476 | # directory). |
2561 | 1993 | if ( | 2477 | if ( |
2563 | 1994 | set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` | 2478 | set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` |
2564 | 1995 | if test "$*" = "X"; then | 2479 | if test "$*" = "X"; then |
2565 | 1996 | # -L didn't work. | 2480 | # -L didn't work. |
2567 | 1997 | set X `ls -t $srcdir/configure conftest.file` | 2481 | set X `ls -t "$srcdir/configure" conftest.file` |
2568 | 1998 | fi | 2482 | fi |
2569 | 1999 | rm -f conftest.file | 2483 | rm -f conftest.file |
2570 | 2000 | if test "$*" != "X $srcdir/configure conftest.file" \ | 2484 | if test "$*" != "X $srcdir/configure conftest.file" \ |
2571 | @@ -2004,11 +2488,8 @@ | |||
2572 | 2004 | # if, for instance, CONFIG_SHELL is bash and it inherits a | 2488 | # if, for instance, CONFIG_SHELL is bash and it inherits a |
2573 | 2005 | # broken ls alias from the environment. This has actually | 2489 | # broken ls alias from the environment. This has actually |
2574 | 2006 | # happened. Such a system could not be considered "sane". | 2490 | # happened. Such a system could not be considered "sane". |
2580 | 2007 | { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken | 2491 | as_fn_error "ls -t appears to fail. Make sure there is not a broken |
2581 | 2008 | alias in your environment" >&5 | 2492 | alias in your environment" "$LINENO" 5 |
2577 | 2009 | echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken | ||
2578 | 2010 | alias in your environment" >&2;} | ||
2579 | 2011 | { (exit 1); exit 1; }; } | ||
2582 | 2012 | fi | 2493 | fi |
2583 | 2013 | 2494 | ||
2584 | 2014 | test "$2" = conftest.file | 2495 | test "$2" = conftest.file |
2585 | @@ -2017,52 +2498,162 @@ | |||
2586 | 2017 | # Ok. | 2498 | # Ok. |
2587 | 2018 | : | 2499 | : |
2588 | 2019 | else | 2500 | else |
2594 | 2020 | { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! | 2501 | as_fn_error "newly created file is older than distributed files! |
2595 | 2021 | Check your system clock" >&5 | 2502 | Check your system clock" "$LINENO" 5 |
2591 | 2022 | echo "$as_me: error: newly created file is older than distributed files! | ||
2592 | 2023 | Check your system clock" >&2;} | ||
2593 | 2024 | { (exit 1); exit 1; }; } | ||
2596 | 2025 | fi | 2503 | fi |
2599 | 2026 | { echo "$as_me:$LINENO: result: yes" >&5 | 2504 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
2600 | 2027 | echo "${ECHO_T}yes" >&6; } | 2505 | $as_echo "yes" >&6; } |
2601 | 2028 | test "$program_prefix" != NONE && | 2506 | test "$program_prefix" != NONE && |
2602 | 2029 | program_transform_name="s&^&$program_prefix&;$program_transform_name" | 2507 | program_transform_name="s&^&$program_prefix&;$program_transform_name" |
2603 | 2030 | # Use a double $ so make ignores it. | 2508 | # Use a double $ so make ignores it. |
2604 | 2031 | test "$program_suffix" != NONE && | 2509 | test "$program_suffix" != NONE && |
2605 | 2032 | program_transform_name="s&\$&$program_suffix&;$program_transform_name" | 2510 | program_transform_name="s&\$&$program_suffix&;$program_transform_name" |
2607 | 2033 | # Double any \ or $. echo might interpret backslashes. | 2511 | # Double any \ or $. |
2608 | 2034 | # By default was `s,x,x', remove it if useless. | 2512 | # By default was `s,x,x', remove it if useless. |
2614 | 2035 | cat <<\_ACEOF >conftest.sed | 2513 | ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' |
2615 | 2036 | s/[\\$]/&&/g;s/;s,x,x,$// | 2514 | program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` |
2611 | 2037 | _ACEOF | ||
2612 | 2038 | program_transform_name=`echo $program_transform_name | sed -f conftest.sed` | ||
2613 | 2039 | rm -f conftest.sed | ||
2616 | 2040 | 2515 | ||
2617 | 2041 | # expand $ac_aux_dir to an absolute path | 2516 | # expand $ac_aux_dir to an absolute path |
2618 | 2042 | am_aux_dir=`cd $ac_aux_dir && pwd` | 2517 | am_aux_dir=`cd $ac_aux_dir && pwd` |
2619 | 2043 | 2518 | ||
2621 | 2044 | test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" | 2519 | if test x"${MISSING+set}" != xset; then |
2622 | 2520 | case $am_aux_dir in | ||
2623 | 2521 | *\ * | *\ *) | ||
2624 | 2522 | MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; | ||
2625 | 2523 | *) | ||
2626 | 2524 | MISSING="\${SHELL} $am_aux_dir/missing" ;; | ||
2627 | 2525 | esac | ||
2628 | 2526 | fi | ||
2629 | 2045 | # Use eval to expand $SHELL | 2527 | # Use eval to expand $SHELL |
2630 | 2046 | if eval "$MISSING --run true"; then | 2528 | if eval "$MISSING --run true"; then |
2631 | 2047 | am_missing_run="$MISSING --run " | 2529 | am_missing_run="$MISSING --run " |
2632 | 2048 | else | 2530 | else |
2633 | 2049 | am_missing_run= | 2531 | am_missing_run= |
2640 | 2050 | { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 | 2532 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 |
2641 | 2051 | echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} | 2533 | $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} |
2642 | 2052 | fi | 2534 | fi |
2643 | 2053 | 2535 | ||
2644 | 2054 | { echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 | 2536 | if test x"${install_sh}" != xset; then |
2645 | 2055 | echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } | 2537 | case $am_aux_dir in |
2646 | 2538 | *\ * | *\ *) | ||
2647 | 2539 | install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; | ||
2648 | 2540 | *) | ||
2649 | 2541 | install_sh="\${SHELL} $am_aux_dir/install-sh" | ||
2650 | 2542 | esac | ||
2651 | 2543 | fi | ||
2652 | 2544 | |||
2653 | 2545 | # Installed binaries are usually stripped using `strip' when the user | ||
2654 | 2546 | # run `make install-strip'. However `strip' might not be the right | ||
2655 | 2547 | # tool to use in cross-compilation environments, therefore Automake | ||
2656 | 2548 | # will honor the `STRIP' environment variable to overrule this program. | ||
2657 | 2549 | if test "$cross_compiling" != no; then | ||
2658 | 2550 | if test -n "$ac_tool_prefix"; then | ||
2659 | 2551 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | ||
2660 | 2552 | set dummy ${ac_tool_prefix}strip; ac_word=$2 | ||
2661 | 2553 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2662 | 2554 | $as_echo_n "checking for $ac_word... " >&6; } | ||
2663 | 2555 | if test "${ac_cv_prog_STRIP+set}" = set; then : | ||
2664 | 2556 | $as_echo_n "(cached) " >&6 | ||
2665 | 2557 | else | ||
2666 | 2558 | if test -n "$STRIP"; then | ||
2667 | 2559 | ac_cv_prog_STRIP="$STRIP" # Let the user override the test. | ||
2668 | 2560 | else | ||
2669 | 2561 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2670 | 2562 | for as_dir in $PATH | ||
2671 | 2563 | do | ||
2672 | 2564 | IFS=$as_save_IFS | ||
2673 | 2565 | test -z "$as_dir" && as_dir=. | ||
2674 | 2566 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2675 | 2567 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
2676 | 2568 | ac_cv_prog_STRIP="${ac_tool_prefix}strip" | ||
2677 | 2569 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2678 | 2570 | break 2 | ||
2679 | 2571 | fi | ||
2680 | 2572 | done | ||
2681 | 2573 | done | ||
2682 | 2574 | IFS=$as_save_IFS | ||
2683 | 2575 | |||
2684 | 2576 | fi | ||
2685 | 2577 | fi | ||
2686 | 2578 | STRIP=$ac_cv_prog_STRIP | ||
2687 | 2579 | if test -n "$STRIP"; then | ||
2688 | 2580 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 | ||
2689 | 2581 | $as_echo "$STRIP" >&6; } | ||
2690 | 2582 | else | ||
2691 | 2583 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2692 | 2584 | $as_echo "no" >&6; } | ||
2693 | 2585 | fi | ||
2694 | 2586 | |||
2695 | 2587 | |||
2696 | 2588 | fi | ||
2697 | 2589 | if test -z "$ac_cv_prog_STRIP"; then | ||
2698 | 2590 | ac_ct_STRIP=$STRIP | ||
2699 | 2591 | # Extract the first word of "strip", so it can be a program name with args. | ||
2700 | 2592 | set dummy strip; ac_word=$2 | ||
2701 | 2593 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2702 | 2594 | $as_echo_n "checking for $ac_word... " >&6; } | ||
2703 | 2595 | if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : | ||
2704 | 2596 | $as_echo_n "(cached) " >&6 | ||
2705 | 2597 | else | ||
2706 | 2598 | if test -n "$ac_ct_STRIP"; then | ||
2707 | 2599 | ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. | ||
2708 | 2600 | else | ||
2709 | 2601 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2710 | 2602 | for as_dir in $PATH | ||
2711 | 2603 | do | ||
2712 | 2604 | IFS=$as_save_IFS | ||
2713 | 2605 | test -z "$as_dir" && as_dir=. | ||
2714 | 2606 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2715 | 2607 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
2716 | 2608 | ac_cv_prog_ac_ct_STRIP="strip" | ||
2717 | 2609 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2718 | 2610 | break 2 | ||
2719 | 2611 | fi | ||
2720 | 2612 | done | ||
2721 | 2613 | done | ||
2722 | 2614 | IFS=$as_save_IFS | ||
2723 | 2615 | |||
2724 | 2616 | fi | ||
2725 | 2617 | fi | ||
2726 | 2618 | ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP | ||
2727 | 2619 | if test -n "$ac_ct_STRIP"; then | ||
2728 | 2620 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 | ||
2729 | 2621 | $as_echo "$ac_ct_STRIP" >&6; } | ||
2730 | 2622 | else | ||
2731 | 2623 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2732 | 2624 | $as_echo "no" >&6; } | ||
2733 | 2625 | fi | ||
2734 | 2626 | |||
2735 | 2627 | if test "x$ac_ct_STRIP" = x; then | ||
2736 | 2628 | STRIP=":" | ||
2737 | 2629 | else | ||
2738 | 2630 | case $cross_compiling:$ac_tool_warned in | ||
2739 | 2631 | yes:) | ||
2740 | 2632 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
2741 | 2633 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
2742 | 2634 | ac_tool_warned=yes ;; | ||
2743 | 2635 | esac | ||
2744 | 2636 | STRIP=$ac_ct_STRIP | ||
2745 | 2637 | fi | ||
2746 | 2638 | else | ||
2747 | 2639 | STRIP="$ac_cv_prog_STRIP" | ||
2748 | 2640 | fi | ||
2749 | 2641 | |||
2750 | 2642 | fi | ||
2751 | 2643 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" | ||
2752 | 2644 | |||
2753 | 2645 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 | ||
2754 | 2646 | $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } | ||
2755 | 2056 | if test -z "$MKDIR_P"; then | 2647 | if test -z "$MKDIR_P"; then |
2758 | 2057 | if test "${ac_cv_path_mkdir+set}" = set; then | 2648 | if test "${ac_cv_path_mkdir+set}" = set; then : |
2759 | 2058 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 2649 | $as_echo_n "(cached) " >&6 |
2760 | 2059 | else | 2650 | else |
2761 | 2060 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | 2651 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2762 | 2061 | for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin | 2652 | for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin |
2763 | 2062 | do | 2653 | do |
2764 | 2063 | IFS=$as_save_IFS | 2654 | IFS=$as_save_IFS |
2765 | 2064 | test -z "$as_dir" && as_dir=. | 2655 | test -z "$as_dir" && as_dir=. |
2767 | 2065 | for ac_prog in mkdir gmkdir; do | 2656 | for ac_prog in mkdir gmkdir; do |
2768 | 2066 | for ac_exec_ext in '' $ac_executable_extensions; do | 2657 | for ac_exec_ext in '' $ac_executable_extensions; do |
2769 | 2067 | { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue | 2658 | { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue |
2770 | 2068 | case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( | 2659 | case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( |
2771 | @@ -2074,11 +2665,12 @@ | |||
2772 | 2074 | esac | 2665 | esac |
2773 | 2075 | done | 2666 | done |
2774 | 2076 | done | 2667 | done |
2776 | 2077 | done | 2668 | done |
2777 | 2078 | IFS=$as_save_IFS | 2669 | IFS=$as_save_IFS |
2778 | 2079 | 2670 | ||
2779 | 2080 | fi | 2671 | fi |
2780 | 2081 | 2672 | ||
2781 | 2673 | test -d ./--version && rmdir ./--version | ||
2782 | 2082 | if test "${ac_cv_path_mkdir+set}" = set; then | 2674 | if test "${ac_cv_path_mkdir+set}" = set; then |
2783 | 2083 | MKDIR_P="$ac_cv_path_mkdir -p" | 2675 | MKDIR_P="$ac_cv_path_mkdir -p" |
2784 | 2084 | else | 2676 | else |
2785 | @@ -2086,12 +2678,11 @@ | |||
2786 | 2086 | # value for MKDIR_P within a source directory, because that will | 2678 | # value for MKDIR_P within a source directory, because that will |
2787 | 2087 | # break other packages using the cache if that directory is | 2679 | # break other packages using the cache if that directory is |
2788 | 2088 | # removed, or if the value is a relative name. | 2680 | # removed, or if the value is a relative name. |
2789 | 2089 | test -d ./--version && rmdir ./--version | ||
2790 | 2090 | MKDIR_P="$ac_install_sh -d" | 2681 | MKDIR_P="$ac_install_sh -d" |
2791 | 2091 | fi | 2682 | fi |
2792 | 2092 | fi | 2683 | fi |
2795 | 2093 | { echo "$as_me:$LINENO: result: $MKDIR_P" >&5 | 2684 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 |
2796 | 2094 | echo "${ECHO_T}$MKDIR_P" >&6; } | 2685 | $as_echo "$MKDIR_P" >&6; } |
2797 | 2095 | 2686 | ||
2798 | 2096 | mkdir_p="$MKDIR_P" | 2687 | mkdir_p="$MKDIR_P" |
2799 | 2097 | case $mkdir_p in | 2688 | case $mkdir_p in |
2800 | @@ -2103,10 +2694,10 @@ | |||
2801 | 2103 | do | 2694 | do |
2802 | 2104 | # Extract the first word of "$ac_prog", so it can be a program name with args. | 2695 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
2803 | 2105 | set dummy $ac_prog; ac_word=$2 | 2696 | set dummy $ac_prog; ac_word=$2 |
2808 | 2106 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 2697 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2809 | 2107 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 2698 | $as_echo_n "checking for $ac_word... " >&6; } |
2810 | 2108 | if test "${ac_cv_prog_AWK+set}" = set; then | 2699 | if test "${ac_cv_prog_AWK+set}" = set; then : |
2811 | 2109 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 2700 | $as_echo_n "(cached) " >&6 |
2812 | 2110 | else | 2701 | else |
2813 | 2111 | if test -n "$AWK"; then | 2702 | if test -n "$AWK"; then |
2814 | 2112 | ac_cv_prog_AWK="$AWK" # Let the user override the test. | 2703 | ac_cv_prog_AWK="$AWK" # Let the user override the test. |
2815 | @@ -2116,36 +2707,37 @@ | |||
2816 | 2116 | do | 2707 | do |
2817 | 2117 | IFS=$as_save_IFS | 2708 | IFS=$as_save_IFS |
2818 | 2118 | test -z "$as_dir" && as_dir=. | 2709 | test -z "$as_dir" && as_dir=. |
2820 | 2119 | for ac_exec_ext in '' $ac_executable_extensions; do | 2710 | for ac_exec_ext in '' $ac_executable_extensions; do |
2821 | 2120 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 2711 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2822 | 2121 | ac_cv_prog_AWK="$ac_prog" | 2712 | ac_cv_prog_AWK="$ac_prog" |
2824 | 2122 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 2713 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2825 | 2123 | break 2 | 2714 | break 2 |
2826 | 2124 | fi | 2715 | fi |
2827 | 2125 | done | 2716 | done |
2829 | 2126 | done | 2717 | done |
2830 | 2127 | IFS=$as_save_IFS | 2718 | IFS=$as_save_IFS |
2831 | 2128 | 2719 | ||
2832 | 2129 | fi | 2720 | fi |
2833 | 2130 | fi | 2721 | fi |
2834 | 2131 | AWK=$ac_cv_prog_AWK | 2722 | AWK=$ac_cv_prog_AWK |
2835 | 2132 | if test -n "$AWK"; then | 2723 | if test -n "$AWK"; then |
2838 | 2133 | { echo "$as_me:$LINENO: result: $AWK" >&5 | 2724 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 |
2839 | 2134 | echo "${ECHO_T}$AWK" >&6; } | 2725 | $as_echo "$AWK" >&6; } |
2840 | 2135 | else | 2726 | else |
2843 | 2136 | { echo "$as_me:$LINENO: result: no" >&5 | 2727 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2844 | 2137 | echo "${ECHO_T}no" >&6; } | 2728 | $as_echo "no" >&6; } |
2845 | 2138 | fi | 2729 | fi |
2846 | 2139 | 2730 | ||
2847 | 2140 | 2731 | ||
2848 | 2141 | test -n "$AWK" && break | 2732 | test -n "$AWK" && break |
2849 | 2142 | done | 2733 | done |
2850 | 2143 | 2734 | ||
2856 | 2144 | { echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 | 2735 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 |
2857 | 2145 | echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } | 2736 | $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } |
2858 | 2146 | set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` | 2737 | set x ${MAKE-make} |
2859 | 2147 | if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then | 2738 | ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` |
2860 | 2148 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 2739 | if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : |
2861 | 2740 | $as_echo_n "(cached) " >&6 | ||
2862 | 2149 | else | 2741 | else |
2863 | 2150 | cat >conftest.make <<\_ACEOF | 2742 | cat >conftest.make <<\_ACEOF |
2864 | 2151 | SHELL = /bin/sh | 2743 | SHELL = /bin/sh |
2865 | @@ -2162,12 +2754,12 @@ | |||
2866 | 2162 | rm -f conftest.make | 2754 | rm -f conftest.make |
2867 | 2163 | fi | 2755 | fi |
2868 | 2164 | if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then | 2756 | if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then |
2871 | 2165 | { echo "$as_me:$LINENO: result: yes" >&5 | 2757 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
2872 | 2166 | echo "${ECHO_T}yes" >&6; } | 2758 | $as_echo "yes" >&6; } |
2873 | 2167 | SET_MAKE= | 2759 | SET_MAKE= |
2874 | 2168 | else | 2760 | else |
2877 | 2169 | { echo "$as_me:$LINENO: result: no" >&5 | 2761 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2878 | 2170 | echo "${ECHO_T}no" >&6; } | 2762 | $as_echo "no" >&6; } |
2879 | 2171 | SET_MAKE="MAKE=${MAKE-make}" | 2763 | SET_MAKE="MAKE=${MAKE-make}" |
2880 | 2172 | fi | 2764 | fi |
2881 | 2173 | 2765 | ||
2882 | @@ -2186,9 +2778,7 @@ | |||
2883 | 2186 | am__isrc=' -I$(srcdir)' | 2778 | am__isrc=' -I$(srcdir)' |
2884 | 2187 | # test to see if srcdir already configured | 2779 | # test to see if srcdir already configured |
2885 | 2188 | if test -f $srcdir/config.status; then | 2780 | if test -f $srcdir/config.status; then |
2889 | 2189 | { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 | 2781 | as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 |
2887 | 2190 | echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} | ||
2888 | 2191 | { (exit 1); exit 1; }; } | ||
2890 | 2192 | fi | 2782 | fi |
2891 | 2193 | fi | 2783 | fi |
2892 | 2194 | 2784 | ||
2893 | @@ -2204,7 +2794,7 @@ | |||
2894 | 2204 | 2794 | ||
2895 | 2205 | # Define the identity of the package. | 2795 | # Define the identity of the package. |
2896 | 2206 | PACKAGE=zabbix | 2796 | PACKAGE=zabbix |
2898 | 2207 | VERSION=1.8.3 | 2797 | VERSION=1.8.5 |
2899 | 2208 | 2798 | ||
2900 | 2209 | 2799 | ||
2901 | 2210 | cat >>confdefs.h <<_ACEOF | 2800 | cat >>confdefs.h <<_ACEOF |
2902 | @@ -2232,112 +2822,6 @@ | |||
2903 | 2232 | 2822 | ||
2904 | 2233 | MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} | 2823 | MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} |
2905 | 2234 | 2824 | ||
2906 | 2235 | install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} | ||
2907 | 2236 | |||
2908 | 2237 | # Installed binaries are usually stripped using `strip' when the user | ||
2909 | 2238 | # run `make install-strip'. However `strip' might not be the right | ||
2910 | 2239 | # tool to use in cross-compilation environments, therefore Automake | ||
2911 | 2240 | # will honor the `STRIP' environment variable to overrule this program. | ||
2912 | 2241 | if test "$cross_compiling" != no; then | ||
2913 | 2242 | if test -n "$ac_tool_prefix"; then | ||
2914 | 2243 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | ||
2915 | 2244 | set dummy ${ac_tool_prefix}strip; ac_word=$2 | ||
2916 | 2245 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
2917 | 2246 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
2918 | 2247 | if test "${ac_cv_prog_STRIP+set}" = set; then | ||
2919 | 2248 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2920 | 2249 | else | ||
2921 | 2250 | if test -n "$STRIP"; then | ||
2922 | 2251 | ac_cv_prog_STRIP="$STRIP" # Let the user override the test. | ||
2923 | 2252 | else | ||
2924 | 2253 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2925 | 2254 | for as_dir in $PATH | ||
2926 | 2255 | do | ||
2927 | 2256 | IFS=$as_save_IFS | ||
2928 | 2257 | test -z "$as_dir" && as_dir=. | ||
2929 | 2258 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2930 | 2259 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
2931 | 2260 | ac_cv_prog_STRIP="${ac_tool_prefix}strip" | ||
2932 | 2261 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2933 | 2262 | break 2 | ||
2934 | 2263 | fi | ||
2935 | 2264 | done | ||
2936 | 2265 | done | ||
2937 | 2266 | IFS=$as_save_IFS | ||
2938 | 2267 | |||
2939 | 2268 | fi | ||
2940 | 2269 | fi | ||
2941 | 2270 | STRIP=$ac_cv_prog_STRIP | ||
2942 | 2271 | if test -n "$STRIP"; then | ||
2943 | 2272 | { echo "$as_me:$LINENO: result: $STRIP" >&5 | ||
2944 | 2273 | echo "${ECHO_T}$STRIP" >&6; } | ||
2945 | 2274 | else | ||
2946 | 2275 | { echo "$as_me:$LINENO: result: no" >&5 | ||
2947 | 2276 | echo "${ECHO_T}no" >&6; } | ||
2948 | 2277 | fi | ||
2949 | 2278 | |||
2950 | 2279 | |||
2951 | 2280 | fi | ||
2952 | 2281 | if test -z "$ac_cv_prog_STRIP"; then | ||
2953 | 2282 | ac_ct_STRIP=$STRIP | ||
2954 | 2283 | # Extract the first word of "strip", so it can be a program name with args. | ||
2955 | 2284 | set dummy strip; ac_word=$2 | ||
2956 | 2285 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
2957 | 2286 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
2958 | 2287 | if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then | ||
2959 | 2288 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2960 | 2289 | else | ||
2961 | 2290 | if test -n "$ac_ct_STRIP"; then | ||
2962 | 2291 | ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. | ||
2963 | 2292 | else | ||
2964 | 2293 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2965 | 2294 | for as_dir in $PATH | ||
2966 | 2295 | do | ||
2967 | 2296 | IFS=$as_save_IFS | ||
2968 | 2297 | test -z "$as_dir" && as_dir=. | ||
2969 | 2298 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2970 | 2299 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
2971 | 2300 | ac_cv_prog_ac_ct_STRIP="strip" | ||
2972 | 2301 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2973 | 2302 | break 2 | ||
2974 | 2303 | fi | ||
2975 | 2304 | done | ||
2976 | 2305 | done | ||
2977 | 2306 | IFS=$as_save_IFS | ||
2978 | 2307 | |||
2979 | 2308 | fi | ||
2980 | 2309 | fi | ||
2981 | 2310 | ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP | ||
2982 | 2311 | if test -n "$ac_ct_STRIP"; then | ||
2983 | 2312 | { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 | ||
2984 | 2313 | echo "${ECHO_T}$ac_ct_STRIP" >&6; } | ||
2985 | 2314 | else | ||
2986 | 2315 | { echo "$as_me:$LINENO: result: no" >&5 | ||
2987 | 2316 | echo "${ECHO_T}no" >&6; } | ||
2988 | 2317 | fi | ||
2989 | 2318 | |||
2990 | 2319 | if test "x$ac_ct_STRIP" = x; then | ||
2991 | 2320 | STRIP=":" | ||
2992 | 2321 | else | ||
2993 | 2322 | case $cross_compiling:$ac_tool_warned in | ||
2994 | 2323 | yes:) | ||
2995 | 2324 | { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | ||
2996 | 2325 | whose name does not start with the host triplet. If you think this | ||
2997 | 2326 | configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
2998 | 2327 | echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
2999 | 2328 | whose name does not start with the host triplet. If you think this | ||
3000 | 2329 | configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
3001 | 2330 | ac_tool_warned=yes ;; | ||
3002 | 2331 | esac | ||
3003 | 2332 | STRIP=$ac_ct_STRIP | ||
3004 | 2333 | fi | ||
3005 | 2334 | else | ||
3006 | 2335 | STRIP="$ac_cv_prog_STRIP" | ||
3007 | 2336 | fi | ||
3008 | 2337 | |||
3009 | 2338 | fi | ||
3010 | 2339 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" | ||
3011 | 2340 | |||
3012 | 2341 | # We need awk for the "check" target. The system "awk" is bad on | 2825 | # We need awk for the "check" target. The system "awk" is bad on |
3013 | 2342 | # some platforms. | 2826 | # some platforms. |
3014 | 2343 | # Always define AMTAR for backward compatibility. | 2827 | # Always define AMTAR for backward compatibility. |
3015 | @@ -2351,14 +2835,15 @@ | |||
3016 | 2351 | 2835 | ||
3017 | 2352 | 2836 | ||
3018 | 2353 | 2837 | ||
3021 | 2354 | { echo "$as_me:$LINENO: Configuring $PACKAGE_NAME $PACKAGE_VERSION" >&5 | 2838 | { $as_echo "$as_me:${as_lineno-$LINENO}: Configuring $PACKAGE_NAME $PACKAGE_VERSION" >&5 |
3022 | 2355 | echo "$as_me: Configuring $PACKAGE_NAME $PACKAGE_VERSION" >&6;} | 2839 | $as_echo "$as_me: Configuring $PACKAGE_NAME $PACKAGE_VERSION" >&6;} |
3023 | 2356 | 2840 | ||
3029 | 2357 | { echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 | 2841 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 |
3030 | 2358 | echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } | 2842 | $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } |
3031 | 2359 | set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` | 2843 | set x ${MAKE-make} |
3032 | 2360 | if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then | 2844 | ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` |
3033 | 2361 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 2845 | if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : |
3034 | 2846 | $as_echo_n "(cached) " >&6 | ||
3035 | 2362 | else | 2847 | else |
3036 | 2363 | cat >conftest.make <<\_ACEOF | 2848 | cat >conftest.make <<\_ACEOF |
3037 | 2364 | SHELL = /bin/sh | 2849 | SHELL = /bin/sh |
3038 | @@ -2375,12 +2860,12 @@ | |||
3039 | 2375 | rm -f conftest.make | 2860 | rm -f conftest.make |
3040 | 2376 | fi | 2861 | fi |
3041 | 2377 | if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then | 2862 | if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then |
3044 | 2378 | { echo "$as_me:$LINENO: result: yes" >&5 | 2863 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
3045 | 2379 | echo "${ECHO_T}yes" >&6; } | 2864 | $as_echo "yes" >&6; } |
3046 | 2380 | SET_MAKE= | 2865 | SET_MAKE= |
3047 | 2381 | else | 2866 | else |
3050 | 2382 | { echo "$as_me:$LINENO: result: no" >&5 | 2867 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3051 | 2383 | echo "${ECHO_T}no" >&6; } | 2868 | $as_echo "no" >&6; } |
3052 | 2384 | SET_MAKE="MAKE=${MAKE-make}" | 2869 | SET_MAKE="MAKE=${MAKE-make}" |
3053 | 2385 | fi | 2870 | fi |
3054 | 2386 | 2871 | ||
3055 | @@ -2390,35 +2875,27 @@ | |||
3056 | 2390 | 2875 | ||
3057 | 2391 | # Make sure we can run config.sub. | 2876 | # Make sure we can run config.sub. |
3058 | 2392 | $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || | 2877 | $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || |
3062 | 2393 | { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 | 2878 | as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 |
3060 | 2394 | echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} | ||
3061 | 2395 | { (exit 1); exit 1; }; } | ||
3063 | 2396 | 2879 | ||
3068 | 2397 | { echo "$as_me:$LINENO: checking build system type" >&5 | 2880 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 |
3069 | 2398 | echo $ECHO_N "checking build system type... $ECHO_C" >&6; } | 2881 | $as_echo_n "checking build system type... " >&6; } |
3070 | 2399 | if test "${ac_cv_build+set}" = set; then | 2882 | if test "${ac_cv_build+set}" = set; then : |
3071 | 2400 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 2883 | $as_echo_n "(cached) " >&6 |
3072 | 2401 | else | 2884 | else |
3073 | 2402 | ac_build_alias=$build_alias | 2885 | ac_build_alias=$build_alias |
3074 | 2403 | test "x$ac_build_alias" = x && | 2886 | test "x$ac_build_alias" = x && |
3075 | 2404 | ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` | 2887 | ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` |
3076 | 2405 | test "x$ac_build_alias" = x && | 2888 | test "x$ac_build_alias" = x && |
3080 | 2406 | { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 | 2889 | as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 |
3078 | 2407 | echo "$as_me: error: cannot guess build type; you must specify one" >&2;} | ||
3079 | 2408 | { (exit 1); exit 1; }; } | ||
3081 | 2409 | ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || | 2890 | ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || |
3085 | 2410 | { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 | 2891 | as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 |
3083 | 2411 | echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} | ||
3084 | 2412 | { (exit 1); exit 1; }; } | ||
3086 | 2413 | 2892 | ||
3087 | 2414 | fi | 2893 | fi |
3090 | 2415 | { echo "$as_me:$LINENO: result: $ac_cv_build" >&5 | 2894 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 |
3091 | 2416 | echo "${ECHO_T}$ac_cv_build" >&6; } | 2895 | $as_echo "$ac_cv_build" >&6; } |
3092 | 2417 | case $ac_cv_build in | 2896 | case $ac_cv_build in |
3093 | 2418 | *-*-*) ;; | 2897 | *-*-*) ;; |
3097 | 2419 | *) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 | 2898 | *) as_fn_error "invalid value of canonical build" "$LINENO" 5;; |
3095 | 2420 | echo "$as_me: error: invalid value of canonical build" >&2;} | ||
3096 | 2421 | { (exit 1); exit 1; }; };; | ||
3098 | 2422 | esac | 2899 | esac |
3099 | 2423 | build=$ac_cv_build | 2900 | build=$ac_cv_build |
3100 | 2424 | ac_save_IFS=$IFS; IFS='-' | 2901 | ac_save_IFS=$IFS; IFS='-' |
3101 | @@ -2434,28 +2911,24 @@ | |||
3102 | 2434 | case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac | 2911 | case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac |
3103 | 2435 | 2912 | ||
3104 | 2436 | 2913 | ||
3109 | 2437 | { echo "$as_me:$LINENO: checking host system type" >&5 | 2914 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 |
3110 | 2438 | echo $ECHO_N "checking host system type... $ECHO_C" >&6; } | 2915 | $as_echo_n "checking host system type... " >&6; } |
3111 | 2439 | if test "${ac_cv_host+set}" = set; then | 2916 | if test "${ac_cv_host+set}" = set; then : |
3112 | 2440 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 2917 | $as_echo_n "(cached) " >&6 |
3113 | 2441 | else | 2918 | else |
3114 | 2442 | if test "x$host_alias" = x; then | 2919 | if test "x$host_alias" = x; then |
3115 | 2443 | ac_cv_host=$ac_cv_build | 2920 | ac_cv_host=$ac_cv_build |
3116 | 2444 | else | 2921 | else |
3117 | 2445 | ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || | 2922 | ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || |
3121 | 2446 | { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 | 2923 | as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 |
3119 | 2447 | echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} | ||
3120 | 2448 | { (exit 1); exit 1; }; } | ||
3122 | 2449 | fi | 2924 | fi |
3123 | 2450 | 2925 | ||
3124 | 2451 | fi | 2926 | fi |
3127 | 2452 | { echo "$as_me:$LINENO: result: $ac_cv_host" >&5 | 2927 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 |
3128 | 2453 | echo "${ECHO_T}$ac_cv_host" >&6; } | 2928 | $as_echo "$ac_cv_host" >&6; } |
3129 | 2454 | case $ac_cv_host in | 2929 | case $ac_cv_host in |
3130 | 2455 | *-*-*) ;; | 2930 | *-*-*) ;; |
3134 | 2456 | *) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 | 2931 | *) as_fn_error "invalid value of canonical host" "$LINENO" 5;; |
3132 | 2457 | echo "$as_me: error: invalid value of canonical host" >&2;} | ||
3133 | 2458 | { (exit 1); exit 1; }; };; | ||
3135 | 2459 | esac | 2932 | esac |
3136 | 2460 | host=$ac_cv_host | 2933 | host=$ac_cv_host |
3137 | 2461 | ac_save_IFS=$IFS; IFS='-' | 2934 | ac_save_IFS=$IFS; IFS='-' |
3138 | @@ -2472,6 +2945,7 @@ | |||
3139 | 2472 | 2945 | ||
3140 | 2473 | 2946 | ||
3141 | 2474 | 2947 | ||
3142 | 2948 | |||
3143 | 2475 | ac_ext=c | 2949 | ac_ext=c |
3144 | 2476 | ac_cpp='$CPP $CPPFLAGS' | 2950 | ac_cpp='$CPP $CPPFLAGS' |
3145 | 2477 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 2951 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
3146 | @@ -2480,10 +2954,10 @@ | |||
3147 | 2480 | if test -n "$ac_tool_prefix"; then | 2954 | if test -n "$ac_tool_prefix"; then |
3148 | 2481 | # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. | 2955 | # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. |
3149 | 2482 | set dummy ${ac_tool_prefix}gcc; ac_word=$2 | 2956 | set dummy ${ac_tool_prefix}gcc; ac_word=$2 |
3154 | 2483 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 2957 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3155 | 2484 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 2958 | $as_echo_n "checking for $ac_word... " >&6; } |
3156 | 2485 | if test "${ac_cv_prog_CC+set}" = set; then | 2959 | if test "${ac_cv_prog_CC+set}" = set; then : |
3157 | 2486 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 2960 | $as_echo_n "(cached) " >&6 |
3158 | 2487 | else | 2961 | else |
3159 | 2488 | if test -n "$CC"; then | 2962 | if test -n "$CC"; then |
3160 | 2489 | ac_cv_prog_CC="$CC" # Let the user override the test. | 2963 | ac_cv_prog_CC="$CC" # Let the user override the test. |
3161 | @@ -2493,25 +2967,25 @@ | |||
3162 | 2493 | do | 2967 | do |
3163 | 2494 | IFS=$as_save_IFS | 2968 | IFS=$as_save_IFS |
3164 | 2495 | test -z "$as_dir" && as_dir=. | 2969 | test -z "$as_dir" && as_dir=. |
3166 | 2496 | for ac_exec_ext in '' $ac_executable_extensions; do | 2970 | for ac_exec_ext in '' $ac_executable_extensions; do |
3167 | 2497 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 2971 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
3168 | 2498 | ac_cv_prog_CC="${ac_tool_prefix}gcc" | 2972 | ac_cv_prog_CC="${ac_tool_prefix}gcc" |
3170 | 2499 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 2973 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3171 | 2500 | break 2 | 2974 | break 2 |
3172 | 2501 | fi | 2975 | fi |
3173 | 2502 | done | 2976 | done |
3175 | 2503 | done | 2977 | done |
3176 | 2504 | IFS=$as_save_IFS | 2978 | IFS=$as_save_IFS |
3177 | 2505 | 2979 | ||
3178 | 2506 | fi | 2980 | fi |
3179 | 2507 | fi | 2981 | fi |
3180 | 2508 | CC=$ac_cv_prog_CC | 2982 | CC=$ac_cv_prog_CC |
3181 | 2509 | if test -n "$CC"; then | 2983 | if test -n "$CC"; then |
3184 | 2510 | { echo "$as_me:$LINENO: result: $CC" >&5 | 2984 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 |
3185 | 2511 | echo "${ECHO_T}$CC" >&6; } | 2985 | $as_echo "$CC" >&6; } |
3186 | 2512 | else | 2986 | else |
3189 | 2513 | { echo "$as_me:$LINENO: result: no" >&5 | 2987 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3190 | 2514 | echo "${ECHO_T}no" >&6; } | 2988 | $as_echo "no" >&6; } |
3191 | 2515 | fi | 2989 | fi |
3192 | 2516 | 2990 | ||
3193 | 2517 | 2991 | ||
3194 | @@ -2520,10 +2994,10 @@ | |||
3195 | 2520 | ac_ct_CC=$CC | 2994 | ac_ct_CC=$CC |
3196 | 2521 | # Extract the first word of "gcc", so it can be a program name with args. | 2995 | # Extract the first word of "gcc", so it can be a program name with args. |
3197 | 2522 | set dummy gcc; ac_word=$2 | 2996 | set dummy gcc; ac_word=$2 |
3202 | 2523 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 2997 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3203 | 2524 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 2998 | $as_echo_n "checking for $ac_word... " >&6; } |
3204 | 2525 | if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | 2999 | if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : |
3205 | 2526 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3000 | $as_echo_n "(cached) " >&6 |
3206 | 2527 | else | 3001 | else |
3207 | 2528 | if test -n "$ac_ct_CC"; then | 3002 | if test -n "$ac_ct_CC"; then |
3208 | 2529 | ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. | 3003 | ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. |
3209 | @@ -2533,25 +3007,25 @@ | |||
3210 | 2533 | do | 3007 | do |
3211 | 2534 | IFS=$as_save_IFS | 3008 | IFS=$as_save_IFS |
3212 | 2535 | test -z "$as_dir" && as_dir=. | 3009 | test -z "$as_dir" && as_dir=. |
3214 | 2536 | for ac_exec_ext in '' $ac_executable_extensions; do | 3010 | for ac_exec_ext in '' $ac_executable_extensions; do |
3215 | 2537 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 3011 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
3216 | 2538 | ac_cv_prog_ac_ct_CC="gcc" | 3012 | ac_cv_prog_ac_ct_CC="gcc" |
3218 | 2539 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 3013 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3219 | 2540 | break 2 | 3014 | break 2 |
3220 | 2541 | fi | 3015 | fi |
3221 | 2542 | done | 3016 | done |
3223 | 2543 | done | 3017 | done |
3224 | 2544 | IFS=$as_save_IFS | 3018 | IFS=$as_save_IFS |
3225 | 2545 | 3019 | ||
3226 | 2546 | fi | 3020 | fi |
3227 | 2547 | fi | 3021 | fi |
3228 | 2548 | ac_ct_CC=$ac_cv_prog_ac_ct_CC | 3022 | ac_ct_CC=$ac_cv_prog_ac_ct_CC |
3229 | 2549 | if test -n "$ac_ct_CC"; then | 3023 | if test -n "$ac_ct_CC"; then |
3232 | 2550 | { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | 3024 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 |
3233 | 2551 | echo "${ECHO_T}$ac_ct_CC" >&6; } | 3025 | $as_echo "$ac_ct_CC" >&6; } |
3234 | 2552 | else | 3026 | else |
3237 | 2553 | { echo "$as_me:$LINENO: result: no" >&5 | 3027 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3238 | 2554 | echo "${ECHO_T}no" >&6; } | 3028 | $as_echo "no" >&6; } |
3239 | 2555 | fi | 3029 | fi |
3240 | 2556 | 3030 | ||
3241 | 2557 | if test "x$ac_ct_CC" = x; then | 3031 | if test "x$ac_ct_CC" = x; then |
3242 | @@ -2559,12 +3033,8 @@ | |||
3243 | 2559 | else | 3033 | else |
3244 | 2560 | case $cross_compiling:$ac_tool_warned in | 3034 | case $cross_compiling:$ac_tool_warned in |
3245 | 2561 | yes:) | 3035 | yes:) |
3252 | 2562 | { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | 3036 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
3253 | 2563 | whose name does not start with the host triplet. If you think this | 3037 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
3248 | 2564 | configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
3249 | 2565 | echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
3250 | 2566 | whose name does not start with the host triplet. If you think this | ||
3251 | 2567 | configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
3254 | 2568 | ac_tool_warned=yes ;; | 3038 | ac_tool_warned=yes ;; |
3255 | 2569 | esac | 3039 | esac |
3256 | 2570 | CC=$ac_ct_CC | 3040 | CC=$ac_ct_CC |
3257 | @@ -2577,10 +3047,10 @@ | |||
3258 | 2577 | if test -n "$ac_tool_prefix"; then | 3047 | if test -n "$ac_tool_prefix"; then |
3259 | 2578 | # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. | 3048 | # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. |
3260 | 2579 | set dummy ${ac_tool_prefix}cc; ac_word=$2 | 3049 | set dummy ${ac_tool_prefix}cc; ac_word=$2 |
3265 | 2580 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 3050 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3266 | 2581 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 3051 | $as_echo_n "checking for $ac_word... " >&6; } |
3267 | 2582 | if test "${ac_cv_prog_CC+set}" = set; then | 3052 | if test "${ac_cv_prog_CC+set}" = set; then : |
3268 | 2583 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3053 | $as_echo_n "(cached) " >&6 |
3269 | 2584 | else | 3054 | else |
3270 | 2585 | if test -n "$CC"; then | 3055 | if test -n "$CC"; then |
3271 | 2586 | ac_cv_prog_CC="$CC" # Let the user override the test. | 3056 | ac_cv_prog_CC="$CC" # Let the user override the test. |
3272 | @@ -2590,25 +3060,25 @@ | |||
3273 | 2590 | do | 3060 | do |
3274 | 2591 | IFS=$as_save_IFS | 3061 | IFS=$as_save_IFS |
3275 | 2592 | test -z "$as_dir" && as_dir=. | 3062 | test -z "$as_dir" && as_dir=. |
3277 | 2593 | for ac_exec_ext in '' $ac_executable_extensions; do | 3063 | for ac_exec_ext in '' $ac_executable_extensions; do |
3278 | 2594 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 3064 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
3279 | 2595 | ac_cv_prog_CC="${ac_tool_prefix}cc" | 3065 | ac_cv_prog_CC="${ac_tool_prefix}cc" |
3281 | 2596 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 3066 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3282 | 2597 | break 2 | 3067 | break 2 |
3283 | 2598 | fi | 3068 | fi |
3284 | 2599 | done | 3069 | done |
3286 | 2600 | done | 3070 | done |
3287 | 2601 | IFS=$as_save_IFS | 3071 | IFS=$as_save_IFS |
3288 | 2602 | 3072 | ||
3289 | 2603 | fi | 3073 | fi |
3290 | 2604 | fi | 3074 | fi |
3291 | 2605 | CC=$ac_cv_prog_CC | 3075 | CC=$ac_cv_prog_CC |
3292 | 2606 | if test -n "$CC"; then | 3076 | if test -n "$CC"; then |
3295 | 2607 | { echo "$as_me:$LINENO: result: $CC" >&5 | 3077 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 |
3296 | 2608 | echo "${ECHO_T}$CC" >&6; } | 3078 | $as_echo "$CC" >&6; } |
3297 | 2609 | else | 3079 | else |
3300 | 2610 | { echo "$as_me:$LINENO: result: no" >&5 | 3080 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3301 | 2611 | echo "${ECHO_T}no" >&6; } | 3081 | $as_echo "no" >&6; } |
3302 | 2612 | fi | 3082 | fi |
3303 | 2613 | 3083 | ||
3304 | 2614 | 3084 | ||
3305 | @@ -2617,10 +3087,10 @@ | |||
3306 | 2617 | if test -z "$CC"; then | 3087 | if test -z "$CC"; then |
3307 | 2618 | # Extract the first word of "cc", so it can be a program name with args. | 3088 | # Extract the first word of "cc", so it can be a program name with args. |
3308 | 2619 | set dummy cc; ac_word=$2 | 3089 | set dummy cc; ac_word=$2 |
3313 | 2620 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 3090 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3314 | 2621 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 3091 | $as_echo_n "checking for $ac_word... " >&6; } |
3315 | 2622 | if test "${ac_cv_prog_CC+set}" = set; then | 3092 | if test "${ac_cv_prog_CC+set}" = set; then : |
3316 | 2623 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3093 | $as_echo_n "(cached) " >&6 |
3317 | 2624 | else | 3094 | else |
3318 | 2625 | if test -n "$CC"; then | 3095 | if test -n "$CC"; then |
3319 | 2626 | ac_cv_prog_CC="$CC" # Let the user override the test. | 3096 | ac_cv_prog_CC="$CC" # Let the user override the test. |
3320 | @@ -2631,18 +3101,18 @@ | |||
3321 | 2631 | do | 3101 | do |
3322 | 2632 | IFS=$as_save_IFS | 3102 | IFS=$as_save_IFS |
3323 | 2633 | test -z "$as_dir" && as_dir=. | 3103 | test -z "$as_dir" && as_dir=. |
3325 | 2634 | for ac_exec_ext in '' $ac_executable_extensions; do | 3104 | for ac_exec_ext in '' $ac_executable_extensions; do |
3326 | 2635 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 3105 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
3327 | 2636 | if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then | 3106 | if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then |
3328 | 2637 | ac_prog_rejected=yes | 3107 | ac_prog_rejected=yes |
3329 | 2638 | continue | 3108 | continue |
3330 | 2639 | fi | 3109 | fi |
3331 | 2640 | ac_cv_prog_CC="cc" | 3110 | ac_cv_prog_CC="cc" |
3333 | 2641 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 3111 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3334 | 2642 | break 2 | 3112 | break 2 |
3335 | 2643 | fi | 3113 | fi |
3336 | 2644 | done | 3114 | done |
3338 | 2645 | done | 3115 | done |
3339 | 2646 | IFS=$as_save_IFS | 3116 | IFS=$as_save_IFS |
3340 | 2647 | 3117 | ||
3341 | 2648 | if test $ac_prog_rejected = yes; then | 3118 | if test $ac_prog_rejected = yes; then |
3342 | @@ -2661,11 +3131,11 @@ | |||
3343 | 2661 | fi | 3131 | fi |
3344 | 2662 | CC=$ac_cv_prog_CC | 3132 | CC=$ac_cv_prog_CC |
3345 | 2663 | if test -n "$CC"; then | 3133 | if test -n "$CC"; then |
3348 | 2664 | { echo "$as_me:$LINENO: result: $CC" >&5 | 3134 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 |
3349 | 2665 | echo "${ECHO_T}$CC" >&6; } | 3135 | $as_echo "$CC" >&6; } |
3350 | 2666 | else | 3136 | else |
3353 | 2667 | { echo "$as_me:$LINENO: result: no" >&5 | 3137 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3354 | 2668 | echo "${ECHO_T}no" >&6; } | 3138 | $as_echo "no" >&6; } |
3355 | 2669 | fi | 3139 | fi |
3356 | 2670 | 3140 | ||
3357 | 2671 | 3141 | ||
3358 | @@ -2676,10 +3146,10 @@ | |||
3359 | 2676 | do | 3146 | do |
3360 | 2677 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | 3147 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
3361 | 2678 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | 3148 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
3366 | 2679 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 3149 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3367 | 2680 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 3150 | $as_echo_n "checking for $ac_word... " >&6; } |
3368 | 2681 | if test "${ac_cv_prog_CC+set}" = set; then | 3151 | if test "${ac_cv_prog_CC+set}" = set; then : |
3369 | 2682 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3152 | $as_echo_n "(cached) " >&6 |
3370 | 2683 | else | 3153 | else |
3371 | 2684 | if test -n "$CC"; then | 3154 | if test -n "$CC"; then |
3372 | 2685 | ac_cv_prog_CC="$CC" # Let the user override the test. | 3155 | ac_cv_prog_CC="$CC" # Let the user override the test. |
3373 | @@ -2689,25 +3159,25 @@ | |||
3374 | 2689 | do | 3159 | do |
3375 | 2690 | IFS=$as_save_IFS | 3160 | IFS=$as_save_IFS |
3376 | 2691 | test -z "$as_dir" && as_dir=. | 3161 | test -z "$as_dir" && as_dir=. |
3378 | 2692 | for ac_exec_ext in '' $ac_executable_extensions; do | 3162 | for ac_exec_ext in '' $ac_executable_extensions; do |
3379 | 2693 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 3163 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
3380 | 2694 | ac_cv_prog_CC="$ac_tool_prefix$ac_prog" | 3164 | ac_cv_prog_CC="$ac_tool_prefix$ac_prog" |
3382 | 2695 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 3165 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3383 | 2696 | break 2 | 3166 | break 2 |
3384 | 2697 | fi | 3167 | fi |
3385 | 2698 | done | 3168 | done |
3387 | 2699 | done | 3169 | done |
3388 | 2700 | IFS=$as_save_IFS | 3170 | IFS=$as_save_IFS |
3389 | 2701 | 3171 | ||
3390 | 2702 | fi | 3172 | fi |
3391 | 2703 | fi | 3173 | fi |
3392 | 2704 | CC=$ac_cv_prog_CC | 3174 | CC=$ac_cv_prog_CC |
3393 | 2705 | if test -n "$CC"; then | 3175 | if test -n "$CC"; then |
3396 | 2706 | { echo "$as_me:$LINENO: result: $CC" >&5 | 3176 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 |
3397 | 2707 | echo "${ECHO_T}$CC" >&6; } | 3177 | $as_echo "$CC" >&6; } |
3398 | 2708 | else | 3178 | else |
3401 | 2709 | { echo "$as_me:$LINENO: result: no" >&5 | 3179 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3402 | 2710 | echo "${ECHO_T}no" >&6; } | 3180 | $as_echo "no" >&6; } |
3403 | 2711 | fi | 3181 | fi |
3404 | 2712 | 3182 | ||
3405 | 2713 | 3183 | ||
3406 | @@ -2720,10 +3190,10 @@ | |||
3407 | 2720 | do | 3190 | do |
3408 | 2721 | # Extract the first word of "$ac_prog", so it can be a program name with args. | 3191 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
3409 | 2722 | set dummy $ac_prog; ac_word=$2 | 3192 | set dummy $ac_prog; ac_word=$2 |
3414 | 2723 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 3193 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3415 | 2724 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 3194 | $as_echo_n "checking for $ac_word... " >&6; } |
3416 | 2725 | if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | 3195 | if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : |
3417 | 2726 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3196 | $as_echo_n "(cached) " >&6 |
3418 | 2727 | else | 3197 | else |
3419 | 2728 | if test -n "$ac_ct_CC"; then | 3198 | if test -n "$ac_ct_CC"; then |
3420 | 2729 | ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. | 3199 | ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. |
3421 | @@ -2733,25 +3203,25 @@ | |||
3422 | 2733 | do | 3203 | do |
3423 | 2734 | IFS=$as_save_IFS | 3204 | IFS=$as_save_IFS |
3424 | 2735 | test -z "$as_dir" && as_dir=. | 3205 | test -z "$as_dir" && as_dir=. |
3426 | 2736 | for ac_exec_ext in '' $ac_executable_extensions; do | 3206 | for ac_exec_ext in '' $ac_executable_extensions; do |
3427 | 2737 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 3207 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
3428 | 2738 | ac_cv_prog_ac_ct_CC="$ac_prog" | 3208 | ac_cv_prog_ac_ct_CC="$ac_prog" |
3430 | 2739 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 3209 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3431 | 2740 | break 2 | 3210 | break 2 |
3432 | 2741 | fi | 3211 | fi |
3433 | 2742 | done | 3212 | done |
3435 | 2743 | done | 3213 | done |
3436 | 2744 | IFS=$as_save_IFS | 3214 | IFS=$as_save_IFS |
3437 | 2745 | 3215 | ||
3438 | 2746 | fi | 3216 | fi |
3439 | 2747 | fi | 3217 | fi |
3440 | 2748 | ac_ct_CC=$ac_cv_prog_ac_ct_CC | 3218 | ac_ct_CC=$ac_cv_prog_ac_ct_CC |
3441 | 2749 | if test -n "$ac_ct_CC"; then | 3219 | if test -n "$ac_ct_CC"; then |
3444 | 2750 | { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | 3220 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 |
3445 | 2751 | echo "${ECHO_T}$ac_ct_CC" >&6; } | 3221 | $as_echo "$ac_ct_CC" >&6; } |
3446 | 2752 | else | 3222 | else |
3449 | 2753 | { echo "$as_me:$LINENO: result: no" >&5 | 3223 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3450 | 2754 | echo "${ECHO_T}no" >&6; } | 3224 | $as_echo "no" >&6; } |
3451 | 2755 | fi | 3225 | fi |
3452 | 2756 | 3226 | ||
3453 | 2757 | 3227 | ||
3454 | @@ -2763,12 +3233,8 @@ | |||
3455 | 2763 | else | 3233 | else |
3456 | 2764 | case $cross_compiling:$ac_tool_warned in | 3234 | case $cross_compiling:$ac_tool_warned in |
3457 | 2765 | yes:) | 3235 | yes:) |
3464 | 2766 | { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | 3236 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
3465 | 2767 | whose name does not start with the host triplet. If you think this | 3237 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
3460 | 2768 | configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
3461 | 2769 | echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
3462 | 2770 | whose name does not start with the host triplet. If you think this | ||
3463 | 2771 | configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
3466 | 2772 | ac_tool_warned=yes ;; | 3238 | ac_tool_warned=yes ;; |
3467 | 2773 | esac | 3239 | esac |
3468 | 2774 | CC=$ac_ct_CC | 3240 | CC=$ac_ct_CC |
3469 | @@ -2778,51 +3244,37 @@ | |||
3470 | 2778 | fi | 3244 | fi |
3471 | 2779 | 3245 | ||
3472 | 2780 | 3246 | ||
3478 | 2781 | test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH | 3247 | test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
3479 | 2782 | See \`config.log' for more details." >&5 | 3248 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
3480 | 2783 | echo "$as_me: error: no acceptable C compiler found in \$PATH | 3249 | as_fn_error "no acceptable C compiler found in \$PATH |
3481 | 2784 | See \`config.log' for more details." >&2;} | 3250 | See \`config.log' for more details." "$LINENO" 5; } |
3477 | 2785 | { (exit 1); exit 1; }; } | ||
3482 | 2786 | 3251 | ||
3483 | 2787 | # Provide some information about the compiler. | 3252 | # Provide some information about the compiler. |
3516 | 2788 | echo "$as_me:$LINENO: checking for C compiler version" >&5 | 3253 | $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 |
3517 | 2789 | ac_compiler=`set X $ac_compile; echo $2` | 3254 | set X $ac_compile |
3518 | 2790 | { (ac_try="$ac_compiler --version >&5" | 3255 | ac_compiler=$2 |
3519 | 2791 | case "(($ac_try" in | 3256 | for ac_option in --version -v -V -qversion; do |
3520 | 2792 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 3257 | { { ac_try="$ac_compiler $ac_option >&5" |
3521 | 2793 | *) ac_try_echo=$ac_try;; | 3258 | case "(($ac_try" in |
3522 | 2794 | esac | 3259 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
3523 | 2795 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | 3260 | *) ac_try_echo=$ac_try;; |
3524 | 2796 | (eval "$ac_compiler --version >&5") 2>&5 | 3261 | esac |
3525 | 2797 | ac_status=$? | 3262 | eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
3526 | 2798 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 3263 | $as_echo "$ac_try_echo"; } >&5 |
3527 | 2799 | (exit $ac_status); } | 3264 | (eval "$ac_compiler $ac_option >&5") 2>conftest.err |
3528 | 2800 | { (ac_try="$ac_compiler -v >&5" | 3265 | ac_status=$? |
3529 | 2801 | case "(($ac_try" in | 3266 | if test -s conftest.err; then |
3530 | 2802 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 3267 | sed '10a\ |
3531 | 2803 | *) ac_try_echo=$ac_try;; | 3268 | ... rest of stderr output deleted ... |
3532 | 2804 | esac | 3269 | 10q' conftest.err >conftest.er1 |
3533 | 2805 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | 3270 | cat conftest.er1 >&5 |
3534 | 2806 | (eval "$ac_compiler -v >&5") 2>&5 | 3271 | fi |
3535 | 2807 | ac_status=$? | 3272 | rm -f conftest.er1 conftest.err |
3536 | 2808 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 3273 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
3537 | 2809 | (exit $ac_status); } | 3274 | test $ac_status = 0; } |
3538 | 2810 | { (ac_try="$ac_compiler -V >&5" | 3275 | done |
3507 | 2811 | case "(($ac_try" in | ||
3508 | 2812 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3509 | 2813 | *) ac_try_echo=$ac_try;; | ||
3510 | 2814 | esac | ||
3511 | 2815 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3512 | 2816 | (eval "$ac_compiler -V >&5") 2>&5 | ||
3513 | 2817 | ac_status=$? | ||
3514 | 2818 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3515 | 2819 | (exit $ac_status); } | ||
3539 | 2820 | 3276 | ||
3545 | 2821 | cat >conftest.$ac_ext <<_ACEOF | 3277 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3541 | 2822 | /* confdefs.h. */ | ||
3542 | 2823 | _ACEOF | ||
3543 | 2824 | cat confdefs.h >>conftest.$ac_ext | ||
3544 | 2825 | cat >>conftest.$ac_ext <<_ACEOF | ||
3546 | 2826 | /* end confdefs.h. */ | 3278 | /* end confdefs.h. */ |
3547 | 2827 | 3279 | ||
3548 | 2828 | int | 3280 | int |
3549 | @@ -2834,42 +3286,38 @@ | |||
3550 | 2834 | } | 3286 | } |
3551 | 2835 | _ACEOF | 3287 | _ACEOF |
3552 | 2836 | ac_clean_files_save=$ac_clean_files | 3288 | ac_clean_files_save=$ac_clean_files |
3554 | 2837 | ac_clean_files="$ac_clean_files a.out a.exe b.out" | 3289 | ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" |
3555 | 2838 | # Try to create an executable without -o first, disregard a.out. | 3290 | # Try to create an executable without -o first, disregard a.out. |
3556 | 2839 | # It will help us diagnose broken compilers, and finding out an intuition | 3291 | # It will help us diagnose broken compilers, and finding out an intuition |
3557 | 2840 | # of exeext. | 3292 | # of exeext. |
3570 | 2841 | { echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 | 3293 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 |
3571 | 2842 | echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } | 3294 | $as_echo_n "checking whether the C compiler works... " >&6; } |
3572 | 2843 | ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` | 3295 | ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` |
3573 | 2844 | # | 3296 | |
3574 | 2845 | # List of possible output files, starting from the most likely. | 3297 | # The possible output files: |
3575 | 2846 | # The algorithm is not robust to junk in `.', hence go to wildcards (a.*) | 3298 | ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" |
3576 | 2847 | # only as a last resort. b.out is created by i960 compilers. | 3299 | |
3565 | 2848 | ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' | ||
3566 | 2849 | # | ||
3567 | 2850 | # The IRIX 6 linker writes into existing files which may not be | ||
3568 | 2851 | # executable, retaining their permissions. Remove them first so a | ||
3569 | 2852 | # subsequent execution test works. | ||
3577 | 2853 | ac_rmfiles= | 3300 | ac_rmfiles= |
3578 | 2854 | for ac_file in $ac_files | 3301 | for ac_file in $ac_files |
3579 | 2855 | do | 3302 | do |
3580 | 2856 | case $ac_file in | 3303 | case $ac_file in |
3582 | 2857 | *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; | 3304 | *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; |
3583 | 2858 | * ) ac_rmfiles="$ac_rmfiles $ac_file";; | 3305 | * ) ac_rmfiles="$ac_rmfiles $ac_file";; |
3584 | 2859 | esac | 3306 | esac |
3585 | 2860 | done | 3307 | done |
3586 | 2861 | rm -f $ac_rmfiles | 3308 | rm -f $ac_rmfiles |
3587 | 2862 | 3309 | ||
3589 | 2863 | if { (ac_try="$ac_link_default" | 3310 | if { { ac_try="$ac_link_default" |
3590 | 2864 | case "(($ac_try" in | 3311 | case "(($ac_try" in |
3591 | 2865 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 3312 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
3592 | 2866 | *) ac_try_echo=$ac_try;; | 3313 | *) ac_try_echo=$ac_try;; |
3593 | 2867 | esac | 3314 | esac |
3595 | 2868 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | 3315 | eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
3596 | 3316 | $as_echo "$ac_try_echo"; } >&5 | ||
3597 | 2869 | (eval "$ac_link_default") 2>&5 | 3317 | (eval "$ac_link_default") 2>&5 |
3598 | 2870 | ac_status=$? | 3318 | ac_status=$? |
3601 | 2871 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 3319 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
3602 | 2872 | (exit $ac_status); }; then | 3320 | test $ac_status = 0; }; then : |
3603 | 2873 | # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. | 3321 | # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. |
3604 | 2874 | # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' | 3322 | # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' |
3605 | 2875 | # in a Makefile. We should not override ac_cv_exeext if it was cached, | 3323 | # in a Makefile. We should not override ac_cv_exeext if it was cached, |
3606 | @@ -2879,14 +3327,14 @@ | |||
3607 | 2879 | do | 3327 | do |
3608 | 2880 | test -f "$ac_file" || continue | 3328 | test -f "$ac_file" || continue |
3609 | 2881 | case $ac_file in | 3329 | case $ac_file in |
3611 | 2882 | *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) | 3330 | *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) |
3612 | 2883 | ;; | 3331 | ;; |
3613 | 2884 | [ab].out ) | 3332 | [ab].out ) |
3614 | 2885 | # We found the default executable, but exeext='' is most | 3333 | # We found the default executable, but exeext='' is most |
3615 | 2886 | # certainly right. | 3334 | # certainly right. |
3616 | 2887 | break;; | 3335 | break;; |
3617 | 2888 | *.* ) | 3336 | *.* ) |
3619 | 2889 | if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; | 3337 | if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; |
3620 | 2890 | then :; else | 3338 | then :; else |
3621 | 2891 | ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` | 3339 | ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` |
3622 | 2892 | fi | 3340 | fi |
3623 | @@ -2905,78 +3353,42 @@ | |||
3624 | 2905 | else | 3353 | else |
3625 | 2906 | ac_file='' | 3354 | ac_file='' |
3626 | 2907 | fi | 3355 | fi |
3632 | 2908 | 3356 | if test -z "$ac_file"; then : | |
3633 | 2909 | { echo "$as_me:$LINENO: result: $ac_file" >&5 | 3357 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3634 | 2910 | echo "${ECHO_T}$ac_file" >&6; } | 3358 | $as_echo "no" >&6; } |
3635 | 2911 | if test -z "$ac_file"; then | 3359 | $as_echo "$as_me: failed program was:" >&5 |
3631 | 2912 | echo "$as_me: failed program was:" >&5 | ||
3636 | 2913 | sed 's/^/| /' conftest.$ac_ext >&5 | 3360 | sed 's/^/| /' conftest.$ac_ext >&5 |
3637 | 2914 | 3361 | ||
3643 | 2915 | { { echo "$as_me:$LINENO: error: C compiler cannot create executables | 3362 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
3644 | 2916 | See \`config.log' for more details." >&5 | 3363 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
3645 | 2917 | echo "$as_me: error: C compiler cannot create executables | 3364 | { as_fn_set_status 77 |
3646 | 2918 | See \`config.log' for more details." >&2;} | 3365 | as_fn_error "C compiler cannot create executables |
3647 | 2919 | { (exit 77); exit 77; }; } | 3366 | See \`config.log' for more details." "$LINENO" 5; }; } |
3648 | 3367 | else | ||
3649 | 3368 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
3650 | 3369 | $as_echo "yes" >&6; } | ||
3651 | 2920 | fi | 3370 | fi |
3653 | 2921 | 3371 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 | |
3654 | 3372 | $as_echo_n "checking for C compiler default output file name... " >&6; } | ||
3655 | 3373 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 | ||
3656 | 3374 | $as_echo "$ac_file" >&6; } | ||
3657 | 2922 | ac_exeext=$ac_cv_exeext | 3375 | ac_exeext=$ac_cv_exeext |
3658 | 2923 | 3376 | ||
3695 | 2924 | # Check that the compiler produces executables we can run. If not, either | 3377 | rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out |
3660 | 2925 | # the compiler is broken, or we cross compile. | ||
3661 | 2926 | { echo "$as_me:$LINENO: checking whether the C compiler works" >&5 | ||
3662 | 2927 | echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } | ||
3663 | 2928 | # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 | ||
3664 | 2929 | # If not cross compiling, check that we can run a simple program. | ||
3665 | 2930 | if test "$cross_compiling" != yes; then | ||
3666 | 2931 | if { ac_try='./$ac_file' | ||
3667 | 2932 | { (case "(($ac_try" in | ||
3668 | 2933 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3669 | 2934 | *) ac_try_echo=$ac_try;; | ||
3670 | 2935 | esac | ||
3671 | 2936 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3672 | 2937 | (eval "$ac_try") 2>&5 | ||
3673 | 2938 | ac_status=$? | ||
3674 | 2939 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3675 | 2940 | (exit $ac_status); }; }; then | ||
3676 | 2941 | cross_compiling=no | ||
3677 | 2942 | else | ||
3678 | 2943 | if test "$cross_compiling" = maybe; then | ||
3679 | 2944 | cross_compiling=yes | ||
3680 | 2945 | else | ||
3681 | 2946 | { { echo "$as_me:$LINENO: error: cannot run C compiled programs. | ||
3682 | 2947 | If you meant to cross compile, use \`--host'. | ||
3683 | 2948 | See \`config.log' for more details." >&5 | ||
3684 | 2949 | echo "$as_me: error: cannot run C compiled programs. | ||
3685 | 2950 | If you meant to cross compile, use \`--host'. | ||
3686 | 2951 | See \`config.log' for more details." >&2;} | ||
3687 | 2952 | { (exit 1); exit 1; }; } | ||
3688 | 2953 | fi | ||
3689 | 2954 | fi | ||
3690 | 2955 | fi | ||
3691 | 2956 | { echo "$as_me:$LINENO: result: yes" >&5 | ||
3692 | 2957 | echo "${ECHO_T}yes" >&6; } | ||
3693 | 2958 | |||
3694 | 2959 | rm -f a.out a.exe conftest$ac_cv_exeext b.out | ||
3696 | 2960 | ac_clean_files=$ac_clean_files_save | 3378 | ac_clean_files=$ac_clean_files_save |
3707 | 2961 | # Check that the compiler produces executables we can run. If not, either | 3379 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 |
3708 | 2962 | # the compiler is broken, or we cross compile. | 3380 | $as_echo_n "checking for suffix of executables... " >&6; } |
3709 | 2963 | { echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 | 3381 | if { { ac_try="$ac_link" |
3700 | 2964 | echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } | ||
3701 | 2965 | { echo "$as_me:$LINENO: result: $cross_compiling" >&5 | ||
3702 | 2966 | echo "${ECHO_T}$cross_compiling" >&6; } | ||
3703 | 2967 | |||
3704 | 2968 | { echo "$as_me:$LINENO: checking for suffix of executables" >&5 | ||
3705 | 2969 | echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } | ||
3706 | 2970 | if { (ac_try="$ac_link" | ||
3710 | 2971 | case "(($ac_try" in | 3382 | case "(($ac_try" in |
3711 | 2972 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 3383 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
3712 | 2973 | *) ac_try_echo=$ac_try;; | 3384 | *) ac_try_echo=$ac_try;; |
3713 | 2974 | esac | 3385 | esac |
3715 | 2975 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | 3386 | eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
3716 | 3387 | $as_echo "$ac_try_echo"; } >&5 | ||
3717 | 2976 | (eval "$ac_link") 2>&5 | 3388 | (eval "$ac_link") 2>&5 |
3718 | 2977 | ac_status=$? | 3389 | ac_status=$? |
3721 | 2978 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 3390 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
3722 | 2979 | (exit $ac_status); }; then | 3391 | test $ac_status = 0; }; then : |
3723 | 2980 | # If both `conftest.exe' and `conftest' are `present' (well, observable) | 3392 | # If both `conftest.exe' and `conftest' are `present' (well, observable) |
3724 | 2981 | # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will | 3393 | # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will |
3725 | 2982 | # work properly (i.e., refer to `conftest.exe'), while it won't with | 3394 | # work properly (i.e., refer to `conftest.exe'), while it won't with |
3726 | @@ -2984,37 +3396,90 @@ | |||
3727 | 2984 | for ac_file in conftest.exe conftest conftest.*; do | 3396 | for ac_file in conftest.exe conftest conftest.*; do |
3728 | 2985 | test -f "$ac_file" || continue | 3397 | test -f "$ac_file" || continue |
3729 | 2986 | case $ac_file in | 3398 | case $ac_file in |
3731 | 2987 | *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; | 3399 | *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; |
3732 | 2988 | *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` | 3400 | *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` |
3733 | 2989 | break;; | 3401 | break;; |
3734 | 2990 | * ) break;; | 3402 | * ) break;; |
3735 | 2991 | esac | 3403 | esac |
3736 | 2992 | done | 3404 | done |
3737 | 2993 | else | 3405 | else |
3743 | 2994 | { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link | 3406 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
3744 | 2995 | See \`config.log' for more details." >&5 | 3407 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
3745 | 2996 | echo "$as_me: error: cannot compute suffix of executables: cannot compile and link | 3408 | as_fn_error "cannot compute suffix of executables: cannot compile and link |
3746 | 2997 | See \`config.log' for more details." >&2;} | 3409 | See \`config.log' for more details." "$LINENO" 5; } |
3742 | 2998 | { (exit 1); exit 1; }; } | ||
3747 | 2999 | fi | 3410 | fi |
3752 | 3000 | 3411 | rm -f conftest conftest$ac_cv_exeext | |
3753 | 3001 | rm -f conftest$ac_cv_exeext | 3412 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 |
3754 | 3002 | { echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 | 3413 | $as_echo "$ac_cv_exeext" >&6; } |
3751 | 3003 | echo "${ECHO_T}$ac_cv_exeext" >&6; } | ||
3755 | 3004 | 3414 | ||
3756 | 3005 | rm -f conftest.$ac_ext | 3415 | rm -f conftest.$ac_ext |
3757 | 3006 | EXEEXT=$ac_cv_exeext | 3416 | EXEEXT=$ac_cv_exeext |
3758 | 3007 | ac_exeext=$EXEEXT | 3417 | ac_exeext=$EXEEXT |
3763 | 3008 | { echo "$as_me:$LINENO: checking for suffix of object files" >&5 | 3418 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3764 | 3009 | echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } | 3419 | /* end confdefs.h. */ |
3765 | 3010 | if test "${ac_cv_objext+set}" = set; then | 3420 | #include <stdio.h> |
3766 | 3011 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3421 | int |
3767 | 3422 | main () | ||
3768 | 3423 | { | ||
3769 | 3424 | FILE *f = fopen ("conftest.out", "w"); | ||
3770 | 3425 | return ferror (f) || fclose (f) != 0; | ||
3771 | 3426 | |||
3772 | 3427 | ; | ||
3773 | 3428 | return 0; | ||
3774 | 3429 | } | ||
3775 | 3430 | _ACEOF | ||
3776 | 3431 | ac_clean_files="$ac_clean_files conftest.out" | ||
3777 | 3432 | # Check that the compiler produces executables we can run. If not, either | ||
3778 | 3433 | # the compiler is broken, or we cross compile. | ||
3779 | 3434 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 | ||
3780 | 3435 | $as_echo_n "checking whether we are cross compiling... " >&6; } | ||
3781 | 3436 | if test "$cross_compiling" != yes; then | ||
3782 | 3437 | { { ac_try="$ac_link" | ||
3783 | 3438 | case "(($ac_try" in | ||
3784 | 3439 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3785 | 3440 | *) ac_try_echo=$ac_try;; | ||
3786 | 3441 | esac | ||
3787 | 3442 | eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
3788 | 3443 | $as_echo "$ac_try_echo"; } >&5 | ||
3789 | 3444 | (eval "$ac_link") 2>&5 | ||
3790 | 3445 | ac_status=$? | ||
3791 | 3446 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
3792 | 3447 | test $ac_status = 0; } | ||
3793 | 3448 | if { ac_try='./conftest$ac_cv_exeext' | ||
3794 | 3449 | { { case "(($ac_try" in | ||
3795 | 3450 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3796 | 3451 | *) ac_try_echo=$ac_try;; | ||
3797 | 3452 | esac | ||
3798 | 3453 | eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
3799 | 3454 | $as_echo "$ac_try_echo"; } >&5 | ||
3800 | 3455 | (eval "$ac_try") 2>&5 | ||
3801 | 3456 | ac_status=$? | ||
3802 | 3457 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
3803 | 3458 | test $ac_status = 0; }; }; then | ||
3804 | 3459 | cross_compiling=no | ||
3805 | 3460 | else | ||
3806 | 3461 | if test "$cross_compiling" = maybe; then | ||
3807 | 3462 | cross_compiling=yes | ||
3808 | 3463 | else | ||
3809 | 3464 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
3810 | 3465 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
3811 | 3466 | as_fn_error "cannot run C compiled programs. | ||
3812 | 3467 | If you meant to cross compile, use \`--host'. | ||
3813 | 3468 | See \`config.log' for more details." "$LINENO" 5; } | ||
3814 | 3469 | fi | ||
3815 | 3470 | fi | ||
3816 | 3471 | fi | ||
3817 | 3472 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 | ||
3818 | 3473 | $as_echo "$cross_compiling" >&6; } | ||
3819 | 3474 | |||
3820 | 3475 | rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out | ||
3821 | 3476 | ac_clean_files=$ac_clean_files_save | ||
3822 | 3477 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 | ||
3823 | 3478 | $as_echo_n "checking for suffix of object files... " >&6; } | ||
3824 | 3479 | if test "${ac_cv_objext+set}" = set; then : | ||
3825 | 3480 | $as_echo_n "(cached) " >&6 | ||
3826 | 3012 | else | 3481 | else |
3832 | 3013 | cat >conftest.$ac_ext <<_ACEOF | 3482 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3828 | 3014 | /* confdefs.h. */ | ||
3829 | 3015 | _ACEOF | ||
3830 | 3016 | cat confdefs.h >>conftest.$ac_ext | ||
3831 | 3017 | cat >>conftest.$ac_ext <<_ACEOF | ||
3833 | 3018 | /* end confdefs.h. */ | 3483 | /* end confdefs.h. */ |
3834 | 3019 | 3484 | ||
3835 | 3020 | int | 3485 | int |
3836 | @@ -3026,51 +3491,46 @@ | |||
3837 | 3026 | } | 3491 | } |
3838 | 3027 | _ACEOF | 3492 | _ACEOF |
3839 | 3028 | rm -f conftest.o conftest.obj | 3493 | rm -f conftest.o conftest.obj |
3841 | 3029 | if { (ac_try="$ac_compile" | 3494 | if { { ac_try="$ac_compile" |
3842 | 3030 | case "(($ac_try" in | 3495 | case "(($ac_try" in |
3843 | 3031 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 3496 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
3844 | 3032 | *) ac_try_echo=$ac_try;; | 3497 | *) ac_try_echo=$ac_try;; |
3845 | 3033 | esac | 3498 | esac |
3847 | 3034 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | 3499 | eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
3848 | 3500 | $as_echo "$ac_try_echo"; } >&5 | ||
3849 | 3035 | (eval "$ac_compile") 2>&5 | 3501 | (eval "$ac_compile") 2>&5 |
3850 | 3036 | ac_status=$? | 3502 | ac_status=$? |
3853 | 3037 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 3503 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
3854 | 3038 | (exit $ac_status); }; then | 3504 | test $ac_status = 0; }; then : |
3855 | 3039 | for ac_file in conftest.o conftest.obj conftest.*; do | 3505 | for ac_file in conftest.o conftest.obj conftest.*; do |
3856 | 3040 | test -f "$ac_file" || continue; | 3506 | test -f "$ac_file" || continue; |
3857 | 3041 | case $ac_file in | 3507 | case $ac_file in |
3859 | 3042 | *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; | 3508 | *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; |
3860 | 3043 | *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` | 3509 | *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` |
3861 | 3044 | break;; | 3510 | break;; |
3862 | 3045 | esac | 3511 | esac |
3863 | 3046 | done | 3512 | done |
3864 | 3047 | else | 3513 | else |
3866 | 3048 | echo "$as_me: failed program was:" >&5 | 3514 | $as_echo "$as_me: failed program was:" >&5 |
3867 | 3049 | sed 's/^/| /' conftest.$ac_ext >&5 | 3515 | sed 's/^/| /' conftest.$ac_ext >&5 |
3868 | 3050 | 3516 | ||
3874 | 3051 | { { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile | 3517 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
3875 | 3052 | See \`config.log' for more details." >&5 | 3518 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
3876 | 3053 | echo "$as_me: error: cannot compute suffix of object files: cannot compile | 3519 | as_fn_error "cannot compute suffix of object files: cannot compile |
3877 | 3054 | See \`config.log' for more details." >&2;} | 3520 | See \`config.log' for more details." "$LINENO" 5; } |
3873 | 3055 | { (exit 1); exit 1; }; } | ||
3878 | 3056 | fi | 3521 | fi |
3879 | 3057 | |||
3880 | 3058 | rm -f conftest.$ac_cv_objext conftest.$ac_ext | 3522 | rm -f conftest.$ac_cv_objext conftest.$ac_ext |
3881 | 3059 | fi | 3523 | fi |
3884 | 3060 | { echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 | 3524 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 |
3885 | 3061 | echo "${ECHO_T}$ac_cv_objext" >&6; } | 3525 | $as_echo "$ac_cv_objext" >&6; } |
3886 | 3062 | OBJEXT=$ac_cv_objext | 3526 | OBJEXT=$ac_cv_objext |
3887 | 3063 | ac_objext=$OBJEXT | 3527 | ac_objext=$OBJEXT |
3892 | 3064 | { echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 | 3528 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 |
3893 | 3065 | echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } | 3529 | $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } |
3894 | 3066 | if test "${ac_cv_c_compiler_gnu+set}" = set; then | 3530 | if test "${ac_cv_c_compiler_gnu+set}" = set; then : |
3895 | 3067 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3531 | $as_echo_n "(cached) " >&6 |
3896 | 3068 | else | 3532 | else |
3902 | 3069 | cat >conftest.$ac_ext <<_ACEOF | 3533 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3898 | 3070 | /* confdefs.h. */ | ||
3899 | 3071 | _ACEOF | ||
3900 | 3072 | cat confdefs.h >>conftest.$ac_ext | ||
3901 | 3073 | cat >>conftest.$ac_ext <<_ACEOF | ||
3903 | 3074 | /* end confdefs.h. */ | 3534 | /* end confdefs.h. */ |
3904 | 3075 | 3535 | ||
3905 | 3076 | int | 3536 | int |
3906 | @@ -3084,54 +3544,34 @@ | |||
3907 | 3084 | return 0; | 3544 | return 0; |
3908 | 3085 | } | 3545 | } |
3909 | 3086 | _ACEOF | 3546 | _ACEOF |
3927 | 3087 | rm -f conftest.$ac_objext | 3547 | if ac_fn_c_try_compile "$LINENO"; then : |
3911 | 3088 | if { (ac_try="$ac_compile" | ||
3912 | 3089 | case "(($ac_try" in | ||
3913 | 3090 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3914 | 3091 | *) ac_try_echo=$ac_try;; | ||
3915 | 3092 | esac | ||
3916 | 3093 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3917 | 3094 | (eval "$ac_compile") 2>conftest.er1 | ||
3918 | 3095 | ac_status=$? | ||
3919 | 3096 | grep -v '^ *+' conftest.er1 >conftest.err | ||
3920 | 3097 | rm -f conftest.er1 | ||
3921 | 3098 | cat conftest.err >&5 | ||
3922 | 3099 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3923 | 3100 | (exit $ac_status); } && { | ||
3924 | 3101 | test -z "$ac_c_werror_flag" || | ||
3925 | 3102 | test ! -s conftest.err | ||
3926 | 3103 | } && test -s conftest.$ac_objext; then | ||
3928 | 3104 | ac_compiler_gnu=yes | 3548 | ac_compiler_gnu=yes |
3929 | 3105 | else | 3549 | else |
3934 | 3106 | echo "$as_me: failed program was:" >&5 | 3550 | ac_compiler_gnu=no |
3931 | 3107 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3932 | 3108 | |||
3933 | 3109 | ac_compiler_gnu=no | ||
3935 | 3110 | fi | 3551 | fi |
3936 | 3111 | |||
3937 | 3112 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | 3552 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
3938 | 3113 | ac_cv_c_compiler_gnu=$ac_compiler_gnu | 3553 | ac_cv_c_compiler_gnu=$ac_compiler_gnu |
3939 | 3114 | 3554 | ||
3940 | 3115 | fi | 3555 | fi |
3944 | 3116 | { echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 | 3556 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 |
3945 | 3117 | echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } | 3557 | $as_echo "$ac_cv_c_compiler_gnu" >&6; } |
3946 | 3118 | GCC=`test $ac_compiler_gnu = yes && echo yes` | 3558 | if test $ac_compiler_gnu = yes; then |
3947 | 3559 | GCC=yes | ||
3948 | 3560 | else | ||
3949 | 3561 | GCC= | ||
3950 | 3562 | fi | ||
3951 | 3119 | ac_test_CFLAGS=${CFLAGS+set} | 3563 | ac_test_CFLAGS=${CFLAGS+set} |
3952 | 3120 | ac_save_CFLAGS=$CFLAGS | 3564 | ac_save_CFLAGS=$CFLAGS |
3957 | 3121 | { echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 | 3565 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 |
3958 | 3122 | echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } | 3566 | $as_echo_n "checking whether $CC accepts -g... " >&6; } |
3959 | 3123 | if test "${ac_cv_prog_cc_g+set}" = set; then | 3567 | if test "${ac_cv_prog_cc_g+set}" = set; then : |
3960 | 3124 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3568 | $as_echo_n "(cached) " >&6 |
3961 | 3125 | else | 3569 | else |
3962 | 3126 | ac_save_c_werror_flag=$ac_c_werror_flag | 3570 | ac_save_c_werror_flag=$ac_c_werror_flag |
3963 | 3127 | ac_c_werror_flag=yes | 3571 | ac_c_werror_flag=yes |
3964 | 3128 | ac_cv_prog_cc_g=no | 3572 | ac_cv_prog_cc_g=no |
3965 | 3129 | CFLAGS="-g" | 3573 | CFLAGS="-g" |
3971 | 3130 | cat >conftest.$ac_ext <<_ACEOF | 3574 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3967 | 3131 | /* confdefs.h. */ | ||
3968 | 3132 | _ACEOF | ||
3969 | 3133 | cat confdefs.h >>conftest.$ac_ext | ||
3970 | 3134 | cat >>conftest.$ac_ext <<_ACEOF | ||
3972 | 3135 | /* end confdefs.h. */ | 3575 | /* end confdefs.h. */ |
3973 | 3136 | 3576 | ||
3974 | 3137 | int | 3577 | int |
3975 | @@ -3142,34 +3582,11 @@ | |||
3976 | 3142 | return 0; | 3582 | return 0; |
3977 | 3143 | } | 3583 | } |
3978 | 3144 | _ACEOF | 3584 | _ACEOF |
3996 | 3145 | rm -f conftest.$ac_objext | 3585 | if ac_fn_c_try_compile "$LINENO"; then : |
3980 | 3146 | if { (ac_try="$ac_compile" | ||
3981 | 3147 | case "(($ac_try" in | ||
3982 | 3148 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3983 | 3149 | *) ac_try_echo=$ac_try;; | ||
3984 | 3150 | esac | ||
3985 | 3151 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3986 | 3152 | (eval "$ac_compile") 2>conftest.er1 | ||
3987 | 3153 | ac_status=$? | ||
3988 | 3154 | grep -v '^ *+' conftest.er1 >conftest.err | ||
3989 | 3155 | rm -f conftest.er1 | ||
3990 | 3156 | cat conftest.err >&5 | ||
3991 | 3157 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3992 | 3158 | (exit $ac_status); } && { | ||
3993 | 3159 | test -z "$ac_c_werror_flag" || | ||
3994 | 3160 | test ! -s conftest.err | ||
3995 | 3161 | } && test -s conftest.$ac_objext; then | ||
3997 | 3162 | ac_cv_prog_cc_g=yes | 3586 | ac_cv_prog_cc_g=yes |
3998 | 3163 | else | 3587 | else |
4008 | 3164 | echo "$as_me: failed program was:" >&5 | 3588 | CFLAGS="" |
4009 | 3165 | sed 's/^/| /' conftest.$ac_ext >&5 | 3589 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4001 | 3166 | |||
4002 | 3167 | CFLAGS="" | ||
4003 | 3168 | cat >conftest.$ac_ext <<_ACEOF | ||
4004 | 3169 | /* confdefs.h. */ | ||
4005 | 3170 | _ACEOF | ||
4006 | 3171 | cat confdefs.h >>conftest.$ac_ext | ||
4007 | 3172 | cat >>conftest.$ac_ext <<_ACEOF | ||
4010 | 3173 | /* end confdefs.h. */ | 3590 | /* end confdefs.h. */ |
4011 | 3174 | 3591 | ||
4012 | 3175 | int | 3592 | int |
4013 | @@ -3180,35 +3597,12 @@ | |||
4014 | 3180 | return 0; | 3597 | return 0; |
4015 | 3181 | } | 3598 | } |
4016 | 3182 | _ACEOF | 3599 | _ACEOF |
4035 | 3183 | rm -f conftest.$ac_objext | 3600 | if ac_fn_c_try_compile "$LINENO"; then : |
4036 | 3184 | if { (ac_try="$ac_compile" | 3601 | |
4019 | 3185 | case "(($ac_try" in | ||
4020 | 3186 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4021 | 3187 | *) ac_try_echo=$ac_try;; | ||
4022 | 3188 | esac | ||
4023 | 3189 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4024 | 3190 | (eval "$ac_compile") 2>conftest.er1 | ||
4025 | 3191 | ac_status=$? | ||
4026 | 3192 | grep -v '^ *+' conftest.er1 >conftest.err | ||
4027 | 3193 | rm -f conftest.er1 | ||
4028 | 3194 | cat conftest.err >&5 | ||
4029 | 3195 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4030 | 3196 | (exit $ac_status); } && { | ||
4031 | 3197 | test -z "$ac_c_werror_flag" || | ||
4032 | 3198 | test ! -s conftest.err | ||
4033 | 3199 | } && test -s conftest.$ac_objext; then | ||
4034 | 3200 | : | ||
4037 | 3201 | else | 3602 | else |
4042 | 3202 | echo "$as_me: failed program was:" >&5 | 3603 | ac_c_werror_flag=$ac_save_c_werror_flag |
4039 | 3203 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
4040 | 3204 | |||
4041 | 3205 | ac_c_werror_flag=$ac_save_c_werror_flag | ||
4043 | 3206 | CFLAGS="-g" | 3604 | CFLAGS="-g" |
4049 | 3207 | cat >conftest.$ac_ext <<_ACEOF | 3605 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4045 | 3208 | /* confdefs.h. */ | ||
4046 | 3209 | _ACEOF | ||
4047 | 3210 | cat confdefs.h >>conftest.$ac_ext | ||
4048 | 3211 | cat >>conftest.$ac_ext <<_ACEOF | ||
4050 | 3212 | /* end confdefs.h. */ | 3606 | /* end confdefs.h. */ |
4051 | 3213 | 3607 | ||
4052 | 3214 | int | 3608 | int |
4053 | @@ -3219,42 +3613,18 @@ | |||
4054 | 3219 | return 0; | 3613 | return 0; |
4055 | 3220 | } | 3614 | } |
4056 | 3221 | _ACEOF | 3615 | _ACEOF |
4074 | 3222 | rm -f conftest.$ac_objext | 3616 | if ac_fn_c_try_compile "$LINENO"; then : |
4058 | 3223 | if { (ac_try="$ac_compile" | ||
4059 | 3224 | case "(($ac_try" in | ||
4060 | 3225 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4061 | 3226 | *) ac_try_echo=$ac_try;; | ||
4062 | 3227 | esac | ||
4063 | 3228 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4064 | 3229 | (eval "$ac_compile") 2>conftest.er1 | ||
4065 | 3230 | ac_status=$? | ||
4066 | 3231 | grep -v '^ *+' conftest.er1 >conftest.err | ||
4067 | 3232 | rm -f conftest.er1 | ||
4068 | 3233 | cat conftest.err >&5 | ||
4069 | 3234 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4070 | 3235 | (exit $ac_status); } && { | ||
4071 | 3236 | test -z "$ac_c_werror_flag" || | ||
4072 | 3237 | test ! -s conftest.err | ||
4073 | 3238 | } && test -s conftest.$ac_objext; then | ||
4075 | 3239 | ac_cv_prog_cc_g=yes | 3617 | ac_cv_prog_cc_g=yes |
4089 | 3240 | else | 3618 | fi |
4090 | 3241 | echo "$as_me: failed program was:" >&5 | 3619 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
4091 | 3242 | sed 's/^/| /' conftest.$ac_ext >&5 | 3620 | fi |
4092 | 3243 | 3621 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
4093 | 3244 | 3622 | fi | |
4081 | 3245 | fi | ||
4082 | 3246 | |||
4083 | 3247 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4084 | 3248 | fi | ||
4085 | 3249 | |||
4086 | 3250 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
4087 | 3251 | fi | ||
4088 | 3252 | |||
4094 | 3253 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | 3623 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
4095 | 3254 | ac_c_werror_flag=$ac_save_c_werror_flag | 3624 | ac_c_werror_flag=$ac_save_c_werror_flag |
4096 | 3255 | fi | 3625 | fi |
4099 | 3256 | { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 | 3626 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 |
4100 | 3257 | echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } | 3627 | $as_echo "$ac_cv_prog_cc_g" >&6; } |
4101 | 3258 | if test "$ac_test_CFLAGS" = set; then | 3628 | if test "$ac_test_CFLAGS" = set; then |
4102 | 3259 | CFLAGS=$ac_save_CFLAGS | 3629 | CFLAGS=$ac_save_CFLAGS |
4103 | 3260 | elif test $ac_cv_prog_cc_g = yes; then | 3630 | elif test $ac_cv_prog_cc_g = yes; then |
4104 | @@ -3270,18 +3640,14 @@ | |||
4105 | 3270 | CFLAGS= | 3640 | CFLAGS= |
4106 | 3271 | fi | 3641 | fi |
4107 | 3272 | fi | 3642 | fi |
4112 | 3273 | { echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 | 3643 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 |
4113 | 3274 | echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } | 3644 | $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } |
4114 | 3275 | if test "${ac_cv_prog_cc_c89+set}" = set; then | 3645 | if test "${ac_cv_prog_cc_c89+set}" = set; then : |
4115 | 3276 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3646 | $as_echo_n "(cached) " >&6 |
4116 | 3277 | else | 3647 | else |
4117 | 3278 | ac_cv_prog_cc_c89=no | 3648 | ac_cv_prog_cc_c89=no |
4118 | 3279 | ac_save_CC=$CC | 3649 | ac_save_CC=$CC |
4124 | 3280 | cat >conftest.$ac_ext <<_ACEOF | 3650 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4120 | 3281 | /* confdefs.h. */ | ||
4121 | 3282 | _ACEOF | ||
4122 | 3283 | cat confdefs.h >>conftest.$ac_ext | ||
4123 | 3284 | cat >>conftest.$ac_ext <<_ACEOF | ||
4125 | 3285 | /* end confdefs.h. */ | 3651 | /* end confdefs.h. */ |
4126 | 3286 | #include <stdarg.h> | 3652 | #include <stdarg.h> |
4127 | 3287 | #include <stdio.h> | 3653 | #include <stdio.h> |
4128 | @@ -3338,31 +3704,9 @@ | |||
4129 | 3338 | -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" | 3704 | -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" |
4130 | 3339 | do | 3705 | do |
4131 | 3340 | CC="$ac_save_CC $ac_arg" | 3706 | CC="$ac_save_CC $ac_arg" |
4149 | 3341 | rm -f conftest.$ac_objext | 3707 | if ac_fn_c_try_compile "$LINENO"; then : |
4133 | 3342 | if { (ac_try="$ac_compile" | ||
4134 | 3343 | case "(($ac_try" in | ||
4135 | 3344 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4136 | 3345 | *) ac_try_echo=$ac_try;; | ||
4137 | 3346 | esac | ||
4138 | 3347 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4139 | 3348 | (eval "$ac_compile") 2>conftest.er1 | ||
4140 | 3349 | ac_status=$? | ||
4141 | 3350 | grep -v '^ *+' conftest.er1 >conftest.err | ||
4142 | 3351 | rm -f conftest.er1 | ||
4143 | 3352 | cat conftest.err >&5 | ||
4144 | 3353 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4145 | 3354 | (exit $ac_status); } && { | ||
4146 | 3355 | test -z "$ac_c_werror_flag" || | ||
4147 | 3356 | test ! -s conftest.err | ||
4148 | 3357 | } && test -s conftest.$ac_objext; then | ||
4150 | 3358 | ac_cv_prog_cc_c89=$ac_arg | 3708 | ac_cv_prog_cc_c89=$ac_arg |
4151 | 3359 | else | ||
4152 | 3360 | echo "$as_me: failed program was:" >&5 | ||
4153 | 3361 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
4154 | 3362 | |||
4155 | 3363 | |||
4156 | 3364 | fi | 3709 | fi |
4157 | 3365 | |||
4158 | 3366 | rm -f core conftest.err conftest.$ac_objext | 3710 | rm -f core conftest.err conftest.$ac_objext |
4159 | 3367 | test "x$ac_cv_prog_cc_c89" != "xno" && break | 3711 | test "x$ac_cv_prog_cc_c89" != "xno" && break |
4160 | 3368 | done | 3712 | done |
4161 | @@ -3373,17 +3717,19 @@ | |||
4162 | 3373 | # AC_CACHE_VAL | 3717 | # AC_CACHE_VAL |
4163 | 3374 | case "x$ac_cv_prog_cc_c89" in | 3718 | case "x$ac_cv_prog_cc_c89" in |
4164 | 3375 | x) | 3719 | x) |
4167 | 3376 | { echo "$as_me:$LINENO: result: none needed" >&5 | 3720 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 |
4168 | 3377 | echo "${ECHO_T}none needed" >&6; } ;; | 3721 | $as_echo "none needed" >&6; } ;; |
4169 | 3378 | xno) | 3722 | xno) |
4172 | 3379 | { echo "$as_me:$LINENO: result: unsupported" >&5 | 3723 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 |
4173 | 3380 | echo "${ECHO_T}unsupported" >&6; } ;; | 3724 | $as_echo "unsupported" >&6; } ;; |
4174 | 3381 | *) | 3725 | *) |
4175 | 3382 | CC="$CC $ac_cv_prog_cc_c89" | 3726 | CC="$CC $ac_cv_prog_cc_c89" |
4178 | 3383 | { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 | 3727 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 |
4179 | 3384 | echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; | 3728 | $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; |
4180 | 3385 | esac | 3729 | esac |
4181 | 3730 | if test "x$ac_cv_prog_cc_c89" != xno; then : | ||
4182 | 3386 | 3731 | ||
4183 | 3732 | fi | ||
4184 | 3387 | 3733 | ||
4185 | 3388 | ac_ext=c | 3734 | ac_ext=c |
4186 | 3389 | ac_cpp='$CPP $CPPFLAGS' | 3735 | ac_cpp='$CPP $CPPFLAGS' |
4187 | @@ -3398,44 +3744,44 @@ | |||
4188 | 3398 | am_make=${MAKE-make} | 3744 | am_make=${MAKE-make} |
4189 | 3399 | cat > confinc << 'END' | 3745 | cat > confinc << 'END' |
4190 | 3400 | am__doit: | 3746 | am__doit: |
4192 | 3401 | @echo done | 3747 | @echo this is the am__doit target |
4193 | 3402 | .PHONY: am__doit | 3748 | .PHONY: am__doit |
4194 | 3403 | END | 3749 | END |
4195 | 3404 | # If we don't find an include directive, just comment out the code. | 3750 | # If we don't find an include directive, just comment out the code. |
4198 | 3405 | { echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 | 3751 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 |
4199 | 3406 | echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } | 3752 | $as_echo_n "checking for style of include used by $am_make... " >&6; } |
4200 | 3407 | am__include="#" | 3753 | am__include="#" |
4201 | 3408 | am__quote= | 3754 | am__quote= |
4202 | 3409 | _am_result=none | 3755 | _am_result=none |
4203 | 3410 | # First try GNU make style include. | 3756 | # First try GNU make style include. |
4204 | 3411 | echo "include confinc" > confmf | 3757 | echo "include confinc" > confmf |
4215 | 3412 | # We grep out `Entering directory' and `Leaving directory' | 3758 | # Ignore all kinds of additional output from `make'. |
4216 | 3413 | # messages which can occur if `w' ends up in MAKEFLAGS. | 3759 | case `$am_make -s -f confmf 2> /dev/null` in #( |
4217 | 3414 | # In particular we don't look at `^make:' because GNU make might | 3760 | *the\ am__doit\ target*) |
4218 | 3415 | # be invoked under some other name (usually "gmake"), in which | 3761 | am__include=include |
4219 | 3416 | # case it prints its new name instead of `make'. | 3762 | am__quote= |
4220 | 3417 | if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then | 3763 | _am_result=GNU |
4221 | 3418 | am__include=include | 3764 | ;; |
4222 | 3419 | am__quote= | 3765 | esac |
4213 | 3420 | _am_result=GNU | ||
4214 | 3421 | fi | ||
4223 | 3422 | # Now try BSD make style include. | 3766 | # Now try BSD make style include. |
4224 | 3423 | if test "$am__include" = "#"; then | 3767 | if test "$am__include" = "#"; then |
4225 | 3424 | echo '.include "confinc"' > confmf | 3768 | echo '.include "confinc"' > confmf |
4231 | 3425 | if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then | 3769 | case `$am_make -s -f confmf 2> /dev/null` in #( |
4232 | 3426 | am__include=.include | 3770 | *the\ am__doit\ target*) |
4233 | 3427 | am__quote="\"" | 3771 | am__include=.include |
4234 | 3428 | _am_result=BSD | 3772 | am__quote="\"" |
4235 | 3429 | fi | 3773 | _am_result=BSD |
4236 | 3774 | ;; | ||
4237 | 3775 | esac | ||
4238 | 3430 | fi | 3776 | fi |
4239 | 3431 | 3777 | ||
4240 | 3432 | 3778 | ||
4243 | 3433 | { echo "$as_me:$LINENO: result: $_am_result" >&5 | 3779 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 |
4244 | 3434 | echo "${ECHO_T}$_am_result" >&6; } | 3780 | $as_echo "$_am_result" >&6; } |
4245 | 3435 | rm -f confinc confmf | 3781 | rm -f confinc confmf |
4246 | 3436 | 3782 | ||
4247 | 3437 | # Check whether --enable-dependency-tracking was given. | 3783 | # Check whether --enable-dependency-tracking was given. |
4249 | 3438 | if test "${enable_dependency_tracking+set}" = set; then | 3784 | if test "${enable_dependency_tracking+set}" = set; then : |
4250 | 3439 | enableval=$enable_dependency_tracking; | 3785 | enableval=$enable_dependency_tracking; |
4251 | 3440 | fi | 3786 | fi |
4252 | 3441 | 3787 | ||
4253 | @@ -3455,10 +3801,10 @@ | |||
4254 | 3455 | 3801 | ||
4255 | 3456 | depcc="$CC" am_compiler_list= | 3802 | depcc="$CC" am_compiler_list= |
4256 | 3457 | 3803 | ||
4261 | 3458 | { echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 | 3804 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 |
4262 | 3459 | echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } | 3805 | $as_echo_n "checking dependency style of $depcc... " >&6; } |
4263 | 3460 | if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then | 3806 | if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : |
4264 | 3461 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3807 | $as_echo_n "(cached) " >&6 |
4265 | 3462 | else | 3808 | else |
4266 | 3463 | if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then | 3809 | if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then |
4267 | 3464 | # We make a subdir and do the tests there. Otherwise we can end up | 3810 | # We make a subdir and do the tests there. Otherwise we can end up |
4268 | @@ -3483,6 +3829,11 @@ | |||
4269 | 3483 | if test "$am_compiler_list" = ""; then | 3829 | if test "$am_compiler_list" = ""; then |
4270 | 3484 | am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` | 3830 | am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` |
4271 | 3485 | fi | 3831 | fi |
4272 | 3832 | am__universal=false | ||
4273 | 3833 | case " $depcc " in #( | ||
4274 | 3834 | *\ -arch\ *\ -arch\ *) am__universal=true ;; | ||
4275 | 3835 | esac | ||
4276 | 3836 | |||
4277 | 3486 | for depmode in $am_compiler_list; do | 3837 | for depmode in $am_compiler_list; do |
4278 | 3487 | # Setup a source with many dependencies, because some compilers | 3838 | # Setup a source with many dependencies, because some compilers |
4279 | 3488 | # like to wrap large dependency lists on column 80 (with \), and | 3839 | # like to wrap large dependency lists on column 80 (with \), and |
4280 | @@ -3500,7 +3851,17 @@ | |||
4281 | 3500 | done | 3851 | done |
4282 | 3501 | echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf | 3852 | echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf |
4283 | 3502 | 3853 | ||
4284 | 3854 | # We check with `-c' and `-o' for the sake of the "dashmstdout" | ||
4285 | 3855 | # mode. It turns out that the SunPro C++ compiler does not properly | ||
4286 | 3856 | # handle `-M -o', and we need to detect this. Also, some Intel | ||
4287 | 3857 | # versions had trouble with output in subdirs | ||
4288 | 3858 | am__obj=sub/conftest.${OBJEXT-o} | ||
4289 | 3859 | am__minus_obj="-o $am__obj" | ||
4290 | 3503 | case $depmode in | 3860 | case $depmode in |
4291 | 3861 | gcc) | ||
4292 | 3862 | # This depmode causes a compiler race in universal mode. | ||
4293 | 3863 | test "$am__universal" = false || continue | ||
4294 | 3864 | ;; | ||
4295 | 3504 | nosideeffect) | 3865 | nosideeffect) |
4296 | 3505 | # after this tag, mechanisms are not by side-effect, so they'll | 3866 | # after this tag, mechanisms are not by side-effect, so they'll |
4297 | 3506 | # only be used when explicitly requested | 3867 | # only be used when explicitly requested |
4298 | @@ -3510,19 +3871,23 @@ | |||
4299 | 3510 | break | 3871 | break |
4300 | 3511 | fi | 3872 | fi |
4301 | 3512 | ;; | 3873 | ;; |
4302 | 3874 | msvisualcpp | msvcmsys) | ||
4303 | 3875 | # This compiler won't grok `-c -o', but also, the minuso test has | ||
4304 | 3876 | # not run yet. These depmodes are late enough in the game, and | ||
4305 | 3877 | # so weak that their functioning should not be impacted. | ||
4306 | 3878 | am__obj=conftest.${OBJEXT-o} | ||
4307 | 3879 | am__minus_obj= | ||
4308 | 3880 | ;; | ||
4309 | 3513 | none) break ;; | 3881 | none) break ;; |
4310 | 3514 | esac | 3882 | esac |
4311 | 3515 | # We check with `-c' and `-o' for the sake of the "dashmstdout" | ||
4312 | 3516 | # mode. It turns out that the SunPro C++ compiler does not properly | ||
4313 | 3517 | # handle `-M -o', and we need to detect this. | ||
4314 | 3518 | if depmode=$depmode \ | 3883 | if depmode=$depmode \ |
4316 | 3519 | source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ | 3884 | source=sub/conftest.c object=$am__obj \ |
4317 | 3520 | depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ | 3885 | depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ |
4319 | 3521 | $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ | 3886 | $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ |
4320 | 3522 | >/dev/null 2>conftest.err && | 3887 | >/dev/null 2>conftest.err && |
4321 | 3523 | grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && | 3888 | grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && |
4322 | 3524 | grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && | 3889 | grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && |
4324 | 3525 | grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && | 3890 | grep $am__obj sub/conftest.Po > /dev/null 2>&1 && |
4325 | 3526 | ${MAKE-make} -s -f confmf > /dev/null 2>&1; then | 3891 | ${MAKE-make} -s -f confmf > /dev/null 2>&1; then |
4326 | 3527 | # icc doesn't choke on unknown options, it will just issue warnings | 3892 | # icc doesn't choke on unknown options, it will just issue warnings |
4327 | 3528 | # or remarks (even with -Werror). So we grep stderr for any message | 3893 | # or remarks (even with -Werror). So we grep stderr for any message |
4328 | @@ -3546,8 +3911,8 @@ | |||
4329 | 3546 | fi | 3911 | fi |
4330 | 3547 | 3912 | ||
4331 | 3548 | fi | 3913 | fi |
4334 | 3549 | { echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 | 3914 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 |
4335 | 3550 | echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } | 3915 | $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } |
4336 | 3551 | CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type | 3916 | CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type |
4337 | 3552 | 3917 | ||
4338 | 3553 | if | 3918 | if |
4339 | @@ -3562,22 +3927,18 @@ | |||
4340 | 3562 | 3927 | ||
4341 | 3563 | 3928 | ||
4342 | 3564 | if test "x$CC" != xcc; then | 3929 | if test "x$CC" != xcc; then |
4345 | 3565 | { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5 | 3930 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 |
4346 | 3566 | echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; } | 3931 | $as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } |
4347 | 3567 | else | 3932 | else |
4350 | 3568 | { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5 | 3933 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 |
4351 | 3569 | echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; } | 3934 | $as_echo_n "checking whether cc understands -c and -o together... " >&6; } |
4352 | 3570 | fi | 3935 | fi |
4354 | 3571 | set dummy $CC; ac_cc=`echo $2 | | 3936 | set dummy $CC; ac_cc=`$as_echo "$2" | |
4355 | 3572 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` | 3937 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` |
4358 | 3573 | if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then | 3938 | if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then : |
4359 | 3574 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3939 | $as_echo_n "(cached) " >&6 |
4360 | 3575 | else | 3940 | else |
4366 | 3576 | cat >conftest.$ac_ext <<_ACEOF | 3941 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4362 | 3577 | /* confdefs.h. */ | ||
4363 | 3578 | _ACEOF | ||
4364 | 3579 | cat confdefs.h >>conftest.$ac_ext | ||
4365 | 3580 | cat >>conftest.$ac_ext <<_ACEOF | ||
4367 | 3581 | /* end confdefs.h. */ | 3942 | /* end confdefs.h. */ |
4368 | 3582 | 3943 | ||
4369 | 3583 | int | 3944 | int |
4370 | @@ -3593,58 +3954,63 @@ | |||
4371 | 3593 | # existing .o file with -o, though they will create one. | 3954 | # existing .o file with -o, though they will create one. |
4372 | 3594 | ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' | 3955 | ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' |
4373 | 3595 | rm -f conftest2.* | 3956 | rm -f conftest2.* |
4392 | 3596 | if { (case "(($ac_try" in | 3957 | if { { case "(($ac_try" in |
4393 | 3597 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 3958 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
4394 | 3598 | *) ac_try_echo=$ac_try;; | 3959 | *) ac_try_echo=$ac_try;; |
4395 | 3599 | esac | 3960 | esac |
4396 | 3600 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | 3961 | eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
4397 | 3601 | (eval "$ac_try") 2>&5 | 3962 | $as_echo "$ac_try_echo"; } >&5 |
4398 | 3602 | ac_status=$? | 3963 | (eval "$ac_try") 2>&5 |
4399 | 3603 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 3964 | ac_status=$? |
4400 | 3604 | (exit $ac_status); } && | 3965 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
4401 | 3605 | test -f conftest2.$ac_objext && { (case "(($ac_try" in | 3966 | test $ac_status = 0; } && |
4402 | 3606 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 3967 | test -f conftest2.$ac_objext && { { case "(($ac_try" in |
4403 | 3607 | *) ac_try_echo=$ac_try;; | 3968 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
4404 | 3608 | esac | 3969 | *) ac_try_echo=$ac_try;; |
4405 | 3609 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | 3970 | esac |
4406 | 3610 | (eval "$ac_try") 2>&5 | 3971 | eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
4407 | 3611 | ac_status=$? | 3972 | $as_echo "$ac_try_echo"; } >&5 |
4408 | 3612 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 3973 | (eval "$ac_try") 2>&5 |
4409 | 3613 | (exit $ac_status); }; | 3974 | ac_status=$? |
4410 | 3975 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
4411 | 3976 | test $ac_status = 0; }; | ||
4412 | 3614 | then | 3977 | then |
4413 | 3615 | eval ac_cv_prog_cc_${ac_cc}_c_o=yes | 3978 | eval ac_cv_prog_cc_${ac_cc}_c_o=yes |
4414 | 3616 | if test "x$CC" != xcc; then | 3979 | if test "x$CC" != xcc; then |
4415 | 3617 | # Test first that cc exists at all. | 3980 | # Test first that cc exists at all. |
4416 | 3618 | if { ac_try='cc -c conftest.$ac_ext >&5' | 3981 | if { ac_try='cc -c conftest.$ac_ext >&5' |
4418 | 3619 | { (case "(($ac_try" in | 3982 | { { case "(($ac_try" in |
4419 | 3620 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 3983 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
4420 | 3621 | *) ac_try_echo=$ac_try;; | 3984 | *) ac_try_echo=$ac_try;; |
4421 | 3622 | esac | 3985 | esac |
4423 | 3623 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | 3986 | eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
4424 | 3987 | $as_echo "$ac_try_echo"; } >&5 | ||
4425 | 3624 | (eval "$ac_try") 2>&5 | 3988 | (eval "$ac_try") 2>&5 |
4426 | 3625 | ac_status=$? | 3989 | ac_status=$? |
4429 | 3626 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 3990 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
4430 | 3627 | (exit $ac_status); }; }; then | 3991 | test $ac_status = 0; }; }; then |
4431 | 3628 | ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' | 3992 | ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' |
4432 | 3629 | rm -f conftest2.* | 3993 | rm -f conftest2.* |
4451 | 3630 | if { (case "(($ac_try" in | 3994 | if { { case "(($ac_try" in |
4452 | 3631 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 3995 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
4453 | 3632 | *) ac_try_echo=$ac_try;; | 3996 | *) ac_try_echo=$ac_try;; |
4454 | 3633 | esac | 3997 | esac |
4455 | 3634 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | 3998 | eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
4456 | 3635 | (eval "$ac_try") 2>&5 | 3999 | $as_echo "$ac_try_echo"; } >&5 |
4457 | 3636 | ac_status=$? | 4000 | (eval "$ac_try") 2>&5 |
4458 | 3637 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 4001 | ac_status=$? |
4459 | 3638 | (exit $ac_status); } && | 4002 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
4460 | 3639 | test -f conftest2.$ac_objext && { (case "(($ac_try" in | 4003 | test $ac_status = 0; } && |
4461 | 3640 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 4004 | test -f conftest2.$ac_objext && { { case "(($ac_try" in |
4462 | 3641 | *) ac_try_echo=$ac_try;; | 4005 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
4463 | 3642 | esac | 4006 | *) ac_try_echo=$ac_try;; |
4464 | 3643 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | 4007 | esac |
4465 | 3644 | (eval "$ac_try") 2>&5 | 4008 | eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
4466 | 3645 | ac_status=$? | 4009 | $as_echo "$ac_try_echo"; } >&5 |
4467 | 3646 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 4010 | (eval "$ac_try") 2>&5 |
4468 | 3647 | (exit $ac_status); }; | 4011 | ac_status=$? |
4469 | 4012 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
4470 | 4013 | test $ac_status = 0; }; | ||
4471 | 3648 | then | 4014 | then |
4472 | 3649 | # cc works too. | 4015 | # cc works too. |
4473 | 3650 | : | 4016 | : |
4474 | @@ -3661,23 +4027,22 @@ | |||
4475 | 3661 | 4027 | ||
4476 | 3662 | fi | 4028 | fi |
4477 | 3663 | if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then | 4029 | if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then |
4480 | 3664 | { echo "$as_me:$LINENO: result: yes" >&5 | 4030 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
4481 | 3665 | echo "${ECHO_T}yes" >&6; } | 4031 | $as_echo "yes" >&6; } |
4482 | 3666 | else | 4032 | else |
4485 | 3667 | { echo "$as_me:$LINENO: result: no" >&5 | 4033 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
4486 | 3668 | echo "${ECHO_T}no" >&6; } | 4034 | $as_echo "no" >&6; } |
4487 | 3669 | 4035 | ||
4491 | 3670 | cat >>confdefs.h <<\_ACEOF | 4036 | $as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h |
4489 | 3671 | #define NO_MINUS_C_MINUS_O 1 | ||
4490 | 3672 | _ACEOF | ||
4492 | 3673 | 4037 | ||
4493 | 3674 | fi | 4038 | fi |
4494 | 3675 | 4039 | ||
4495 | 3676 | # FIXME: we rely on the cache variable name because | 4040 | # FIXME: we rely on the cache variable name because |
4496 | 3677 | # there is no other way. | 4041 | # there is no other way. |
4497 | 3678 | set dummy $CC | 4042 | set dummy $CC |
4500 | 3679 | ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` | 4043 | am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` |
4501 | 3680 | if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then | 4044 | eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o |
4502 | 4045 | if test "$am_t" != yes; then | ||
4503 | 3681 | # Losing compiler, so override with the script. | 4046 | # Losing compiler, so override with the script. |
4504 | 3682 | # FIXME: It is wrong to rewrite CC. | 4047 | # FIXME: It is wrong to rewrite CC. |
4505 | 3683 | # But if we don't then we get into trouble of one sort or another. | 4048 | # But if we don't then we get into trouble of one sort or another. |
4506 | @@ -3689,20 +4054,21 @@ | |||
4507 | 3689 | 4054 | ||
4508 | 3690 | 4055 | ||
4509 | 3691 | 4056 | ||
4510 | 4057 | |||
4511 | 3692 | ac_ext=c | 4058 | ac_ext=c |
4512 | 3693 | ac_cpp='$CPP $CPPFLAGS' | 4059 | ac_cpp='$CPP $CPPFLAGS' |
4513 | 3694 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 4060 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
4514 | 3695 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | 4061 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
4515 | 3696 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | 4062 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
4518 | 3697 | { echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 | 4063 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 |
4519 | 3698 | echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } | 4064 | $as_echo_n "checking how to run the C preprocessor... " >&6; } |
4520 | 3699 | # On Suns, sometimes $CPP names a directory. | 4065 | # On Suns, sometimes $CPP names a directory. |
4521 | 3700 | if test -n "$CPP" && test -d "$CPP"; then | 4066 | if test -n "$CPP" && test -d "$CPP"; then |
4522 | 3701 | CPP= | 4067 | CPP= |
4523 | 3702 | fi | 4068 | fi |
4524 | 3703 | if test -z "$CPP"; then | 4069 | if test -z "$CPP"; then |
4527 | 3704 | if test "${ac_cv_prog_CPP+set}" = set; then | 4070 | if test "${ac_cv_prog_CPP+set}" = set; then : |
4528 | 3705 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 4071 | $as_echo_n "(cached) " >&6 |
4529 | 3706 | else | 4072 | else |
4530 | 3707 | # Double quotes because CPP needs to be expanded | 4073 | # Double quotes because CPP needs to be expanded |
4531 | 3708 | for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" | 4074 | for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" |
4532 | @@ -3716,11 +4082,7 @@ | |||
4533 | 3716 | # <limits.h> exists even on freestanding compilers. | 4082 | # <limits.h> exists even on freestanding compilers. |
4534 | 3717 | # On the NeXT, cc -E runs the code through the compiler's parser, | 4083 | # On the NeXT, cc -E runs the code through the compiler's parser, |
4535 | 3718 | # not just through cpp. "Syntax error" is here to catch this case. | 4084 | # not just through cpp. "Syntax error" is here to catch this case. |
4541 | 3719 | cat >conftest.$ac_ext <<_ACEOF | 4085 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4537 | 3720 | /* confdefs.h. */ | ||
4538 | 3721 | _ACEOF | ||
4539 | 3722 | cat confdefs.h >>conftest.$ac_ext | ||
4540 | 3723 | cat >>conftest.$ac_ext <<_ACEOF | ||
4542 | 3724 | /* end confdefs.h. */ | 4086 | /* end confdefs.h. */ |
4543 | 3725 | #ifdef __STDC__ | 4087 | #ifdef __STDC__ |
4544 | 3726 | # include <limits.h> | 4088 | # include <limits.h> |
4545 | @@ -3729,76 +4091,34 @@ | |||
4546 | 3729 | #endif | 4091 | #endif |
4547 | 3730 | Syntax error | 4092 | Syntax error |
4548 | 3731 | _ACEOF | 4093 | _ACEOF |
4566 | 3732 | if { (ac_try="$ac_cpp conftest.$ac_ext" | 4094 | if ac_fn_c_try_cpp "$LINENO"; then : |
4567 | 3733 | case "(($ac_try" in | 4095 | |
4551 | 3734 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4552 | 3735 | *) ac_try_echo=$ac_try;; | ||
4553 | 3736 | esac | ||
4554 | 3737 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4555 | 3738 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
4556 | 3739 | ac_status=$? | ||
4557 | 3740 | grep -v '^ *+' conftest.er1 >conftest.err | ||
4558 | 3741 | rm -f conftest.er1 | ||
4559 | 3742 | cat conftest.err >&5 | ||
4560 | 3743 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4561 | 3744 | (exit $ac_status); } >/dev/null && { | ||
4562 | 3745 | test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | ||
4563 | 3746 | test ! -s conftest.err | ||
4564 | 3747 | }; then | ||
4565 | 3748 | : | ||
4568 | 3749 | else | 4096 | else |
4569 | 3750 | echo "$as_me: failed program was:" >&5 | ||
4570 | 3751 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
4571 | 3752 | |||
4572 | 3753 | # Broken: fails on valid input. | 4097 | # Broken: fails on valid input. |
4573 | 3754 | continue | 4098 | continue |
4574 | 3755 | fi | 4099 | fi |
4575 | 3756 | |||
4576 | 3757 | rm -f conftest.err conftest.$ac_ext | 4100 | rm -f conftest.err conftest.$ac_ext |
4577 | 3758 | 4101 | ||
4578 | 3759 | # OK, works on sane cases. Now check whether nonexistent headers | 4102 | # OK, works on sane cases. Now check whether nonexistent headers |
4579 | 3760 | # can be detected and how. | 4103 | # can be detected and how. |
4585 | 3761 | cat >conftest.$ac_ext <<_ACEOF | 4104 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4581 | 3762 | /* confdefs.h. */ | ||
4582 | 3763 | _ACEOF | ||
4583 | 3764 | cat confdefs.h >>conftest.$ac_ext | ||
4584 | 3765 | cat >>conftest.$ac_ext <<_ACEOF | ||
4586 | 3766 | /* end confdefs.h. */ | 4105 | /* end confdefs.h. */ |
4587 | 3767 | #include <ac_nonexistent.h> | 4106 | #include <ac_nonexistent.h> |
4588 | 3768 | _ACEOF | 4107 | _ACEOF |
4605 | 3769 | if { (ac_try="$ac_cpp conftest.$ac_ext" | 4108 | if ac_fn_c_try_cpp "$LINENO"; then : |
4590 | 3770 | case "(($ac_try" in | ||
4591 | 3771 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4592 | 3772 | *) ac_try_echo=$ac_try;; | ||
4593 | 3773 | esac | ||
4594 | 3774 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4595 | 3775 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
4596 | 3776 | ac_status=$? | ||
4597 | 3777 | grep -v '^ *+' conftest.er1 >conftest.err | ||
4598 | 3778 | rm -f conftest.er1 | ||
4599 | 3779 | cat conftest.err >&5 | ||
4600 | 3780 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4601 | 3781 | (exit $ac_status); } >/dev/null && { | ||
4602 | 3782 | test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | ||
4603 | 3783 | test ! -s conftest.err | ||
4604 | 3784 | }; then | ||
4606 | 3785 | # Broken: success on invalid input. | 4109 | # Broken: success on invalid input. |
4607 | 3786 | continue | 4110 | continue |
4608 | 3787 | else | 4111 | else |
4609 | 3788 | echo "$as_me: failed program was:" >&5 | ||
4610 | 3789 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
4611 | 3790 | |||
4612 | 3791 | # Passes both tests. | 4112 | # Passes both tests. |
4613 | 3792 | ac_preproc_ok=: | 4113 | ac_preproc_ok=: |
4614 | 3793 | break | 4114 | break |
4615 | 3794 | fi | 4115 | fi |
4616 | 3795 | |||
4617 | 3796 | rm -f conftest.err conftest.$ac_ext | 4116 | rm -f conftest.err conftest.$ac_ext |
4618 | 3797 | 4117 | ||
4619 | 3798 | done | 4118 | done |
4620 | 3799 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. | 4119 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. |
4621 | 3800 | rm -f conftest.err conftest.$ac_ext | 4120 | rm -f conftest.err conftest.$ac_ext |
4623 | 3801 | if $ac_preproc_ok; then | 4121 | if $ac_preproc_ok; then : |
4624 | 3802 | break | 4122 | break |
4625 | 3803 | fi | 4123 | fi |
4626 | 3804 | 4124 | ||
4627 | @@ -3810,8 +4130,8 @@ | |||
4628 | 3810 | else | 4130 | else |
4629 | 3811 | ac_cv_prog_CPP=$CPP | 4131 | ac_cv_prog_CPP=$CPP |
4630 | 3812 | fi | 4132 | fi |
4633 | 3813 | { echo "$as_me:$LINENO: result: $CPP" >&5 | 4133 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 |
4634 | 3814 | echo "${ECHO_T}$CPP" >&6; } | 4134 | $as_echo "$CPP" >&6; } |
4635 | 3815 | ac_preproc_ok=false | 4135 | ac_preproc_ok=false |
4636 | 3816 | for ac_c_preproc_warn_flag in '' yes | 4136 | for ac_c_preproc_warn_flag in '' yes |
4637 | 3817 | do | 4137 | do |
4638 | @@ -3821,11 +4141,7 @@ | |||
4639 | 3821 | # <limits.h> exists even on freestanding compilers. | 4141 | # <limits.h> exists even on freestanding compilers. |
4640 | 3822 | # On the NeXT, cc -E runs the code through the compiler's parser, | 4142 | # On the NeXT, cc -E runs the code through the compiler's parser, |
4641 | 3823 | # not just through cpp. "Syntax error" is here to catch this case. | 4143 | # not just through cpp. "Syntax error" is here to catch this case. |
4647 | 3824 | cat >conftest.$ac_ext <<_ACEOF | 4144 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4643 | 3825 | /* confdefs.h. */ | ||
4644 | 3826 | _ACEOF | ||
4645 | 3827 | cat confdefs.h >>conftest.$ac_ext | ||
4646 | 3828 | cat >>conftest.$ac_ext <<_ACEOF | ||
4648 | 3829 | /* end confdefs.h. */ | 4145 | /* end confdefs.h. */ |
4649 | 3830 | #ifdef __STDC__ | 4146 | #ifdef __STDC__ |
4650 | 3831 | # include <limits.h> | 4147 | # include <limits.h> |
4651 | @@ -3834,83 +4150,40 @@ | |||
4652 | 3834 | #endif | 4150 | #endif |
4653 | 3835 | Syntax error | 4151 | Syntax error |
4654 | 3836 | _ACEOF | 4152 | _ACEOF |
4672 | 3837 | if { (ac_try="$ac_cpp conftest.$ac_ext" | 4153 | if ac_fn_c_try_cpp "$LINENO"; then : |
4673 | 3838 | case "(($ac_try" in | 4154 | |
4657 | 3839 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4658 | 3840 | *) ac_try_echo=$ac_try;; | ||
4659 | 3841 | esac | ||
4660 | 3842 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4661 | 3843 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
4662 | 3844 | ac_status=$? | ||
4663 | 3845 | grep -v '^ *+' conftest.er1 >conftest.err | ||
4664 | 3846 | rm -f conftest.er1 | ||
4665 | 3847 | cat conftest.err >&5 | ||
4666 | 3848 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4667 | 3849 | (exit $ac_status); } >/dev/null && { | ||
4668 | 3850 | test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | ||
4669 | 3851 | test ! -s conftest.err | ||
4670 | 3852 | }; then | ||
4671 | 3853 | : | ||
4674 | 3854 | else | 4155 | else |
4675 | 3855 | echo "$as_me: failed program was:" >&5 | ||
4676 | 3856 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
4677 | 3857 | |||
4678 | 3858 | # Broken: fails on valid input. | 4156 | # Broken: fails on valid input. |
4679 | 3859 | continue | 4157 | continue |
4680 | 3860 | fi | 4158 | fi |
4681 | 3861 | |||
4682 | 3862 | rm -f conftest.err conftest.$ac_ext | 4159 | rm -f conftest.err conftest.$ac_ext |
4683 | 3863 | 4160 | ||
4684 | 3864 | # OK, works on sane cases. Now check whether nonexistent headers | 4161 | # OK, works on sane cases. Now check whether nonexistent headers |
4685 | 3865 | # can be detected and how. | 4162 | # can be detected and how. |
4691 | 3866 | cat >conftest.$ac_ext <<_ACEOF | 4163 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4687 | 3867 | /* confdefs.h. */ | ||
4688 | 3868 | _ACEOF | ||
4689 | 3869 | cat confdefs.h >>conftest.$ac_ext | ||
4690 | 3870 | cat >>conftest.$ac_ext <<_ACEOF | ||
4692 | 3871 | /* end confdefs.h. */ | 4164 | /* end confdefs.h. */ |
4693 | 3872 | #include <ac_nonexistent.h> | 4165 | #include <ac_nonexistent.h> |
4694 | 3873 | _ACEOF | 4166 | _ACEOF |
4711 | 3874 | if { (ac_try="$ac_cpp conftest.$ac_ext" | 4167 | if ac_fn_c_try_cpp "$LINENO"; then : |
4696 | 3875 | case "(($ac_try" in | ||
4697 | 3876 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4698 | 3877 | *) ac_try_echo=$ac_try;; | ||
4699 | 3878 | esac | ||
4700 | 3879 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4701 | 3880 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
4702 | 3881 | ac_status=$? | ||
4703 | 3882 | grep -v '^ *+' conftest.er1 >conftest.err | ||
4704 | 3883 | rm -f conftest.er1 | ||
4705 | 3884 | cat conftest.err >&5 | ||
4706 | 3885 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4707 | 3886 | (exit $ac_status); } >/dev/null && { | ||
4708 | 3887 | test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | ||
4709 | 3888 | test ! -s conftest.err | ||
4710 | 3889 | }; then | ||
4712 | 3890 | # Broken: success on invalid input. | 4168 | # Broken: success on invalid input. |
4713 | 3891 | continue | 4169 | continue |
4714 | 3892 | else | 4170 | else |
4715 | 3893 | echo "$as_me: failed program was:" >&5 | ||
4716 | 3894 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
4717 | 3895 | |||
4718 | 3896 | # Passes both tests. | 4171 | # Passes both tests. |
4719 | 3897 | ac_preproc_ok=: | 4172 | ac_preproc_ok=: |
4720 | 3898 | break | 4173 | break |
4721 | 3899 | fi | 4174 | fi |
4722 | 3900 | |||
4723 | 3901 | rm -f conftest.err conftest.$ac_ext | 4175 | rm -f conftest.err conftest.$ac_ext |
4724 | 3902 | 4176 | ||
4725 | 3903 | done | 4177 | done |
4726 | 3904 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. | 4178 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. |
4727 | 3905 | rm -f conftest.err conftest.$ac_ext | 4179 | rm -f conftest.err conftest.$ac_ext |
4730 | 3906 | if $ac_preproc_ok; then | 4180 | if $ac_preproc_ok; then : |
4731 | 3907 | : | 4181 | |
4732 | 3908 | else | 4182 | else |
4738 | 3909 | { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check | 4183 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
4739 | 3910 | See \`config.log' for more details." >&5 | 4184 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
4740 | 3911 | echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check | 4185 | as_fn_error "C preprocessor \"$CPP\" fails sanity check |
4741 | 3912 | See \`config.log' for more details." >&2;} | 4186 | See \`config.log' for more details." "$LINENO" 5; } |
4737 | 3913 | { (exit 1); exit 1; }; } | ||
4742 | 3914 | fi | 4187 | fi |
4743 | 3915 | 4188 | ||
4744 | 3916 | ac_ext=c | 4189 | ac_ext=c |
4745 | @@ -3920,45 +4193,40 @@ | |||
4746 | 3920 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | 4193 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
4747 | 3921 | 4194 | ||
4748 | 3922 | 4195 | ||
4760 | 3923 | { echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 | 4196 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 |
4761 | 3924 | echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } | 4197 | $as_echo_n "checking for grep that handles long lines and -e... " >&6; } |
4762 | 3925 | if test "${ac_cv_path_GREP+set}" = set; then | 4198 | if test "${ac_cv_path_GREP+set}" = set; then : |
4763 | 3926 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 4199 | $as_echo_n "(cached) " >&6 |
4764 | 3927 | else | 4200 | else |
4765 | 3928 | # Extract the first word of "grep ggrep" to use in msg output | 4201 | if test -z "$GREP"; then |
4755 | 3929 | if test -z "$GREP"; then | ||
4756 | 3930 | set dummy grep ggrep; ac_prog_name=$2 | ||
4757 | 3931 | if test "${ac_cv_path_GREP+set}" = set; then | ||
4758 | 3932 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4759 | 3933 | else | ||
4766 | 3934 | ac_path_GREP_found=false | 4202 | ac_path_GREP_found=false |
4769 | 3935 | # Loop through the user's path and test for each of PROGNAME-LIST | 4203 | # Loop through the user's path and test for each of PROGNAME-LIST |
4770 | 3936 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | 4204 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
4771 | 3937 | for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin | 4205 | for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin |
4772 | 3938 | do | 4206 | do |
4773 | 3939 | IFS=$as_save_IFS | 4207 | IFS=$as_save_IFS |
4774 | 3940 | test -z "$as_dir" && as_dir=. | 4208 | test -z "$as_dir" && as_dir=. |
4780 | 3941 | for ac_prog in grep ggrep; do | 4209 | for ac_prog in grep ggrep; do |
4781 | 3942 | for ac_exec_ext in '' $ac_executable_extensions; do | 4210 | for ac_exec_ext in '' $ac_executable_extensions; do |
4782 | 3943 | ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" | 4211 | ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" |
4783 | 3944 | { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue | 4212 | { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue |
4784 | 3945 | # Check for GNU ac_path_GREP and select it if it is found. | 4213 | # Check for GNU ac_path_GREP and select it if it is found. |
4785 | 3946 | # Check for GNU $ac_path_GREP | 4214 | # Check for GNU $ac_path_GREP |
4786 | 3947 | case `"$ac_path_GREP" --version 2>&1` in | 4215 | case `"$ac_path_GREP" --version 2>&1` in |
4787 | 3948 | *GNU*) | 4216 | *GNU*) |
4788 | 3949 | ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; | 4217 | ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; |
4789 | 3950 | *) | 4218 | *) |
4790 | 3951 | ac_count=0 | 4219 | ac_count=0 |
4792 | 3952 | echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" | 4220 | $as_echo_n 0123456789 >"conftest.in" |
4793 | 3953 | while : | 4221 | while : |
4794 | 3954 | do | 4222 | do |
4795 | 3955 | cat "conftest.in" "conftest.in" >"conftest.tmp" | 4223 | cat "conftest.in" "conftest.in" >"conftest.tmp" |
4796 | 3956 | mv "conftest.tmp" "conftest.in" | 4224 | mv "conftest.tmp" "conftest.in" |
4797 | 3957 | cp "conftest.in" "conftest.nl" | 4225 | cp "conftest.in" "conftest.nl" |
4799 | 3958 | echo 'GREP' >> "conftest.nl" | 4226 | $as_echo 'GREP' >> "conftest.nl" |
4800 | 3959 | "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break | 4227 | "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break |
4801 | 3960 | diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break | 4228 | diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break |
4803 | 3961 | ac_count=`expr $ac_count + 1` | 4229 | as_fn_arith $ac_count + 1 && ac_count=$as_val |
4804 | 3962 | if test $ac_count -gt ${ac_path_GREP_max-0}; then | 4230 | if test $ac_count -gt ${ac_path_GREP_max-0}; then |
4805 | 3963 | # Best one so far, save it but keep looking for a better one | 4231 | # Best one so far, save it but keep looking for a better one |
4806 | 3964 | ac_cv_path_GREP="$ac_path_GREP" | 4232 | ac_cv_path_GREP="$ac_path_GREP" |
4807 | @@ -3970,77 +4238,61 @@ | |||
4808 | 3970 | rm -f conftest.in conftest.tmp conftest.nl conftest.out;; | 4238 | rm -f conftest.in conftest.tmp conftest.nl conftest.out;; |
4809 | 3971 | esac | 4239 | esac |
4810 | 3972 | 4240 | ||
4817 | 3973 | 4241 | $ac_path_GREP_found && break 3 | |
4818 | 3974 | $ac_path_GREP_found && break 3 | 4242 | done |
4819 | 3975 | done | 4243 | done |
4820 | 3976 | done | 4244 | done |
4815 | 3977 | |||
4816 | 3978 | done | ||
4821 | 3979 | IFS=$as_save_IFS | 4245 | IFS=$as_save_IFS |
4833 | 3980 | 4246 | if test -z "$ac_cv_path_GREP"; then | |
4834 | 3981 | 4247 | as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 | |
4835 | 3982 | fi | 4248 | fi |
4825 | 3983 | |||
4826 | 3984 | GREP="$ac_cv_path_GREP" | ||
4827 | 3985 | if test -z "$GREP"; then | ||
4828 | 3986 | { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 | ||
4829 | 3987 | echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} | ||
4830 | 3988 | { (exit 1); exit 1; }; } | ||
4831 | 3989 | fi | ||
4832 | 3990 | |||
4836 | 3991 | else | 4249 | else |
4837 | 3992 | ac_cv_path_GREP=$GREP | 4250 | ac_cv_path_GREP=$GREP |
4838 | 3993 | fi | 4251 | fi |
4839 | 3994 | 4252 | ||
4840 | 3995 | |||
4841 | 3996 | fi | 4253 | fi |
4844 | 3997 | { echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 | 4254 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 |
4845 | 3998 | echo "${ECHO_T}$ac_cv_path_GREP" >&6; } | 4255 | $as_echo "$ac_cv_path_GREP" >&6; } |
4846 | 3999 | GREP="$ac_cv_path_GREP" | 4256 | GREP="$ac_cv_path_GREP" |
4847 | 4000 | 4257 | ||
4848 | 4001 | 4258 | ||
4853 | 4002 | { echo "$as_me:$LINENO: checking for egrep" >&5 | 4259 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 |
4854 | 4003 | echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } | 4260 | $as_echo_n "checking for egrep... " >&6; } |
4855 | 4004 | if test "${ac_cv_path_EGREP+set}" = set; then | 4261 | if test "${ac_cv_path_EGREP+set}" = set; then : |
4856 | 4005 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 4262 | $as_echo_n "(cached) " >&6 |
4857 | 4006 | else | 4263 | else |
4858 | 4007 | if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 | 4264 | if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 |
4859 | 4008 | then ac_cv_path_EGREP="$GREP -E" | 4265 | then ac_cv_path_EGREP="$GREP -E" |
4860 | 4009 | else | 4266 | else |
4867 | 4010 | # Extract the first word of "egrep" to use in msg output | 4267 | if test -z "$EGREP"; then |
4862 | 4011 | if test -z "$EGREP"; then | ||
4863 | 4012 | set dummy egrep; ac_prog_name=$2 | ||
4864 | 4013 | if test "${ac_cv_path_EGREP+set}" = set; then | ||
4865 | 4014 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4866 | 4015 | else | ||
4868 | 4016 | ac_path_EGREP_found=false | 4268 | ac_path_EGREP_found=false |
4871 | 4017 | # Loop through the user's path and test for each of PROGNAME-LIST | 4269 | # Loop through the user's path and test for each of PROGNAME-LIST |
4872 | 4018 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | 4270 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
4873 | 4019 | for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin | 4271 | for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin |
4874 | 4020 | do | 4272 | do |
4875 | 4021 | IFS=$as_save_IFS | 4273 | IFS=$as_save_IFS |
4876 | 4022 | test -z "$as_dir" && as_dir=. | 4274 | test -z "$as_dir" && as_dir=. |
4882 | 4023 | for ac_prog in egrep; do | 4275 | for ac_prog in egrep; do |
4883 | 4024 | for ac_exec_ext in '' $ac_executable_extensions; do | 4276 | for ac_exec_ext in '' $ac_executable_extensions; do |
4884 | 4025 | ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" | 4277 | ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" |
4885 | 4026 | { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue | 4278 | { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue |
4886 | 4027 | # Check for GNU ac_path_EGREP and select it if it is found. | 4279 | # Check for GNU ac_path_EGREP and select it if it is found. |
4887 | 4028 | # Check for GNU $ac_path_EGREP | 4280 | # Check for GNU $ac_path_EGREP |
4888 | 4029 | case `"$ac_path_EGREP" --version 2>&1` in | 4281 | case `"$ac_path_EGREP" --version 2>&1` in |
4889 | 4030 | *GNU*) | 4282 | *GNU*) |
4890 | 4031 | ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; | 4283 | ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; |
4891 | 4032 | *) | 4284 | *) |
4892 | 4033 | ac_count=0 | 4285 | ac_count=0 |
4894 | 4034 | echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" | 4286 | $as_echo_n 0123456789 >"conftest.in" |
4895 | 4035 | while : | 4287 | while : |
4896 | 4036 | do | 4288 | do |
4897 | 4037 | cat "conftest.in" "conftest.in" >"conftest.tmp" | 4289 | cat "conftest.in" "conftest.in" >"conftest.tmp" |
4898 | 4038 | mv "conftest.tmp" "conftest.in" | 4290 | mv "conftest.tmp" "conftest.in" |
4899 | 4039 | cp "conftest.in" "conftest.nl" | 4291 | cp "conftest.in" "conftest.nl" |
4901 | 4040 | echo 'EGREP' >> "conftest.nl" | 4292 | $as_echo 'EGREP' >> "conftest.nl" |
4902 | 4041 | "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break | 4293 | "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break |
4903 | 4042 | diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break | 4294 | diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break |
4905 | 4043 | ac_count=`expr $ac_count + 1` | 4295 | as_fn_arith $ac_count + 1 && ac_count=$as_val |
4906 | 4044 | if test $ac_count -gt ${ac_path_EGREP_max-0}; then | 4296 | if test $ac_count -gt ${ac_path_EGREP_max-0}; then |
4907 | 4045 | # Best one so far, save it but keep looking for a better one | 4297 | # Best one so far, save it but keep looking for a better one |
4908 | 4046 | ac_cv_path_EGREP="$ac_path_EGREP" | 4298 | ac_cv_path_EGREP="$ac_path_EGREP" |
4909 | @@ -4052,46 +4304,31 @@ | |||
4910 | 4052 | rm -f conftest.in conftest.tmp conftest.nl conftest.out;; | 4304 | rm -f conftest.in conftest.tmp conftest.nl conftest.out;; |
4911 | 4053 | esac | 4305 | esac |
4912 | 4054 | 4306 | ||
4919 | 4055 | 4307 | $ac_path_EGREP_found && break 3 | |
4920 | 4056 | $ac_path_EGREP_found && break 3 | 4308 | done |
4921 | 4057 | done | 4309 | done |
4922 | 4058 | done | 4310 | done |
4917 | 4059 | |||
4918 | 4060 | done | ||
4923 | 4061 | IFS=$as_save_IFS | 4311 | IFS=$as_save_IFS |
4935 | 4062 | 4312 | if test -z "$ac_cv_path_EGREP"; then | |
4936 | 4063 | 4313 | as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 | |
4937 | 4064 | fi | 4314 | fi |
4927 | 4065 | |||
4928 | 4066 | EGREP="$ac_cv_path_EGREP" | ||
4929 | 4067 | if test -z "$EGREP"; then | ||
4930 | 4068 | { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 | ||
4931 | 4069 | echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} | ||
4932 | 4070 | { (exit 1); exit 1; }; } | ||
4933 | 4071 | fi | ||
4934 | 4072 | |||
4938 | 4073 | else | 4315 | else |
4939 | 4074 | ac_cv_path_EGREP=$EGREP | 4316 | ac_cv_path_EGREP=$EGREP |
4940 | 4075 | fi | 4317 | fi |
4941 | 4076 | 4318 | ||
4942 | 4077 | |||
4943 | 4078 | fi | 4319 | fi |
4944 | 4079 | fi | 4320 | fi |
4947 | 4080 | { echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 | 4321 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 |
4948 | 4081 | echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } | 4322 | $as_echo "$ac_cv_path_EGREP" >&6; } |
4949 | 4082 | EGREP="$ac_cv_path_EGREP" | 4323 | EGREP="$ac_cv_path_EGREP" |
4950 | 4083 | 4324 | ||
4951 | 4084 | 4325 | ||
4956 | 4085 | { echo "$as_me:$LINENO: checking for ANSI C header files" >&5 | 4326 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 |
4957 | 4086 | echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } | 4327 | $as_echo_n "checking for ANSI C header files... " >&6; } |
4958 | 4087 | if test "${ac_cv_header_stdc+set}" = set; then | 4328 | if test "${ac_cv_header_stdc+set}" = set; then : |
4959 | 4088 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 4329 | $as_echo_n "(cached) " >&6 |
4960 | 4089 | else | 4330 | else |
4966 | 4090 | cat >conftest.$ac_ext <<_ACEOF | 4331 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4962 | 4091 | /* confdefs.h. */ | ||
4963 | 4092 | _ACEOF | ||
4964 | 4093 | cat confdefs.h >>conftest.$ac_ext | ||
4965 | 4094 | cat >>conftest.$ac_ext <<_ACEOF | ||
4967 | 4095 | /* end confdefs.h. */ | 4332 | /* end confdefs.h. */ |
4968 | 4096 | #include <stdlib.h> | 4333 | #include <stdlib.h> |
4969 | 4097 | #include <stdarg.h> | 4334 | #include <stdarg.h> |
4970 | @@ -4106,47 +4343,23 @@ | |||
4971 | 4106 | return 0; | 4343 | return 0; |
4972 | 4107 | } | 4344 | } |
4973 | 4108 | _ACEOF | 4345 | _ACEOF |
4991 | 4109 | rm -f conftest.$ac_objext | 4346 | if ac_fn_c_try_compile "$LINENO"; then : |
4975 | 4110 | if { (ac_try="$ac_compile" | ||
4976 | 4111 | case "(($ac_try" in | ||
4977 | 4112 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4978 | 4113 | *) ac_try_echo=$ac_try;; | ||
4979 | 4114 | esac | ||
4980 | 4115 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4981 | 4116 | (eval "$ac_compile") 2>conftest.er1 | ||
4982 | 4117 | ac_status=$? | ||
4983 | 4118 | grep -v '^ *+' conftest.er1 >conftest.err | ||
4984 | 4119 | rm -f conftest.er1 | ||
4985 | 4120 | cat conftest.err >&5 | ||
4986 | 4121 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4987 | 4122 | (exit $ac_status); } && { | ||
4988 | 4123 | test -z "$ac_c_werror_flag" || | ||
4989 | 4124 | test ! -s conftest.err | ||
4990 | 4125 | } && test -s conftest.$ac_objext; then | ||
4992 | 4126 | ac_cv_header_stdc=yes | 4347 | ac_cv_header_stdc=yes |
4993 | 4127 | else | 4348 | else |
4998 | 4128 | echo "$as_me: failed program was:" >&5 | 4349 | ac_cv_header_stdc=no |
4995 | 4129 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
4996 | 4130 | |||
4997 | 4131 | ac_cv_header_stdc=no | ||
4999 | 4132 | fi | 4350 | fi |
5000 | 4133 |
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)?