From a3954726c0f0e5bf41cbb0159d5f3fa0b360a70e Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 8 Apr 2019 17:09:54 +0200 Subject: [PATCH] */*: sync with upstream Taken from: HardenedBSD --- archivers/rpm4/Makefile | 1 + astro/geographiclib/Makefile | 2 +- astro/weather/Makefile | 1 + audio/ardour5/Makefile | 2 +- audio/bambootracker/Makefile | 2 +- audio/beets/Makefile | 2 +- audio/cutmp3/Makefile | 2 +- audio/ecasound/Makefile | 2 +- audio/fasttracker2/Makefile | 2 +- audio/fasttracker2/distinfo | 6 +- audio/fluidsynth/Makefile | 1 + audio/guitarix-lv2/Makefile | 6 +- audio/guitarix-lv2/distinfo | 6 +- audio/guitarix-lv2/files/patch-boost-1.69 | 18 - .../files/patch-src_gx__head_gui_machine.cpp | 13 +- audio/guitarix-lv2/pkg-plist | 1 + audio/jack/Makefile | 2 +- audio/kid3-qt5/Makefile | 2 +- audio/lash/Makefile | 2 +- audio/libopenmpt/Makefile | 2 +- audio/libopenmpt/distinfo | 6 +- audio/libsmf/Makefile | 2 +- audio/mma/Makefile | 2 +- audio/mpiosh/Makefile | 2 +- audio/mps/Makefile | 2 +- audio/ncmpcpp/Makefile | 2 +- audio/paprefs/Makefile | 2 +- audio/pulseaudio/Makefile | 11 +- audio/pulseaudio/pkg-plist | 21 +- audio/py-aubio/Makefile | 2 +- audio/py-fmoo-audiotools/Makefile | 2 +- audio/py-mutagen/Makefile | 1 + audio/py-soundscrape/Makefile | 1 + audio/qmidictl/Makefile | 2 +- audio/supercollider/Makefile | 2 +- audio/x42-plugins-lv2/Makefile | 2 +- audio/xmms2/Makefile | 2 +- audio/yoshimi/Makefile | 1 + audio/zrythm/Makefile | 19 +- audio/zrythm/distinfo | 6 +- audio/zrythm/pkg-plist | 10 + benchmarks/netperf/Makefile | 5 +- benchmarks/py-naarad/Makefile | 2 +- benchmarks/py-zopkio/Makefile | 2 +- biology/checkm/Makefile | 1 + biology/mrbayes/Makefile | 2 +- biology/py-biom-format/Makefile | 2 +- biology/py-cutadapt/Makefile | 1 + biology/py-gffutils/Makefile | 1 + biology/py-pyfaidx/Makefile | 1 + cad/abc/Makefile | 1 + cad/iverilog/Makefile | 1 + cad/linuxcnc-devel/Makefile | 2 +- cad/ngspice_rework/Makefile | 1 + cad/py-lcapy/Makefile | 2 +- cad/solvespace/Makefile | 7 +- chinese/ibus-libpinyin/Makefile | 2 +- chinese/ibus-pinyin/Makefile | 2 +- comms/gpredict/Makefile | 2 +- comms/hamlib/Makefile | 1 + comms/klog/Makefile | 3 +- comms/obexapp/Makefile | 2 +- comms/py-adafruit-ampy/Makefile | 1 + comms/py-esptool/Makefile | 1 + comms/py-serial/Makefile | 1 + comms/soapyairspy/Makefile | 2 +- comms/wsjtx/Makefile | 1 + comms/zssh/Makefile | 2 +- converters/p5-Sereal-Decoder/Makefile | 2 +- converters/p5-Sereal-Decoder/distinfo | 6 +- converters/p5-Sereal-Encoder/Makefile | 2 +- converters/p5-Sereal-Encoder/distinfo | 6 +- converters/p5-Sereal/Makefile | 2 +- converters/p5-Sereal/distinfo | 6 +- converters/py-unidecode/Makefile | 1 + databases/buzhug/Makefile | 1 + databases/cego/Makefile | 1 + databases/clickhouse/Makefile | 2 +- databases/couchdb2/Makefile | 1 + databases/gqlplus/Makefile | 2 +- databases/grass7/Makefile | 2 +- databases/ip4r/Makefile | 2 +- databases/libgda5/Makefile | 2 +- databases/libodbc++/Makefile | 2 +- databases/mariadb101-server/Makefile | 2 +- databases/mariadb102-server/Makefile | 2 +- databases/mariadb103-server/Makefile | 2 +- databases/mariadb55-client/Makefile | 1 + databases/mdbtools/Makefile | 2 +- databases/mysql55-server/Makefile | 2 +- databases/opendbx/Makefile | 2 +- databases/opentsdb/Makefile | 1 + .../p5-DBIx-Class-DeploymentHandler/Makefile | 8 +- .../p5-DBIx-Class-DeploymentHandler/distinfo | 6 +- .../p5-DBIx-Class-DeploymentHandler/pkg-plist | 2 - databases/p5-DBIx-Class-Fixtures/Makefile | 2 +- databases/p5-DBIx-Class-Fixtures/distinfo | 6 +- databases/percona55-server/Makefile | 2 +- databases/pg_activity/Makefile | 2 +- databases/pg_citus/Makefile | 1 + databases/pgbarman/Makefile | 1 + databases/pgpool-II-35/Makefile | 2 +- databases/pgpool-II-35/distinfo | 6 +- databases/pgpool-II-36/Makefile | 2 +- databases/pgpool-II-36/distinfo | 6 +- databases/pgpool-II-37/Makefile | 2 +- databases/pgpool-II-37/distinfo | 6 +- databases/pgpool-II-40/Makefile | 2 +- databases/pgpool-II-40/distinfo | 6 +- databases/pgpool/Makefile | 2 +- databases/pgpool/distinfo | 6 +- databases/pgsanity/Makefile | 2 +- databases/postgres-xl/Makefile | 1 + databases/postgresql11-server/Makefile | 2 +- databases/postgresql95-plperl/Makefile | 2 +- databases/pspg/Makefile | 3 +- databases/pspg/distinfo | 6 +- databases/py-couchdb/Makefile | 1 + databases/py-fakeredis/Makefile | 5 +- databases/py-fakeredis/distinfo | 6 +- databases/py-mycli/Makefile | 1 + databases/py-peewee/Makefile | 1 + databases/py-pgcli/Makefile | 2 +- databases/py-pgxnclient/Makefile | 2 +- databases/py-sqlalchemy-migrate/Makefile | 1 + databases/py-sqlparse/Makefile | 1 + databases/py-sqlparse020/Makefile | 1 + databases/py-sqlrelay/Makefile | 2 + databases/py-whisper/Makefile | 1 + databases/riak/Makefile | 2 +- databases/sqlcached/Makefile | 2 +- databases/sqlitestudio/Makefile | 2 +- databases/sqlrelay/Makefile | 1 + databases/sqsh/Makefile | 1 + databases/tarantool/Makefile | 1 + databases/virtuoso/Makefile | 2 +- databases/xrootd/Makefile | 2 +- deskutils/Makefile | 1 + deskutils/autocutsel/Makefile | 15 +- deskutils/autocutsel/files/patch-autocutsel.1 | 101 + deskutils/autocutsel/files/patch-cutsel.1 | 66 + deskutils/cherrytree/Makefile | 27 + deskutils/cherrytree/distinfo | 3 + deskutils/cherrytree/pkg-descr | 4 + deskutils/conkyforecast/Makefile | 2 +- deskutils/dosage/Makefile | 1 + deskutils/genius/Makefile | 2 +- deskutils/meteo/Makefile | 2 +- deskutils/pal/Makefile | 2 +- deskutils/spice-gtk/Makefile | 5 +- deskutils/tasksh/Makefile | 2 +- devel/Makefile | 3 +- devel/ald/Makefile | 2 +- devel/android-tools-adb/files/Makefile | 2 - devel/android-tools-fastboot/files/Makefile | 1 - devel/arduino-avrdude/Makefile | 2 +- devel/avrdude/Makefile | 2 +- devel/awscli/Makefile | 1 + devel/b2/Makefile | 1 + devel/bossa/Makefile | 2 +- devel/bpython/Makefile | 1 + devel/catch/Makefile | 2 +- devel/catch/distinfo | 6 +- devel/cdecl/Makefile | 1 + devel/cgdb/Makefile | 2 +- devel/clewn/Makefile | 2 +- devel/codesearch-py/Makefile | 1 + devel/cut/Makefile | 1 + devel/d-feet/Makefile | 2 +- devel/devtodo/Makefile | 2 +- devel/dispy/Makefile | 1 + devel/elf/Makefile | 2 +- devel/elfsh/Makefile | 2 +- devel/gettext-lint/Makefile | 2 +- devel/git-cinnabar/Makefile | 4 +- devel/git-cinnabar/distinfo | 6 +- devel/git-review/Makefile | 1 + devel/gitaly/Makefile | 3 +- devel/gitaly/files/patch-__support_makegen.go | 7 +- devel/gitinspector/Makefile | 2 +- devel/gnatcoll/Makefile | 2 +- devel/grv/Makefile | 1 + devel/gtranslator/Makefile | 2 +- devel/hs-readline/Makefile | 2 +- devel/hub/Makefile | 2 +- devel/hub/distinfo | 6 +- devel/ikos/Makefile | 6 +- devel/ikos/distinfo | 6 +- devel/ikos/pkg-plist | 1 + devel/ipython5/Makefile | 2 +- devel/jetbrains-phpstorm/Makefile | 6 +- devel/jetbrains-phpstorm/distinfo | 6 +- devel/jetbrains-phpstorm/pkg-plist | 103 +- devel/kf5-kapidox/Makefile | 1 + devel/lab/Makefile | 90 + devel/lab/distinfo | 109 + devel/lab/pkg-descr | 4 + devel/libarea/Makefile | 2 +- devel/libepp-nicbr/Makefile | 2 +- devel/libnfc/Makefile | 2 +- devel/libpeas/Makefile | 2 +- devel/libreadline-java/Makefile | 2 +- devel/libvirt/Makefile | 1 + devel/mspdebug/Makefile | 2 +- devel/nuitka/Makefile | 1 + devel/omake/Makefile | 2 +- devel/omniORB/Makefile | 1 + devel/opendht/Makefile | 1 + devel/openzz/Makefile | 2 +- devel/p5-Alien-Build/Makefile | 2 +- devel/p5-Alien-Build/distinfo | 6 +- devel/p5-Term-ReadLine-Gnu/Makefile | 1 + devel/p5-Test2-Harness/Makefile | 2 +- devel/p5-Test2-Harness/distinfo | 6 +- devel/pam_wrapper/Makefile | 2 +- devel/pear-HTML_Common2/Makefile | 4 +- devel/pear-HTML_Common2/distinfo | 6 +- devel/pecl-xdebug-devel/Makefile | 23 - devel/pecl-xdebug-devel/distinfo | 3 - .../files/patch-xdebug__compat.h | 11 - devel/pecl-xdebug-devel/files/pkg-message.in | 21 - devel/pecl-xdebug-devel/pkg-descr | 20 - devel/pecl-xdebug25/Makefile | 26 - devel/pecl-xdebug25/distinfo | 3 - devel/pecl-xdebug25/files/patch-xdebug__com.c | 10 - devel/pecl-xdebug25/files/pkg-message.in | 15 - devel/pecl-xdebug25/pkg-descr | 19 - devel/pep8/Makefile | 2 +- devel/physfs/Makefile | 1 + devel/poco-ssl/Makefile | 3 + devel/pure-readline/Makefile | 2 +- devel/py-Automat/Makefile | 1 + devel/py-Faker/Makefile | 2 +- devel/py-PyUtilib/Makefile | 1 + devel/py-argcomplete/Makefile | 1 + devel/py-avro/Makefile | 1 + devel/py-black/Makefile | 4 +- devel/py-black/distinfo | 6 +- devel/py-boto/Makefile | 1 + devel/py-btest/Makefile | 1 + devel/py-buildbot-pkg/Makefile | 1 + devel/py-buildbot-worker/Makefile | 1 + devel/py-buildbot/Makefile | 2 +- devel/py-cdg/Makefile | 1 + devel/py-check-manifest/Makefile | 1 + devel/py-codecov/Makefile | 1 + devel/py-coloredlogs/Makefile | 1 + devel/py-confusable_homoglyphs/Makefile | 1 + devel/py-cookiecutter/Makefile | 1 + devel/py-dateutils/Makefile | 2 +- devel/py-ddtrace/Makefile | 1 + devel/py-dill/Makefile | 1 + devel/py-dtfabric/Makefile | 1 + devel/py-epsilon/Makefile | 1 + devel/py-eventlib/Makefile | 1 + devel/py-fastentrypoints/Makefile | 1 + devel/py-fastimport/Makefile | 1 + devel/py-flake8/Makefile | 1 + devel/py-flex/Makefile | 2 +- devel/py-foolscap/Makefile | 2 +- devel/py-future/Makefile | 1 + devel/py-fypp/Makefile | 1 + devel/py-gdata/Makefile | 2 + devel/py-git-up/Makefile | 1 + devel/py-git_semver/Makefile | 1 + devel/py-gitless/Makefile | 1 + devel/py-glance-store/Makefile | 1 + devel/py-icalendar/Makefile | 1 + devel/py-invoke/Makefile | 1 + devel/py-ipdb/Makefile | 1 + devel/py-ipyparallel/Makefile | 2 +- devel/py-isort/Makefile | 3 +- devel/py-isort/distinfo | 6 +- devel/py-javaproperties/Makefile | 2 +- devel/py-javaproperties/distinfo | 6 +- devel/py-javaproperties/files/patch-setup.py | 12 - devel/py-jsondiff/Makefile | 1 + devel/py-jsonpatch/Makefile | 1 + devel/py-jsonpointer/Makefile | 2 +- devel/py-jsonschema/Makefile | 2 +- devel/py-jupyter_client/Makefile | 1 + devel/py-jupyter_core/Makefile | 2 +- devel/py-kaptan/Makefile | 1 + devel/py-logfury/Makefile | 2 +- devel/py-logilab-common/Makefile | 1 + devel/py-memory_profiler/Makefile | 1 + devel/py-molecule/Makefile | 1 + devel/py-nbconvert/Makefile | 1 + devel/py-nbformat/Makefile | 2 +- devel/py-nose2/Makefile | 1 + devel/py-numba/Makefile | 2 +- devel/py-oletools/Makefile | 1 + devel/py-oslo.concurrency/Makefile | 1 + devel/py-oslo.config/Makefile | 1 + devel/py-oslo.log/Makefile | 1 + devel/py-oslo.messaging/Makefile | 1 + devel/py-oslo.policy/Makefile | 1 + devel/py-oslo.privsep/Makefile | 1 + devel/py-oslo.rootwrap/Makefile | 1 + devel/py-petname/Makefile | 1 + devel/py-pew/Makefile | 1 + devel/py-phply/Makefile | 2 +- devel/py-pip-tools/Makefile | 1 + devel/py-pipenv/Makefile | 1 + devel/py-ptable/Makefile | 1 + devel/py-ptpython/Makefile | 1 + devel/py-pudb/Makefile | 1 + devel/py-pyasn1-modules/Makefile | 1 + devel/py-pycallgraph/Makefile | 2 +- devel/py-pycmd/Makefile | 1 + devel/py-pydevd/Makefile | 2 +- devel/py-pydocstyle/Makefile | 1 + devel/py-pyelftools/Makefile | 1 + devel/py-pyflakes/Makefile | 1 + devel/py-pyparsing/Makefile | 2 +- devel/py-pyparsing/distinfo | 6 +- devel/py-pyro/Makefile | 1 + devel/py-python-bugzilla/Makefile | 1 + devel/py-python-gflags/Makefile | 1 + devel/py-python-gilt/Makefile | 1 + devel/py-python-gitlab/Makefile | 1 + devel/py-python-subunit/Makefile | 2 +- devel/py-pyvisa/Makefile | 1 + devel/py-pyxb/Makefile | 1 + devel/py-qt5-core/Makefile | 1 + devel/py-raven/Makefile | 1 + devel/py-rwt/Makefile | 1 + devel/py-sip/Makefile | 1 + devel/py-tables/Makefile | 1 + devel/py-tabulate/Makefile | 2 +- devel/py-tapi/Makefile | 2 +- devel/py-tempora/Makefile | 1 + devel/py-testrepository/Makefile | 1 + devel/py-tox/Makefile | 1 + devel/py-twine/Makefile | 1 + devel/py-twisted/Makefile | 1 + devel/py-virtualenv-clone/Makefile | 1 + devel/py-vulture/Makefile | 1 + devel/py-xdis/Makefile | 1 + devel/py-yamllint/Makefile | 1 + devel/py-yappi/Makefile | 1 + devel/pycanberra/Makefile | 2 +- devel/pycos/Makefile | 1 + devel/pylint1/Makefile | 1 + devel/pyobfuscate/Makefile | 1 + devel/pysvn/Makefile | 1 + devel/radian/Makefile | 1 + devel/remake/Makefile | 2 +- devel/rlwrap/Makefile | 2 +- devel/rubygem-bindex/Makefile | 2 +- devel/rubygem-bindex/distinfo | 6 +- devel/rubygem-resque/Makefile | 4 +- devel/rubygem-resque/distinfo | 6 +- devel/rubygem-web-console-rails50/Makefile | 2 +- devel/rubygem-web-console/Makefile | 2 +- devel/rudiments/Makefile | 1 + devel/st/Makefile | 2 +- devel/tclreadline/Makefile | 1 + devel/tdl/Makefile | 2 +- devel/tig/Makefile | 2 +- devel/urjtag/Makefile | 2 +- devel/vitables/Makefile | 2 +- devel/yosys/Makefile | 2 +- dns/dnsrecon/Makefile | 2 +- dns/dnsviz/Makefile | 2 +- dns/opendd/Makefile | 5 + dns/powerdns-recursor/Makefile | 3 +- dns/powerdns-recursor/distinfo | 6 +- dns/powerdns/Makefile | 2 +- dns/py-cloudflare/Makefile | 1 + dns/py-dns-lexicon/Makefile | 1 + dns/py-publicsuffixlist/Makefile | 1 + dns/py-tld/Makefile | 2 +- dns/py-tld/distinfo | 6 +- dns/sshfp/Makefile | 2 +- editors/encryptpad/Makefile | 2 +- editors/fileobj/Makefile | 1 + emulators/bochs/Makefile | 2 +- emulators/citra/Makefile | 4 +- emulators/citra/distinfo | 6 +- emulators/hatari/Makefile | 1 + emulators/kcemu/Makefile | 8 +- emulators/vice/Makefile | 2 +- finance/Makefile | 1 + finance/bitcoinnodestats/Makefile | 43 + finance/bitcoinnodestats/distinfo | 3 + finance/bitcoinnodestats/files/pkg-message.in | 10 + finance/bitcoinnodestats/pkg-descr | 7 + finance/bitcoinnodestats/pkg-plist | 49 + .../Makefile | 4 + .../pkg-descr | 2 + finance/py-pycoin/Makefile | 1 + ftp/hsftp/Makefile | 2 +- ftp/lftp/Makefile | 2 +- ftp/py-tftpy/Makefile | 1 + ftp/quftp/Makefile | 2 +- ftp/rexx-curl/Makefile | 44 +- ftp/rexx-curl/distinfo | 6 +- ftp/rexx-curl/files/patch-Makefile.in | 50 +- ftp/rexx-curl/files/patch-common_loader.c | 10 - ftp/rexx-curl/files/patch-rexxcurl.c | 30 +- ftp/rexx-curl/pkg-plist | 17 +- ftp/yafc/Makefile | 2 +- games/Makefile | 1 + games/eif/Makefile | 2 +- games/freeciv/Makefile | 2 +- games/ggz-txt-client/Makefile | 2 +- games/gnubg/Makefile | 2 +- games/gnurobots/Makefile | 2 +- games/hoichess/Makefile | 2 +- games/hyperrogue/Makefile | 4 +- games/iortcw/Makefile | 2 +- .../files/patch-MP_code_qcommon_q__platform.h | 11 +- .../files/patch-SP_code_qcommon_q__platform.h | 11 +- games/jaggedalliance2/Makefile | 92 +- games/jaggedalliance2/distinfo | 73 +- games/jaggedalliance2/files/patch-Makefile | 25 - games/jaggedalliance2/files/patch-configure | 11 - games/jaggedalliance2/files/pkg-message.in | 7 - games/jaggedalliance2/pkg-descr | 2 +- games/jaggedalliance2/pkg-message | 2 + games/jaggedalliance2/pkg-plist | 39 +- games/manaplus/Makefile | 2 +- games/manaplus/distinfo | 6 +- games/opengfx/Makefile | 4 +- games/opengfx/distinfo | 6 +- games/openttd/Makefile | 47 +- games/openttd/distinfo | 6 +- games/openttd/pkg-plist | 13 +- games/wesnoth/Makefile | 1 + games/whichwayisup/Makefile | 2 +- games/xbill/Makefile | 52 + games/xbill/distinfo | 2 + games/xbill/files/patch-configure | 11 + games/xbill/pkg-descr | 4 + german/mythes/Makefile | 2 +- german/mythes/distinfo | 6 +- graphics/atril/Makefile | 2 +- graphics/atril/pkg-descr | 2 +- graphics/bugle/Makefile | 2 +- graphics/curator/Makefile | 2 +- graphics/gphoto2/Makefile | 1 + graphics/minder/Makefile | 12 +- graphics/minder/distinfo | 6 +- graphics/minder/files/patch-meson.build | 8 +- graphics/minder/pkg-plist | 1 + .../p5-Captcha-reCAPTCHA-Mailhide/Makefile | 4 + graphics/partio/Makefile | 1 + graphics/pqiv/Makefile | 10 +- graphics/py-gdal/Makefile | 1 + graphics/py-imageio24/Makefile | 2 +- graphics/py-mayavi/Makefile | 2 +- graphics/py-photocollage/Makefile | 1 + graphics/py-scikit-image/Makefile | 1 + graphics/qgis/Makefile | 8 +- graphics/qgis/distinfo | 6 +- ...cessing_algs_saga_SagaAlgorithmProvider.py | 13 +- ..._plugins_processing_algs_saga_SagaUtils.py | 55 - graphics/qgis/files/patch-src_app_main.cpp | 20 - graphics/ristretto/Makefile | 4 +- graphics/ristretto/distinfo | 6 +- graphics/ristretto/pkg-plist | 1 + graphics/s10sh/Makefile | 2 +- irc/py-limnoria/Makefile | 1 + korean/ibus-hangul/Makefile | 1 + lang/Gofer/Makefile | 2 +- lang/algol68g/Makefile | 2 +- lang/chaiscript/Makefile | 2 +- lang/cint/Makefile | 2 +- lang/erlang-java/Makefile | 46 +- lang/erlang-java/distinfo | 42 +- lang/erlang-runtime15/Makefile | 40 +- lang/erlang-runtime15/distinfo | 6 +- lang/erlang-runtime16/Makefile | 40 +- lang/erlang-runtime16/distinfo | 6 +- lang/erlang-runtime17/Makefile | 48 +- lang/erlang-runtime17/distinfo | 40 +- lang/erlang-runtime18/Makefile | 47 +- lang/erlang-runtime18/distinfo | 38 +- lang/erlang-runtime19/Makefile | 51 +- lang/erlang-runtime19/distinfo | 44 +- .../files/patch-lib_wx_configure | 10464 ---------------- lang/erlang-runtime20/Makefile | 59 +- lang/erlang-runtime20/distinfo | 54 +- .../files/patch-lib_wx_configure | 10464 ---------------- lang/erlang-runtime21/Makefile | 54 +- lang/erlang-runtime21/distinfo | 8 +- lang/erlang-wx/Makefile | 76 +- lang/erlang-wx/distinfo | 42 +- lang/erlang-wx/files/patch-lib_wx_configure | 10464 ---------------- lang/erlang-wx/pkg-plist | 1143 +- lang/erlang/Makefile | 73 +- lang/erlang/distinfo | 44 +- lang/erlang/files/patch-lib_wx_configure | 10464 ---------------- lang/fasm/Makefile | 2 +- lang/fasm/distinfo | 6 +- lang/gcc8-devel/Makefile | 2 +- lang/gcc8-devel/distinfo | 6 +- lang/gcc9-devel/Makefile | 2 +- lang/gcc9-devel/distinfo | 6 +- lang/gjs/Makefile | 2 +- lang/guile2/Makefile | 2 +- lang/io/Makefile | 2 +- lang/kawa/Makefile | 2 +- lang/lci/Makefile | 2 +- lang/librep/Makefile | 2 +- lang/mdk/Makefile | 1 + lang/micropython/Makefile | 2 +- lang/mujs/Makefile | 1 + lang/newlisp-devel/Makefile | 2 +- lang/newlisp/Makefile | 2 +- lang/nickle/Makefile | 1 + lang/ohugs/Makefile | 2 +- lang/opencoarrays/Makefile | 2 +- lang/opencoarrays/distinfo | 6 +- lang/opencoarrays/pkg-plist | 3 + lang/php71/Makefile | 2 +- lang/php71/pkg-message.mod | 8 +- lang/php73/Makefile | 2 +- lang/php73/pkg-message.mod | 8 +- lang/picoc/Makefile | 2 +- lang/python-tools/Makefile | 1 + lang/python35/Makefile | 2 +- lang/python37/Makefile | 1 + lang/rexx-regutil/Makefile | 3 +- lang/rexx-regutil/files/patch-Makefile.bsd | 11 + lang/rubinius/Makefile | 14 +- lang/rust-nightly/Makefile | 2 +- lang/rust-nightly/distinfo | 6 +- lang/scm/Makefile | 2 +- lang/sdcc/Makefile | 2 +- lang/seed7/Makefile | 2 +- lang/seed7/distinfo | 6 +- lang/seed7/pkg-plist | 4 +- lang/spidermonkey17/Makefile | 2 +- lang/spidermonkey170/Makefile | 2 +- lang/spidermonkey185/Makefile | 2 +- lang/spidermonkey24/Makefile | 2 +- lang/spidermonkey38/Makefile | 2 +- lang/spidermonkey52/Makefile | 2 +- lang/swi-pl/Makefile | 1 + lang/yap-devel/Makefile | 2 +- lang/yap/Makefile | 2 +- mail/abook/Makefile | 2 +- mail/automx/Makefile | 2 +- mail/isbg/Makefile | 1 + mail/mailfromd/Makefile | 2 +- mail/mailhog/Makefile | 3 + mail/nmh/Makefile | 1 + mail/nmzmail/Makefile | 2 +- mail/p5-Mail-DMARC/Makefile | 11 +- mail/p5-Mail-DMARC/distinfo | 6 +- mail/p5-Sisimai/Makefile | 3 +- mail/p5-Sisimai/distinfo | 6 +- mail/p5-Sisimai/pkg-plist | 6 + mail/py-afew/Makefile | 2 +- mail/py-dkimpy/Makefile | 1 + mail/py-mail-parser/Makefile | 1 + mail/py-milter/Makefile | 2 +- mail/py-pymailq/Makefile | 1 + mail/py-pyspf/Makefile | 2 +- mail/tumgreyspf/Makefile | 2 +- math/R/Makefile | 2 +- math/SCIP/Makefile | 1 + math/aamath/Makefile | 2 +- math/asymptote/Makefile | 2 +- math/bcal/Makefile | 1 + math/calc/Makefile | 1 + math/cvc4/Makefile | 2 +- math/dbcsr/Makefile | 12 +- math/dbcsr/distinfo | 6 +- math/dbcsr/files/patch-CMakeLists.txt | 13 + math/dbcsr/pkg-plist | 8 +- math/eukleides/Makefile | 2 +- math/eval/Makefile | 2 +- math/fityk/Makefile | 2 +- math/giacxcas/Makefile | 1 + math/gnuplot/Makefile | 1 + math/gretl/Makefile | 1 + math/gri/Makefile | 2 +- math/lambda/Makefile | 2 +- math/libqalculate/Makefile | 1 + math/mathomatic/Makefile | 2 +- math/octave/Makefile | 2 +- math/pari/Makefile | 1 + math/pspp/Makefile | 1 + math/py-PuLP/Makefile | 1 + math/py-Pyomo/Makefile | 1 + math/py-bottleneck/Makefile | 4 +- math/py-igraph/Makefile | 2 +- math/py-matplotlib/Makefile | 2 +- math/py-numpy/Makefile | 1 + math/py-python-louvain/Makefile | 1 + math/py-rpy2/Makefile | 2 +- math/py-sympy/Makefile | 1 + math/py-theano/Makefile | 1 + math/rexx-regmath/Makefile | 4 +- math/rexx-regmath/files/patch-Makefile.bsd | 8 +- math/sfst/Makefile | 2 +- math/spar/Makefile | 2 +- math/stp/Makefile | 1 + math/topaz/Makefile | 2 +- math/wcalc/Makefile | 2 +- math/wxmaxima/Makefile | 5 +- math/wxmaxima/distinfo | 6 +- misc/biblical-curse/Makefile | 2 +- misc/free42/Makefile | 2 +- misc/free42/distinfo | 6 +- misc/freebsd-doc-all/Makefile | 2 +- misc/freebsd-doc-en/Makefile | 2 +- misc/freebsd-doc-en/distinfo | 6 +- misc/freebsd-doc-en/pkg-plist.html-split | 4 +- misc/freebsd-doc-es/pkg-plist.html | 3 + misc/freebsd-doc-es/pkg-plist.html-common | 3 + misc/freebsd-doc-es/pkg-plist.html-split | 33 +- misc/freebsd-doc-es/pkg-plist.pdf | 3 + misc/freebsd-doc-es/pkg-plist.ps | 3 + misc/freebsd-doc-es/pkg-plist.txt | 3 + misc/ipa_conv/Makefile | 2 +- misc/lxi-tools/Makefile | 1 + misc/nnn/Makefile | 1 + misc/pinfo/Makefile | 2 +- misc/pubs/Makefile | 1 + misc/py-pykml/Makefile | 1 + misc/py-spdx-lookup/Makefile | 1 + misc/py-tqdm/Makefile | 1 + misc/tempcontrol/Makefile | 2 +- misc/ytree/Makefile | 2 +- multimedia/aom/Makefile | 4 +- multimedia/aom/distinfo | 6 +- multimedia/ffmpeg/Makefile | 2 +- multimedia/ffmpeg/distinfo | 4 +- multimedia/kissdx/Makefile | 12 +- multimedia/libcec/Makefile | 2 +- multimedia/libva/Makefile | 4 +- multimedia/libva/distinfo | 8 +- multimedia/py-av/Makefile | 1 + multimedia/py-mido/Makefile | 1 + multimedia/py-subliminal/Makefile | 2 +- multimedia/rav1e/Makefile | 14 +- multimedia/rav1e/distinfo | 26 +- multimedia/xine/Makefile | 2 +- net-im/folks/Makefile | 2 +- net-im/freetalk/Makefile | 2 +- net-im/libaccounts-glib/Makefile | 2 +- net-im/libsignon-glib/Makefile | 2 +- net-im/profanity/Makefile | 1 + net-im/telegram/Makefile | 2 +- net-im/telepathy-farsight/Makefile | 7 +- net-im/telepathy-farsight/pkg-descr | 2 +- net-im/zephyr/Makefile | 2 +- net-mgmt/alertmanager/Makefile | 2 +- net-mgmt/alertmanager/distinfo | 6 +- net-mgmt/argus3-clients/Makefile | 2 +- net-mgmt/netbox/Makefile | 3 +- net-mgmt/netbox/distinfo | 6 +- net-mgmt/netbox/pkg-plist | 1 + net-mgmt/nsca-ng/Makefile | 5 + net-mgmt/py-ciscoconfparse/Makefile | 2 +- net-mgmt/py-ciscoconfparse/distinfo | 6 +- net-mgmt/py-napalm-logs/Makefile | 1 + net-mgmt/py-napalm/Makefile | 1 + net-mgmt/py-ncclient/Makefile | 4 +- net-mgmt/py-ncclient/distinfo | 6 +- .../py-ncclient/files/patch-requirements.txt | 9 - net-mgmt/py-pysmi/Makefile | 2 +- net-mgmt/py-snmpclitools/Makefile | 1 + net-mgmt/scli/Makefile | 2 +- net-mgmt/send/Makefile | 2 +- net-p2p/amule-devel/Makefile | 2 +- net-p2p/amule/Makefile | 2 +- net-p2p/microdc2/Makefile | 2 +- net-p2p/monero-cli/Makefile | 1 + net-p2p/py-vertex/Makefile | 2 +- net-p2p/shx/Makefile | 2 +- net/afpfs-ng/Makefile | 2 +- net/bird/Makefile | 1 + net/c3270/Makefile | 2 +- net/ccxstream/Makefile | 2 +- net/frr3/Makefile | 1 + net/frr4/Makefile | 1 + net/frr6/Makefile | 2 +- net/glusterfs/Makefile | 2 +- net/kafka/Makefile | 2 +- net/kafka/distinfo | 4 +- net/kafka/pkg-plist | 27 +- net/kafkacat/Makefile | 2 +- net/kafkacat/distinfo | 6 +- net/kamailio/Makefile | 1 + net/msend/Makefile | 2 +- net/nethogs/Makefile | 2 + net/nfsshell/Makefile | 2 +- net/ns3/Makefile | 2 +- net/ocserv/Makefile | 1 + net/pacemaker1/Makefile | 1 + net/pacemaker2/Makefile | 1 + net/phpldapadmin/Makefile | 3 +- net/py-confluent-kafka/Makefile | 3 +- net/py-confluent-kafka/distinfo | 6 +- net/py-gspreadsheet/Makefile | 5 +- net/py-haproxyctl/Makefile | 1 + net/py-ndg_httpsclient/Makefile | 1 + net/py-port-for/Makefile | 1 + net/py-python-cinderclient/Makefile | 2 +- net/py-python-glanceclient/Makefile | 1 + net/py-python-novaclient/Makefile | 1 + net/py-pyvmomi/Makefile | 1 + net/py-softlayer/Makefile | 1 + net/py-sshtunnel/Makefile | 1 + net/py-sshuttle/Makefile | 1 + net/rubygem-opennebula/Makefile | 2 +- net/rubygem-opennebula/distinfo | 6 +- net/samba46/Makefile | 2 +- net/samba47/Makefile | 4 +- net/samba48/Makefile | 13 +- net/samba48/distinfo | 6 +- net/samba48/files/patch-bind13 | 31 +- .../patch-source3_rpc__server_mdssvc_mdssvc.c | 15 + net/samba48/pkg-plist | 1 + net/tcpwatch/Makefile | 2 +- net/turses/Makefile | 1 + net/vde2/Makefile | 2 +- net/vether-kmod/Makefile | 4 +- net/vether-kmod/distinfo | 6 +- net/yaz/Makefile | 2 +- net/zebra/Makefile | 2 +- palm/pilot-link/Makefile | 2 +- polish/ekg2/Makefile | 2 +- polish/kadu/Makefile | 2 +- ports-mgmt/portfmt/Makefile | 4 +- ports-mgmt/portfmt/distinfo | 6 +- ports-mgmt/ports-tools/Makefile | 2 +- ports-mgmt/ports-tools/distinfo | 6 +- print/cloudprint/Makefile | 1 + print/fontforge/Makefile | 1 + print/hplip/Makefile | 2 +- print/lilypond-devel/Makefile | 2 +- print/lilypond-devel/distinfo | 6 +- print/mftrace/Makefile | 2 +- print/py-fonttools/Makefile | 3 +- print/py-fonttools/distinfo | 6 +- print/py-psautohint/Makefile | 1 + print/py-trml2pdf/Makefile | 11 +- science/agrum/Makefile | 2 +- science/cp2k/Makefile | 2 +- science/gnudatalanguage/Makefile | 2 +- science/libsvm-python/Makefile | 1 + science/openbabel/Makefile | 2 +- science/py-GPyOpt/Makefile | 1 + science/py-ase/Makefile | 2 +- science/py-coards/Makefile | 2 +- science/py-gpaw/Makefile | 1 + science/py-netCDF4/Makefile | 2 +- science/py-oddt/Makefile | 1 + science/py-pyaixi/Makefile | 2 +- science/py-rmsd/Makefile | 1 + science/pybrain/Makefile | 2 +- science/qcl/Makefile | 2 +- science/quantum-espresso/Makefile | 2 +- science/quantum-espresso/distinfo | 6 +- science/rdkit/Makefile | 1 + science/scidavis/Makefile | 1 + science/silo/Makefile | 2 +- security/Makefile | 1 + security/authforce/Makefile | 2 +- security/binwalk/Makefile | 1 + security/botan2/Makefile | 9 +- security/botan2/distinfo | 6 +- security/botan2/files/patch-boost-1.70 | 51 + security/botan2/pkg-plist | 4 +- security/certificate-transparency/Makefile | 9 +- security/chkrootkit/Makefile | 2 +- security/chkrootkit/distinfo | 6 +- security/cowrie/Makefile | 36 + security/cowrie/distinfo | 3 + security/cowrie/pkg-descr | 4 + security/gnomint/Makefile | 2 +- security/gnupg1/Makefile | 2 +- security/heimdal/Makefile | 2 +- security/kc24/Makefile | 1 + security/krb5-115/Makefile | 2 +- security/krb5-116/Makefile | 2 +- security/krb5-devel/Makefile | 1 + security/libdecaf/Makefile | 4 +- security/libpwquality/Makefile | 1 + security/nextcloud-twofactor_u2f/Makefile | 2 +- security/nextcloud-twofactor_u2f/distinfo | 6 +- security/nextcloud-twofactor_u2f/pkg-plist | 3 + security/nyx/Makefile | 1 + security/osiris/Makefile | 2 +- security/ossec-hids-local/Makefile | 2 +- security/pixiewps/Makefile | 2 - security/pixiewps/files/patch-Makefile | 8 + security/pixiewps/files/patch-pixiewps.c | 13 + security/pssh/Makefile | 1 + security/pwman3/Makefile | 2 +- security/py-artifacts/Makefile | 1 + security/py-bro-pkg/Makefile | 1 + security/py-certbot/Makefile | 1 + security/py-certstream/Makefile | 1 + security/py-josepy/Makefile | 1 + security/py-keepkey/Makefile | 1 + security/py-keyring/Makefile | 1 + security/py-msoffcrypto-tool/Makefile | 1 + security/py-pysaml2/Makefile | 1 + security/py-requests-credssp/Makefile | 14 +- security/py-requests-credssp/distinfo | 6 +- security/py-rsa/Makefile | 1 + security/py-stem/Makefile | 1 + security/py-tuf/Makefile | 1 + security/py-yubikey-manager/Makefile | 1 + security/silktools/Makefile | 1 + security/softether-devel/Makefile | 2 +- security/softether5/Makefile | 4 +- security/softether5/distinfo | 6 +- security/stunnel/Makefile | 2 +- security/stunnel/distinfo | 6 +- security/theonionbox/Makefile | 1 + security/tinc-devel/Makefile | 2 +- security/vanguards-tor/Makefile | 1 + security/vinetto/Makefile | 2 +- security/wapiti/Makefile | 6 +- security/wapiti/distinfo | 6 +- security/wapiti/files/patch-setup.py | 4 +- security/yubico-piv-tool/Makefile | 9 + shells/es/Makefile | 2 +- shells/esh/Makefile | 2 +- shells/pear-PHP_Shell/Makefile | 1 + shells/rc/Makefile | 2 +- shells/sparforte/Makefile | 2 +- sysutils/afflib/Makefile | 1 + sysutils/aimage/Makefile | 2 +- sysutils/android-file-transfer/Makefile | 2 +- sysutils/ansible23/Makefile | 2 +- sysutils/ansible24/Makefile | 2 +- sysutils/ansible25/Makefile | 2 +- sysutils/ansible26/Makefile | 1 + sysutils/apachetop/Makefile | 1 + sysutils/bacula9-server/Makefile | 5 +- sysutils/bacula9-server/pkg-descr | 2 +- sysutils/bareos-server/Makefile | 2 +- sysutils/bareos16-server/Makefile | 2 +- sysutils/burp-devel/Makefile | 3 +- sysutils/burp-devel/distinfo | 6 +- sysutils/burp-devel/pkg-plist | 2 +- sysutils/burp/Makefile | 3 +- sysutils/burp/distinfo | 6 +- sysutils/burp/pkg-plist | 3 +- sysutils/deltarpm/Makefile | 1 + sysutils/djmount/Makefile | 2 +- sysutils/docker-compose/Makefile | 1 + sysutils/eksctl/Makefile | 2 +- sysutils/eksctl/distinfo | 6 +- sysutils/fusefs-gitfs/Makefile | 1 + sysutils/hstr/Makefile | 1 + sysutils/kubectl/Makefile | 2 +- sysutils/kubectl/distinfo | 6 +- sysutils/lnav/Makefile | 1 + sysutils/manck/Makefile | 2 +- sysutils/mmc-utils/Makefile | 4 +- sysutils/mmc-utils/distinfo | 6 +- sysutils/mmc-utils/files/patch-mmc__cmds.c | 11 +- sysutils/mog/Makefile | 1 + sysutils/ohmu/Makefile | 2 +- sysutils/openipmi/Makefile | 1 + sysutils/p5-BackupPC-XS/Makefile | 2 +- sysutils/p5-BackupPC-XS/distinfo | 6 +- sysutils/pwsafe/Makefile | 2 +- sysutils/py-ansible-lint/Makefile | 1 + sysutils/py-ansible-runner/Makefile | 1 + sysutils/py-azure-cli/Makefile | 1 + sysutils/py-dirsync/Makefile | 2 +- sysutils/py-distro/Makefile | 1 + sysutils/py-dlipower/Makefile | 1 + sysutils/py-google-compute-engine/Makefile | 1 + sysutils/py-honcho/Makefile | 1 + sysutils/py-hpilo/Makefile | 1 + sysutils/py-pkginfo/Makefile | 1 + sysutils/py-pywatchman/Makefile | 1 + sysutils/py-tmuxp/Makefile | 1 + sysutils/renameutils/Makefile | 2 +- sysutils/riak-cs/Makefile | 2 +- sysutils/s-tui/Makefile | 1 + sysutils/slurm-wlm/Makefile | 2 +- sysutils/socket/Makefile | 2 +- sysutils/solaar/Makefile | 1 + sysutils/stanchion/Makefile | 2 +- sysutils/vm-bhyve/Makefile | 2 +- sysutils/vm-bhyve/distinfo | 6 +- sysutils/vm-bhyve/pkg-plist | 2 + sysutils/webmin/Makefile | 1 + sysutils/xfsprogs/Makefile | 2 +- sysutils/xorriso/Makefile | 2 +- textproc/augeas/Makefile | 2 +- textproc/cdiff/Makefile | 1 + textproc/cmark/Makefile | 2 +- textproc/cmark/distinfo | 6 +- textproc/coccigrep/Makefile | 1 + textproc/hunspell/Makefile | 1 + textproc/icdiff/Makefile | 1 + textproc/libe-book/Makefile | 2 +- textproc/markdown/Makefile | 2 +- textproc/p5-CSS-Sass/Makefile | 2 + textproc/p5-Excel-Writer-XLSX/Makefile | 2 +- textproc/p5-Excel-Writer-XLSX/distinfo | 6 +- textproc/py-CommonMark/Makefile | 1 + textproc/py-QDarkStyle/Makefile | 1 + textproc/py-autopep8/Makefile | 1 + textproc/py-citeproc-py/Makefile | 1 + textproc/py-docx2txt/Makefile | 1 + textproc/py-duecredit/Makefile | 1 + textproc/py-enchant/Makefile | 2 +- textproc/py-html2text/Makefile | 2 +- textproc/py-humanfriendly/Makefile | 1 + textproc/py-m2r/Makefile | 1 + textproc/py-mako/Makefile | 1 + textproc/py-markdown/Makefile | 1 + textproc/py-mkdocs/Makefile | 1 + textproc/py-pdfminer.six/Makefile | 1 + textproc/py-pdftotext/Makefile | 2 +- textproc/py-pss/Makefile | 1 + textproc/py-pygtail/Makefile | 1 + textproc/py-pyjade/Makefile | 1 + textproc/py-pystache/Makefile | 1 + textproc/py-python-bidi/Makefile | 1 + textproc/py-qrcode/Makefile | 1 + textproc/py-qt5-xml/Makefile | 1 + textproc/py-reno/Makefile | 1 + textproc/py-rnc2rng/Makefile | 1 + textproc/py-rst2html5/Makefile | 1 + textproc/py-transifex-client/Makefile | 1 + textproc/py-xhtml2pdf/Makefile | 1 + textproc/py-xlrd/Makefile | 1 + textproc/py-xlsxwriter/Makefile | 1 + textproc/py-yapf/Makefile | 1 + textproc/qstardict/Makefile | 2 +- textproc/re-flex/Makefile | 2 +- textproc/re-flex/distinfo | 6 +- textproc/redland-bindings/Makefile | 2 +- textproc/refdb/Makefile | 2 +- textproc/rubygem-autoprefixer-rails/Makefile | 2 +- textproc/rubygem-autoprefixer-rails/distinfo | 6 +- textproc/rubygem-commonmarker/Makefile | 2 +- textproc/rubygem-commonmarker/distinfo | 6 +- textproc/rubygem-elasticsearch-api/Makefile | 2 +- textproc/rubygem-elasticsearch-api/distinfo | 6 +- .../rubygem-elasticsearch-transport/Makefile | 2 +- .../rubygem-elasticsearch-transport/distinfo | 6 +- textproc/rubygem-elasticsearch-xpack/Makefile | 4 +- textproc/rubygem-elasticsearch-xpack/distinfo | 6 +- textproc/rubygem-elasticsearch/Makefile | 2 +- textproc/rubygem-elasticsearch/distinfo | 6 +- textproc/sdcv/Makefile | 2 +- textproc/ucto/Makefile | 2 +- textproc/xml2rfc/Makefile | 1 + www/butterfly/Makefile | 1 + www/edbrowse/Makefile | 2 +- www/firefox/Makefile | 1 + www/firefox/files/patch-bug1513605 | 59 + www/flashplayer/Makefile | 2 +- www/groupoffice/Makefile | 2 +- www/groupoffice/distinfo | 6 +- .../files/patch-go_base_Config.php | 14 +- www/groupoffice/pkg-plist | 21 + www/itop/Makefile | 1 + www/linux-flashplayer/Makefile | 2 +- www/linux-flashplayer/distinfo | 6 +- www/matomo/Makefile | 1 + www/mediawiki127/Makefile | 1 + www/mediawiki130/Makefile | 1 + www/mediawiki131/Makefile | 2 +- www/mediawiki132/Makefile | 1 + www/mergelog/Makefile | 2 +- www/nextcloud-contacts/Makefile | 2 +- www/nextcloud-contacts/distinfo | 6 +- www/nextcloud-contacts/pkg-plist | 6 +- www/nextcloud/Makefile | 2 +- www/nextcloud/distinfo | 6 +- www/nextcloud/pkg-plist | 46 +- .../Makefile | 4 + www/palemoon/Makefile | 3 +- www/py-bokeh/Makefile | 2 +- www/py-bottle/Makefile | 2 +- www/py-cachecontrol/Makefile | 2 +- www/py-cherrypy/Makefile | 2 +- www/py-cssmin/Makefile | 2 +- www/py-cssutils/Makefile | 1 + www/py-django-annotations/Makefile | 2 +- www/py-django-configurations/Makefile | 1 + www/py-django-mezzanine/Makefile | 1 + www/py-flask/Makefile | 1 + www/py-gandi.cli/Makefile | 1 + www/py-grip/Makefile | 1 + www/py-hyperlink/Makefile | 7 +- www/py-hyperlink/distinfo | 6 +- www/py-imdbpy/Makefile | 1 + www/py-internetarchive/Makefile | 1 + www/py-lesscpy/Makefile | 1 + www/py-livereload/Makefile | 1 + www/py-notebook/Makefile | 1 + www/py-pafy/Makefile | 2 +- www/py-pelican/Makefile | 1 + www/py-planet/Makefile | 1 + www/py-praw/Makefile | 1 + www/py-pyjwt/Makefile | 1 + www/py-python-dotenv/Makefile | 1 + www/py-scrapy/Makefile | 2 +- www/py-spyne/Makefile | 1 + www/py-wagtail/Makefile | 1 + www/py-waitress/Makefile | 1 + www/py-wfuzz/Makefile | 1 + www/radicale/Makefile | 2 +- www/rtv/Makefile | 1 + www/seamonkey/Makefile | 3 +- .../files/patch-src_security_ServerOptions.h | 11 + www/tomcat85/Makefile | 2 +- www/tomcat85/distinfo | 6 +- www/tomcat9/Makefile | 2 +- www/tomcat9/distinfo | 6 +- www/uwsgi/Makefile | 2 +- www/uwsgitop/Makefile | 1 + www/varnish4/Makefile | 2 +- www/varnish6/Makefile | 2 +- x11-fonts/Makefile | 1 + x11-fonts/orbitron/Makefile | 26 + x11-fonts/orbitron/distinfo | 3 + x11-fonts/orbitron/pkg-descr | 5 + x11-fonts/orbitron/pkg-plist | 4 + x11-fonts/py-bdflib/Makefile | 1 + x11-fonts/py-compreffor/Makefile | 1 + x11-fonts/py-cu2qu/Makefile | 1 + x11-fonts/py-fontmake/Makefile | 1 + x11-fonts/py-glyphsLib/Makefile | 1 + x11-toolkits/nanogui/Makefile | 2 +- x11-wm/fvwm2/Makefile | 2 +- x11-wm/ratpoison/Makefile | 2 +- x11/alacritty/Makefile | 230 +- x11/alacritty/distinfo | 418 +- x11/alacritty/files/patch-src_event.rs | 20 - x11/sddm/Makefile | 9 +- x11/sddm/pkg-plist | 4 + x11/xcb-proto/Makefile | 1 + 1042 files changed, 3995 insertions(+), 44788 deletions(-) delete mode 100644 audio/guitarix-lv2/files/patch-boost-1.69 create mode 100644 audio/zrythm/pkg-plist create mode 100644 deskutils/autocutsel/files/patch-autocutsel.1 create mode 100644 deskutils/autocutsel/files/patch-cutsel.1 create mode 100644 deskutils/cherrytree/Makefile create mode 100644 deskutils/cherrytree/distinfo create mode 100644 deskutils/cherrytree/pkg-descr create mode 100644 devel/lab/Makefile create mode 100644 devel/lab/distinfo create mode 100644 devel/lab/pkg-descr delete mode 100644 devel/pecl-xdebug-devel/Makefile delete mode 100644 devel/pecl-xdebug-devel/distinfo delete mode 100644 devel/pecl-xdebug-devel/files/patch-xdebug__compat.h delete mode 100644 devel/pecl-xdebug-devel/files/pkg-message.in delete mode 100644 devel/pecl-xdebug-devel/pkg-descr delete mode 100644 devel/pecl-xdebug25/Makefile delete mode 100644 devel/pecl-xdebug25/distinfo delete mode 100644 devel/pecl-xdebug25/files/patch-xdebug__com.c delete mode 100644 devel/pecl-xdebug25/files/pkg-message.in delete mode 100644 devel/pecl-xdebug25/pkg-descr delete mode 100644 devel/py-javaproperties/files/patch-setup.py create mode 100644 finance/bitcoinnodestats/Makefile create mode 100644 finance/bitcoinnodestats/distinfo create mode 100644 finance/bitcoinnodestats/files/pkg-message.in create mode 100644 finance/bitcoinnodestats/pkg-descr create mode 100644 finance/bitcoinnodestats/pkg-plist delete mode 100644 ftp/rexx-curl/files/patch-common_loader.c delete mode 100644 games/jaggedalliance2/files/patch-Makefile delete mode 100644 games/jaggedalliance2/files/patch-configure delete mode 100644 games/jaggedalliance2/files/pkg-message.in create mode 100644 games/jaggedalliance2/pkg-message create mode 100644 games/xbill/Makefile create mode 100644 games/xbill/distinfo create mode 100644 games/xbill/files/patch-configure create mode 100644 games/xbill/pkg-descr delete mode 100644 graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaUtils.py delete mode 100644 graphics/qgis/files/patch-src_app_main.cpp delete mode 100644 lang/erlang-runtime19/files/patch-lib_wx_configure delete mode 100644 lang/erlang-runtime20/files/patch-lib_wx_configure delete mode 100644 lang/erlang-wx/files/patch-lib_wx_configure delete mode 100644 lang/erlang/files/patch-lib_wx_configure create mode 100644 lang/rexx-regutil/files/patch-Makefile.bsd create mode 100644 math/dbcsr/files/patch-CMakeLists.txt delete mode 100644 net-mgmt/py-ncclient/files/patch-requirements.txt create mode 100644 net/samba48/files/patch-source3_rpc__server_mdssvc_mdssvc.c create mode 100644 security/botan2/files/patch-boost-1.70 create mode 100644 security/cowrie/Makefile create mode 100644 security/cowrie/distinfo create mode 100644 security/cowrie/pkg-descr create mode 100644 security/pixiewps/files/patch-Makefile create mode 100644 security/pixiewps/files/patch-pixiewps.c create mode 100644 www/firefox/files/patch-bug1513605 create mode 100644 www/squid-devel/files/patch-src_security_ServerOptions.h create mode 100644 x11-fonts/orbitron/Makefile create mode 100644 x11-fonts/orbitron/distinfo create mode 100644 x11-fonts/orbitron/pkg-descr create mode 100644 x11-fonts/orbitron/pkg-plist delete mode 100644 x11/alacritty/files/patch-src_event.rs diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile index 4c73ece75ee..187658882f7 100644 --- a/archivers/rpm4/Makefile +++ b/archivers/rpm4/Makefile @@ -3,6 +3,7 @@ PORTNAME= rpm PORTVERSION= 4.14.2.1 +PORTREVISION= 1 CATEGORIES= archivers MASTER_SITES= http://ftp.rpm.org/releases/rpm-4.14.x/ PKGNAMESUFFIX= 4 diff --git a/astro/geographiclib/Makefile b/astro/geographiclib/Makefile index b884276072a..4ecf5e5115b 100644 --- a/astro/geographiclib/Makefile +++ b/astro/geographiclib/Makefile @@ -3,7 +3,7 @@ PORTNAME= geographiclib PORTVERSION= 1.49 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= astro MASTER_SITES= SF/geographiclib/distrib\ SF/geographiclib:geoids,gravity,magnetic diff --git a/astro/weather/Makefile b/astro/weather/Makefile index ed7674b0e9d..0f1d52c1a21 100644 --- a/astro/weather/Makefile +++ b/astro/weather/Makefile @@ -3,6 +3,7 @@ PORTNAME= weather PORTVERSION= 2.3 +PORTREVISION= 1 CATEGORIES= astro python MASTER_SITES= http://fungi.yuggoth.org/weather/src/ \ LOCAL/sunpoet diff --git a/audio/ardour5/Makefile b/audio/ardour5/Makefile index 69b3e89ea89..5f95199d76f 100644 --- a/audio/ardour5/Makefile +++ b/audio/ardour5/Makefile @@ -3,7 +3,7 @@ PORTNAME= ardour5 PORTVERSION= 5.12.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= audio MASTER_SITES= https://github.com/beerml/ardour_releases/raw/master/ # The original master side points to the latest release only: diff --git a/audio/bambootracker/Makefile b/audio/bambootracker/Makefile index d8f321dacd5..1c6265ff773 100644 --- a/audio/bambootracker/Makefile +++ b/audio/bambootracker/Makefile @@ -14,7 +14,7 @@ COMMENT= Music tracker for the Yamaha YM2608 (OPNA) sound chip LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= qmake qt:5 gl +USES= compiler:c++14-lang qmake qt:5 gl USE_QT= buildtools core gui linguisttools_build multimedia network \ widgets USE_GL= gl diff --git a/audio/beets/Makefile b/audio/beets/Makefile index abebfe3271c..0e7aa48c960 100644 --- a/audio/beets/Makefile +++ b/audio/beets/Makefile @@ -3,7 +3,7 @@ PORTNAME= beets PORTVERSION= 1.4.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio python MASTER_SITES= CHEESESHOP diff --git a/audio/cutmp3/Makefile b/audio/cutmp3/Makefile index 54f37ec7be7..c4285dcd256 100644 --- a/audio/cutmp3/Makefile +++ b/audio/cutmp3/Makefile @@ -3,7 +3,7 @@ PORTNAME= cutmp3 PORTVERSION= 3.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://www.puchalla-online.de/ \ http://mirror.mcx2.org/ diff --git a/audio/ecasound/Makefile b/audio/ecasound/Makefile index e89ab94388d..9ffbcf8f817 100644 --- a/audio/ecasound/Makefile +++ b/audio/ecasound/Makefile @@ -3,7 +3,7 @@ PORTNAME= ecasound PORTVERSION= 2.9.1 -PORTREVISION= 4 +PORTREVISION= 6 CATEGORIES= audio MASTER_SITES= http://ecasound.seul.org/download/ \ http://nosignal.fi/download/ \ diff --git a/audio/fasttracker2/Makefile b/audio/fasttracker2/Makefile index e17f7864cd5..72630e38e38 100644 --- a/audio/fasttracker2/Makefile +++ b/audio/fasttracker2/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= fasttracker2 -DISTVERSION= 0.1-b146 +DISTVERSION= 0.1-b147 CATEGORIES= audio MASTER_SITES= https://16-bits.org/ \ LOCAL/ehaupt diff --git a/audio/fasttracker2/distinfo b/audio/fasttracker2/distinfo index 434377d82c7..6afad4eb610 100644 --- a/audio/fasttracker2/distinfo +++ b/audio/fasttracker2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554311603 -SHA256 (ft2clone-b146-code.zip) = d01acd90fd86d35d15afa8732e5b3b5a57cb6527939c06a97d5ca86c8784458f -SIZE (ft2clone-b146-code.zip) = 3423205 +TIMESTAMP = 1554801533 +SHA256 (ft2clone-b147-code.zip) = 506e6d879853b924c99a96d5056672aab3c60991a0f5c10eecb1bd065e1e1bf0 +SIZE (ft2clone-b147-code.zip) = 3423627 diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile index 13dd6290094..72b463fa513 100644 --- a/audio/fluidsynth/Makefile +++ b/audio/fluidsynth/Makefile @@ -4,6 +4,7 @@ PORTNAME= fluidsynth DISTVERSIONPREFIX= v DISTVERSION= 2.0.3 +PORTREVISION= 1 CATEGORIES= audio PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ diff --git a/audio/guitarix-lv2/Makefile b/audio/guitarix-lv2/Makefile index 7b7c7019c9c..19d93464472 100644 --- a/audio/guitarix-lv2/Makefile +++ b/audio/guitarix-lv2/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= guitarix -DISTVERSION= 0.37.3 -PORTREVISION= 4 +DISTVERSION= 0.38.0 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/ PKGNAMESUFFIX= -lv2 @@ -40,7 +40,7 @@ LIB_DEPENDS= libavahi-common.so:net/avahi-app \ libzita-resampler.so:audio/zita-resampler RUN_DEPENDS= roboto-fonts-ttf>0:x11-fonts/roboto-fonts-ttf -USES= eigen:3 libarchive localbase:ldflags pkgconfig \ +USES= eigen:3 gnome libarchive localbase:ldflags pkgconfig \ python:2.7,build readline waf tar:xz USE_GNOME= atkmm cairo gtk20 gtkmm24 pangomm USE_LDCONFIG= yes diff --git a/audio/guitarix-lv2/distinfo b/audio/guitarix-lv2/distinfo index 1d3af1ba5b9..2f0f9e8b9bd 100644 --- a/audio/guitarix-lv2/distinfo +++ b/audio/guitarix-lv2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1532238281 -SHA256 (guitarix2-0.37.3.tar.xz) = 4ca93bd4226cd175456f37612acd28b46e13133db61c0f235917dbcc3347d5f1 -SIZE (guitarix2-0.37.3.tar.xz) = 80724152 +TIMESTAMP = 1554783742 +SHA256 (guitarix2-0.38.0.tar.xz) = c709ec903b2ae653802bd9327c32a20a086e6a97e8d029c8d79f1a8445dd655b +SIZE (guitarix2-0.38.0.tar.xz) = 80746904 diff --git a/audio/guitarix-lv2/files/patch-boost-1.69 b/audio/guitarix-lv2/files/patch-boost-1.69 deleted file mode 100644 index 810cfb574a5..00000000000 --- a/audio/guitarix-lv2/files/patch-boost-1.69 +++ /dev/null @@ -1,18 +0,0 @@ -After https://github.com/boostorg/system/commit/2fa0a00583a3a7 build fails: - -In file included from ../src/gx_head/engine/gx_pluginloader.cpp:22: -In file included from ../src/headers/engine.h:73: -../src/headers/gx_system.h:353:28: error: expected class name -class BasicOptions: boost::noncopyable { - ^ - ---- src/headers/engine.h.orig 2018-07-22 04:24:50 UTC -+++ src/headers/engine.h -@@ -38,6 +38,7 @@ - #include - #include - #include -+#include - #include - #include // NOLINT - #include // NOLINT diff --git a/audio/guitarix-lv2/files/patch-src_gx__head_gui_machine.cpp b/audio/guitarix-lv2/files/patch-src_gx__head_gui_machine.cpp index 20e473314de..8a303fb5301 100644 --- a/audio/guitarix-lv2/files/patch-src_gx__head_gui_machine.cpp +++ b/audio/guitarix-lv2/files/patch-src_gx__head_gui_machine.cpp @@ -1,15 +1,6 @@ ---- src/gx_head/gui/machine.cpp.orig 2018-07-22 05:47:48 UTC +--- src/gx_head/gui/machine.cpp.orig 2019-04-07 05:17:18 UTC +++ src/gx_head/gui/machine.cpp -@@ -18,7 +18,7 @@ - - #include "guitarix.h" - #include --#include -+#include - #include "jsonrpc_methods.h" - #include - #include -@@ -31,7 +31,7 @@ +@@ -46,7 +46,7 @@ void set_memory_allocation() {} #endif void lock_rt_memory() { diff --git a/audio/guitarix-lv2/pkg-plist b/audio/guitarix-lv2/pkg-plist index 245c35b9854..8eccbf027fc 100644 --- a/audio/guitarix-lv2/pkg-plist +++ b/audio/guitarix-lv2/pkg-plist @@ -686,6 +686,7 @@ share/gx_head/sounds/greathall.wav %%NLS%%share/locale/es/LC_MESSAGES/guitarix.mo %%NLS%%share/locale/fr/LC_MESSAGES/guitarix.mo %%NLS%%share/locale/it/LC_MESSAGES/guitarix.mo +%%NLS%%share/locale/ru/LC_MESSAGES/guitarix.mo share/pixmaps/gx_bypass.png share/pixmaps/gx_head-midi.png share/pixmaps/gx_head-warn.png diff --git a/audio/jack/Makefile b/audio/jack/Makefile index b189d4d7d53..67042359864 100644 --- a/audio/jack/Makefile +++ b/audio/jack/Makefile @@ -3,7 +3,7 @@ PORTNAME= jackit PORTVERSION= 0.125.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= audio MAINTAINER= multimedia@FreeBSD.org diff --git a/audio/kid3-qt5/Makefile b/audio/kid3-qt5/Makefile index decfa1ad779..33b596c576b 100644 --- a/audio/kid3-qt5/Makefile +++ b/audio/kid3-qt5/Makefile @@ -2,7 +2,7 @@ PORTNAME= kid3 PORTVERSION= 3.7.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= audio kde MASTER_SITES= SF PKGNAMESUFFIX= -${SLAVE} diff --git a/audio/lash/Makefile b/audio/lash/Makefile index 4337abc9ac1..61544243c4a 100644 --- a/audio/lash/Makefile +++ b/audio/lash/Makefile @@ -3,7 +3,7 @@ PORTNAME= lash PORTVERSION= 0.5.4 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= audio MASTER_SITES= SAVANNAH diff --git a/audio/libopenmpt/Makefile b/audio/libopenmpt/Makefile index d8062be0483..ab92efaadd6 100644 --- a/audio/libopenmpt/Makefile +++ b/audio/libopenmpt/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libopenmpt -PORTVERSION= 0.4.3 +PORTVERSION= 0.4.4 DISTVERSIONSUFFIX= +release.autotools CATEGORIES= audio MASTER_SITES= https://lib.openmpt.org/files/libopenmpt/src/ \ diff --git a/audio/libopenmpt/distinfo b/audio/libopenmpt/distinfo index fe8a52ae7d7..8a03d48a990 100644 --- a/audio/libopenmpt/distinfo +++ b/audio/libopenmpt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1549950641 -SHA256 (libopenmpt-0.4.3+release.autotools.tar.gz) = d77443a279003921d6f0c4edb30d1e9dda387983f44113a6d58f623c1e6942ae -SIZE (libopenmpt-0.4.3+release.autotools.tar.gz) = 1462862 +TIMESTAMP = 1554700928 +SHA256 (libopenmpt-0.4.4+release.autotools.tar.gz) = 57834bd4e67485019584e19a1080615269c1e92551230a7c96e79c4fc97b0f75 +SIZE (libopenmpt-0.4.4+release.autotools.tar.gz) = 1468436 diff --git a/audio/libsmf/Makefile b/audio/libsmf/Makefile index 370084ab170..74d02bbaae2 100644 --- a/audio/libsmf/Makefile +++ b/audio/libsmf/Makefile @@ -3,7 +3,7 @@ PORTNAME= libsmf PORTVERSION= 1.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MASTER_SITES= SF diff --git a/audio/mma/Makefile b/audio/mma/Makefile index 0a05c814170..9efc1ba79ea 100644 --- a/audio/mma/Makefile +++ b/audio/mma/Makefile @@ -3,7 +3,7 @@ PORTNAME= mma PORTVERSION= 16.06 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://www.mellowood.ca/${PORTNAME}/ DISTFILES= ${PORTNAME}-bin-${PORTVERSION}.tar.gz diff --git a/audio/mpiosh/Makefile b/audio/mpiosh/Makefile index fd441d694bb..a05970e62af 100644 --- a/audio/mpiosh/Makefile +++ b/audio/mpiosh/Makefile @@ -3,7 +3,7 @@ PORTNAME= mpiosh PORTVERSION= 0.7.1.p2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= audio MASTER_SITES= SF/mpio/mpio%20pre-release/0.7.1-pre2 DISTNAME= mpio-${PORTVERSION:S|.p|_pre|} diff --git a/audio/mps/Makefile b/audio/mps/Makefile index cd7b133d4a3..de6da29a466 100644 --- a/audio/mps/Makefile +++ b/audio/mps/Makefile @@ -4,7 +4,7 @@ PORTNAME= mps PORTVERSION= 0.20.16 #PORTREVISION= 0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= CHEESESHOP diff --git a/audio/ncmpcpp/Makefile b/audio/ncmpcpp/Makefile index 49ce4ac7e73..dd397227dd0 100644 --- a/audio/ncmpcpp/Makefile +++ b/audio/ncmpcpp/Makefile @@ -2,7 +2,7 @@ PORTNAME= ncmpcpp DISTVERSION= 0.8.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= audio MASTER_SITES= http://ncmpcpp.rybczak.net/stable/ diff --git a/audio/paprefs/Makefile b/audio/paprefs/Makefile index 1f22b4425a2..f90f499f0d6 100644 --- a/audio/paprefs/Makefile +++ b/audio/paprefs/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ libpulse.so:audio/pulseaudio -USES= meson pkgconfig tar:xz +USES= compiler:c++11-lang gnome meson pkgconfig tar:xz USE_GNOME= atkmm glib20 glibmm gtk30 gtkmm30 libsigc++20 OPTIONS_DEFINE= PK NLS diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index e825e9d3f12..e584feec0a8 100644 --- a/audio/pulseaudio/Makefile +++ b/audio/pulseaudio/Makefile @@ -6,7 +6,7 @@ PORTNAME= pulseaudio PORTVERSION= 12.2 -PORTREVISION= 2 +PORTREVISION= 4 CATEGORIES= audio MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/ @@ -66,14 +66,13 @@ GCONF_CONFIGURE_ENABLE= gconf GCONF_USE= GNOME=gconf2 GSETTINGS_DESC= GSettings configuration backend support GSETTINGS_CONFIGURE_ENABLE= gsettings +GSETTINGS_VARS= GLIB_SCHEMAS=org.freedesktop.pulseaudio.gschema.xml SIMD_CONFIGURE_ENABLE= orc SIMD_LIB_DEPENDS= liborc-0.4.so:devel/orc -OPTIONS_GROUP= AUDIO COMPLETIONS +OPTIONS_GROUP= AUDIO OPTIONS_GROUP_AUDIO= ALSA JACK SOXR SPEEX WEBRTC_AEC -OPTIONS_GROUP_COMPLETIONS= BASH ZSH AUDIO_DESC= Audio support -COMPLETIONS_DESC= Programmable completions ALSA_CONFIGURE_ENABLE= alsa ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib JACK_CONFIGURE_ENABLE= jack @@ -86,7 +85,6 @@ SPEEX_LIB_DEPENDS= libspeexdsp.so:audio/speexdsp WEBRTC_AEC_DESC= WebRTC-based echo canceller WEBRTC_AEC_LIB_DEPENDS= libwebrtc_audio_processing.so:audio/webrtc-audio-processing WEBRTC_AEC_CONFIGURE_ENABLE= webrtc-aec -ZSH_CONFIGURE_OFF= --without-zsh-completion-dir OPTIONS_SINGLE= DATABASE OPTIONS_SINGLE_DATABASE= TDB GDBM SIMPLE @@ -119,7 +117,4 @@ post-install: @(cd ${STAGEDIR}${PREFIX}/libexec && \ ${FIND} * -maxdepth 0 -type d -empty -name pulse -delete) -post-install-BASH-off: - @${RM} -r ${STAGEDIR}${PREFIX}/share/bash-completion - .include diff --git a/audio/pulseaudio/pkg-plist b/audio/pulseaudio/pkg-plist index f1b1896b85a..6d4882de5cb 100644 --- a/audio/pulseaudio/pkg-plist +++ b/audio/pulseaudio/pkg-plist @@ -12,15 +12,15 @@ bin/pax11publish bin/pulseaudio bin/qpaeq bin/start-pulseaudio-x11 -%%BASH%%share/bash-completion/completions/pacat -%%BASH%%share/bash-completion/completions/pacmd -%%BASH%%share/bash-completion/completions/pactl -%%BASH%%share/bash-completion/completions/padsp -%%BASH%%share/bash-completion/completions/paplay -%%BASH%%share/bash-completion/completions/parec -%%BASH%%share/bash-completion/completions/parecord -%%BASH%%share/bash-completion/completions/pasuspender -%%BASH%%share/bash-completion/completions/pulseaudio +share/bash-completion/completions/pacat +share/bash-completion/completions/pacmd +share/bash-completion/completions/pactl +share/bash-completion/completions/padsp +share/bash-completion/completions/paplay +share/bash-completion/completions/parec +share/bash-completion/completions/parecord +share/bash-completion/completions/pasuspender +share/bash-completion/completions/pulseaudio etc/dbus-1/system.d/pulseaudio-system.conf @sample etc/pulse/client.conf.sample @sample etc/pulse/daemon.conf.sample @@ -188,7 +188,6 @@ man/man5/pulse-cli-syntax.5.gz man/man5/pulse-client.conf.5.gz man/man5/pulse-daemon.conf.5.gz %%GSETTINGS%%share/GConf/gsettings/pulseaudio.convert -%%GSETTINGS%%share/glib-2.0/schemas/org.freedesktop.pulseaudio.gschema.xml %%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-aux.conf %%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-dock-mic.conf %%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-fm.conf @@ -242,7 +241,7 @@ man/man5/pulse-daemon.conf.5.gz %%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-traktorkontrol-s4.conf %%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/sb-omni-surround-5.1.conf %%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/steelseries-arctis-usb-audio.conf -%%ZSH%%share/zsh/site-functions/_pulseaudio +share/zsh/site-functions/_pulseaudio share/locale/as/LC_MESSAGES/pulseaudio.mo share/locale/be/LC_MESSAGES/pulseaudio.mo share/locale/bn_IN/LC_MESSAGES/pulseaudio.mo diff --git a/audio/py-aubio/Makefile b/audio/py-aubio/Makefile index 643839ff0c6..7ba9f831274 100644 --- a/audio/py-aubio/Makefile +++ b/audio/py-aubio/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/audio/py-fmoo-audiotools/Makefile b/audio/py-fmoo-audiotools/Makefile index ac020ca9d2f..bb769178a12 100644 --- a/audio/py-fmoo-audiotools/Makefile +++ b/audio/py-fmoo-audiotools/Makefile @@ -2,7 +2,7 @@ PORTNAME= fmoo-audiotools PORTVERSION= 3.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio python MASTER_SITES= SF/audiotools/audiotools DISTNAME= audiotools-${PORTVERSION} diff --git a/audio/py-mutagen/Makefile b/audio/py-mutagen/Makefile index c72577c1f21..e253b574432 100644 --- a/audio/py-mutagen/Makefile +++ b/audio/py-mutagen/Makefile @@ -3,6 +3,7 @@ PORTNAME= mutagen PORTVERSION= 1.42.0 +PORTREVISION= 1 CATEGORIES= audio python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/audio/py-soundscrape/Makefile b/audio/py-soundscrape/Makefile index 1ebd0cf6eb3..259f39214c7 100644 --- a/audio/py-soundscrape/Makefile +++ b/audio/py-soundscrape/Makefile @@ -3,6 +3,7 @@ PORTNAME= soundscrape PORTVERSION= 0.30.2 +PORTREVISION= 1 CATEGORIES= audio python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/audio/qmidictl/Makefile b/audio/qmidictl/Makefile index 1457cef760a..504ae54ff2d 100644 --- a/audio/qmidictl/Makefile +++ b/audio/qmidictl/Makefile @@ -11,7 +11,7 @@ COMMENT= MIDI remote control application sending MIDI over UDP/IP multicast LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= gl gmake localbase pkgconfig qt:5 +USES= compiler:c++11-lang gl gmake localbase pkgconfig qt:5 GNU_CONFIGURE= yes USE_QT= core gui widgets qmake_build buildtools_build USE_GL= gl diff --git a/audio/supercollider/Makefile b/audio/supercollider/Makefile index b203ae7d6d0..d051c5f0d1e 100644 --- a/audio/supercollider/Makefile +++ b/audio/supercollider/Makefile @@ -2,7 +2,7 @@ PORTNAME= supercollider DISTVERSION= 3.9.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= audio MASTER_SITES= https://github.com/supercollider/supercollider/releases/download/Version-${PORTVERSION}/ DISTNAME= SuperCollider-${PORTVERSION}-Source-linux diff --git a/audio/x42-plugins-lv2/Makefile b/audio/x42-plugins-lv2/Makefile index 421498dcd04..a36028aaec3 100644 --- a/audio/x42-plugins-lv2/Makefile +++ b/audio/x42-plugins-lv2/Makefile @@ -24,7 +24,7 @@ LIB_DEPENDS= libfftw3f.so:math/fftw3-float \ libsndfile.so:audio/libsndfile \ libzita-convolver.so:audio/zita-convolver -USES= gl gmake gnome localbase pkgconfig tar:xz shebangfix +USES= compiler:c++11-lang gl gmake gnome localbase pkgconfig tar:xz shebangfix USE_GITHUB= nodefault GH_TUPLE= x42:convoLV2:f814f1e:x/convoLV2zita4 USE_GNOME= glib20 pango cairo diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile index 3b69beab19c..a56b45be6f9 100644 --- a/audio/xmms2/Makefile +++ b/audio/xmms2/Makefile @@ -4,7 +4,7 @@ PORTNAME?= xmms2 PORTVERSION= 0.8 DISTVERSIONSUFFIX= DrO_o -PORTREVISION?= 28 +PORTREVISION?= 29 CATEGORIES?= audio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX} diff --git a/audio/yoshimi/Makefile b/audio/yoshimi/Makefile index 75433e72b44..96a6d41e2d9 100644 --- a/audio/yoshimi/Makefile +++ b/audio/yoshimi/Makefile @@ -2,6 +2,7 @@ PORTNAME= yoshimi DISTVERSION= 1.5.7 +PORTREVISION= 1 CATEGORIES= audio MAINTAINER= hello@blubee.me diff --git a/audio/zrythm/Makefile b/audio/zrythm/Makefile index 81c03080986..3a9ae30471a 100644 --- a/audio/zrythm/Makefile +++ b/audio/zrythm/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= zrythm -DISTVERSION= g20190216 -PORTREVISION= 1 +DISTVERSIONPREFIX= v +DISTVERSION= 0.3.029 CATEGORIES= audio MAINTAINER= yuri@FreeBSD.org @@ -30,23 +30,18 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \ kf5-breeze-icons>0:x11-themes/kf5-breeze-icons -USES= autoreconf gettext-runtime gmake python:3.5+,build gettext-runtime gnome pkgconfig +USES= autoreconf gettext-tools gmake python:3.5+,build gettext-runtime gnome libtool pkgconfig USE_GITLAB= yes GL_SITE= https://git.zrythm.org -GL_COMMIT= fd92153c1c2552b54ac9ea2b5981bbb880da04f8 +GL_COMMIT= 07e862579c31120b093ad8618e06a218e9161efd GNU_CONFIGURE= yes USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk30 libxml2 pango +USE_XORG= x11 GLIB_SCHEMAS= org.zrythm.gschema.xml -ALL_TARGET= ${PORTNAME} INSTALLS_ICONS= yes -BINARY_ALIAS= python3=${PYTHON_CMD} +LDFLAGS+= -lexecinfo -MAKE_ARGS= RELEASE=1 - -PLIST_FILES= bin/zrythm \ - share/applications/zrythm.desktop \ - share/fonts/zrythm/Segment7Standard/OFL.txt \ - share/icons/hicolor/scalable/apps/z.svg +BINARY_ALIAS= python3=${PYTHON_CMD} make=${GMAKE} .include diff --git a/audio/zrythm/distinfo b/audio/zrythm/distinfo index 2e414b483f6..0138bc0dcef 100644 --- a/audio/zrythm/distinfo +++ b/audio/zrythm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1550345216 -SHA256 (zrythm-zrythm-fd92153c1c2552b54ac9ea2b5981bbb880da04f8_GL0.tar.gz) = 0769d2d6a007fc91878983173cada9cb305dbf0072ca9ca89b26c6f373e4dcf8 -SIZE (zrythm-zrythm-fd92153c1c2552b54ac9ea2b5981bbb880da04f8_GL0.tar.gz) = 602150 +TIMESTAMP = 1554740502 +SHA256 (zrythm-zrythm-07e862579c31120b093ad8618e06a218e9161efd_GL0.tar.gz) = be7fda176499581bf90af26607c547d0b458685ade9d0674fad33612135982ca +SIZE (zrythm-zrythm-07e862579c31120b093ad8618e06a218e9161efd_GL0.tar.gz) = 3521417 diff --git a/audio/zrythm/pkg-plist b/audio/zrythm/pkg-plist new file mode 100644 index 00000000000..e1f6192cda4 --- /dev/null +++ b/audio/zrythm/pkg-plist @@ -0,0 +1,10 @@ +bin/zrythm +share/applications/zrythm.desktop +share/fonts/zrythm/Segment7Standard/OFL.txt +share/icons/hicolor/48x48/apps/zrythm.svg +share/icons/hicolor/scalable/apps/zrythm.svg +share/locale/de/LC_MESSAGES/zrythm.mo +share/locale/es/LC_MESSAGES/zrythm.mo +share/locale/fr/LC_MESSAGES/zrythm.mo +share/locale/it/LC_MESSAGES/zrythm.mo +share/locale/ja/LC_MESSAGES/zrythm.mo diff --git a/benchmarks/netperf/Makefile b/benchmarks/netperf/Makefile index 58ffaf58fc5..11b48d91605 100644 --- a/benchmarks/netperf/Makefile +++ b/benchmarks/netperf/Makefile @@ -14,11 +14,12 @@ GH_ACCOUNT= HewlettPackard #GH_TAGNAME= ${PORTNAME}-${PORTVERSION} GH_TAGNAME= d566775bf -OPTIONS_DEFINE= EXAMPLES EXS HISTOGRAM OMNI SCTP SOCKETS +OPTIONS_DEFINE= EXAMPLES EXS HISTOGRAM INFO OMNI SCTP SOCKETS OPTIONS_DEFAULT= ${OPTIONS_DEFINE} EXS_DESC= Enable ICSC async socket support HISTOGRAM_DESC= Enable histogram output +INFO_DESC= Enable installation of info documentation OMNI_DESC= Enable OMNI tests (disable for aio(4) support) SCTP_DESC= Enable SCTP support SOCKETS_DESC= Enable Unix Domain socket support @@ -29,7 +30,7 @@ CONFIGURE_ENV= "transform=" CONFIGURE_ARGS= --program-prefix="" --program-suffix="" --enable-dirty \ --enable-demo --enable-burst --enable-intervals -INFO= netperf +INFO_INFO= netperf EXS_CONFIGURE_ENABLE= exs HISTOGRAM_CONFIGURE_ENABLE= histogram diff --git a/benchmarks/py-naarad/Makefile b/benchmarks/py-naarad/Makefile index 068e0671853..675f43b9cdf 100644 --- a/benchmarks/py-naarad/Makefile +++ b/benchmarks/py-naarad/Makefile @@ -2,7 +2,7 @@ PORTNAME= naarad PORTVERSION= 1.0.15 -PORTREVISION= 2 +PORTREVISION= 3 DISTVERSIONPREFIX= v CATEGORIES= benchmarks python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/benchmarks/py-zopkio/Makefile b/benchmarks/py-zopkio/Makefile index 5a160ab5f8f..7ac98f6898b 100644 --- a/benchmarks/py-zopkio/Makefile +++ b/benchmarks/py-zopkio/Makefile @@ -2,7 +2,7 @@ PORTNAME= Zopkio PORTVERSION= 0.2.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= benchmarks python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/biology/checkm/Makefile b/biology/checkm/Makefile index 41d153141bd..a4bb57a6265 100644 --- a/biology/checkm/Makefile +++ b/biology/checkm/Makefile @@ -3,6 +3,7 @@ PORTNAME= CheckM DISTVERSIONPREFIX= v DISTVERSION= 1.0.13 +PORTREVISION= 1 CATEGORIES= biology python MAINTAINER= yuri@FreeBSD.org diff --git a/biology/mrbayes/Makefile b/biology/mrbayes/Makefile index 574aa1618ab..accda2d10ab 100644 --- a/biology/mrbayes/Makefile +++ b/biology/mrbayes/Makefile @@ -3,7 +3,7 @@ PORTNAME= mrbayes PORTVERSION= 3.1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= biology MASTER_SITES= SF diff --git a/biology/py-biom-format/Makefile b/biology/py-biom-format/Makefile index 4849b4c9f99..1eb621328c6 100644 --- a/biology/py-biom-format/Makefile +++ b/biology/py-biom-format/Makefile @@ -2,7 +2,7 @@ PORTNAME= biom-format PORTVERSION= 2.1.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= biology python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/biology/py-cutadapt/Makefile b/biology/py-cutadapt/Makefile index 54b42e184e1..b368e22a9e3 100644 --- a/biology/py-cutadapt/Makefile +++ b/biology/py-cutadapt/Makefile @@ -2,6 +2,7 @@ PORTNAME= cutadapt DISTVERSION= 2.1 +PORTREVISION= 1 CATEGORIES= biology python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/biology/py-gffutils/Makefile b/biology/py-gffutils/Makefile index 4cd1202fefe..e39a2df3ecf 100644 --- a/biology/py-gffutils/Makefile +++ b/biology/py-gffutils/Makefile @@ -2,6 +2,7 @@ PORTNAME= gffutils DISTVERSION= 0.9 +PORTREVISION= 1 CATEGORIES= biology python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/biology/py-pyfaidx/Makefile b/biology/py-pyfaidx/Makefile index d8cc0cd11df..4e5e9035b29 100644 --- a/biology/py-pyfaidx/Makefile +++ b/biology/py-pyfaidx/Makefile @@ -2,6 +2,7 @@ PORTNAME= pyfaidx DISTVERSION= 0.5.5.2 +PORTREVISION= 1 CATEGORIES= biology python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/cad/abc/Makefile b/cad/abc/Makefile index e3fd04a33f7..d2eb8033802 100644 --- a/cad/abc/Makefile +++ b/cad/abc/Makefile @@ -2,6 +2,7 @@ PORTNAME= abc DISTVERSION= g20180420 +PORTREVISION= 1 CATEGORIES= cad MAINTAINER= uddka@student.kit.edu diff --git a/cad/iverilog/Makefile b/cad/iverilog/Makefile index 45b025e3eed..371de24c554 100644 --- a/cad/iverilog/Makefile +++ b/cad/iverilog/Makefile @@ -3,6 +3,7 @@ PORTNAME= iverilog PORTVERSION= 10.2 +PORTREVISION= 1 CATEGORIES= cad MASTER_SITES= ftp://icarus.com/pub/eda/verilog/v10/ DISTNAME= verilog-${PORTVERSION} diff --git a/cad/linuxcnc-devel/Makefile b/cad/linuxcnc-devel/Makefile index d255daa6f0c..73ca6c07ee3 100644 --- a/cad/linuxcnc-devel/Makefile +++ b/cad/linuxcnc-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= linuxcnc PORTVERSION= 20170708 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= cad PKGNAMESUFFIX= -devel diff --git a/cad/ngspice_rework/Makefile b/cad/ngspice_rework/Makefile index 450de573606..39c2abd1cc7 100644 --- a/cad/ngspice_rework/Makefile +++ b/cad/ngspice_rework/Makefile @@ -3,6 +3,7 @@ PORTNAME= ngspice_rework PORTVERSION= 30 +PORTREVISION= 1 CATEGORIES= cad MASTER_SITES= SF/ngspice/ng-spice-rework/${PORTVERSION} DISTNAME= ngspice-${PORTVERSION} diff --git a/cad/py-lcapy/Makefile b/cad/py-lcapy/Makefile index e8b4c16b6ed..33d6b65219a 100644 --- a/cad/py-lcapy/Makefile +++ b/cad/py-lcapy/Makefile @@ -2,7 +2,7 @@ PORTNAME= lcapy DISTVERSION= g20171202 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= cad python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/cad/solvespace/Makefile b/cad/solvespace/Makefile index a7faf1543a0..daffb85e87f 100644 --- a/cad/solvespace/Makefile +++ b/cad/solvespace/Makefile @@ -18,18 +18,19 @@ LIB_DEPENDS= libpng.so:graphics/png \ libfreetype.so:print/freetype2 \ libgtkmm-2.4.so:x11-toolkits/gtkmm24 -BROKEN_powerpc64= fails to compile: cc1plus: unrecognized command line option "-std=c++11" - USE_GITHUB= yes GH_PROJECT= libdxfrw:libdxfrw GH_TAGNAME= 8f95895:libdxfrw GH_SUBDIR= extlib/libdxfrw:libdxfrw -USES= cmake pkgconfig +USES= cmake compiler:c++11-lang gl gnome pkgconfig USE_GL= gl glu glew USE_GNOME= atkmm gtk20 pangomm USE_XORG= x11 USE_LDCONFIG= yes INSTALLS_ICONS= yes +post-patch: + ${REINPLACE_CMD} -e '/-stdlib=libc++/d' ${WRKSRC}/CMakeLists.txt + .include diff --git a/chinese/ibus-libpinyin/Makefile b/chinese/ibus-libpinyin/Makefile index 4a84c5795b1..47560f99a33 100644 --- a/chinese/ibus-libpinyin/Makefile +++ b/chinese/ibus-libpinyin/Makefile @@ -3,7 +3,7 @@ PORTNAME= ibus-libpinyin PORTVERSION= 1.10.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= chinese MASTER_SITES= SF/libpinyin/${PORTNAME} diff --git a/chinese/ibus-pinyin/Makefile b/chinese/ibus-pinyin/Makefile index 46034d48aa2..b3078eb1754 100644 --- a/chinese/ibus-pinyin/Makefile +++ b/chinese/ibus-pinyin/Makefile @@ -3,7 +3,7 @@ PORTNAME= ibus-pinyin PORTVERSION= 1.5.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= chinese MAINTAINER= henry.hu.sh@gmail.com diff --git a/comms/gpredict/Makefile b/comms/gpredict/Makefile index b773df2f516..596e7e3bdea 100644 --- a/comms/gpredict/Makefile +++ b/comms/gpredict/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libgoocanvas-2.0.so:graphics/goocanvas2 \ libgps.so:astro/gpsd -USES= gettext gmake pkgconfig tar:bz2 +USES= compiler:c11 gettext gmake gnome pkgconfig tar:bz2 GNU_CONFIGURE= yes USE_GNOME= cairo gdkpixbuf2 gtk30 intltool diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile index d42b11c1c58..d050c56dce2 100644 --- a/comms/hamlib/Makefile +++ b/comms/hamlib/Makefile @@ -3,6 +3,7 @@ PORTNAME= hamlib PORTVERSION= 3.3 +PORTREVISION= 2 CATEGORIES= comms hamradio MASTER_SITES= SF diff --git a/comms/klog/Makefile b/comms/klog/Makefile index a33d2a26fb0..2f1282b61cd 100644 --- a/comms/klog/Makefile +++ b/comms/klog/Makefile @@ -12,7 +12,8 @@ COMMENT= Simple Qt-based amateur radio logger LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -USES= qmake qt:5 +USES= compiler:c++11-lang gl qmake qt:5 +USE_GL= glu USE_QT= buildtools_build core gui linguisttools_build multimedia network \ printsupport sql sql-sqlite3_run widgets DESKTOP_ENTRIES= "KLog" "Simple Amateur Radio Logging Program" \ diff --git a/comms/obexapp/Makefile b/comms/obexapp/Makefile index c4ab5efd99c..11f50db1c58 100644 --- a/comms/obexapp/Makefile +++ b/comms/obexapp/Makefile @@ -2,7 +2,7 @@ PORTNAME= obexapp PORTVERSION= 1.4.15 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= comms net MASTER_SITES= http://people.freebsd.org/~emax/obexapp/ diff --git a/comms/py-adafruit-ampy/Makefile b/comms/py-adafruit-ampy/Makefile index 49783740d71..1ced30700c4 100644 --- a/comms/py-adafruit-ampy/Makefile +++ b/comms/py-adafruit-ampy/Makefile @@ -2,6 +2,7 @@ PORTNAME= adafruit-ampy PORTVERSION= 1.0.5 +PORTREVISION= 1 CATEGORIES= comms python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/comms/py-esptool/Makefile b/comms/py-esptool/Makefile index bfcbb526387..7d57d29d31d 100644 --- a/comms/py-esptool/Makefile +++ b/comms/py-esptool/Makefile @@ -3,6 +3,7 @@ PORTNAME= esptool DISTVERSIONPREFIX= v DISTVERSION= 2.5.1 +PORTREVISION= 1 CATEGORIES= comms python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/comms/py-serial/Makefile b/comms/py-serial/Makefile index 46f1233e730..00bf6d40dfc 100644 --- a/comms/py-serial/Makefile +++ b/comms/py-serial/Makefile @@ -3,6 +3,7 @@ PORTNAME= serial PORTVERSION= 3.4 +PORTREVISION= 1 CATEGORIES= comms python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/comms/soapyairspy/Makefile b/comms/soapyairspy/Makefile index 7c1d3be7841..165651bb5ca 100644 --- a/comms/soapyairspy/Makefile +++ b/comms/soapyairspy/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libairspy.so:comms/airspy \ libSoapySDR.so:misc/soapysdr -USES= cmake +USES= cmake compiler:c++11-lang USE_GITHUB= yes GH_ACCOUNT= pothosware diff --git a/comms/wsjtx/Makefile b/comms/wsjtx/Makefile index c901129ca0d..f67f49bc064 100644 --- a/comms/wsjtx/Makefile +++ b/comms/wsjtx/Makefile @@ -2,6 +2,7 @@ PORTNAME= wsjtx PORTVERSION= 2.0.1 +PORTREVISION= 1 CATEGORIES= comms hamradio MASTER_SITES= SF/wsjt/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX} diff --git a/comms/zssh/Makefile b/comms/zssh/Makefile index 741ab45c7dc..d3e370a0706 100644 --- a/comms/zssh/Makefile +++ b/comms/zssh/Makefile @@ -3,7 +3,7 @@ PORTNAME= zssh PORTVERSION= 1.5c -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= comms security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.5 diff --git a/converters/p5-Sereal-Decoder/Makefile b/converters/p5-Sereal-Decoder/Makefile index a7f69e9271d..0816a18ab70 100644 --- a/converters/p5-Sereal-Decoder/Makefile +++ b/converters/p5-Sereal-Decoder/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= Sereal-Decoder -PORTVERSION= 4.005 +PORTVERSION= 4.007 CATEGORIES= converters perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:YVES diff --git a/converters/p5-Sereal-Decoder/distinfo b/converters/p5-Sereal-Decoder/distinfo index 43057589761..c266d352948 100644 --- a/converters/p5-Sereal-Decoder/distinfo +++ b/converters/p5-Sereal-Decoder/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1516748258 -SHA256 (Sereal-Decoder-4.005.tar.gz) = 043adad093d1bfdea1e637e1a6fe598291da244d18213e9e5486e313f0c25e9f -SIZE (Sereal-Decoder-4.005.tar.gz) = 494527 +TIMESTAMP = 1554854411 +SHA256 (Sereal-Decoder-4.007.tar.gz) = 0508118344682c22e179e85e69bb0771fb0af2965cfa5d7a7d5d097b69ffcc4b +SIZE (Sereal-Decoder-4.007.tar.gz) = 488293 diff --git a/converters/p5-Sereal-Encoder/Makefile b/converters/p5-Sereal-Encoder/Makefile index 6dce480638c..b0c83508ad0 100644 --- a/converters/p5-Sereal-Encoder/Makefile +++ b/converters/p5-Sereal-Encoder/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= Sereal-Encoder -PORTVERSION= 4.005 +PORTVERSION= 4.007 CATEGORIES= converters perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:YVES diff --git a/converters/p5-Sereal-Encoder/distinfo b/converters/p5-Sereal-Encoder/distinfo index 63c3ad097e3..c46e9785d0c 100644 --- a/converters/p5-Sereal-Encoder/distinfo +++ b/converters/p5-Sereal-Encoder/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1516748248 -SHA256 (Sereal-Encoder-4.005.tar.gz) = 2950b328d69f262c6fba2350f8604744e54016ecfddc3d96b7d71dcc5b990b0a -SIZE (Sereal-Encoder-4.005.tar.gz) = 501265 +TIMESTAMP = 1554854442 +SHA256 (Sereal-Encoder-4.007.tar.gz) = bf6fdddc8fcc901c78adcfb61f56c393cd64d73ab320195ebae9e4a82976eab6 +SIZE (Sereal-Encoder-4.007.tar.gz) = 497719 diff --git a/converters/p5-Sereal/Makefile b/converters/p5-Sereal/Makefile index c53e8000e33..5f4a4a1fc48 100644 --- a/converters/p5-Sereal/Makefile +++ b/converters/p5-Sereal/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= Sereal -PORTVERSION= 4.005 +PORTVERSION= 4.007 CATEGORIES= converters perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:YVES diff --git a/converters/p5-Sereal/distinfo b/converters/p5-Sereal/distinfo index bda8e95ecd1..6bf356b1afc 100644 --- a/converters/p5-Sereal/distinfo +++ b/converters/p5-Sereal/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1516748233 -SHA256 (Sereal-4.005.tar.gz) = 9987baecb9f8e591df6ed274b4dcd5aaecafb5732097d3c54af486305cfecc52 -SIZE (Sereal-4.005.tar.gz) = 193565 +TIMESTAMP = 1554854391 +SHA256 (Sereal-4.007.tar.gz) = 450e43072e8e5afc0402f81008ca9f1d3d8d4377ff8105cff10aef96be769a59 +SIZE (Sereal-4.007.tar.gz) = 195181 diff --git a/converters/py-unidecode/Makefile b/converters/py-unidecode/Makefile index 3ae3a2ce696..86a038c9017 100644 --- a/converters/py-unidecode/Makefile +++ b/converters/py-unidecode/Makefile @@ -3,6 +3,7 @@ PORTNAME= unidecode PORTVERSION= 1.0.23 +PORTREVISION= 1 CATEGORIES= converters python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/databases/buzhug/Makefile b/databases/buzhug/Makefile index 0d6c10cd42f..f14bec6bfee 100644 --- a/databases/buzhug/Makefile +++ b/databases/buzhug/Makefile @@ -3,6 +3,7 @@ PORTNAME= buzhug PORTVERSION= 1.8 +PORTREVISION= 1 CATEGORIES= databases python MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/databases/cego/Makefile b/databases/cego/Makefile index e0a07b10bb6..1c61c833c7f 100644 --- a/databases/cego/Makefile +++ b/databases/cego/Makefile @@ -2,6 +2,7 @@ PORTNAME= cego PORTVERSION= 2.39.16 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://www.lemke-it.com/ diff --git a/databases/clickhouse/Makefile b/databases/clickhouse/Makefile index 070d15c537d..07339a2e401 100644 --- a/databases/clickhouse/Makefile +++ b/databases/clickhouse/Makefile @@ -5,7 +5,7 @@ PORTNAME= clickhouse PORTVERSION= 18.14.18 DISTVERSIONPREFIX= v DISTVERSIONSUFFIX= -stable -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= databases MAINTAINER= proler@gmail.com diff --git a/databases/couchdb2/Makefile b/databases/couchdb2/Makefile index 7aa6faba44f..c66f9f06f98 100644 --- a/databases/couchdb2/Makefile +++ b/databases/couchdb2/Makefile @@ -3,6 +3,7 @@ PORTNAME= couchdb2 DISTVERSION= 2.3.1 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= APACHE/couchdb/source/${DISTVERSION} DISTNAME= apache-couchdb-${DISTVERSION} diff --git a/databases/gqlplus/Makefile b/databases/gqlplus/Makefile index 368be28d879..2caf368f3e6 100644 --- a/databases/gqlplus/Makefile +++ b/databases/gqlplus/Makefile @@ -3,7 +3,7 @@ PORTNAME= gqlplus PORTVERSION= 1.16 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= SF diff --git a/databases/grass7/Makefile b/databases/grass7/Makefile index b7fa5b083bd..1ef2d10c92a 100644 --- a/databases/grass7/Makefile +++ b/databases/grass7/Makefile @@ -3,7 +3,7 @@ PORTNAME= grass PORTVERSION= 7.6.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases geography MASTER_SITES= https://grass.osgeo.org/%SUBDIR%/ \ http://grass.cict.fr/%SUBDIR%/ \ diff --git a/databases/ip4r/Makefile b/databases/ip4r/Makefile index 98565189f80..ec6df7ad7d4 100644 --- a/databases/ip4r/Makefile +++ b/databases/ip4r/Makefile @@ -6,7 +6,7 @@ PORTVERSION= 2.2 PORTREVISION= 1 CATEGORIES= databases net -MAINTAINER= tobez@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= IP address and IP range index types for PostgreSQL LICENSE= PostgreSQL diff --git a/databases/libgda5/Makefile b/databases/libgda5/Makefile index a7fd333e74f..f6c10ca6fbe 100644 --- a/databases/libgda5/Makefile +++ b/databases/libgda5/Makefile @@ -3,7 +3,7 @@ PORTNAME= libgda PORTVERSION?= 5.2.5 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases gnome MASTER_SITES= GNOME PKGNAMESUFFIX?= 5 diff --git a/databases/libodbc++/Makefile b/databases/libodbc++/Makefile index f6d520915c5..6197aa05d91 100644 --- a/databases/libodbc++/Makefile +++ b/databases/libodbc++/Makefile @@ -2,7 +2,7 @@ PORTNAME= libodbc++ PORTVERSION= 0.2.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= databases devel MASTER_SITES= SF/libodbcxx/libodbc%2B%2B/${PORTVERSION} diff --git a/databases/mariadb101-server/Makefile b/databases/mariadb101-server/Makefile index 138ee299594..6d9347a9fc6 100644 --- a/databases/mariadb101-server/Makefile +++ b/databases/mariadb101-server/Makefile @@ -2,7 +2,7 @@ PORTNAME?= mariadb PORTVERSION= 10.1.38 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ http://mirrors.supportex.net/${SITESDIR}/ \ diff --git a/databases/mariadb102-server/Makefile b/databases/mariadb102-server/Makefile index 22f78ea01d3..96caabcb159 100644 --- a/databases/mariadb102-server/Makefile +++ b/databases/mariadb102-server/Makefile @@ -2,7 +2,7 @@ PORTNAME?= mariadb PORTVERSION= 10.2.22 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases ipv6 MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ diff --git a/databases/mariadb103-server/Makefile b/databases/mariadb103-server/Makefile index cd360e4a3cf..d63c997c5bc 100644 --- a/databases/mariadb103-server/Makefile +++ b/databases/mariadb103-server/Makefile @@ -3,7 +3,7 @@ PORTNAME?= mariadb PORTVERSION= 10.3.13 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases ipv6 MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ diff --git a/databases/mariadb55-client/Makefile b/databases/mariadb55-client/Makefile index 42536a9fca2..d8eae0d3513 100644 --- a/databases/mariadb55-client/Makefile +++ b/databases/mariadb55-client/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= mariadb +PORTREVISION= 1 PKGNAMESUFFIX= 55-client COMMENT= Multithreaded SQL database (client) diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile index ff96adaf686..c7e5a58ddee 100644 --- a/databases/mdbtools/Makefile +++ b/databases/mdbtools/Makefile @@ -3,7 +3,7 @@ PORTNAME= mdbtools PORTVERSION= 0.7.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= databases MAINTAINER= rhurlin@gwdg.de diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index 5424e483842..9b824ed9a96 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -3,7 +3,7 @@ PORTNAME?= mysql PORTVERSION= 5.5.62 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.5 PKGNAMESUFFIX?= 55-server diff --git a/databases/opendbx/Makefile b/databases/opendbx/Makefile index ed449cdfa54..a41dd251139 100644 --- a/databases/opendbx/Makefile +++ b/databases/opendbx/Makefile @@ -3,7 +3,7 @@ PORTNAME= opendbx PORTVERSION= 1.4.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= databases MASTER_SITES= http://www.linuxnetworks.de/opendbx/download/ diff --git a/databases/opentsdb/Makefile b/databases/opentsdb/Makefile index 86e08d7c3e3..1bcb81833fd 100644 --- a/databases/opentsdb/Makefile +++ b/databases/opentsdb/Makefile @@ -3,6 +3,7 @@ PORTNAME= opentsdb PORTVERSION= 2.3.0 +PORTREVISION= 1 CATEGORIES= databases java MASTER_SITES= https://github.com/OpenTSDB/opentsdb/releases/download/v${PORTVERSION}/ diff --git a/databases/p5-DBIx-Class-DeploymentHandler/Makefile b/databases/p5-DBIx-Class-DeploymentHandler/Makefile index 59f4d8979d8..4992c510cd9 100644 --- a/databases/p5-DBIx-Class-DeploymentHandler/Makefile +++ b/databases/p5-DBIx-Class-DeploymentHandler/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= DBIx-Class-DeploymentHandler -PORTVERSION= 0.002218 +PORTVERSION= 0.002230 CATEGORIES= databases perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -19,13 +19,13 @@ RUN_DEPENDS= \ p5-DBIx-Class>=0.08121:databases/p5-DBIx-Class \ p5-Log-Contextual>=0.005005:devel/p5-Log-Contextual \ p5-Method-Signatures-Simple>=0.05:devel/p5-Method-Signatures-Simple \ - p5-Moo>=1.003:devel/p5-Moo \ - p5-Moose>=1.0:devel/p5-Moose \ - p5-MooseX-Role-Parameterized>=0.18:devel/p5-MooseX-Role-Parameterized \ + p5-Moo>=2:devel/p5-Moo \ + p5-MooX-Role-Parameterized>=0.082:devel/p5-MooX-Role-Parameterized \ p5-SQL-Translator>=0.11005:databases/p5-SQL-Translator \ p5-Sub-Exporter-Progressive>0:devel/p5-Sub-Exporter-Progressive \ p5-Text-Brew>=0.02:textproc/p5-Text-Brew \ p5-Try-Tiny>0:lang/p5-Try-Tiny \ + p5-Type-Tiny>=1.004004:devel/p5-Type-Tiny \ p5-namespace-autoclean>0:devel/p5-namespace-autoclean USES= perl5 diff --git a/databases/p5-DBIx-Class-DeploymentHandler/distinfo b/databases/p5-DBIx-Class-DeploymentHandler/distinfo index ac6006cf6bb..74c4439d3c5 100644 --- a/databases/p5-DBIx-Class-DeploymentHandler/distinfo +++ b/databases/p5-DBIx-Class-DeploymentHandler/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1475929008 -SHA256 (DBIx-Class-DeploymentHandler-0.002218.tar.gz) = d78a9ecf8f7ef73d29796ac95a8c3b8dcb8ad0ceaf6e09211946d053d37edf76 -SIZE (DBIx-Class-DeploymentHandler-0.002218.tar.gz) = 66051 +TIMESTAMP = 1553479679 +SHA256 (DBIx-Class-DeploymentHandler-0.002230.tar.gz) = 0195c71a222049cfa9e3a24f282ff473100c4b897fb4627103baa4f333ed31c4 +SIZE (DBIx-Class-DeploymentHandler-0.002230.tar.gz) = 76230 diff --git a/databases/p5-DBIx-Class-DeploymentHandler/pkg-plist b/databases/p5-DBIx-Class-DeploymentHandler/pkg-plist index 7481b712f49..0aa38607276 100644 --- a/databases/p5-DBIx-Class-DeploymentHandler/pkg-plist +++ b/databases/p5-DBIx-Class-DeploymentHandler/pkg-plist @@ -1,5 +1,4 @@ %%SITE_PERL%%/DBIx/Class/DeploymentHandler.pm -%%SITE_PERL%%/DBIx/Class/DeploymentHandler/Cookbook/CustomResultSource.pod %%SITE_PERL%%/DBIx/Class/DeploymentHandler/Dad.pm %%SITE_PERL%%/DBIx/Class/DeploymentHandler/DeployMethod/SQL/Translator.pm %%SITE_PERL%%/DBIx/Class/DeploymentHandler/DeployMethod/SQL/Translator/Deprecated.pm @@ -28,7 +27,6 @@ %%SITE_PERL%%/DBIx/Class/DeploymentHandler/WithApplicatorDumple.pm %%SITE_PERL%%/DBIx/Class/DeploymentHandler/WithReasonableDefaults.pm %%PERL5_MAN3%%/DBIx::Class::DeploymentHandler.3.gz -%%PERL5_MAN3%%/DBIx::Class::DeploymentHandler::Cookbook::CustomResultSource.3.gz %%PERL5_MAN3%%/DBIx::Class::DeploymentHandler::Dad.3.gz %%PERL5_MAN3%%/DBIx::Class::DeploymentHandler::DeployMethod::SQL::Translator.3.gz %%PERL5_MAN3%%/DBIx::Class::DeploymentHandler::DeployMethod::SQL::Translator::Deprecated.3.gz diff --git a/databases/p5-DBIx-Class-Fixtures/Makefile b/databases/p5-DBIx-Class-Fixtures/Makefile index 986eb55f5aa..e0280b2bb3e 100644 --- a/databases/p5-DBIx-Class-Fixtures/Makefile +++ b/databases/p5-DBIx-Class-Fixtures/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= DBIx-Class-Fixtures -PORTVERSION= 1.001036 +PORTVERSION= 1.001039 CATEGORIES= databases perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:SKAUFMAN diff --git a/databases/p5-DBIx-Class-Fixtures/distinfo b/databases/p5-DBIx-Class-Fixtures/distinfo index 6160e45a767..522310c7bda 100644 --- a/databases/p5-DBIx-Class-Fixtures/distinfo +++ b/databases/p5-DBIx-Class-Fixtures/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1475929046 -SHA256 (DBIx-Class-Fixtures-1.001036.tar.gz) = 3b0be56b22be3916135b939ab91aefbe2cd7cdc2cc526a2ecd73aa356abc5eaa -SIZE (DBIx-Class-Fixtures-1.001036.tar.gz) = 40058 +TIMESTAMP = 1553481624 +SHA256 (DBIx-Class-Fixtures-1.001039.tar.gz) = 8430bdb90da9b5fd963514944fa440913b3822fc65be5dd2d6fb8654ad883c80 +SIZE (DBIx-Class-Fixtures-1.001039.tar.gz) = 41628 diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile index 07b49e46aaf..d55d3442418 100644 --- a/databases/percona55-server/Makefile +++ b/databases/percona55-server/Makefile @@ -2,7 +2,7 @@ PORTNAME?= percona DISTVERSION= 5.5.61-38.13 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= databases ipv6 MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.5/Percona-Server-${DISTVERSION}/source/tarball/ PKGNAMESUFFIX?= 55-server diff --git a/databases/pg_activity/Makefile b/databases/pg_activity/Makefile index 6fb034e95e7..0ee5ef3fe05 100644 --- a/databases/pg_activity/Makefile +++ b/databases/pg_activity/Makefile @@ -3,7 +3,7 @@ PORTNAME= pg_activity PORTVERSION= 1.4.0 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= databases python diff --git a/databases/pg_citus/Makefile b/databases/pg_citus/Makefile index aaa996bf29c..25599d65265 100644 --- a/databases/pg_citus/Makefile +++ b/databases/pg_citus/Makefile @@ -3,6 +3,7 @@ PORTNAME= citus PORTVERSION= 8.2.1 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= databases PKGNAMEPREFIX= pg_ diff --git a/databases/pgbarman/Makefile b/databases/pgbarman/Makefile index ed61a3fdd68..d696121cba0 100644 --- a/databases/pgbarman/Makefile +++ b/databases/pgbarman/Makefile @@ -3,6 +3,7 @@ PORTNAME= barman DISTVERSION= 2.7 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= SF/${PKGNAMEPREFIX}${PORTNAME}/${DISTVERSION} PKGNAMEPREFIX= pg diff --git a/databases/pgpool-II-35/Makefile b/databases/pgpool-II-35/Makefile index bfd40ad4669..897b4e37318 100644 --- a/databases/pgpool-II-35/Makefile +++ b/databases/pgpool-II-35/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pgpool-II -PORTVERSION= 3.5.19 +PORTVERSION= 3.5.20 CATEGORIES= databases MASTER_SITES= http://www.pgpool.net/mediawiki/images/ PKGNAMESUFFIX= 35 diff --git a/databases/pgpool-II-35/distinfo b/databases/pgpool-II-35/distinfo index ee842090795..44cd6b5fcc0 100644 --- a/databases/pgpool-II-35/distinfo +++ b/databases/pgpool-II-35/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551101880 -SHA256 (pgpool-II-3.5.19.tar.gz) = 99fa837db22cb6c190520c133e28e530265291f7731101450079a6fece1f14aa -SIZE (pgpool-II-3.5.19.tar.gz) = 2277719 +TIMESTAMP = 1554556296 +SHA256 (pgpool-II-3.5.20.tar.gz) = c1f3288bcf60d1a21e2071e767cf2ba92d5421945376a700f05bc140c05de735 +SIZE (pgpool-II-3.5.20.tar.gz) = 2278264 diff --git a/databases/pgpool-II-36/Makefile b/databases/pgpool-II-36/Makefile index 2e94af752dd..18f5fb634fe 100644 --- a/databases/pgpool-II-36/Makefile +++ b/databases/pgpool-II-36/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pgpool-II -PORTVERSION= 3.6.15 +PORTVERSION= 3.6.16 CATEGORIES= databases MASTER_SITES= http://www.pgpool.net/mediawiki/images/ PKGNAMESUFFIX= 36 diff --git a/databases/pgpool-II-36/distinfo b/databases/pgpool-II-36/distinfo index af83dd4bef9..26fad7856f4 100644 --- a/databases/pgpool-II-36/distinfo +++ b/databases/pgpool-II-36/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551101906 -SHA256 (pgpool-II-3.6.15.tar.gz) = cbcc89b61d07aa8c3eba8ebb672d83ef8384908d7532b5ee25c0d2ebb894ffed -SIZE (pgpool-II-3.6.15.tar.gz) = 3283823 +TIMESTAMP = 1554556578 +SHA256 (pgpool-II-3.6.16.tar.gz) = 2bcc4cc19b9ab9e6f666dd9538834c83f7bb22d2fdcf41336f36c33dbe7c363c +SIZE (pgpool-II-3.6.16.tar.gz) = 3296415 diff --git a/databases/pgpool-II-37/Makefile b/databases/pgpool-II-37/Makefile index d3275a50b5b..9621db94045 100644 --- a/databases/pgpool-II-37/Makefile +++ b/databases/pgpool-II-37/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pgpool-II -PORTVERSION= 3.7.8 +PORTVERSION= 3.7.9 CATEGORIES= databases MASTER_SITES= http://www.pgpool.net/mediawiki/images/ PKGNAMESUFFIX= 37 diff --git a/databases/pgpool-II-37/distinfo b/databases/pgpool-II-37/distinfo index 9a8681b1ebc..9492d879bda 100644 --- a/databases/pgpool-II-37/distinfo +++ b/databases/pgpool-II-37/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551101928 -SHA256 (pgpool-II-3.7.8.tar.gz) = 805c94424aa06a65fa3ab8204ce0a733891129caa704383006f34890b9895a29 -SIZE (pgpool-II-3.7.8.tar.gz) = 3337039 +TIMESTAMP = 1554556566 +SHA256 (pgpool-II-3.7.9.tar.gz) = ff255c1270bca564b7775b90dd1f598eacd33b4ca4dfc02fcd430a514679d977 +SIZE (pgpool-II-3.7.9.tar.gz) = 3352257 diff --git a/databases/pgpool-II-40/Makefile b/databases/pgpool-II-40/Makefile index f24bdb95a72..a1beea3f527 100644 --- a/databases/pgpool-II-40/Makefile +++ b/databases/pgpool-II-40/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pgpool-II -PORTVERSION= 4.0.3 +PORTVERSION= 4.0.4 CATEGORIES= databases MASTER_SITES= http://www.pgpool.net/mediawiki/images/ PKGNAMESUFFIX= 40 diff --git a/databases/pgpool-II-40/distinfo b/databases/pgpool-II-40/distinfo index f442ec18dc3..433d5c2f810 100644 --- a/databases/pgpool-II-40/distinfo +++ b/databases/pgpool-II-40/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551102601 -SHA256 (pgpool-II-4.0.3.tar.gz) = 9eb84d14352c4ab108357c9e0a442f28bdb63e1d209ad13326b83f309e5c475d -SIZE (pgpool-II-4.0.3.tar.gz) = 3715976 +TIMESTAMP = 1554556646 +SHA256 (pgpool-II-4.0.4.tar.gz) = 1b399568d049fb3c1802329a477fc65679e1db7c3ee7ffff51eae36605b9ee39 +SIZE (pgpool-II-4.0.4.tar.gz) = 3736577 diff --git a/databases/pgpool/Makefile b/databases/pgpool/Makefile index 97a8884eacf..00d6afc54c1 100644 --- a/databases/pgpool/Makefile +++ b/databases/pgpool/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pgpool -PORTVERSION= 3.4.22 +PORTVERSION= 3.4.23 CATEGORIES= databases MASTER_SITES= http://www.pgpool.net/mediawiki/images/ DISTNAME= ${PORTNAME}-II-${PORTVERSION} diff --git a/databases/pgpool/distinfo b/databases/pgpool/distinfo index 1611687dc7a..86960ee6e71 100644 --- a/databases/pgpool/distinfo +++ b/databases/pgpool/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551101858 -SHA256 (pgpool-II-3.4.22.tar.gz) = 50e04eee250fa402df1a5b27836a52e4f3625d425f89b2dbbea0eb4d5eb4c550 -SIZE (pgpool-II-3.4.22.tar.gz) = 2180963 +TIMESTAMP = 1554556131 +SHA256 (pgpool-II-3.4.23.tar.gz) = f8371a3e7eddea83d309a20c0907a61348284eab9d8674f6de2d7edb2173af6c +SIZE (pgpool-II-3.4.23.tar.gz) = 2182309 diff --git a/databases/pgsanity/Makefile b/databases/pgsanity/Makefile index ceb04d29d5d..19f7082ddc8 100644 --- a/databases/pgsanity/Makefile +++ b/databases/pgsanity/Makefile @@ -3,7 +3,7 @@ PORTNAME= pgsanity DISTVERSIONPREFIX= v DISTVERSION= 0.2.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/databases/postgres-xl/Makefile b/databases/postgres-xl/Makefile index 999852fceb6..053584aabe1 100644 --- a/databases/postgres-xl/Makefile +++ b/databases/postgres-xl/Makefile @@ -3,6 +3,7 @@ PORTNAME= postgres-xl DISTVERSION= 9.5r1.5 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://files.postgres-xl.org/ diff --git a/databases/postgresql11-server/Makefile b/databases/postgresql11-server/Makefile index abcc948cfdc..f81f7f99beb 100644 --- a/databases/postgresql11-server/Makefile +++ b/databases/postgresql11-server/Makefile @@ -5,7 +5,7 @@ PORTNAME?= postgresql DISTVERSION?= 11.2 # PORTREVISION must be ?= otherwise, all other port get this PORTREVISION and # not their own. Probably best to keep it at ?=0 when reset here too. -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= databases MASTER_SITES= PGSQL/source/v${DISTVERSION} PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT} diff --git a/databases/postgresql95-plperl/Makefile b/databases/postgresql95-plperl/Makefile index c70eefbd69c..b135f01e26a 100644 --- a/databases/postgresql95-plperl/Makefile +++ b/databases/postgresql95-plperl/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= postgresql -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= databases perl5 PKGNAMESUFFIX?= ${WANT_PGSQL_VER:S/.//}${COMPONENT} diff --git a/databases/pspg/Makefile b/databases/pspg/Makefile index 677f2b0f88a..7f89c18edcb 100644 --- a/databases/pspg/Makefile +++ b/databases/pspg/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ PORTNAME= pspg -DISTVERSION= 1.6.4 +DISTVERSION= 1.6.5 +PORTREVISION= 1 CATEGORIES= databases MAINTAINER= dg@syrec.org diff --git a/databases/pspg/distinfo b/databases/pspg/distinfo index 8d9bee7ebbf..6d1ca82332e 100644 --- a/databases/pspg/distinfo +++ b/databases/pspg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553172283 -SHA256 (okbob-pspg-1.6.4_GH0.tar.gz) = 076e043d0a19edfbb560146f73fb49393e314532306d85c588d1b00981b42aa8 -SIZE (okbob-pspg-1.6.4_GH0.tar.gz) = 1004839 +TIMESTAMP = 1554735002 +SHA256 (okbob-pspg-1.6.5_GH0.tar.gz) = 7a997af15b5a392b5112f826d88e808661986e1ef95bc344071dc8bd5e4f9204 +SIZE (okbob-pspg-1.6.5_GH0.tar.gz) = 1005525 diff --git a/databases/py-couchdb/Makefile b/databases/py-couchdb/Makefile index 6751153e8f5..016034f4286 100644 --- a/databases/py-couchdb/Makefile +++ b/databases/py-couchdb/Makefile @@ -3,6 +3,7 @@ PORTNAME= CouchDB PORTVERSION= 1.1 +PORTREVISION= 1 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/databases/py-fakeredis/Makefile b/databases/py-fakeredis/Makefile index ee917446e88..9b62d74a1bd 100644 --- a/databases/py-fakeredis/Makefile +++ b/databases/py-fakeredis/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= fakeredis -PORTVERSION= 0.16.0 +PORTVERSION= 1.0.3 CATEGORIES= databases MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,7 +12,8 @@ COMMENT= Fake version of databases/py-redis for unit testing LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>=0,<3:databases/py-redis@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>=0:databases/py-redis@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sortedcontainers>=2.1.0:devel/py-sortedcontainers@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} USES= python diff --git a/databases/py-fakeredis/distinfo b/databases/py-fakeredis/distinfo index f0c21f1df7a..01b6407de95 100644 --- a/databases/py-fakeredis/distinfo +++ b/databases/py-fakeredis/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1543484032 -SHA256 (fakeredis-0.16.0.tar.gz) = ba8a820203ba5a7a7ef62e3619318d513b87f60328c5583634df398ae4b7af00 -SIZE (fakeredis-0.16.0.tar.gz) = 56714 +TIMESTAMP = 1554752464 +SHA256 (fakeredis-1.0.3.tar.gz) = 94c98b320e9d64535e9ffea360512ad8181129d4b07439168feaf5efc412711f +SIZE (fakeredis-1.0.3.tar.gz) = 72711 diff --git a/databases/py-mycli/Makefile b/databases/py-mycli/Makefile index 13d4e93cd22..55924056ad8 100644 --- a/databases/py-mycli/Makefile +++ b/databases/py-mycli/Makefile @@ -3,6 +3,7 @@ PORTNAME= mycli PORTVERSION= 1.17.0 +PORTREVISION= 1 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/databases/py-peewee/Makefile b/databases/py-peewee/Makefile index 8f6327c74f2..5113695c38a 100644 --- a/databases/py-peewee/Makefile +++ b/databases/py-peewee/Makefile @@ -3,6 +3,7 @@ PORTNAME= peewee DISTVERSION= 3.8.0 +PORTREVISION= 1 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/databases/py-pgcli/Makefile b/databases/py-pgcli/Makefile index 53a9de6cbad..8a3ded89465 100644 --- a/databases/py-pgcli/Makefile +++ b/databases/py-pgcli/Makefile @@ -3,7 +3,7 @@ PORTNAME= pgcli PORTVERSION= 1.11.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/databases/py-pgxnclient/Makefile b/databases/py-pgxnclient/Makefile index 2732eb85a76..c4bd3abd533 100644 --- a/databases/py-pgxnclient/Makefile +++ b/databases/py-pgxnclient/Makefile @@ -3,7 +3,7 @@ PORTNAME= pgxnclient PORTVERSION= 1.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases python MASTER_SITES= CHEESESHOP diff --git a/databases/py-sqlalchemy-migrate/Makefile b/databases/py-sqlalchemy-migrate/Makefile index 81c226d2381..95ebea467c2 100644 --- a/databases/py-sqlalchemy-migrate/Makefile +++ b/databases/py-sqlalchemy-migrate/Makefile @@ -3,6 +3,7 @@ PORTNAME= sqlalchemy-migrate PORTVERSION= 0.12.0 +PORTREVISION= 1 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/databases/py-sqlparse/Makefile b/databases/py-sqlparse/Makefile index dc3aaaeaa0b..12eb845f7b9 100644 --- a/databases/py-sqlparse/Makefile +++ b/databases/py-sqlparse/Makefile @@ -3,6 +3,7 @@ PORTNAME= sqlparse PORTVERSION= 0.3.0 +PORTREVISION= 1 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/databases/py-sqlparse020/Makefile b/databases/py-sqlparse020/Makefile index 2a095fa04ad..639af0ccca6 100644 --- a/databases/py-sqlparse020/Makefile +++ b/databases/py-sqlparse020/Makefile @@ -2,6 +2,7 @@ PORTNAME= sqlparse020 PORTVERSION= 0.2.0 +PORTREVISION= 1 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/databases/py-sqlrelay/Makefile b/databases/py-sqlrelay/Makefile index 198fc0f950c..51bea907551 100644 --- a/databases/py-sqlrelay/Makefile +++ b/databases/py-sqlrelay/Makefile @@ -12,6 +12,8 @@ DISTFILES= # none MAINTAINER= ports@FreeBSD.org COMMENT= Python modules to access to SQL Relay +BROKEN_amd64= Invalid configuration 'amd64-portbld-freebsd11.2': machine 'amd64-portbld' not recognized + EXTRACT_DEPENDS= ${NONEXISTENT}:${SQLRELAY_PORTDIR}:patch LIB_DEPENDS= libsqlrclient.so:${SQLRELAY_PORTDIR} diff --git a/databases/py-whisper/Makefile b/databases/py-whisper/Makefile index b91de0c9ccd..8898b1b439a 100644 --- a/databases/py-whisper/Makefile +++ b/databases/py-whisper/Makefile @@ -3,6 +3,7 @@ PORTNAME= whisper PORTVERSION= 1.1.3 +PORTREVISION= 1 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/databases/riak/Makefile b/databases/riak/Makefile index 3057490984f..b025b4b173c 100644 --- a/databases/riak/Makefile +++ b/databases/riak/Makefile @@ -2,7 +2,7 @@ PORTNAME= riak PORTVERSION= 1.4.12 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= databases MASTER_SITES= http://s3.amazonaws.com/downloads.basho.com/riak/${PORTVERSION:R}/${PORTVERSION}/ \ http://downloads.basho.com.s3.amazonaws.com/riak/${PORTVERSION:R}/${PORTVERSION}/ diff --git a/databases/sqlcached/Makefile b/databases/sqlcached/Makefile index ac84ac19e3a..9fc422a41ef 100644 --- a/databases/sqlcached/Makefile +++ b/databases/sqlcached/Makefile @@ -3,7 +3,7 @@ PORTNAME= sqlcached PORTVERSION= r6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= databases net MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/databases/sqlitestudio/Makefile b/databases/sqlitestudio/Makefile index c70321a509a..c9eb5b4017c 100644 --- a/databases/sqlitestudio/Makefile +++ b/databases/sqlitestudio/Makefile @@ -3,7 +3,7 @@ PORTNAME= sqlitestudio DISTVERSION= 3.2.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= databases MASTER_SITES= http://sqlitestudio.pl/files/sqlitestudio3/complete/tar/ diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile index bca7e97eedb..75660e8ad59 100644 --- a/databases/sqlrelay/Makefile +++ b/databases/sqlrelay/Makefile @@ -3,6 +3,7 @@ PORTNAME= ${SQLRELAY_PORTNAME} PORTVERSION= ${SQLRELAY_PORTVERSION} +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= SF diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile index 4c5f69ae1b3..20dc01ee9da 100644 --- a/databases/sqsh/Makefile +++ b/databases/sqsh/Makefile @@ -3,6 +3,7 @@ PORTNAME= sqsh PORTVERSION= 2.5.16.1 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R:R} diff --git a/databases/tarantool/Makefile b/databases/tarantool/Makefile index a0d14d56388..c2dac00118f 100644 --- a/databases/tarantool/Makefile +++ b/databases/tarantool/Makefile @@ -3,6 +3,7 @@ PORTNAME= tarantool PORTVERSION= 1.10.3 +PORTREVISION= 1 CATEGORIES= databases MAINTAINER= sunpoet@FreeBSD.org diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile index b69210bcad8..8c64756cc7c 100644 --- a/databases/virtuoso/Makefile +++ b/databases/virtuoso/Makefile @@ -3,7 +3,7 @@ PORTNAME= virtuoso PORTVERSION= 7.2.5 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= SF DISTNAME= ${PORTNAME}-opensource-${PORTVERSION} diff --git a/databases/xrootd/Makefile b/databases/xrootd/Makefile index e242d36d1ee..542f374850b 100644 --- a/databases/xrootd/Makefile +++ b/databases/xrootd/Makefile @@ -2,7 +2,7 @@ PORTNAME= xrootd DISTVERSION= 4.8.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= http://xrootd.org/download/v${DISTVERSION}/ diff --git a/deskutils/Makefile b/deskutils/Makefile index f38468e98d0..7aafb6de74f 100644 --- a/deskutils/Makefile +++ b/deskutils/Makefile @@ -29,6 +29,7 @@ SUBDIR += cartotheque SUBDIR += charmtimetracker SUBDIR += chart + SUBDIR += cherrytree SUBDIR += clipit SUBDIR += conduit SUBDIR += conkyemail diff --git a/deskutils/autocutsel/Makefile b/deskutils/autocutsel/Makefile index 18f11d4748e..4c4caccead1 100644 --- a/deskutils/autocutsel/Makefile +++ b/deskutils/autocutsel/Makefile @@ -3,22 +3,31 @@ PORTNAME= autocutsel PORTVERSION= 0.10.0 +PORTREVISION= 1 CATEGORIES= deskutils MAINTAINER= john@jnielsen.net COMMENT= Synchronizes the two copy/paste buffers used by X applications +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + +USES= autoreconf gmake libtool +USE_XORG= ice sm x11 xaw xext xmu xt USE_GITHUB= yes GH_ACCOUNT= sigmike -USE_XORG= x11 xaw xmu GNU_CONFIGURE= yes -USES= gmake autoreconf libtool PLIST_FILES= bin/autocutsel \ - bin/cutsel + bin/cutsel \ + man/man1/autocutsel.1.gz \ + man/man1/cutsel.1.gz post-configure: @${REINPLACE_CMD} -e 's|-I\.|-I/usr/local/include|g' ${WRKSRC}/Makefile +post-install: + ${INSTALL_MAN} ${WRKSRC}/*.1 ${STAGEDIR}${PREFIX}/man/man1 + .include diff --git a/deskutils/autocutsel/files/patch-autocutsel.1 b/deskutils/autocutsel/files/patch-autocutsel.1 new file mode 100644 index 00000000000..c91fb3d1f79 --- /dev/null +++ b/deskutils/autocutsel/files/patch-autocutsel.1 @@ -0,0 +1,101 @@ +--- autocutsel.1.orig 2019-03-25 17:46:04 UTC ++++ autocutsel.1 +@@ -0,0 +1,98 @@ ++.TH "AUTOCUTSEL" "1" "5 December 2007" "autocutsel 0.9.0" ++.SH "NAME" ++autocutsel \- keep the X clipboard and the cutbuffer in sync ++.SH "SYNOPSIS" ++.na ++.B autocutsel ++.RB [ \-selection ++.IR selection_name ] ++.RB [ \-cutbuffer ++.IR number ] ++.RB [ \-debug ] ++.RB [ \-verbose ] ++.RB [ \-fork ] ++.RB [ \-pause ++.IR milliseconds ] ++.RB [ \-buttonup ] ++ ++.LP ++.SH "DESCRIPTION" ++.PP ++This manual page documents briefly the ++.B autocutsel ++command. ++.PP ++This manual page was written for the ++.B Debian ++distribution because the original ++program does not have a manual page. ++.PP ++.B autocutsel ++tracks changes in the server's ++cutbuffer and clipboard selection. ++When the clipboard is changed, ++it updates the cutbuffer. ++When the cutbuffer is changed, ++it owns the clipboard selection. ++The cutbuffer and clipboard ++selection are always synchronized. ++Since the VNC client synchronizes ++the Windows' clipboard and the ++server's cutbuffer, ++all three "clipboards" are ++always kept synchronized. ++When you copy some text in Windows, ++the cutbuffer and the clipboard ++selection are updated. ++When you copy text on the server ++using either the cutbuffer or ++the clipboard selection, ++the Windows's clipboard is always ++updated. ++ ++.SH "OPTIONS" ++.TP ++.B -selection, -select, -sel, -s {CLIPBOARD|PRIMARY} ++Specify which selection to use. ++Default is CLIPBOARD. ++ ++.TP ++.B -cutbuffer ++(Details of this parameter unknown.) ++ ++.TP ++.B -debug, -d ++Run with debugging mode. ++ ++.TP ++.B -verbose, -v ++Be more verbose. ++Reports the version and announces synchronizations. ++ ++.TP ++.B -fork, -f ++Run as a daemon program in the background. ++This is recommended when used from an X startup script. ++ ++.TP ++.B -pause, -p ++Wait some milliseconds before owning the selection. ++ ++.TP ++.B -buttonup ++Get the selection only when the ++button 1 is not pressed. ++This may help with OpenOffice Writer. ++ ++.SH "AUTHOR" ++.PP ++This manual page was written by ++Elmar S. Heeb for the ++.B Debian ++system (but may be used by others). ++Permission is granted to copy, ++distribute and/or modify this ++document under the terms of the ++GNU General Public License, ++Version 2 any later version published ++by the Free Software Foundation. diff --git a/deskutils/autocutsel/files/patch-cutsel.1 b/deskutils/autocutsel/files/patch-cutsel.1 new file mode 100644 index 00000000000..3a60ce7d9cc --- /dev/null +++ b/deskutils/autocutsel/files/patch-cutsel.1 @@ -0,0 +1,66 @@ +--- cutsel.1.orig 2019-03-25 17:46:04 UTC ++++ cutsel.1 +@@ -0,0 +1,63 @@ ++.TH "CUTSEL" "1" "5 December 2007" "autocutsel 0.9.0" ++.SH "NAME" ++cutsel \- show information about the X clipboard and the cutbuffer in sync ++.SH "SYNOPSIS" ++.PP ++.B cutsel ++[\-selection \fIselection_name\fP] ++[\-cutbuffer \fInumber\fP] ++[\-debug] ++[\-verbose] ++{cut|sel} ++ ++.LP ++.SH "DESCRIPTION" ++.PP ++This manual page documents briefly the ++.B cutsel ++command. ++.PP ++This manual page was written for the ++.B Debian ++distribution because the original ++program does not have a manual page. ++ ++.TP ++.B cutsel [\fIoptions\fP] cut ++shows the contents of the cut buffer ++and ++.TP ++.B cutsel [\fIoptions\fP] sel ++shows the owner of the selection. ++ ++.SH "OPTIONS" ++.TP ++.B \-selection, \-select, \-sel, \-s {CLIPBOARD|PRIMARY} ++Specify which selection to use. ++Default is CLIPBOARD. ++ ++.TP ++.B \-cutbuffer ++(Details of this parameter unknown.) ++ ++.TP ++.B \-debug, \-d ++Run with debugging mode. ++ ++.TP ++.B \-verbose, \-v ++Be more verbose. ++Reports the version and announces synchronizations. ++ ++.SH "AUTHOR" ++.PP ++This manual page was written by ++Elmar S. Heeb for the ++.B Debian ++system (but may be used by others). ++Permission is granted to copy, ++distribute and/or modify this ++document under the terms of the ++GNU General Public License, ++Version 2 any later version published ++by the Free Software Foundation. diff --git a/deskutils/cherrytree/Makefile b/deskutils/cherrytree/Makefile new file mode 100644 index 00000000000..c05e28a4f2a --- /dev/null +++ b/deskutils/cherrytree/Makefile @@ -0,0 +1,27 @@ +# $FreeBSD$ + +PORTNAME= cherrytree +DISTVERSION= 0.38.8 +PORTREVISION= 1 +CATEGORIES= deskutils +MASTER_SITES= https://www.giuspen.com/software/ + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Hierarchical note taking application + +LICENSE= GPLv3 + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gtksourceview>0:x11-toolkits/py-gtksourceview + +USES= desktop-file-utils gettext-tools python:2.7 shared-mime-info shebangfix tar:xz +SHEBANG_FILES= glade/svg_to_png.py +USE_PYTHON= distutils noflavors autoplist + +NO_ARCH= yes + +.include + +# PYDISTUTILS_INSTALLNOSINGLE is deprecated so... +PYDISTUTILS_INSTALLARGS:= ${PYDISTUTILS_INSTALLARGS:N--single-version-externally-managed} + +.include diff --git a/deskutils/cherrytree/distinfo b/deskutils/cherrytree/distinfo new file mode 100644 index 00000000000..bbd3fe527b2 --- /dev/null +++ b/deskutils/cherrytree/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1554703205 +SHA256 (cherrytree-0.38.8.tar.xz) = af21e540fddb3c5a92cdad9b4bbfc6ccd3ce3ab87076a2a01d2e3f2d683f48db +SIZE (cherrytree-0.38.8.tar.xz) = 7526748 diff --git a/deskutils/cherrytree/pkg-descr b/deskutils/cherrytree/pkg-descr new file mode 100644 index 00000000000..32469409cf9 --- /dev/null +++ b/deskutils/cherrytree/pkg-descr @@ -0,0 +1,4 @@ +A hierarchical note taking application, featuring rich text and syntax +highlighting, storing data in a single xml or sqlite file. + +WWW: https://www.giuspen.com/cherrytree/ diff --git a/deskutils/conkyforecast/Makefile b/deskutils/conkyforecast/Makefile index 7d5cdbcfde3..4f99f418585 100644 --- a/deskutils/conkyforecast/Makefile +++ b/deskutils/conkyforecast/Makefile @@ -3,7 +3,7 @@ PORTNAME= conkyforecast PORTVERSION= 2.20 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils MASTER_SITES= https://launchpadlibrarian.net/70673352/ \ LOCAL/vg diff --git a/deskutils/dosage/Makefile b/deskutils/dosage/Makefile index 6e317a0199e..b9cbee7da45 100644 --- a/deskutils/dosage/Makefile +++ b/deskutils/dosage/Makefile @@ -3,6 +3,7 @@ PORTNAME= dosage PORTVERSION= 2.15 +PORTREVISION= 1 CATEGORIES= deskutils python MASTER_SITES= CHEESESHOP diff --git a/deskutils/genius/Makefile b/deskutils/genius/Makefile index ced1c0fb042..eea697561e3 100644 --- a/deskutils/genius/Makefile +++ b/deskutils/genius/Makefile @@ -3,7 +3,7 @@ PORTNAME= genius PORTVERSION= 1.0.23 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils gnome MASTER_SITES= GNOME \ http://ftp.5z.com/pub/genius/ diff --git a/deskutils/meteo/Makefile b/deskutils/meteo/Makefile index 62028038aa6..45024616149 100644 --- a/deskutils/meteo/Makefile +++ b/deskutils/meteo/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= libappindicator3.so:devel/libappindicator \ libgeocode-glib.so:net/geocode-glib \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 -USES= desktop-file-utils gettext gnome meson pkgconfig \ +USES= compiler:c11 desktop-file-utils gettext gnome meson pkgconfig \ python:3.5+,build shebangfix USE_GITLAB= yes diff --git a/deskutils/pal/Makefile b/deskutils/pal/Makefile index 80f403d01f1..0fe49551949 100644 --- a/deskutils/pal/Makefile +++ b/deskutils/pal/Makefile @@ -3,7 +3,7 @@ PORTNAME= pal PORTVERSION= 0.4.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils MASTER_SITES= SF/${PORTNAME}cal/${PORTNAME}/${PORTVERSION} diff --git a/deskutils/spice-gtk/Makefile b/deskutils/spice-gtk/Makefile index f1c7b3b6c2e..9c25a5cfe6c 100644 --- a/deskutils/spice-gtk/Makefile +++ b/deskutils/spice-gtk/Makefile @@ -3,6 +3,7 @@ PORTNAME= spice-gtk PORTVERSION= 0.36 +PORTREVISION= 1 CATEGORIES?= deskutils gnome MASTER_SITES= http://www.spice-space.org/download/gtk/ @@ -17,9 +18,9 @@ NOT_FOR_ARCHS_REASON= server only supports little-endian LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ libjson-glib-1.0.so:devel/json-glib \ libopus.so:audio/opus -BUILD_DEPENDS= spice-protocol>=0.12.14:devel/spice-protocol \ +BUILD_DEPENDS= spice-protocol>=0.12.15:devel/spice-protocol \ ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing@${PY_FLAVOR} -RUN_DEPENDS= spice-protocol>=0.12.14:devel/spice-protocol +RUN_DEPENDS= spice-protocol>=0.12.15:devel/spice-protocol USES= autoreconf cpe gettext-tools gmake jpeg libtool pkgconfig tar:bzip2 \ python ssl localbase:ldflags diff --git a/deskutils/tasksh/Makefile b/deskutils/tasksh/Makefile index 42f874760ae..b6caaa33a26 100644 --- a/deskutils/tasksh/Makefile +++ b/deskutils/tasksh/Makefile @@ -2,7 +2,7 @@ PORTNAME= tasksh PORTVERSION= 1.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils MASTER_SITES= http://taskwarrior.org/download/ diff --git a/devel/Makefile b/devel/Makefile index 7b21a7cfbf3..bc4e5398816 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1313,6 +1313,7 @@ SUBDIR += ksql SUBDIR += kyra SUBDIR += kyua + SUBDIR += lab SUBDIR += lasi SUBDIR += lattice-ice40-examples-hx1k SUBDIR += lattice-ice40-examples-hx8k @@ -4058,8 +4059,6 @@ SUBDIR += pecl-vld SUBDIR += pecl-weakref2 SUBDIR += pecl-xdebug - SUBDIR += pecl-xdebug-devel - SUBDIR += pecl-xdebug25 SUBDIR += pecl-yac SUBDIR += pecl-yaconf SUBDIR += pecl-zookeeper diff --git a/devel/ald/Makefile b/devel/ald/Makefile index cd07249a4a2..71d21eb6b3b 100644 --- a/devel/ald/Makefile +++ b/devel/ald/Makefile @@ -3,7 +3,7 @@ PORTNAME= ald PORTVERSION= 0.1.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/devel/android-tools-adb/files/Makefile b/devel/android-tools-adb/files/Makefile index 1e60f6f15a6..d717897fb23 100644 --- a/devel/android-tools-adb/files/Makefile +++ b/devel/android-tools-adb/files/Makefile @@ -85,8 +85,6 @@ SRCS+= socket_network_client_unix.cpp SRCS+= ../libcutils/sockets.cpp SRCS+= load_file.cpp SRCS+= threads.cpp -# XXX Obsolete after 10.2 or r279980/r280329 -CPPFLAGS.sockets.cpp+= -o ${.TARGET} # required by base/file.cpp .PATH: ${.CURDIR}/../liblog diff --git a/devel/android-tools-fastboot/files/Makefile b/devel/android-tools-fastboot/files/Makefile index 38bf8e6ecff..3c93be6084f 100644 --- a/devel/android-tools-fastboot/files/Makefile +++ b/devel/android-tools-fastboot/files/Makefile @@ -40,7 +40,6 @@ SRCS+= ../libcutils/sockets.cpp SRCS+= socket_inaddr_any_server_unix.cpp SRCS+= socket_network_client_unix.cpp SRCS+= sockets_unix.cpp -CPPFLAGS.sockets.cpp+= -o ${.TARGET} # XXX pre-r279980 # required by base and libutils .PATH: ${.CURDIR}/../liblog diff --git a/devel/arduino-avrdude/Makefile b/devel/arduino-avrdude/Makefile index cdc9a3c2daa..8cf47d5cf42 100644 --- a/devel/arduino-avrdude/Makefile +++ b/devel/arduino-avrdude/Makefile @@ -2,7 +2,7 @@ PORTNAME= avrdude PORTVERSION= 6.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= SAVANNAH/avrdude PKGNAMEPREFIX= arduino- diff --git a/devel/avrdude/Makefile b/devel/avrdude/Makefile index 44c95999ae3..5989e03f12d 100644 --- a/devel/avrdude/Makefile +++ b/devel/avrdude/Makefile @@ -3,7 +3,7 @@ PORTNAME= avrdude PORTVERSION= 6.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= SAVANNAH/avrdude diff --git a/devel/awscli/Makefile b/devel/awscli/Makefile index 6c44dd417a9..e984662542f 100644 --- a/devel/awscli/Makefile +++ b/devel/awscli/Makefile @@ -3,6 +3,7 @@ PORTNAME= awscli PORTVERSION= 1.16.135 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= CHEESESHOP diff --git a/devel/b2/Makefile b/devel/b2/Makefile index eb2898cd573..3dba18bfd3d 100644 --- a/devel/b2/Makefile +++ b/devel/b2/Makefile @@ -4,6 +4,7 @@ PORTNAME= b2 DISTVERSIONPREFIX= v DISTVERSION= 1.3.8 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= robak@FreeBSD.org diff --git a/devel/bossa/Makefile b/devel/bossa/Makefile index fbe370092d0..8ebe52ce38b 100644 --- a/devel/bossa/Makefile +++ b/devel/bossa/Makefile @@ -2,7 +2,7 @@ PORTNAME= bossa PORTVERSION= 1.7.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= devel MAINTAINER= kevans@FreeBSD.org diff --git a/devel/bpython/Makefile b/devel/bpython/Makefile index e2a781463b1..afa8634fb28 100644 --- a/devel/bpython/Makefile +++ b/devel/bpython/Makefile @@ -3,6 +3,7 @@ PORTNAME= bpython PORTVERSION= 0.18 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP \ https://bpython-interpreter.org/releases/ diff --git a/devel/catch/Makefile b/devel/catch/Makefile index 3ab1aec9d80..c3f7dcf12dc 100644 --- a/devel/catch/Makefile +++ b/devel/catch/Makefile @@ -3,7 +3,7 @@ PORTNAME= catch DISTVERSIONPREFIX= v -DISTVERSION= 2.7.0 +DISTVERSION= 2.7.1 PORTREVISION= 0 CATEGORIES= devel diff --git a/devel/catch/distinfo b/devel/catch/distinfo index 622bb017997..146b3084d0f 100644 --- a/devel/catch/distinfo +++ b/devel/catch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1552392787 -SHA256 (catchorg-Catch2-v2.7.0_GH0.tar.gz) = d4655e87c0ccda5a2e78bf4256fce8036feb969399503dcc8272f4c90347d9c0 -SIZE (catchorg-Catch2-v2.7.0_GH0.tar.gz) = 569753 +TIMESTAMP = 1554799917 +SHA256 (catchorg-Catch2-v2.7.1_GH0.tar.gz) = 04b303517284572c277597004a33c3f8c02a4d12ba73d5a4cb73b4a369dfef0b +SIZE (catchorg-Catch2-v2.7.1_GH0.tar.gz) = 573626 diff --git a/devel/cdecl/Makefile b/devel/cdecl/Makefile index eddd635a0a1..cf0b4720bcc 100644 --- a/devel/cdecl/Makefile +++ b/devel/cdecl/Makefile @@ -3,6 +3,7 @@ PORTNAME= cdecl PORTVERSION= 6.0.2 +PORTREVISION= 1 DISTVERSIONPREFIX= ${PORTNAME}- CATEGORIES= devel diff --git a/devel/cgdb/Makefile b/devel/cgdb/Makefile index ee1ee78225d..534ffb7f5d3 100644 --- a/devel/cgdb/Makefile +++ b/devel/cgdb/Makefile @@ -3,7 +3,7 @@ PORTNAME= cgdb PORTVERSION= 0.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://cgdb.me/files/ diff --git a/devel/clewn/Makefile b/devel/clewn/Makefile index d59948a2493..e8da7870173 100644 --- a/devel/clewn/Makefile +++ b/devel/clewn/Makefile @@ -3,7 +3,7 @@ PORTNAME= clewn PORTVERSION= 1.14 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel editors MASTER_SITES= SF/${PORTNAME}/OldFiles/${PORTNAME}-${PORTVERSION}/ diff --git a/devel/codesearch-py/Makefile b/devel/codesearch-py/Makefile index 1d6a25075f8..cb33d46ee54 100644 --- a/devel/codesearch-py/Makefile +++ b/devel/codesearch-py/Makefile @@ -3,6 +3,7 @@ PORTNAME= codesearch-py DISTVERSION= g20180623 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/cut/Makefile b/devel/cut/Makefile index 8c607e81170..98897e16c7f 100644 --- a/devel/cut/Makefile +++ b/devel/cut/Makefile @@ -3,6 +3,7 @@ PORTNAME= cut PORTVERSION= 2.7 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://bitbucket.org/kc5tja/cut/get/ DISTNAME= v${PORTVERSION} diff --git a/devel/d-feet/Makefile b/devel/d-feet/Makefile index 31363eb5de8..7ee526fb318 100644 --- a/devel/d-feet/Makefile +++ b/devel/d-feet/Makefile @@ -3,7 +3,7 @@ PORTNAME= d-feet PORTVERSION= 0.3.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= GNOME diff --git a/devel/devtodo/Makefile b/devel/devtodo/Makefile index 42ee7543d26..b012e50be5a 100644 --- a/devel/devtodo/Makefile +++ b/devel/devtodo/Makefile @@ -3,7 +3,7 @@ PORTNAME= devtodo PORTVERSION= 0.1.20 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= http://swapoff.org/files/devtodo/ diff --git a/devel/dispy/Makefile b/devel/dispy/Makefile index e5a23e5eb37..8cd642bb8b8 100644 --- a/devel/dispy/Makefile +++ b/devel/dispy/Makefile @@ -3,6 +3,7 @@ PORTNAME= dispy PORTVERSION= 4.10.4 +PORTREVISION= 1 CATEGORIES= devel net MASTER_SITES= SF/${PORTNAME} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/elf/Makefile b/devel/elf/Makefile index 18d93bd178c..e33f2d234dc 100644 --- a/devel/elf/Makefile +++ b/devel/elf/Makefile @@ -3,7 +3,7 @@ PORTNAME= elf PORTVERSION= 0.5.4p1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MASTER_SITES= PACKETSTORM/linux/reverse-engineering diff --git a/devel/elfsh/Makefile b/devel/elfsh/Makefile index 179939f72a9..53335515b90 100644 --- a/devel/elfsh/Makefile +++ b/devel/elfsh/Makefile @@ -3,7 +3,7 @@ PORTNAME= elfsh PORTVERSION= 0.51b3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MASTER_SITES= http://elfsh.asgardlabs.org/files/ DISTNAME= elfsh-0.51b3-portable diff --git a/devel/gettext-lint/Makefile b/devel/gettext-lint/Makefile index 079925fd0ca..2c6d6382734 100644 --- a/devel/gettext-lint/Makefile +++ b/devel/gettext-lint/Makefile @@ -3,7 +3,7 @@ PORTNAME= gettext-lint PORTVERSION= 0.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}.0 diff --git a/devel/git-cinnabar/Makefile b/devel/git-cinnabar/Makefile index 61e4ec7b477..94bb8b7155e 100644 --- a/devel/git-cinnabar/Makefile +++ b/devel/git-cinnabar/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= git-cinnabar -DISTVERSION= 0.5.0-124 -DISTVERSIONSUFFIX= -g7b22e41 +DISTVERSION= 0.5.0-139 +DISTVERSIONSUFFIX= -g4ba9974 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org diff --git a/devel/git-cinnabar/distinfo b/devel/git-cinnabar/distinfo index 066d03ab345..47e1b19044c 100644 --- a/devel/git-cinnabar/distinfo +++ b/devel/git-cinnabar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554587604 -SHA256 (glandium-git-cinnabar-0.5.0-124-g7b22e41_GH0.tar.gz) = 5e58c2586da230e2d4e5609b0a105d681c88e59ef93847f59edae9140679fa60 -SIZE (glandium-git-cinnabar-0.5.0-124-g7b22e41_GH0.tar.gz) = 154149 +TIMESTAMP = 1554724629 +SHA256 (glandium-git-cinnabar-0.5.0-139-g4ba9974_GH0.tar.gz) = ec394d156c95c49fb5abe67f8bc86fc55616a7ff770b4a2ed08d8c8137a848a1 +SIZE (glandium-git-cinnabar-0.5.0-139-g4ba9974_GH0.tar.gz) = 155763 diff --git a/devel/git-review/Makefile b/devel/git-review/Makefile index 0b7f55ba1e4..96a28a144e5 100644 --- a/devel/git-review/Makefile +++ b/devel/git-review/Makefile @@ -2,6 +2,7 @@ PORTNAME= git-review DISTVERSION= 1.26.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index a0d9c4eebb4..5c9351059bd 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -2,6 +2,7 @@ PORTNAME= gitaly DISTVERSION= 1.27.1 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org @@ -27,11 +28,9 @@ MY_DEPENDS= git>=2.18:devel/git \ rubygem-rbtrace>0:devel/rubygem-rbtrace \ rubygem-licensee8>=8.9.0:devel/rubygem-licensee8 \ rubygem-google-protobuf>=3.6:devel/rubygem-google-protobuf - BUILD_DEPENDS= go>=1.10:lang/go \ gem:devel/ruby-gems \ ${MY_DEPENDS} - RUN_DEPENDS= ${MY_DEPENDS} \ gitlab-shell>=6.0.4:devel/gitlab-shell diff --git a/devel/gitaly/files/patch-__support_makegen.go b/devel/gitaly/files/patch-__support_makegen.go index a0fe22c51af..463391135c1 100644 --- a/devel/gitaly/files/patch-__support_makegen.go +++ b/devel/gitaly/files/patch-__support_makegen.go @@ -1,4 +1,4 @@ ---- _support/makegen.go.orig 2019-03-11 20:46:03 UTC +--- _support/makegen.go.orig 2019-03-25 09:02:26 UTC +++ _support/makegen.go @@ -253,7 +253,7 @@ var templateText = ` # These variables may be overriden at runtime by top-level make @@ -9,12 +9,13 @@ ASSEMBLY_ROOT ?= {{ .BuildDir }}/assembly BUILD_TAGS := tracer_static tracer_static_jaeger -@@ -274,7 +274,7 @@ build: ../.ruby-bundle +@@ -273,8 +273,8 @@ build: ../.ruby-bundle + # step. Both Omnibus and CNG assume it is in the Gitaly root, not in # _build. Hence the '../' in front. ../.ruby-bundle: {{ .GitalyRubyDir }}/Gemfile.lock {{ .GitalyRubyDir }}/Gemfile ++ cd {{ .GitalyRubyDir }} && rm Gemfile.lock && bundle install $(BUNDLE_FLAGS) cd {{ .GitalyRubyDir }} && bundle config # for debugging - cd {{ .GitalyRubyDir }} && bundle install $(BUNDLE_FLAGS) -+ cd {{ .GitalyRubyDir }} && rm Gemfile.lock && bundle install $(BUNDLE_FLAGS) cd {{ .GitalyRubyDir }} && bundle show gitaly-proto # sanity check touch $@ diff --git a/devel/gitinspector/Makefile b/devel/gitinspector/Makefile index 63e9afff7bd..490145aa556 100644 --- a/devel/gitinspector/Makefile +++ b/devel/gitinspector/Makefile @@ -3,7 +3,7 @@ PORTNAME= gitinspector PORTVERSION= 0.4.4 DISTVERSIONPREFIX= v -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel python PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX} diff --git a/devel/gnatcoll/Makefile b/devel/gnatcoll/Makefile index 3a28bb33708..0f60c90f6fc 100644 --- a/devel/gnatcoll/Makefile +++ b/devel/gnatcoll/Makefile @@ -3,7 +3,7 @@ PORTNAME= gnatcoll PORTVERSION= 2016 # branch: gpl-for-gps-2016 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MAINTAINER= ports@FreeBSD.org diff --git a/devel/grv/Makefile b/devel/grv/Makefile index 7fb264d5659..d10d3581a82 100644 --- a/devel/grv/Makefile +++ b/devel/grv/Makefile @@ -3,6 +3,7 @@ PORTNAME= grv DISTVERSIONPREFIX= v DISTVERSION= 0.3.2 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= dg@syrec.org diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile index cd72a7b68d1..fc56e1e0cfb 100644 --- a/devel/gtranslator/Makefile +++ b/devel/gtranslator/Makefile @@ -3,7 +3,7 @@ PORTNAME= gtranslator PORTVERSION= 2.91.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel gnome MASTER_SITES= GNOME diff --git a/devel/hs-readline/Makefile b/devel/hs-readline/Makefile index 1d6137b08cd..5d857c318a4 100644 --- a/devel/hs-readline/Makefile +++ b/devel/hs-readline/Makefile @@ -3,7 +3,7 @@ PORTNAME= readline PORTVERSION= 1.0.3.0 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hub/Makefile b/devel/hub/Makefile index 7353672fb17..7919e061390 100644 --- a/devel/hub/Makefile +++ b/devel/hub/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= hub -PORTVERSION= 2.10.0 +PORTVERSION= 2.11.1 DISTVERSIONPREFIX= v CATEGORIES= devel sysutils diff --git a/devel/hub/distinfo b/devel/hub/distinfo index 317ca358bb9..4e61e32fe2c 100644 --- a/devel/hub/distinfo +++ b/devel/hub/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551100773 -SHA256 (github-hub-v2.10.0_GH0.tar.gz) = c1599a7387df5de6cd309094525a1f14728ca9d09cc5e168805e8fcec829e13f -SIZE (github-hub-v2.10.0_GH0.tar.gz) = 1042511 +TIMESTAMP = 1554574257 +SHA256 (github-hub-v2.11.1_GH0.tar.gz) = dfd6531cdd31f004dcbcd2764dea4e1c040e72358ae79758a6c3060b9e743371 +SIZE (github-hub-v2.11.1_GH0.tar.gz) = 1043499 diff --git a/devel/ikos/Makefile b/devel/ikos/Makefile index c1af38566e9..4e57bad1873 100644 --- a/devel/ikos/Makefile +++ b/devel/ikos/Makefile @@ -2,8 +2,8 @@ PORTNAME= ikos DISTVERSIONPREFIX= v -DISTVERSION= 2.1-104 -DISTVERSIONSUFFIX= -g5244fd8 +DISTVERSION= 2.1-129 +DISTVERSIONSUFFIX= -gf431373 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org @@ -25,7 +25,7 @@ USE_GITHUB= yes GH_ACCOUNT= NASA-SW-VnV USE_LDCONFIG= yes -LLVM_VERSION= 70 # ${LLVM_DEFAULT} isn't desirable here since ikos doesn't support llvm < 70, but LLVM_DEFAULT implies that many llvm versions are supported +LLVM_VERSION= 80 # ${LLVM_DEFAULT} isn't desirable here since ikos doesn't support llvm < 70, but LLVM_DEFAULT implies that many llvm versions are supported CXXFLAGS+= -DNDEBUG # https://github.com/NASA-SW-VnV/ikos/issues/36, it also breaks with assert without NDEBUG diff --git a/devel/ikos/distinfo b/devel/ikos/distinfo index 983e0c3a575..78f4150d889 100644 --- a/devel/ikos/distinfo +++ b/devel/ikos/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551059458 -SHA256 (NASA-SW-VnV-ikos-v2.1-104-g5244fd8_GH0.tar.gz) = aba561ba808f3c2e9b0dd94c365f43eb11e993f0c4b107d228e5dc60d01b5263 -SIZE (NASA-SW-VnV-ikos-v2.1-104-g5244fd8_GH0.tar.gz) = 1272263 +TIMESTAMP = 1554869173 +SHA256 (NASA-SW-VnV-ikos-v2.1-129-gf431373_GH0.tar.gz) = c402db7f450d9281006d8d8e90f8e6c5216b945f46433b29ee7fe85818c0ea77 +SIZE (NASA-SW-VnV-ikos-v2.1-129-gf431373_GH0.tar.gz) = 1289728 diff --git a/devel/ikos/pkg-plist b/devel/ikos/pkg-plist index 3ee329a4709..30972d40e8f 100644 --- a/devel/ikos/pkg-plist +++ b/devel/ikos/pkg-plist @@ -7,6 +7,7 @@ bin/ikos-report bin/ikos-scan bin/ikos-scan-c++ bin/ikos-scan-cc +bin/ikos-scan-extract bin/ikos-view include/ikos/analyzer/intrinsic.h include/ikos/ar/format/dot.hpp diff --git a/devel/ipython5/Makefile b/devel/ipython5/Makefile index 7f7041384b4..7a9979e990a 100644 --- a/devel/ipython5/Makefile +++ b/devel/ipython5/Makefile @@ -3,7 +3,7 @@ PORTNAME= ipython PORTVERSION= 5.8.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/jetbrains-phpstorm/Makefile b/devel/jetbrains-phpstorm/Makefile index 267a9891b06..322508acd44 100644 --- a/devel/jetbrains-phpstorm/Makefile +++ b/devel/jetbrains-phpstorm/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= phpstorm -PORTVERSION= 2018.3.5 +PORTVERSION= 2019.1 CATEGORIES= devel java MASTER_SITES= https://download.jetbrains.com/webide/ \ http://download.jetbrains.com/webide/ @@ -30,7 +30,7 @@ SHEBANG_FILES= bin/printenv.py bin/restart.py NO_ARCH= yes NO_BUILD= yes -WRKSRC= ${WRKDIR}/PhpStorm-183.5912.26 +WRKSRC= ${WRKDIR}/PhpStorm-191.6183.95 SUB_FILES= phpstorm phpstorm.desktop pkg-message SUB_LIST= DATADIR=${DATADIR} @@ -42,7 +42,7 @@ do-install: @${RM} ${STAGEDIR}${DATADIR}/bin/fsnotifier \ ${STAGEDIR}${DATADIR}/bin/fsnotifier-arm \ ${STAGEDIR}${DATADIR}/bin/fsnotifier64 \ - ${STAGEDIR}${DATADIR}/bin/lib*.so + ${STAGEDIR}${DATADIR}/bin/lib*.so @${RM} ${STAGEDIR}${DATADIR}/plugins/performanceTesting/lib/lib*.so # Remove the bundled native Pty4J support libraries, they are replaced # by java/intellij-pty4j diff --git a/devel/jetbrains-phpstorm/distinfo b/devel/jetbrains-phpstorm/distinfo index a90a41a8dba..d983bc7af77 100644 --- a/devel/jetbrains-phpstorm/distinfo +++ b/devel/jetbrains-phpstorm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1552095622 -SHA256 (PhpStorm-2018.3.5.tar.gz) = d8d39d3ddc2a62ddec326176e779e1e0d5d62ff2d058e28e12d3888e74119948 -SIZE (PhpStorm-2018.3.5.tar.gz) = 311609827 +TIMESTAMP = 1554219440 +SHA256 (PhpStorm-2019.1.tar.gz) = eed58d18011805933eba0b5d2ec18471f2af9f74d96112b8403231cd4d5062af +SIZE (PhpStorm-2019.1.tar.gz) = 316782925 diff --git a/devel/jetbrains-phpstorm/pkg-plist b/devel/jetbrains-phpstorm/pkg-plist index e6ef80f7da1..e86bbe3c123 100644 --- a/devel/jetbrains-phpstorm/pkg-plist +++ b/devel/jetbrains-phpstorm/pkg-plist @@ -16,7 +16,8 @@ share/applications/phpstorm.desktop %%DATADIR%%/build.txt %%DATADIR%%/help/ReferenceCard.pdf %%DATADIR%%/help/ReferenceCardForMac.pdf -%%DATADIR%%/lib/annotations-16.0.2.jar +%%DATADIR%%/lib/FastInfoset-1.2.15.jar +%%DATADIR%%/lib/annotations-17.0.0.jar %%DATADIR%%/lib/annotations-java5.jar %%DATADIR%%/lib/asm-all-7.0.jar %%DATADIR%%/lib/automaton-1.12-1.jar @@ -26,12 +27,12 @@ share/applications/phpstorm.desktop %%DATADIR%%/lib/cglib-nodep-3.2.4.jar %%DATADIR%%/lib/cli-parser-1.1.2.jar %%DATADIR%%/lib/cloud-config-client.jar -%%DATADIR%%/lib/common-image-3.3.2.jar -%%DATADIR%%/lib/common-io-3.3.2.jar -%%DATADIR%%/lib/common-lang-3.3.2.jar +%%DATADIR%%/lib/common-image-3.4.1.jar +%%DATADIR%%/lib/common-io-3.4.1.jar +%%DATADIR%%/lib/common-lang-3.4.1.jar %%DATADIR%%/lib/commons-codec-1.10.jar %%DATADIR%%/lib/commons-collections-3.2.2.jar -%%DATADIR%%/lib/commons-compress-1.17.jar +%%DATADIR%%/lib/commons-compress-1.18.jar %%DATADIR%%/lib/commons-httpclient-3.1-patched.jar %%DATADIR%%/lib/commons-imaging-1.0-RC-1.jar %%DATADIR%%/lib/commons-lang-2.4.jar @@ -53,20 +54,25 @@ share/applications/phpstorm.desktop %%DATADIR%%/lib/httpcore-4.4.10.jar %%DATADIR%%/lib/httpmime-4.5.6.jar %%DATADIR%%/lib/icons.jar -%%DATADIR%%/lib/imageio-core-3.3.2.jar -%%DATADIR%%/lib/imageio-metadata-3.3.2.jar -%%DATADIR%%/lib/imageio-tiff-3.3.2.jar +%%DATADIR%%/lib/imageio-core-3.4.1.jar +%%DATADIR%%/lib/imageio-metadata-3.4.1.jar +%%DATADIR%%/lib/imageio-tiff-3.4.1.jar %%DATADIR%%/lib/imgscalr-lib-4.2.jar %%DATADIR%%/lib/ini4j-0.5.5-2.jar %%DATADIR%%/lib/intellij-coverage-agent-1.0.495.jar %%DATADIR%%/lib/intellij-test-discovery-agent-1.0.495.jar %%DATADIR%%/lib/isorelax-20030108.jar +%%DATADIR%%/lib/istack-commons-runtime-3.0.7.jar %%DATADIR%%/lib/jackson-annotations-2.9.0.jar -%%DATADIR%%/lib/jackson-core-2.9.6.jar -%%DATADIR%%/lib/jackson-databind-2.9.6.jar +%%DATADIR%%/lib/jackson-core-2.9.7.jar +%%DATADIR%%/lib/jackson-databind-2.9.7.jar %%DATADIR%%/lib/java-compatibility-1.0.1.jar %%DATADIR%%/lib/javahelp-2.0.02.jar %%DATADIR%%/lib/javassist-3.22.0-GA.jar +%%DATADIR%%/lib/javax.activation-1.2.0.jar +%%DATADIR%%/lib/javax.annotation-api-1.3.2.jar +%%DATADIR%%/lib/jaxb-api-2.3.1.jar +%%DATADIR%%/lib/jaxb-runtime-2.3.1.jar %%DATADIR%%/lib/jaxen-1.1.6.jar %%DATADIR%%/lib/jbcrypt-1.0.0.jar %%DATADIR%%/lib/jdom.jar @@ -77,7 +83,7 @@ share/applications/phpstorm.desktop %%DATADIR%%/lib/jna-platform.jar %%DATADIR%%/lib/jna.jar %%DATADIR%%/lib/jps-model.jar -%%DATADIR%%/lib/jsch-0.1.54.jar +%%DATADIR%%/lib/jsch-0.1.55.jar %%DATADIR%%/lib/jsch.agentproxy.connector-factory.jar %%DATADIR%%/lib/jsch.agentproxy.core.jar %%DATADIR%%/lib/jsch.agentproxy.jsch.jar @@ -85,14 +91,18 @@ share/applications/phpstorm.desktop %%DATADIR%%/lib/jsch.agentproxy.sshagent.jar %%DATADIR%%/lib/jsch.agentproxy.usocket-jna.jar %%DATADIR%%/lib/jsch.agentproxy.usocket-nc.jar +%%DATADIR%%/lib/junit-4.12.jar %%DATADIR%%/lib/jzlib-1.1.3.jar -%%DATADIR%%/lib/kotlin-reflect.jar -%%DATADIR%%/lib/kotlin-stdlib-jdk7.jar -%%DATADIR%%/lib/kotlin-stdlib-jdk8.jar -%%DATADIR%%/lib/kotlin-stdlib.jar -%%DATADIR%%/lib/kotlin-test.jar -%%DATADIR%%/lib/kotlinx-coroutines-core-0.26.1.jar -%%DATADIR%%/lib/kotlinx-coroutines-jdk8-0.26.1.jar +%%DATADIR%%/lib/kotlin-reflect-1.3.11.jar +%%DATADIR%%/lib/kotlin-stdlib-1.3.11.jar +%%DATADIR%%/lib/kotlin-stdlib-common-1.3.11.jar +%%DATADIR%%/lib/kotlin-stdlib-jdk7-1.3.11.jar +%%DATADIR%%/lib/kotlin-stdlib-jdk8-1.3.11.jar +%%DATADIR%%/lib/kotlin-test-1.3.11.jar +%%DATADIR%%/lib/kotlin-test-common-1.3.11.jar +%%DATADIR%%/lib/kotlinx-coroutines-core-1.0.1.jar +%%DATADIR%%/lib/kotlinx-coroutines-core-common-1.0.1.jar +%%DATADIR%%/lib/kotlinx-coroutines-jdk8-1.0.1.jar %%DATADIR%%/lib/log4j.jar %%DATADIR%%/lib/lz4-1.3.0.jar %%DATADIR%%/lib/markdown4j-2.2-cj-1.1.jar @@ -100,15 +110,14 @@ share/applications/phpstorm.desktop %%DATADIR%%/lib/microba.jar %%DATADIR%%/lib/miglayout-core-5.2.jar %%DATADIR%%/lib/miglayout-swing-5.2.jar -%%DATADIR%%/lib/mutability-annotations-compat.jar %%DATADIR%%/lib/nanoxml-2.2.3.jar -%%DATADIR%%/lib/netty-buffer-4.1.30.Final.jar -%%DATADIR%%/lib/netty-codec-4.1.30.Final.jar -%%DATADIR%%/lib/netty-codec-http-4.1.30.Final.jar -%%DATADIR%%/lib/netty-common-4.1.30.Final.jar -%%DATADIR%%/lib/netty-handler-4.1.30.Final.jar -%%DATADIR%%/lib/netty-resolver-4.1.30.Final.jar -%%DATADIR%%/lib/netty-transport-4.1.30.Final.jar +%%DATADIR%%/lib/netty-buffer-4.1.32.Final.jar +%%DATADIR%%/lib/netty-codec-4.1.32.Final.jar +%%DATADIR%%/lib/netty-codec-http-4.1.32.Final.jar +%%DATADIR%%/lib/netty-common-4.1.32.Final.jar +%%DATADIR%%/lib/netty-handler-4.1.32.Final.jar +%%DATADIR%%/lib/netty-resolver-4.1.32.Final.jar +%%DATADIR%%/lib/netty-transport-4.1.32.Final.jar %%DATADIR%%/lib/objenesis-2.6.jar %%DATADIR%%/lib/openapi.jar %%DATADIR%%/lib/org.eclipse.lsp4j-0.3.1.jar @@ -119,7 +128,7 @@ share/applications/phpstorm.desktop %%DATADIR%%/lib/platform-api.jar %%DATADIR%%/lib/platform-impl.jar %%DATADIR%%/lib/proxy-vole-1.0.6.jar -%%DATADIR%%/lib/pty4j-0.8.6.jar +%%DATADIR%%/lib/pty4j-0.9.1.jar %%DATADIR%%/lib/purejavacomm-0.0.11.1.jar %%DATADIR%%/lib/resources.jar %%DATADIR%%/lib/resources_en.jar @@ -128,17 +137,19 @@ share/applications/phpstorm.desktop %%DATADIR%%/lib/serviceMessages.jar %%DATADIR%%/lib/slf4j-api-1.7.25.jar %%DATADIR%%/lib/slf4j-log4j12-1.7.25.jar -%%DATADIR%%/lib/snakeyaml-1.22.jar +%%DATADIR%%/lib/snakeyaml-1.23.jar %%DATADIR%%/lib/stax-api-1.0.1.jar +%%DATADIR%%/lib/stax-ex-1.8.jar %%DATADIR%%/lib/streamex-0.6.7.jar %%DATADIR%%/lib/swingx-core-1.6.2-2.jar %%DATADIR%%/lib/testFramework.jar %%DATADIR%%/lib/trang-core.jar %%DATADIR%%/lib/trilead-ssh2-build-217-jenkins-11.jar %%DATADIR%%/lib/trove4j.jar +%%DATADIR%%/lib/txw2-2.3.1.jar %%DATADIR%%/lib/util.jar %%DATADIR%%/lib/velocity-1.7.jar -%%DATADIR%%/lib/winp-1.27.jar +%%DATADIR%%/lib/winp-1.28.jar %%DATADIR%%/lib/xercesImpl-2.12.0.jar %%DATADIR%%/lib/xml-apis-ext-1.3.04.jar %%DATADIR%%/lib/xml-resolver-1.2.jar @@ -189,13 +200,6 @@ share/applications/phpstorm.desktop %%DATADIR%%/plugins/AngularJS/ngCli/schematicsProvider60.js %%DATADIR%%/plugins/AngularJS/ngCli/schematicsProvider62.js %%DATADIR%%/plugins/AngularJS/ngCli/schematicsProvider70.js -%%DATADIR%%/plugins/AngularJS/ngLanguageService/angular-plugin.js -%%DATADIR%%/plugins/AngularJS/ngLanguageService/angular-session-20.js -%%DATADIR%%/plugins/AngularJS/ngLanguageService/angular-session-latest.js -%%DATADIR%%/plugins/AngularJS/ngLanguageService/angular-session.js -%%DATADIR%%/plugins/AngularJS/ngLanguageService/ngutil.js -%%DATADIR%%/plugins/AngularJS/ngLanguageService/node_modules/ngPluginIDE/index.js -%%DATADIR%%/plugins/AngularJS/ngLanguageService/syntax-kind.js %%DATADIR%%/plugins/CSS/lib/css-openapi.jar %%DATADIR%%/plugins/CSS/lib/css.jar %%DATADIR%%/plugins/CSS/lib/resources_en.jar @@ -214,6 +218,7 @@ share/applications/phpstorm.desktop %%DATADIR%%/plugins/Docker/lib/commons-cli-1.2.jar %%DATADIR%%/plugins/Docker/lib/commons-io-2.3.jar %%DATADIR%%/plugins/Docker/lib/jackson-dataformat-yaml-2.7.3.jar +%%DATADIR%%/plugins/Docker/lib/rt/FastInfoset-1.2.15.jar %%DATADIR%%/plugins/Docker/lib/rt/annotations-3.0.1u2.jar %%DATADIR%%/plugins/Docker/lib/rt/aopalliance-repackaged-2.5.0-b42.jar %%DATADIR%%/plugins/Docker/lib/rt/bcpkix-jdk15on-1.60.jar @@ -230,6 +235,7 @@ share/applications/phpstorm.desktop %%DATADIR%%/plugins/Docker/lib/rt/hk2-utils-2.5.0-b42.jar %%DATADIR%%/plugins/Docker/lib/rt/httpclient-4.5.6.jar %%DATADIR%%/plugins/Docker/lib/rt/httpcore-4.4.10.jar +%%DATADIR%%/plugins/Docker/lib/rt/istack-commons-runtime-3.0.7.jar %%DATADIR%%/plugins/Docker/lib/rt/jackson-annotations-2.9.0.jar %%DATADIR%%/plugins/Docker/lib/rt/jackson-core-2.9.5.jar %%DATADIR%%/plugins/Docker/lib/rt/jackson-databind-2.9.5.jar @@ -242,6 +248,8 @@ share/applications/phpstorm.desktop %%DATADIR%%/plugins/Docker/lib/rt/javax.inject-2.5.0-b42.jar %%DATADIR%%/plugins/Docker/lib/rt/javax.websocket-client-api-1.1.jar %%DATADIR%%/plugins/Docker/lib/rt/javax.ws.rs-api-2.1.jar +%%DATADIR%%/plugins/Docker/lib/rt/jaxb-api-2.3.1.jar +%%DATADIR%%/plugins/Docker/lib/rt/jaxb-runtime-2.3.1.jar %%DATADIR%%/plugins/Docker/lib/rt/jcip-annotations-1.0.jar %%DATADIR%%/plugins/Docker/lib/rt/jcl-over-slf4j-1.7.21.jar %%DATADIR%%/plugins/Docker/lib/rt/jersey-apache-connector-2.27.jar @@ -259,11 +267,13 @@ share/applications/phpstorm.desktop %%DATADIR%%/plugins/Docker/lib/rt/slf4j-api-1.7.25.jar %%DATADIR%%/plugins/Docker/lib/rt/slf4j-log4j12-1.7.25.jar %%DATADIR%%/plugins/Docker/lib/rt/snakeyaml-1.15.jar +%%DATADIR%%/plugins/Docker/lib/rt/stax-ex-1.8.jar %%DATADIR%%/plugins/Docker/lib/rt/tomcat-juli-8.0.22.jar %%DATADIR%%/plugins/Docker/lib/rt/tomcat-servlet-api-8.0.22.jar %%DATADIR%%/plugins/Docker/lib/rt/tomcat-util-8.0.22.jar %%DATADIR%%/plugins/Docker/lib/rt/tomcat-websocket-8.0.22.jar %%DATADIR%%/plugins/Docker/lib/rt/tomcat-websocket-api-8.0.22.jar +%%DATADIR%%/plugins/Docker/lib/rt/txw2-2.3.1.jar %%DATADIR%%/plugins/Docker/lib/specifics/dockerSpecifics.jar %%DATADIR%%/plugins/IntelliLang/lib/IntelliLang.jar %%DATADIR%%/plugins/JSIntentionPowerPack/lib/JSIntentionPowerPack.jar @@ -425,9 +435,11 @@ share/applications/phpstorm.desktop %%DATADIR%%/plugins/NodeJS/lib/resources_en.jar %%DATADIR%%/plugins/PerforceIntegration/lib/PerforceIntegration.jar %%DATADIR%%/plugins/PerforceIntegration/lib/perforce_util.jar +%%DATADIR%%/plugins/PerforceIntegration/lib/resources_en.jar %%DATADIR%%/plugins/RefactorX/lib/RefactorX.jar %%DATADIR%%/plugins/RefactorX/lib/resources_en.jar %%DATADIR%%/plugins/apacheConfig/lib/apacheConfig.jar +%%DATADIR%%/plugins/apacheConfig/lib/resources_en.jar %%DATADIR%%/plugins/asp/lib/asp.jar %%DATADIR%%/plugins/asp/lib/resources_en.jar %%DATADIR%%/plugins/behat/lib/behat.jar @@ -444,12 +456,7 @@ share/applications/phpstorm.desktop %%DATADIR%%/plugins/commandLineTool/lib/resources_en.jar %%DATADIR%%/plugins/configurationScript/lib/configurationScript.jar %%DATADIR%%/plugins/copyright/lib/copyright.jar -%%DATADIR%%/plugins/cvsIntegration/lib/cvsIntegration.jar -%%DATADIR%%/plugins/cvsIntegration/lib/cvs_util.jar -%%DATADIR%%/plugins/cvsIntegration/lib/javacvs-src.jar -%%DATADIR%%/plugins/cvsIntegration/lib/resources_en.jar -%%DATADIR%%/plugins/cvsIntegration/lib/smartcvs-src.jar -%%DATADIR%%/plugins/cvsIntegration/lib/trilead-ssh2-build213.jar +%%DATADIR%%/plugins/copyright/lib/resources_en.jar %%DATADIR%%/plugins/dql/lib/dql.jar %%DATADIR%%/plugins/drupal/lib/drupal.jar %%DATADIR%%/plugins/drupal/lib/resources_en.jar @@ -462,6 +469,7 @@ share/applications/phpstorm.desktop %%DATADIR%%/plugins/git4idea/lib/remote-servers-git.jar %%DATADIR%%/plugins/git4idea/lib/resources_en.jar %%DATADIR%%/plugins/github/lib/github.jar +%%DATADIR%%/plugins/github/lib/resources_en.jar %%DATADIR%%/plugins/haml/lib/haml.jar %%DATADIR%%/plugins/haml/lib/resources_en.jar %%DATADIR%%/plugins/hg4idea/lib/hg4idea.jar @@ -478,13 +486,15 @@ share/applications/phpstorm.desktop %%DATADIR%%/plugins/less/lib/less.jar %%DATADIR%%/plugins/less/lib/resources_en.jar %%DATADIR%%/plugins/localization/lib/localization.jar +%%DATADIR%%/plugins/localization/lib/resources_en.jar %%DATADIR%%/plugins/markdown/lib/markdown-0.1.31.jar %%DATADIR%%/plugins/markdown/lib/markdown.jar %%DATADIR%%/plugins/markdown/lib/owasp-java-html-sanitizer.jar %%DATADIR%%/plugins/markdown/lib/resources_en.jar -%%DATADIR%%/plugins/performanceTesting/lib/async-profiler.jar +%%DATADIR%%/plugins/performanceTesting/lib/async-profiler-1.5-ea.jar %%DATADIR%%/plugins/performanceTesting/lib/performanceTesting.jar %%DATADIR%%/plugins/performanceTesting/lib/resources_en.jar +%%DATADIR%%/plugins/performanceTesting/lib/yjp-controller-api-redist.jar %%DATADIR%%/plugins/phing/lib/phing.jar %%DATADIR%%/plugins/phing/lib/resources_en.jar %%DATADIR%%/plugins/php/index/id-index.input @@ -512,7 +522,7 @@ share/applications/phpstorm.desktop %%DATADIR%%/plugins/php/index/sdk-stubs.names_i %%DATADIR%%/plugins/php/index/sdk-stubs.names_i.len %%DATADIR%%/plugins/php/index/sdk-stubs.version -%%DATADIR%%/plugins/php/lib/commons-compress-1.17.jar +%%DATADIR%%/plugins/php/lib/commons-compress-1.18.jar %%DATADIR%%/plugins/php/lib/php-openapi-src.jar %%DATADIR%%/plugins/php/lib/php-openapi.jar %%DATADIR%%/plugins/php/lib/php.jar @@ -525,6 +535,7 @@ share/applications/phpstorm.desktop %%DATADIR%%/plugins/phpstorm-workshop/lib/phpstorm-workshop.jar %%DATADIR%%/plugins/phpstorm-workshop/lib/resources_en.jar %%DATADIR%%/plugins/remote-run/lib/remote-run.jar +%%DATADIR%%/plugins/remote-run/lib/resources_en.jar %%DATADIR%%/plugins/rest/lib/resources_en.jar %%DATADIR%%/plugins/rest/lib/rest.jar %%DATADIR%%/plugins/restClient/lib/resources_en.jar @@ -547,6 +558,7 @@ share/applications/phpstorm.desktop %%DATADIR%%/plugins/tasks/lib/json-path-0.8.0.jar %%DATADIR%%/plugins/tasks/lib/json-smart-1.1.1.jar %%DATADIR%%/plugins/tasks/lib/tasks-api.jar +%%DATADIR%%/plugins/tasks/lib/tasks-compatibility.jar %%DATADIR%%/plugins/tasks/lib/tasks-core.jar %%DATADIR%%/plugins/tasks/lib/wsdl4j-1.4.jar %%DATADIR%%/plugins/terminal/.zshrc @@ -556,6 +568,7 @@ share/applications/phpstorm.desktop %%DATADIR%%/plugins/terminal/lib/terminal.jar %%DATADIR%%/plugins/textmate/lib/jcodings-1.0.30.jar %%DATADIR%%/plugins/textmate/lib/joni-2.1.18.jar +%%DATADIR%%/plugins/textmate/lib/resources_en.jar %%DATADIR%%/plugins/textmate/lib/textmate.jar %%DATADIR%%/plugins/textmate/lib/themes/All Hallow's Eve.tmTheme %%DATADIR%%/plugins/textmate/lib/themes/Blackboard.tmTheme @@ -589,7 +602,7 @@ share/applications/phpstorm.desktop %%DATADIR%%/plugins/w3validators/lib/tagsoup-1.2.1.jar %%DATADIR%%/plugins/w3validators/lib/w3-css-validator.jar %%DATADIR%%/plugins/w3validators/lib/w3validators.jar -%%DATADIR%%/plugins/webDeployment/lib/commons-vfs2-2.2.1.2.jar +%%DATADIR%%/plugins/webDeployment/lib/commons-vfs2-2.2.1.5.jar %%DATADIR%%/plugins/webDeployment/lib/resources_en.jar %%DATADIR%%/plugins/webDeployment/lib/webDeployment.jar %%DATADIR%%/plugins/wordPress/lib/resources_en.jar diff --git a/devel/kf5-kapidox/Makefile b/devel/kf5-kapidox/Makefile index 0ee6459a433..c36c3b62cfc 100644 --- a/devel/kf5-kapidox/Makefile +++ b/devel/kf5-kapidox/Makefile @@ -2,6 +2,7 @@ PORTNAME= kapidox DISTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org diff --git a/devel/lab/Makefile b/devel/lab/Makefile new file mode 100644 index 00000000000..f440a42d711 --- /dev/null +++ b/devel/lab/Makefile @@ -0,0 +1,90 @@ +# $FreeBSD$ + +PORTNAME= lab +PORTVERSION= 0.15.3 +DISTVERSIONPREFIX= v +CATEGORIES= devel + +MAINTAINER= swills@FreeBSD.org +COMMENT= Lab makes it simple to work with repositories on GitLab + +LICENSE= UNLICENSE +LICENSE_FILE= ${WRKSRC}/LICENSE + +BUILD_DEPENDS= go>=1.10,1:lang/go + +OPTIONS_DEFINE= GIT_SUBVERSION + +GIT_SUBVERSION_DESC= Use devel/git-subversion as backend +GIT_SUBVERSION_RUN_DEPENDS= git-subversion>0:devel/git-subversion +GIT_SUBVERSION_RUN_DEPENDS_OFF= git:devel/git + +USE_GITHUB= yes + +GH_TUPLE= zaquestion:${PORTNAME}:${DISTVERSIONPREFIX}${PORTVERSION}:DEFAULT/src/github.com/zaquestion/${PORTNAME} \ + BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \ + armon:consul-api:eb2c6b5:armon_consul_api/vendor/github.com/armon/consul-api \ + avast:retry-go:5469272:avast_retry_go/vendor/github.com/avast/retry-go \ + coreos:go-etcd:v2.0.0:coreos_go_etcd/vendor/github.com/coreos/go-etcd \ + cpuguy83:go-md2man:v1.0.8:cpuguy83_go_md2man/vendor/github.com/cpuguy83/go-md2man \ + davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \ + fsnotify:fsnotify:v1.4.7:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \ + gdamore:encoding:b23993c:gdamore_encoding/vendor/github.com/gdamore/encoding \ + gdamore:tcell:2f25810:gdamore_tcell/vendor/github.com/gdamore/tcell \ + go-yaml:yaml:v2.2.2:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \ + golang:appengine:v1.4.0:golang_appengine/vendor/google.golang.org/appengine \ + golang:crypto:c2843e0:golang_crypto/vendor/golang.org/x/crypto \ + golang:net:d888771:golang_net/vendor/golang.org/x/net \ + golang:oauth2:e64efc7:golang_oauth2/vendor/golang.org/x/oauth2 \ + golang:protobuf:v1.2.0:golang_protobuf/vendor/github.com/golang/protobuf \ + golang:sync:e225da7:golang_sync/vendor/golang.org/x/sync \ + golang:sys:d0b11bd:golang_sys/vendor/golang.org/x/sys \ + golang:text:17ff2d5:golang_text/vendor/golang.org/x/text \ + golang:tools:e65039e:golang_tools/vendor/golang.org/x/tools \ + google:go-querystring:v1.0.0:google_go_querystring/vendor/github.com/google/go-querystring \ + googleapis:gax-go:v2.0.4:googleapis_gax_go/vendor/github.com/googleapis/gax-go/v2 \ + gopherjs:gopherjs:d547d1d:gopherjs_gopherjs/vendor/github.com/gopherjs/gopherjs \ + hashicorp:golang-lru:v0.5.0:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \ + hashicorp:hcl:ef8a98b:hashicorp_hcl/vendor/github.com/hashicorp/hcl \ + inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \ + jtolds:gls:v4.2.1:jtolds_gls/vendor/github.com/jtolds/gls \ + kr:fs:v0.1.0:kr_fs/vendor/github.com/kr/fs \ + lucasb-eyer:go-colorful:2312723:lucasb_eyer_go_colorful/vendor/github.com/lucasb-eyer/go-colorful \ + lunixbochs:vtclean:2d01aac:lunixbochs_vtclean/vendor/github.com/lunixbochs/vtclean \ + magiconair:properties:v1.7.6:magiconair_properties/vendor/github.com/magiconair/properties \ + mattn:go-runewidth:v0.0.2:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \ + mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \ + mitchellh:mapstructure:00c29f5:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \ + onsi:gomega:v1.4.3:onsi_gomega/vendor/github.com/onsi/gomega \ + pelletier:go-toml:v1.1.0:pelletier_go_toml/vendor/github.com/pelletier/go-toml \ + pkg:errors:v0.8.0:pkg_errors/vendor/github.com/pkg/errors \ + pkg:sftp:v1.10.0:pkg_sftp/vendor/github.com/pkg/sftp \ + pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \ + rivo:tview:f855bee:rivo_tview/vendor/github.com/rivo/tview \ + rsteube:cobra:v0.0.1-zsh-completion-custom:rsteube_cobra/vendor/github.com/spf13/cobra \ + russross:blackfriday:v1.5.1:russross_blackfriday/vendor/github.com/russross/blackfriday \ + smartystreets:assertions:b2de0cb:smartystreets_assertions/vendor/github.com/smartystreets/assertions \ + smartystreets:goconvey:044398e:smartystreets_goconvey/vendor/github.com/smartystreets/goconvey \ + spf13:afero:v1.1.0:spf13_afero/vendor/github.com/spf13/afero \ + spf13:cast:v1.2.0:spf13_cast/vendor/github.com/spf13/cast \ + spf13:jwalterweatherman:7c0cea3:spf13_jwalterweatherman/vendor/github.com/spf13/jwalterweatherman \ + spf13:pflag:v1.0.1:spf13_pflag/vendor/github.com/spf13/pflag \ + spf13:viper:1573881:spf13_viper/vendor/github.com/spf13/viper \ + stretchr:objx:v0.1.1:stretchr_objx/vendor/github.com/stretchr/objx \ + stretchr:testify:v1.2.2:stretchr_testify/vendor/github.com/stretchr/testify \ + tcnksm:go-gitconfig:v0.1.2:tcnksm_go_gitconfig/vendor/github.com/tcnksm/go-gitconfig \ + xanzy:go-gitlab:7bc4155:xanzy_go_gitlab/vendor/github.com/xanzy/go-gitlab \ + xordataexchange:crypt:v0.0.2:xordataexchange_crypt/vendor/github.com/xordataexchange/crypt + +PLIST_FILES= bin/lab + +do-build: + @cd ${WRKSRC}/src/github.com/zaquestion/${PORTNAME}; \ + ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 ${BUILD_ENV} \ + GOPATH=${WRKSRC} go build \ + -ldflags "-X \"main.version=${PORTVERSION}\"" + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ + +.include diff --git a/devel/lab/distinfo b/devel/lab/distinfo new file mode 100644 index 00000000000..61152cfaa85 --- /dev/null +++ b/devel/lab/distinfo @@ -0,0 +1,109 @@ +TIMESTAMP = 1554746559 +SHA256 (zaquestion-lab-v0.15.3_GH0.tar.gz) = 803d3b1a6e3a9d0568d6015f9e470f8ba7235fb90c3867aa06e625aec2dd5fdf +SIZE (zaquestion-lab-v0.15.3_GH0.tar.gz) = 87160 +SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f +SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077 +SHA256 (armon-consul-api-eb2c6b5_GH0.tar.gz) = 619d18729ecc8def1ebde61778c11999e0ee4de7767c29fb6ce35df72f0d8cfc +SIZE (armon-consul-api-eb2c6b5_GH0.tar.gz) = 17977 +SHA256 (avast-retry-go-5469272_GH0.tar.gz) = f4a7a234f791d8a6f3012716e2c8f8ef85ce9766d8e223735705cc689724baa1 +SIZE (avast-retry-go-5469272_GH0.tar.gz) = 6361 +SHA256 (coreos-go-etcd-v2.0.0_GH0.tar.gz) = efddec35876c05beca5d5a673acd34df383d92c795167b312167253b93d98f6c +SIZE (coreos-go-etcd-v2.0.0_GH0.tar.gz) = 19503 +SHA256 (cpuguy83-go-md2man-v1.0.8_GH0.tar.gz) = 84e443c78d048f4a609743704b6bff5c83473691a0793c577ebb9b1f7577c9d5 +SIZE (cpuguy83-go-md2man-v1.0.8_GH0.tar.gz) = 79284 +SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e +SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152 +SHA256 (fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = b7530d973d0ab0e58ad8ce1b9a4b963d6f57b3d72f2f9e13d49846976361b1cd +SIZE (fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = 31139 +SHA256 (gdamore-encoding-b23993c_GH0.tar.gz) = 7fe1ed858143ba259114120a8a736645ee644b22bece7c09240df6113922f01a +SIZE (gdamore-encoding-b23993c_GH0.tar.gz) = 10629 +SHA256 (gdamore-tcell-2f25810_GH0.tar.gz) = e6a928bfa9e1756928fbbe55ff68ba1086fc1494459a1614ae4d78a2ff6eee77 +SIZE (gdamore-tcell-2f25810_GH0.tar.gz) = 718895 +SHA256 (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 42c3e4ef9eca2860d22b3c6c5582c6c13fb4b417e5ebc1acc56ee5e2c4ddcaff +SIZE (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 70656 +SHA256 (golang-appengine-v1.4.0_GH0.tar.gz) = 88b39d4ea8c910849238fea21a52b7fbb53ed63bce64c2496959ebdb8ab36dad +SIZE (golang-appengine-v1.4.0_GH0.tar.gz) = 325752 +SHA256 (golang-crypto-c2843e0_GH0.tar.gz) = f3afeea2d51b073a71102724a2066603c43cd949b6c28cfaad9d665dc8a33def +SIZE (golang-crypto-c2843e0_GH0.tar.gz) = 1650748 +SHA256 (golang-net-d888771_GH0.tar.gz) = dc4279816e175c3e6bb8b0d4808de2e84ab919f1b069818659a476f430fd6e5e +SIZE (golang-net-d888771_GH0.tar.gz) = 973923 +SHA256 (golang-oauth2-e64efc7_GH0.tar.gz) = 905d1fb3366809914621bae03b40b589bede25dd36692ecda661e78ff3521c0e +SIZE (golang-oauth2-e64efc7_GH0.tar.gz) = 44945 +SHA256 (golang-protobuf-v1.2.0_GH0.tar.gz) = 157a148ae4e132eb169ec794b6cb43f1002780eeacaea8b0694811d1948fb1ec +SIZE (golang-protobuf-v1.2.0_GH0.tar.gz) = 332565 +SHA256 (golang-sync-e225da7_GH0.tar.gz) = 0ca7d229725c37038f50bdd2fc5065eb3fbc7de47a96e8ecfbf2c3da04e671e4 +SIZE (golang-sync-e225da7_GH0.tar.gz) = 16285 +SHA256 (golang-sys-d0b11bd_GH0.tar.gz) = a55bda51979fb37cbbab8d1a8ef5b23eb4e9124e0de05c05aec5916af6281df4 +SIZE (golang-sys-d0b11bd_GH0.tar.gz) = 1242651 +SHA256 (golang-text-17ff2d5_GH0.tar.gz) = f0ca7e4efb2d77f6b9aea6c4e86c875b4cb33f656e48a0433e8da418e67ad362 +SIZE (golang-text-17ff2d5_GH0.tar.gz) = 6580326 +SHA256 (golang-tools-e65039e_GH0.tar.gz) = 29fd59183877a438012e2ec6d2875f4403b0f4b58aa8a793372edc9df3a3a20c +SIZE (golang-tools-e65039e_GH0.tar.gz) = 2681790 +SHA256 (google-go-querystring-v1.0.0_GH0.tar.gz) = 59fdfd4d740c85c60c35d3e09b587cfa2b435e78178ac4a23950afbece7118ed +SIZE (google-go-querystring-v1.0.0_GH0.tar.gz) = 7529 +SHA256 (googleapis-gax-go-v2.0.4_GH0.tar.gz) = 9c02744a9260cb20efd22cad068c521029c2b0cc13adaaf768d1f75b53e2a20d +SIZE (googleapis-gax-go-v2.0.4_GH0.tar.gz) = 14335 +SHA256 (gopherjs-gopherjs-d547d1d_GH0.tar.gz) = dd2c46d79cdc6fa4904b3ac1647c9f42e1c4f1a896d10938ef66e194e8cec50d +SIZE (gopherjs-gopherjs-d547d1d_GH0.tar.gz) = 217267 +SHA256 (hashicorp-golang-lru-v0.5.0_GH0.tar.gz) = be137eb6d52bf3573c13d3c6713b7463e82d7d18efefe3959af4d96bc9ed3357 +SIZE (hashicorp-golang-lru-v0.5.0_GH0.tar.gz) = 12942 +SHA256 (hashicorp-hcl-ef8a98b_GH0.tar.gz) = 57a3754b8f027f56aed31b98b607e4e5a3e9f4ae64625fd98e1c3a66ea59a190 +SIZE (hashicorp-hcl-ef8a98b_GH0.tar.gz) = 70438 +SHA256 (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 5edc7731c819c305623568e317aa253d342be3447def97f1fa9e10eb5ad819f6 +SIZE (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 2290 +SHA256 (jtolds-gls-v4.2.1_GH0.tar.gz) = 955860227f00b82bfe0e877f6100832c47ff723913d8a58baccdead73d43d1e7 +SIZE (jtolds-gls-v4.2.1_GH0.tar.gz) = 7296 +SHA256 (kr-fs-v0.1.0_GH0.tar.gz) = 5743b4ec1e7c4a336c40c9936989174dc9bfc1fb19640d7308c04892453f6c8d +SIZE (kr-fs-v0.1.0_GH0.tar.gz) = 4405 +SHA256 (lucasb-eyer-go-colorful-2312723_GH0.tar.gz) = 2fa3fe490b720c273e9d9ce092f6da6ffa35c6156108eec68cd7fe0570714387 +SIZE (lucasb-eyer-go-colorful-2312723_GH0.tar.gz) = 428451 +SHA256 (lunixbochs-vtclean-2d01aac_GH0.tar.gz) = 786cca3c6fef757ae36439ccecd2519b2f4631223b1305ed7649b77e88e86f13 +SIZE (lunixbochs-vtclean-2d01aac_GH0.tar.gz) = 4181 +SHA256 (magiconair-properties-v1.7.6_GH0.tar.gz) = 65d298ef1db6e26409b926d36cf65dcbea684aa9c1dfb676aca321b76a8867b0 +SIZE (magiconair-properties-v1.7.6_GH0.tar.gz) = 28717 +SHA256 (mattn-go-runewidth-v0.0.2_GH0.tar.gz) = 6c7734401fdf829af4f35a5af21a54548f7d3a68336940fb550178ddfe95b076 +SIZE (mattn-go-runewidth-v0.0.2_GH0.tar.gz) = 22367 +SHA256 (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 646671c73a84a8dfb4a5a76b80c7b63549ffefa906524d45077301bc7da76600 +SIZE (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 3362 +SHA256 (mitchellh-mapstructure-00c29f5_GH0.tar.gz) = 612c2d0d6aade35b2556e74be050689517bc9f68a2f0c8c8b3cb1d09d8d123b4 +SIZE (mitchellh-mapstructure-00c29f5_GH0.tar.gz) = 18395 +SHA256 (onsi-gomega-v1.4.3_GH0.tar.gz) = ee4dc5a8bdcf403b631f9e44b996730a36072f06e9aeeb4c527d3c764db37902 +SIZE (onsi-gomega-v1.4.3_GH0.tar.gz) = 87325 +SHA256 (pelletier-go-toml-v1.1.0_GH0.tar.gz) = 7bbfdb5c0ad8af831a43fc2474aa137e0c237258fbc3a843f9de32d3fc41f143 +SIZE (pelletier-go-toml-v1.1.0_GH0.tar.gz) = 56991 +SHA256 (pkg-errors-v0.8.0_GH0.tar.gz) = bacf6c58e490911398cee61742ddc6a90c560733e4c9dcb3d867b17a894c9dd5 +SIZE (pkg-errors-v0.8.0_GH0.tar.gz) = 11344 +SHA256 (pkg-sftp-v1.10.0_GH0.tar.gz) = 583c05019b7c1f3aa9669394f29bf3bf22441498124d1313d9c77f7ef3fdd760 +SIZE (pkg-sftp-v1.10.0_GH0.tar.gz) = 69907 +SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda +SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398 +SHA256 (rivo-tview-f855bee_GH0.tar.gz) = 79e91212073ba10baf1040caaea08473ffc223a02564283291d42217a011707e +SIZE (rivo-tview-f855bee_GH0.tar.gz) = 2739207 +SHA256 (rsteube-cobra-v0.0.1-zsh-completion-custom_GH0.tar.gz) = b13525378bc15275b5d5e7d7ab877abb746ab306ae5fd5ab36f5f9c7fce94158 +SIZE (rsteube-cobra-v0.0.1-zsh-completion-custom_GH0.tar.gz) = 107058 +SHA256 (russross-blackfriday-v1.5.1_GH0.tar.gz) = 9e9169ce1da8f17240843a8547d05b02c6154379d17397d6f374527523e5c0ae +SIZE (russross-blackfriday-v1.5.1_GH0.tar.gz) = 75044 +SHA256 (smartystreets-assertions-b2de0cb_GH0.tar.gz) = 72beb4f8033e151cabc9b7b8df8abd45c596f335f4d0011ebf4609c59238cd32 +SIZE (smartystreets-assertions-b2de0cb_GH0.tar.gz) = 52212 +SHA256 (smartystreets-goconvey-044398e_GH0.tar.gz) = bad3ddcff0dd5baee2a6a7696307ba00fcfedc332268e8d2c68e6b11e35ef903 +SIZE (smartystreets-goconvey-044398e_GH0.tar.gz) = 1476905 +SHA256 (spf13-afero-v1.1.0_GH0.tar.gz) = af615860bcdee49838c76bc6ee9de92fd974def3506636aa675723d07487acf5 +SIZE (spf13-afero-v1.1.0_GH0.tar.gz) = 45189 +SHA256 (spf13-cast-v1.2.0_GH0.tar.gz) = 72398a50dc8f3509cb032c60c9df88cd705ef5e5737d87b157b05dbc1a73a1cd +SIZE (spf13-cast-v1.2.0_GH0.tar.gz) = 9856 +SHA256 (spf13-jwalterweatherman-7c0cea3_GH0.tar.gz) = 2a0f6381de8fccad376097ac7757483706efc74525650918d2cb10f1c578393b +SIZE (spf13-jwalterweatherman-7c0cea3_GH0.tar.gz) = 6342 +SHA256 (spf13-pflag-v1.0.1_GH0.tar.gz) = 3fd7b88585a49ffdf09d72c5320de616334064f79aca4c0152b72a0d7864733b +SIZE (spf13-pflag-v1.0.1_GH0.tar.gz) = 43244 +SHA256 (spf13-viper-1573881_GH0.tar.gz) = 6cf333ceb868f7cd69d52966bb7bd5045b01e85a7683ba3d6e4f33b6a9ff2e98 +SIZE (spf13-viper-1573881_GH0.tar.gz) = 32065 +SHA256 (stretchr-objx-v0.1.1_GH0.tar.gz) = 3bb0a581651f4c040435a70167ab60b723c5af04a5b0326af3c8b01ccc6fdcf0 +SIZE (stretchr-objx-v0.1.1_GH0.tar.gz) = 75768 +SHA256 (stretchr-testify-v1.2.2_GH0.tar.gz) = 0728bb470254e8b39deae3e6c1c92a98e737239ae0be484188fb9083250adf5f +SIZE (stretchr-testify-v1.2.2_GH0.tar.gz) = 101698 +SHA256 (tcnksm-go-gitconfig-v0.1.2_GH0.tar.gz) = 719be614d7ef0c60b6ac2cc745eb67abb0328e9c37c5fc4a30fb8070b9d2ecbc +SIZE (tcnksm-go-gitconfig-v0.1.2_GH0.tar.gz) = 4468 +SHA256 (xanzy-go-gitlab-7bc4155_GH0.tar.gz) = 6f0ed6b437fe99ddae90ef4405e13755447aaa0ff1e3b2a6761dbf7cf27acdee +SIZE (xanzy-go-gitlab-7bc4155_GH0.tar.gz) = 108356 +SHA256 (xordataexchange-crypt-v0.0.2_GH0.tar.gz) = f8203f73cb62049254ef1d43fb202c025f65f8fe7f9f49e3a8ef934ed38e31f7 +SIZE (xordataexchange-crypt-v0.0.2_GH0.tar.gz) = 9045 diff --git a/devel/lab/pkg-descr b/devel/lab/pkg-descr new file mode 100644 index 00000000000..ccf8f8035dc --- /dev/null +++ b/devel/lab/pkg-descr @@ -0,0 +1,4 @@ +Lab wraps Git or Hub, making it simple to clone, fork, and interact with +repositories on GitLab + +WWW: https://zaquestion.github.io/lab diff --git a/devel/libarea/Makefile b/devel/libarea/Makefile index 8345f72a40f..e752723b2f5 100644 --- a/devel/libarea/Makefile +++ b/devel/libarea/Makefile @@ -3,7 +3,7 @@ PORTNAME= libarea PORTVERSION= 20160313 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= devel cad MAINTAINER= pfg@FreeBSD.org diff --git a/devel/libepp-nicbr/Makefile b/devel/libepp-nicbr/Makefile index 6f74cc0ea4e..b185ffb4d94 100644 --- a/devel/libepp-nicbr/Makefile +++ b/devel/libepp-nicbr/Makefile @@ -3,7 +3,7 @@ PORTNAME= libepp-nicbr PORTVERSION= 1.15 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= ftp://ftp.registro.br/pub/libepp-nicbr/ diff --git a/devel/libnfc/Makefile b/devel/libnfc/Makefile index 7237c1a357b..5f4a23e6826 100644 --- a/devel/libnfc/Makefile +++ b/devel/libnfc/Makefile @@ -3,7 +3,7 @@ PORTNAME= libnfc PORTVERSION= 1.7.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MASTER_SITES= http://dl.bintray.com/nfc-tools/sources/ \ http://romain.blogreen.org/distfiles/ diff --git a/devel/libpeas/Makefile b/devel/libpeas/Makefile index 689c94f308d..168604776cb 100644 --- a/devel/libpeas/Makefile +++ b/devel/libpeas/Makefile @@ -38,7 +38,7 @@ PLIST= ${.CURDIR}/pkg-plist USES+= python USE_PYTHON= flavors USE_GNOME+= pygobject3 -.if ${FLAVOR:Upy27:Mpy2*} +.if ${FLAVOR:Upy36:Mpy2*} CONFIGURE_ARGS+= --disable-python3 BUILD_WRKSRC= ${WRKSRC}/loaders/python INSTALL_WRKSRC= ${WRKSRC}/loaders/python diff --git a/devel/libreadline-java/Makefile b/devel/libreadline-java/Makefile index fafcb698193..368313a9880 100644 --- a/devel/libreadline-java/Makefile +++ b/devel/libreadline-java/Makefile @@ -4,7 +4,7 @@ PORTNAME= libreadline-java PORTVERSION= 0.8.0 DISTVERSIONSUFFIX= -src -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel java MASTER_SITES= SF/java-readline/java-readline/${PORTVERSION} diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile index 5fd0056378e..4180bf43dbd 100644 --- a/devel/libvirt/Makefile +++ b/devel/libvirt/Makefile @@ -3,6 +3,7 @@ PORTNAME= libvirt PORTVERSION= 5.2.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://libvirt.org/sources/ \ ftp://libvirt.org/libvirt/ diff --git a/devel/mspdebug/Makefile b/devel/mspdebug/Makefile index 0133d23ccfd..0e623d30f16 100644 --- a/devel/mspdebug/Makefile +++ b/devel/mspdebug/Makefile @@ -3,7 +3,7 @@ PORTNAME= mspdebug PORTVERSION= 0.25.20180301 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= peterjeremy@acm.org diff --git a/devel/nuitka/Makefile b/devel/nuitka/Makefile index 2dbd7441323..483b1dbd976 100644 --- a/devel/nuitka/Makefile +++ b/devel/nuitka/Makefile @@ -3,6 +3,7 @@ PORTNAME= nuitka PORTVERSION= 0.6.3 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= https://nuitka.net/releases/ DISTNAME= Nuitka-${PORTVERSION} diff --git a/devel/omake/Makefile b/devel/omake/Makefile index cf9d1c61f07..16adbde795b 100644 --- a/devel/omake/Makefile +++ b/devel/omake/Makefile @@ -3,7 +3,7 @@ PORTNAME= omake DISTVERSION= 0.9.8.6-0.rc1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= http://pkgs.fedoraproject.org/repo/pkgs/ocaml-omake/omake-0.9.8.6-0.rc1.tar.gz/fe39a476ef4e33b7ba2ca77a6bcaded2/ \ http://download.camlcity.org/download/ diff --git a/devel/omniORB/Makefile b/devel/omniORB/Makefile index 084e26e9b0c..3a70956d3dc 100644 --- a/devel/omniORB/Makefile +++ b/devel/omniORB/Makefile @@ -3,6 +3,7 @@ PORTNAME= omniORB DISTVERSION= 4.2.3 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME}/${PORTNAME}-${DISTVERSION:S/-2//} diff --git a/devel/opendht/Makefile b/devel/opendht/Makefile index 1ab29c556aa..a103baa52f4 100644 --- a/devel/opendht/Makefile +++ b/devel/opendht/Makefile @@ -3,6 +3,7 @@ PORTNAME= opendht DISTVERSION= 1.8.2 +PORTREVISION= 1 CATEGORIES= devel net MAINTAINER= yuri@FreeBSD.org diff --git a/devel/openzz/Makefile b/devel/openzz/Makefile index 44814d63883..19f8159ae87 100644 --- a/devel/openzz/Makefile +++ b/devel/openzz/Makefile @@ -3,7 +3,7 @@ PORTNAME= openzz DISTVERSION= 1.0.4-4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-1.0.4-4 diff --git a/devel/p5-Alien-Build/Makefile b/devel/p5-Alien-Build/Makefile index 00d9f3a1976..076ce1fba32 100644 --- a/devel/p5-Alien-Build/Makefile +++ b/devel/p5-Alien-Build/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= Alien-Build -PORTVERSION= 1.62 +PORTVERSION= 1.63 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-Alien-Build/distinfo b/devel/p5-Alien-Build/distinfo index 50b7899fe4c..fa6117314cc 100644 --- a/devel/p5-Alien-Build/distinfo +++ b/devel/p5-Alien-Build/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553765427 -SHA256 (Alien-Build-1.62.tar.gz) = f9c69455de8a0949e54ed3cb6c01ca510fe532ef708c51658235d78de0720161 -SIZE (Alien-Build-1.62.tar.gz) = 233731 +TIMESTAMP = 1554816937 +SHA256 (Alien-Build-1.63.tar.gz) = 031b78e56bb9d8739cce3adbf6fc388c07745b5ad8463261be54b0d6aa3ed38b +SIZE (Alien-Build-1.63.tar.gz) = 256233 diff --git a/devel/p5-Term-ReadLine-Gnu/Makefile b/devel/p5-Term-ReadLine-Gnu/Makefile index aa0f14dbf6b..a565c75ea34 100644 --- a/devel/p5-Term-ReadLine-Gnu/Makefile +++ b/devel/p5-Term-ReadLine-Gnu/Makefile @@ -3,6 +3,7 @@ PORTNAME= Term-ReadLine-Gnu PORTVERSION= 1.36 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-Test2-Harness/Makefile b/devel/p5-Test2-Harness/Makefile index f783dfbe1f1..316eab475d0 100644 --- a/devel/p5-Test2-Harness/Makefile +++ b/devel/p5-Test2-Harness/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Test2-Harness -PORTVERSION= 0.001071 +PORTVERSION= 0.001072 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:EXODIST diff --git a/devel/p5-Test2-Harness/distinfo b/devel/p5-Test2-Harness/distinfo index 79bc9867d44..f4e8a7edd27 100644 --- a/devel/p5-Test2-Harness/distinfo +++ b/devel/p5-Test2-Harness/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1546258214 -SHA256 (Test2-Harness-0.001071.tar.gz) = e88cbe375969dbde4d4fe86983af13b445b1acf1449146296e6fb54d98cd7339 -SIZE (Test2-Harness-0.001071.tar.gz) = 185320 +TIMESTAMP = 1554816903 +SHA256 (Test2-Harness-0.001072.tar.gz) = bafe29e44591b031b7a752fa9471b02cdb2eebcc35334394f469adf6d26365f9 +SIZE (Test2-Harness-0.001072.tar.gz) = 187043 diff --git a/devel/pam_wrapper/Makefile b/devel/pam_wrapper/Makefile index eedfb7fbdbf..2741502dbce 100644 --- a/devel/pam_wrapper/Makefile +++ b/devel/pam_wrapper/Makefile @@ -2,7 +2,7 @@ PORTNAME= pam_wrapper PORTVERSION= 1.0.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= SAMBA/cwrap diff --git a/devel/pear-HTML_Common2/Makefile b/devel/pear-HTML_Common2/Makefile index c4f882ce4ce..778ca934440 100644 --- a/devel/pear-HTML_Common2/Makefile +++ b/devel/pear-HTML_Common2/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= HTML_Common2 -PORTVERSION= 2.1.1 +PORTVERSION= 2.1.2 CATEGORIES= devel www pear MAINTAINER= bofh@FreeBSD.org @@ -12,4 +12,6 @@ LICENSE= BSD2CLAUSE USES= pear +NO_ARCH= yes + .include diff --git a/devel/pear-HTML_Common2/distinfo b/devel/pear-HTML_Common2/distinfo index 7c0db0f0f47..9f08b7fa554 100644 --- a/devel/pear-HTML_Common2/distinfo +++ b/devel/pear-HTML_Common2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1497163087 -SHA256 (PEAR/HTML_Common2-2.1.1.tgz) = 50f608e33ec1812eff40a42f375c4ba95021dcf3f9f67e7836f4d14032ed4dc3 -SIZE (PEAR/HTML_Common2-2.1.1.tgz) = 8664 +TIMESTAMP = 1554838803 +SHA256 (PEAR/HTML_Common2-2.1.2.tgz) = f93f91a6cfffa1f97297963193f467bd57e466104874b43eed84bacebaafb3ec +SIZE (PEAR/HTML_Common2-2.1.2.tgz) = 8579 diff --git a/devel/pecl-xdebug-devel/Makefile b/devel/pecl-xdebug-devel/Makefile deleted file mode 100644 index d5f2f1b3d55..00000000000 --- a/devel/pecl-xdebug-devel/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# Created by: Luca Pizzamiglio -# $FreeBSD$ - -PORTNAME= xdebug -DISTVERSION= 2.7.0beta1 -CATEGORIES= devel pear -PKGNAMESUFFIX= -devel - -MAINTAINER= pizzamig@FreeBSD.org -COMMENT= Xdebug extension for PHP - -LICENSE= PHP30 -LICENSE_FILE= ${WRKSRC}/LICENSE - -IGNORE_WITH_PHP= 71 - -USES= php:pecl,zend tar:tgz - -CONFIGURE_ARGS= --enable-xdebug - -SUB_FILES= pkg-message - -.include diff --git a/devel/pecl-xdebug-devel/distinfo b/devel/pecl-xdebug-devel/distinfo deleted file mode 100644 index a9a189264af..00000000000 --- a/devel/pecl-xdebug-devel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1539096489 -SHA256 (PECL/xdebug-2.7.0beta1.tgz) = 90a0ceaf95c7d936113ed0d7474f16978ec2277453be69239d92d0523e0910be -SIZE (PECL/xdebug-2.7.0beta1.tgz) = 226296 diff --git a/devel/pecl-xdebug-devel/files/patch-xdebug__compat.h b/devel/pecl-xdebug-devel/files/patch-xdebug__compat.h deleted file mode 100644 index f631c585edf..00000000000 --- a/devel/pecl-xdebug-devel/files/patch-xdebug__compat.h +++ /dev/null @@ -1,11 +0,0 @@ ---- xdebug_compat.h.orig 2018-12-23 17:22:30 UTC -+++ xdebug_compat.h -@@ -75,8 +75,4 @@ zend_bool xdebug_zend_hash_apply_protection_end(HashTa - # define XDEBUG_ZEND_CONSTANT_MODULE_NUMBER(v) ((v)->module_number) - # endif - --# if PHP_VERSION_ID < 70300 --typedef void (*zif_handler)(INTERNAL_FUNCTION_PARAMETERS); --# endif -- - #endif diff --git a/devel/pecl-xdebug-devel/files/pkg-message.in b/devel/pecl-xdebug-devel/files/pkg-message.in deleted file mode 100644 index 40b8ca11dcb..00000000000 --- a/devel/pecl-xdebug-devel/files/pkg-message.in +++ /dev/null @@ -1,21 +0,0 @@ -***************************************************************************** -The php debugger 'xdebug' has been installed successful. -Add a line containing - - extension=%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/xdebug.so - -or - - zend_extension=%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/xdebug.so - -to your php.ini to load it. xdebug is not compatible with the extension -'Zend Optimizer' - you're only able to use one of them. So take care having -at least the lesser required extension disabled by commenting out it's -loader line in your php.ini. - -Add following section to enable profiling: - -xdebug.profiler_enable = 1 -xdebug.profiler_output_dir = /tmp/profiler - -***************************************************************************** diff --git a/devel/pecl-xdebug-devel/pkg-descr b/devel/pecl-xdebug-devel/pkg-descr deleted file mode 100644 index 6559c98759f..00000000000 --- a/devel/pecl-xdebug-devel/pkg-descr +++ /dev/null @@ -1,20 +0,0 @@ -The Xdebug extension helps you debugging your script by providing a lot of -valuable debug information. The debug information that Xdebug can provide -includes the following: - - * stack and function traces in error messages with: - o full parameter display for user defined functions - o function name, file name and line indications - o support for member functions - * memory allocation - * protection for infinite recursions - -Xdebug also provides: - - * profiling information for PHP scripts - * script execution analysis - * capabilities to debug your scripts interactively with a debug client - -Beta Version! The only one supporting PHP 7.3 - -WWW: http://www.xdebug.org/ diff --git a/devel/pecl-xdebug25/Makefile b/devel/pecl-xdebug25/Makefile deleted file mode 100644 index 9e212319dd7..00000000000 --- a/devel/pecl-xdebug25/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# Created by: Jens Rehsack -# $FreeBSD$ - -PORTNAME= xdebug -PORTVERSION= 2.5.5 -PORTREVISION= 1 -CATEGORIES= devel pear -PKGNAMESUFFIX= 25 - -MAINTAINER= pizzamig@FreeBSD.org -COMMENT= Xdebug extension for PHP - -LICENSE= PHP30 -LICENSE_FILE= ${WRKSRC}/LICENSE - -IGNORE_WITH_PHP= 72 73 - -USES= php:pecl,zend - -CONFIGURE_ARGS= --enable-xdebug - -SUB_FILES= pkg-message - -PORTSCOUT= limit=^2\.5\. - -.include diff --git a/devel/pecl-xdebug25/distinfo b/devel/pecl-xdebug25/distinfo deleted file mode 100644 index ab2cc250b5e..00000000000 --- a/devel/pecl-xdebug25/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1515538532 -SHA256 (PECL/xdebug-2.5.5.tgz) = 72108bf2bc514ee7198e10466a0fedcac3df9bbc5bd26ce2ec2dafab990bf1a4 -SIZE (PECL/xdebug-2.5.5.tgz) = 279491 diff --git a/devel/pecl-xdebug25/files/patch-xdebug__com.c b/devel/pecl-xdebug25/files/patch-xdebug__com.c deleted file mode 100644 index 96256283258..00000000000 --- a/devel/pecl-xdebug25/files/patch-xdebug__com.c +++ /dev/null @@ -1,10 +0,0 @@ ---- xdebug_com.c.orig 2016-12-28 02:42:57 UTC -+++ xdebug_com.c -@@ -26,6 +26,7 @@ - # include - # include - # include -+# include - # include - # include - #else diff --git a/devel/pecl-xdebug25/files/pkg-message.in b/devel/pecl-xdebug25/files/pkg-message.in deleted file mode 100644 index d3960b2f56f..00000000000 --- a/devel/pecl-xdebug25/files/pkg-message.in +++ /dev/null @@ -1,15 +0,0 @@ -***************************************************************************** -The php debugger 'xdebug' has been installed successful. - -It has been automatically enabled. - -xdebug is not compatible with the extension 'Zend Optimizer' - you're only able -to use one of them. So take care having at least the lesser required extension -disabled by commenting out it's loader line in its %%PREFIX%%/etc/php/ext-* file. - -Add following section to enable profiling: - -xdebug.profiler_enable = 1 -xdebug.profiler_output_dir = /tmp/profiler - -***************************************************************************** diff --git a/devel/pecl-xdebug25/pkg-descr b/devel/pecl-xdebug25/pkg-descr deleted file mode 100644 index afbb8bcb431..00000000000 --- a/devel/pecl-xdebug25/pkg-descr +++ /dev/null @@ -1,19 +0,0 @@ -The Xdebug extension helps you debugging your script by providing a lot of -valuable debug information. The debug information that Xdebug can provide -includes the following: - - * stack and function traces in error messages with: - o full parameter display for user defined functions - o function name, file name and line indications - o support for member functions - * memory allocation - * protection for infinite recursions - -Xdebug also provides: - - * profiling information for PHP scripts - * script execution analysis - * capabilities to debug your scripts interactively with a debug client - -WWW: https://www.xdebug.org/ -WWW: https://pecl.php.net/package/xdebug diff --git a/devel/pep8/Makefile b/devel/pep8/Makefile index 6ee3c8b142e..7d22201f645 100644 --- a/devel/pep8/Makefile +++ b/devel/pep8/Makefile @@ -3,7 +3,7 @@ PORTNAME= pep8 PORTVERSION= 1.7.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/physfs/Makefile b/devel/physfs/Makefile index 5d192663226..6b799f4187d 100644 --- a/devel/physfs/Makefile +++ b/devel/physfs/Makefile @@ -3,6 +3,7 @@ PORTNAME= physfs PORTVERSION= 3.0.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://icculus.org/${PORTNAME}/downloads/ diff --git a/devel/poco-ssl/Makefile b/devel/poco-ssl/Makefile index 3bee9259e21..93bc5a511d0 100644 --- a/devel/poco-ssl/Makefile +++ b/devel/poco-ssl/Makefile @@ -16,6 +16,9 @@ COMMENT= C++ libraries with a network/internet focus (full version) LICENSE= BSL LICENSE_FILE= ${WRKSRC}/LICENSE +DEPRECATED= Newer version available; use devel/poco instead +EXPIRATION_DATE= 2019-04-30 + BROKEN_SSL= openssl111 BROKEN_SSL_REASON_openssl111= field has incomplete type 'EVP_CIPHER_CTX' (aka 'evp_cipher_ctx_st') diff --git a/devel/pure-readline/Makefile b/devel/pure-readline/Makefile index 399efc0d2ed..113bba88195 100644 --- a/devel/pure-readline/Makefile +++ b/devel/pure-readline/Makefile @@ -3,7 +3,7 @@ PORTNAME= pure-readline PORTVERSION= 0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= https://bitbucket.org/purelang/pure-lang/downloads/ DIST_SUBDIR= pure diff --git a/devel/py-Automat/Makefile b/devel/py-Automat/Makefile index 40a1a9b3e0a..79e746eaa1d 100644 --- a/devel/py-Automat/Makefile +++ b/devel/py-Automat/Makefile @@ -3,6 +3,7 @@ PORTNAME= Automat PORTVERSION= 0.7.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-Faker/Makefile b/devel/py-Faker/Makefile index 10f33fe4719..169fd7a2a6b 100644 --- a/devel/py-Faker/Makefile +++ b/devel/py-Faker/Makefile @@ -3,7 +3,7 @@ PORTNAME= Faker PORTVERSION= 0.8.15 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-PyUtilib/Makefile b/devel/py-PyUtilib/Makefile index 9b84fea63cd..6a908f1689b 100644 --- a/devel/py-PyUtilib/Makefile +++ b/devel/py-PyUtilib/Makefile @@ -2,6 +2,7 @@ PORTNAME= PyUtilib DISTVERSION= 5.6.5 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-argcomplete/Makefile b/devel/py-argcomplete/Makefile index 9799d760ff1..83b3c29a5a9 100644 --- a/devel/py-argcomplete/Makefile +++ b/devel/py-argcomplete/Makefile @@ -3,6 +3,7 @@ PORTNAME= argcomplete PORTVERSION= 1.9.5 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-avro/Makefile b/devel/py-avro/Makefile index 017f814c3f9..7dce2ff8641 100644 --- a/devel/py-avro/Makefile +++ b/devel/py-avro/Makefile @@ -3,6 +3,7 @@ PORTNAME= avro PORTVERSION= 1.8.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-black/Makefile b/devel/py-black/Makefile index 261a72e3dff..63ca4444f8d 100644 --- a/devel/py-black/Makefile +++ b/devel/py-black/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= black -DISTVERSION= 18.9b0 +DISTVERSION= 19.3b0 CATEGORIES= devel MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,7 +12,7 @@ COMMENT= Python code formatter LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=17.4.0:devel/py-attrs@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=18.1.0:devel/py-attrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}click>=6.5:devel/py-click@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}toml>=0.9.4:textproc/py-toml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}appdirs>=0:devel/py-appdirs@${PY_FLAVOR} diff --git a/devel/py-black/distinfo b/devel/py-black/distinfo index 81179e3b152..f6fcf4460ea 100644 --- a/devel/py-black/distinfo +++ b/devel/py-black/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1542678848 -SHA256 (black-18.9b0.tar.gz) = e030a9a28f542debc08acceb273f228ac422798e5215ba2a791a6ddeaaca22a5 -SIZE (black-18.9b0.tar.gz) = 151371 +TIMESTAMP = 1553109740 +SHA256 (black-19.3b0.tar.gz) = 68950ffd4d9169716bcb8719a56c07a2f4485354fec061cdd5910aa07369731c +SIZE (black-19.3b0.tar.gz) = 155556 diff --git a/devel/py-boto/Makefile b/devel/py-boto/Makefile index 57a87352f35..5517176f6b2 100644 --- a/devel/py-boto/Makefile +++ b/devel/py-boto/Makefile @@ -3,6 +3,7 @@ PORTNAME= boto PORTVERSION= 2.49.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-btest/Makefile b/devel/py-btest/Makefile index 90bda83d9b8..d2e4608f78c 100644 --- a/devel/py-btest/Makefile +++ b/devel/py-btest/Makefile @@ -2,6 +2,7 @@ PORTNAME= btest DISTVERSION= 0.58 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-buildbot-pkg/Makefile b/devel/py-buildbot-pkg/Makefile index 357eeb1019e..39d9a4c7401 100644 --- a/devel/py-buildbot-pkg/Makefile +++ b/devel/py-buildbot-pkg/Makefile @@ -3,6 +3,7 @@ PORTNAME= buildbot-pkg PORTVERSION= 1.5.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-buildbot-worker/Makefile b/devel/py-buildbot-worker/Makefile index c665686237b..8af1604012d 100644 --- a/devel/py-buildbot-worker/Makefile +++ b/devel/py-buildbot-worker/Makefile @@ -3,6 +3,7 @@ PORTNAME= buildbot-worker PORTVERSION= 1.5.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-buildbot/Makefile b/devel/py-buildbot/Makefile index 718268697e2..024878c691d 100644 --- a/devel/py-buildbot/Makefile +++ b/devel/py-buildbot/Makefile @@ -3,7 +3,7 @@ PORTNAME= buildbot PORTVERSION= 1.5.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-cdg/Makefile b/devel/py-cdg/Makefile index c704d747e23..f0706e96e01 100644 --- a/devel/py-cdg/Makefile +++ b/devel/py-cdg/Makefile @@ -2,6 +2,7 @@ PORTNAME= cdg PORTVERSION= 0.1.3 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-check-manifest/Makefile b/devel/py-check-manifest/Makefile index f63ccf9c8ea..fb76d78abd6 100644 --- a/devel/py-check-manifest/Makefile +++ b/devel/py-check-manifest/Makefile @@ -3,6 +3,7 @@ PORTNAME= check-manifest PORTVERSION= 0.37 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-codecov/Makefile b/devel/py-codecov/Makefile index 53fbb6112fc..27dae88cb88 100644 --- a/devel/py-codecov/Makefile +++ b/devel/py-codecov/Makefile @@ -3,6 +3,7 @@ PORTNAME= codecov PORTVERSION= 2.0.15 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-coloredlogs/Makefile b/devel/py-coloredlogs/Makefile index 81651c7ef52..5d3cfe538e1 100644 --- a/devel/py-coloredlogs/Makefile +++ b/devel/py-coloredlogs/Makefile @@ -2,6 +2,7 @@ PORTNAME= coloredlogs PORTVERSION= 10.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-confusable_homoglyphs/Makefile b/devel/py-confusable_homoglyphs/Makefile index 67ac2edbb7c..e568f0051d6 100644 --- a/devel/py-confusable_homoglyphs/Makefile +++ b/devel/py-confusable_homoglyphs/Makefile @@ -3,6 +3,7 @@ PORTNAME= confusable_homoglyphs PORTVERSION= 3.2.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-cookiecutter/Makefile b/devel/py-cookiecutter/Makefile index f29458be395..567989b5b75 100644 --- a/devel/py-cookiecutter/Makefile +++ b/devel/py-cookiecutter/Makefile @@ -2,6 +2,7 @@ PORTNAME= cookiecutter PORTVERSION= 1.6.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-dateutils/Makefile b/devel/py-dateutils/Makefile index 0059e5239c8..21f3bf80882 100644 --- a/devel/py-dateutils/Makefile +++ b/devel/py-dateutils/Makefile @@ -3,7 +3,7 @@ PORTNAME= dateutils PORTVERSION= 0.6.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-ddtrace/Makefile b/devel/py-ddtrace/Makefile index 797abc7ea2f..e07798e2c29 100644 --- a/devel/py-ddtrace/Makefile +++ b/devel/py-ddtrace/Makefile @@ -3,6 +3,7 @@ PORTNAME= ddtrace PORTVERSION= 0.23.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-dill/Makefile b/devel/py-dill/Makefile index b341c407c7a..fde7defe730 100644 --- a/devel/py-dill/Makefile +++ b/devel/py-dill/Makefile @@ -3,6 +3,7 @@ PORTNAME= dill DISTVERSION= 0.2.9 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-dtfabric/Makefile b/devel/py-dtfabric/Makefile index 217d42b49d9..3b1dd136373 100644 --- a/devel/py-dtfabric/Makefile +++ b/devel/py-dtfabric/Makefile @@ -3,6 +3,7 @@ PORTNAME= dtfabric PORTVERSION= 20190120 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP \ https://github.com/libyal/dtfabric/releases/download/${PORTVERSION}/ diff --git a/devel/py-epsilon/Makefile b/devel/py-epsilon/Makefile index d8a184de694..e74ad589090 100644 --- a/devel/py-epsilon/Makefile +++ b/devel/py-epsilon/Makefile @@ -3,6 +3,7 @@ PORTNAME= epsilon PORTVERSION= 0.7.3 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-eventlib/Makefile b/devel/py-eventlib/Makefile index 401ca0829e6..078d2affe46 100644 --- a/devel/py-eventlib/Makefile +++ b/devel/py-eventlib/Makefile @@ -3,6 +3,7 @@ PORTNAME= eventlib PORTVERSION= 0.1.5 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-fastentrypoints/Makefile b/devel/py-fastentrypoints/Makefile index 69f00bf04d5..e7fc4155d90 100644 --- a/devel/py-fastentrypoints/Makefile +++ b/devel/py-fastentrypoints/Makefile @@ -2,6 +2,7 @@ PORTNAME= fastentrypoints PORTVERSION= 0.9 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-fastimport/Makefile b/devel/py-fastimport/Makefile index e2fe91b43b9..f3c94514654 100644 --- a/devel/py-fastimport/Makefile +++ b/devel/py-fastimport/Makefile @@ -3,6 +3,7 @@ PORTNAME= fastimport PORTVERSION= 0.9.8 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-flake8/Makefile b/devel/py-flake8/Makefile index f6942515cf6..a46ab17ad38 100644 --- a/devel/py-flake8/Makefile +++ b/devel/py-flake8/Makefile @@ -3,6 +3,7 @@ PORTNAME= flake8 PORTVERSION= 3.7.7 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-flex/Makefile b/devel/py-flex/Makefile index 557fac0caf0..571a58cbb29 100644 --- a/devel/py-flex/Makefile +++ b/devel/py-flex/Makefile @@ -2,7 +2,7 @@ PORTNAME= flex DISTVERSION= 6.13.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-foolscap/Makefile b/devel/py-foolscap/Makefile index 6c267b82f11..47b59bf311a 100644 --- a/devel/py-foolscap/Makefile +++ b/devel/py-foolscap/Makefile @@ -3,7 +3,7 @@ PORTNAME= foolscap PORTVERSION= 0.13.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-future/Makefile b/devel/py-future/Makefile index 82d2c5cb82d..1ed7b9d7d5f 100644 --- a/devel/py-future/Makefile +++ b/devel/py-future/Makefile @@ -3,6 +3,7 @@ PORTNAME= future PORTVERSION= 0.17.1 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-fypp/Makefile b/devel/py-fypp/Makefile index 70ea917df4a..1f22ed49383 100644 --- a/devel/py-fypp/Makefile +++ b/devel/py-fypp/Makefile @@ -2,6 +2,7 @@ PORTNAME= fypp PORTVERSION= 2.1.1 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-gdata/Makefile b/devel/py-gdata/Makefile index 5db819bf601..2ae6abeb23b 100644 --- a/devel/py-gdata/Makefile +++ b/devel/py-gdata/Makefile @@ -16,6 +16,8 @@ LICENSE= APACHE20 USES= python:2.7 USE_PYTHON= autoplist distutils +NO_ARCH= yes + OPTIONS_DEFINE= GMPY M2CRYPTO PYCRYPTO EXAMPLES # optional modules (see src/gdata/tlslite/utils/cryptomath.py) diff --git a/devel/py-git-up/Makefile b/devel/py-git-up/Makefile index dae846c1ec5..d041ba418a6 100644 --- a/devel/py-git-up/Makefile +++ b/devel/py-git-up/Makefile @@ -2,6 +2,7 @@ PORTNAME= git-up DISTVERSION= 1.4.5 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-git_semver/Makefile b/devel/py-git_semver/Makefile index 66ee857a59e..43c4398673f 100644 --- a/devel/py-git_semver/Makefile +++ b/devel/py-git_semver/Makefile @@ -3,6 +3,7 @@ PORTNAME= git_semver PORTVERSION= 0.2.3 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-gitless/Makefile b/devel/py-gitless/Makefile index be373dc0367..78f30178d63 100644 --- a/devel/py-gitless/Makefile +++ b/devel/py-gitless/Makefile @@ -3,6 +3,7 @@ PORTNAME= gitless PORTVERSION= 0.8.6 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-glance-store/Makefile b/devel/py-glance-store/Makefile index c0163374f61..6d16ca32672 100644 --- a/devel/py-glance-store/Makefile +++ b/devel/py-glance-store/Makefile @@ -3,6 +3,7 @@ PORTNAME= glance-store PORTVERSION= 0.23.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-icalendar/Makefile b/devel/py-icalendar/Makefile index f390d38c8bb..ceece6288af 100644 --- a/devel/py-icalendar/Makefile +++ b/devel/py-icalendar/Makefile @@ -3,6 +3,7 @@ PORTNAME= icalendar PORTVERSION= 4.0.3 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-invoke/Makefile b/devel/py-invoke/Makefile index 2cf82bdffbd..1a76180fcad 100644 --- a/devel/py-invoke/Makefile +++ b/devel/py-invoke/Makefile @@ -3,6 +3,7 @@ PORTNAME= invoke PORTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-ipdb/Makefile b/devel/py-ipdb/Makefile index 1cff1d2bc98..e15c7e75ce2 100644 --- a/devel/py-ipdb/Makefile +++ b/devel/py-ipdb/Makefile @@ -2,6 +2,7 @@ PORTNAME= ipdb PORTVERSION= 0.12 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-ipyparallel/Makefile b/devel/py-ipyparallel/Makefile index 7e8c66cb0f9..d4054a8edf6 100644 --- a/devel/py-ipyparallel/Makefile +++ b/devel/py-ipyparallel/Makefile @@ -2,7 +2,7 @@ PORTNAME= ipyparallel PORTVERSION= 6.2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-isort/Makefile b/devel/py-isort/Makefile index 8a8de7c1296..677e9f532a3 100644 --- a/devel/py-isort/Makefile +++ b/devel/py-isort/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ PORTNAME= isort -PORTVERSION= 4.3.16 +PORTVERSION= 4.3.17 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-isort/distinfo b/devel/py-isort/distinfo index b6a481f259b..014631841e4 100644 --- a/devel/py-isort/distinfo +++ b/devel/py-isort/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553536702 -SHA256 (isort-4.3.16.tar.gz) = 08f8e3f0f0b7249e9fad7e5c41e2113aba44969798a26452ee790c06f155d4ec -SIZE (isort-4.3.16.tar.gz) = 68434 +TIMESTAMP = 1554740469 +SHA256 (isort-4.3.17.tar.gz) = 268067462aed7eb2a1e237fcb287852f22077de3fb07964e87e00f829eea2d1a +SIZE (isort-4.3.17.tar.gz) = 68797 diff --git a/devel/py-javaproperties/Makefile b/devel/py-javaproperties/Makefile index 4c6456ea4f9..6d9280c8b04 100644 --- a/devel/py-javaproperties/Makefile +++ b/devel/py-javaproperties/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= javaproperties -DISTVERSION= 0.5.1 +DISTVERSION= 0.5.2 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-javaproperties/distinfo b/devel/py-javaproperties/distinfo index 3a4e6853b5c..92930fd2e5a 100644 --- a/devel/py-javaproperties/distinfo +++ b/devel/py-javaproperties/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1550757174 -SHA256 (javaproperties-0.5.1.tar.gz) = 2b0237b054af4d24c74f54734b7d997ca040209a1820e96fb4a82625f7bd40cf -SIZE (javaproperties-0.5.1.tar.gz) = 29150 +TIMESTAMP = 1554810508 +SHA256 (javaproperties-0.5.2.tar.gz) = 68add3438bd24d6e32665cad91f254fc82a51bf905e21f3f424a085c79904fb3 +SIZE (javaproperties-0.5.2.tar.gz) = 30244 diff --git a/devel/py-javaproperties/files/patch-setup.py b/devel/py-javaproperties/files/patch-setup.py deleted file mode 100644 index 070f8e12402..00000000000 --- a/devel/py-javaproperties/files/patch-setup.py +++ /dev/null @@ -1,12 +0,0 @@ ---- setup.py.orig 2018-05-25 22:39:16 UTC -+++ setup.py -@@ -3,6 +3,9 @@ import re - from setuptools import setup - - with open(join(dirname(__file__), 'javaproperties', '__init__.py')) as fp: -+ # Workaround for Python 3: -+ # Move a bit forward to get past the unicode characters -+ fp.seek(256) - for line in fp: - m = re.search(r'^\s*__version__\s*=\s*([\'"])([^\'"]+)\1\s*$', line) - if m: diff --git a/devel/py-jsondiff/Makefile b/devel/py-jsondiff/Makefile index 46e66ed4ce7..a616fb70a97 100644 --- a/devel/py-jsondiff/Makefile +++ b/devel/py-jsondiff/Makefile @@ -3,6 +3,7 @@ PORTNAME= jsondiff PORTVERSION= 1.1.2 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-jsonpatch/Makefile b/devel/py-jsonpatch/Makefile index cc3902a469f..73b4bd8f125 100644 --- a/devel/py-jsonpatch/Makefile +++ b/devel/py-jsonpatch/Makefile @@ -2,6 +2,7 @@ PORTNAME= jsonpatch DISTVERSION= 1.21 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-jsonpointer/Makefile b/devel/py-jsonpointer/Makefile index fd1df59796a..c00ba3485d5 100644 --- a/devel/py-jsonpointer/Makefile +++ b/devel/py-jsonpointer/Makefile @@ -2,7 +2,7 @@ PORTNAME= jsonpointer PORTVERSION= 1.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-jsonschema/Makefile b/devel/py-jsonschema/Makefile index 0ee61018b0b..94fb393170a 100644 --- a/devel/py-jsonschema/Makefile +++ b/devel/py-jsonschema/Makefile @@ -3,7 +3,7 @@ PORTNAME= jsonschema PORTVERSION= 3.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-jupyter_client/Makefile b/devel/py-jupyter_client/Makefile index 166520e1d1f..8c418b9e2e9 100644 --- a/devel/py-jupyter_client/Makefile +++ b/devel/py-jupyter_client/Makefile @@ -2,6 +2,7 @@ PORTNAME= jupyter_client PORTVERSION= 5.2.4 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-jupyter_core/Makefile b/devel/py-jupyter_core/Makefile index b869c7d4cec..b6f4b925e98 100644 --- a/devel/py-jupyter_core/Makefile +++ b/devel/py-jupyter_core/Makefile @@ -2,7 +2,7 @@ PORTNAME= jupyter_core PORTVERSION= 4.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-kaptan/Makefile b/devel/py-kaptan/Makefile index 124c3f29b6e..516382853af 100644 --- a/devel/py-kaptan/Makefile +++ b/devel/py-kaptan/Makefile @@ -3,6 +3,7 @@ PORTNAME= kaptan PORTVERSION= 0.5.11 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-logfury/Makefile b/devel/py-logfury/Makefile index f2ac8707257..14f192e3142 100644 --- a/devel/py-logfury/Makefile +++ b/devel/py-logfury/Makefile @@ -6,7 +6,7 @@ PORTVERSION= 0.1.2 CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -MAINTAINER= gordon@FreeBSD.org +MAINTAINER= python@FreeBSD.org COMMENT= Toolkit for logging of library method calls LICENSE= BSD3CLAUSE diff --git a/devel/py-logilab-common/Makefile b/devel/py-logilab-common/Makefile index 9595a0b17e1..133f63e9e6e 100644 --- a/devel/py-logilab-common/Makefile +++ b/devel/py-logilab-common/Makefile @@ -3,6 +3,7 @@ PORTNAME= logilab-common PORTVERSION= 1.4.2 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-memory_profiler/Makefile b/devel/py-memory_profiler/Makefile index ccfb02621f5..b4f56cd5efd 100644 --- a/devel/py-memory_profiler/Makefile +++ b/devel/py-memory_profiler/Makefile @@ -3,6 +3,7 @@ PORTNAME= memory_profiler PORTVERSION= 0.55.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-molecule/Makefile b/devel/py-molecule/Makefile index 814bb48c2ee..b6abda3a5e8 100644 --- a/devel/py-molecule/Makefile +++ b/devel/py-molecule/Makefile @@ -2,6 +2,7 @@ PORTNAME= molecule PORTVERSION= 2.20.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-nbconvert/Makefile b/devel/py-nbconvert/Makefile index 15a20a17a59..0f3da58515e 100644 --- a/devel/py-nbconvert/Makefile +++ b/devel/py-nbconvert/Makefile @@ -2,6 +2,7 @@ PORTNAME= nbconvert PORTVERSION= 5.4.1 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-nbformat/Makefile b/devel/py-nbformat/Makefile index c1eff0093b7..81aa6c30670 100644 --- a/devel/py-nbformat/Makefile +++ b/devel/py-nbformat/Makefile @@ -2,7 +2,7 @@ PORTNAME= nbformat PORTVERSION= 4.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-nose2/Makefile b/devel/py-nose2/Makefile index 54d32f9326d..52a0df0b4b8 100644 --- a/devel/py-nose2/Makefile +++ b/devel/py-nose2/Makefile @@ -2,6 +2,7 @@ PORTNAME= nose2 PORTVERSION= 0.8.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-numba/Makefile b/devel/py-numba/Makefile index 14dcbcecf11..2348bfbf20b 100644 --- a/devel/py-numba/Makefile +++ b/devel/py-numba/Makefile @@ -3,7 +3,7 @@ PORTNAME= numba DISTVERSION= 0.40.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-oletools/Makefile b/devel/py-oletools/Makefile index 555c391070f..ca1df0e6137 100644 --- a/devel/py-oletools/Makefile +++ b/devel/py-oletools/Makefile @@ -3,6 +3,7 @@ PORTNAME= oletools PORTVERSION= 0.52.5 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-oslo.concurrency/Makefile b/devel/py-oslo.concurrency/Makefile index 188934dff55..1b7c4c2c8e7 100644 --- a/devel/py-oslo.concurrency/Makefile +++ b/devel/py-oslo.concurrency/Makefile @@ -3,6 +3,7 @@ PORTNAME= oslo.concurrency PORTVERSION= 3.29.1 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-oslo.config/Makefile b/devel/py-oslo.config/Makefile index 0aa33315e6d..254d954030c 100644 --- a/devel/py-oslo.config/Makefile +++ b/devel/py-oslo.config/Makefile @@ -3,6 +3,7 @@ PORTNAME= oslo.config PORTVERSION= 6.8.1 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-oslo.log/Makefile b/devel/py-oslo.log/Makefile index 8d27fd5c075..63363c34072 100644 --- a/devel/py-oslo.log/Makefile +++ b/devel/py-oslo.log/Makefile @@ -3,6 +3,7 @@ PORTNAME= oslo.log PORTVERSION= 3.42.3 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-oslo.messaging/Makefile b/devel/py-oslo.messaging/Makefile index 2a0e56fffbc..17a615dfb6a 100644 --- a/devel/py-oslo.messaging/Makefile +++ b/devel/py-oslo.messaging/Makefile @@ -3,6 +3,7 @@ PORTNAME= oslo.messaging PORTVERSION= 9.5.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-oslo.policy/Makefile b/devel/py-oslo.policy/Makefile index f90aa300a2f..eccb9a41654 100644 --- a/devel/py-oslo.policy/Makefile +++ b/devel/py-oslo.policy/Makefile @@ -3,6 +3,7 @@ PORTNAME= oslo.policy PORTVERSION= 2.1.1 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-oslo.privsep/Makefile b/devel/py-oslo.privsep/Makefile index 36021016cb2..a4dc8cdbc22 100644 --- a/devel/py-oslo.privsep/Makefile +++ b/devel/py-oslo.privsep/Makefile @@ -3,6 +3,7 @@ PORTNAME= oslo.privsep PORTVERSION= 1.32.1 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-oslo.rootwrap/Makefile b/devel/py-oslo.rootwrap/Makefile index 486fade6158..ad9341941dc 100644 --- a/devel/py-oslo.rootwrap/Makefile +++ b/devel/py-oslo.rootwrap/Makefile @@ -3,6 +3,7 @@ PORTNAME= oslo.rootwrap PORTVERSION= 5.15.2 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-petname/Makefile b/devel/py-petname/Makefile index 6b5512120ff..6843857f7bf 100644 --- a/devel/py-petname/Makefile +++ b/devel/py-petname/Makefile @@ -3,6 +3,7 @@ PORTNAME= petname PORTVERSION= 2.2 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-pew/Makefile b/devel/py-pew/Makefile index 6543ee3af07..d19c8e4cfaa 100644 --- a/devel/py-pew/Makefile +++ b/devel/py-pew/Makefile @@ -3,6 +3,7 @@ PORTNAME= pew PORTVERSION= 1.1.5 +PORTREVISION= 1 CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-phply/Makefile b/devel/py-phply/Makefile index c3405713da9..f6f918a5b77 100644 --- a/devel/py-phply/Makefile +++ b/devel/py-phply/Makefile @@ -2,7 +2,7 @@ PORTNAME= phply PORTVERSION= 1.2.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-pip-tools/Makefile b/devel/py-pip-tools/Makefile index 0305d397ee2..25573494093 100644 --- a/devel/py-pip-tools/Makefile +++ b/devel/py-pip-tools/Makefile @@ -3,6 +3,7 @@ PORTNAME= pip-tools PORTVERSION= 3.6.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-pipenv/Makefile b/devel/py-pipenv/Makefile index 27c6d7f8b4d..4ca1c7193bd 100644 --- a/devel/py-pipenv/Makefile +++ b/devel/py-pipenv/Makefile @@ -3,6 +3,7 @@ PORTNAME= pipenv PORTVERSION= 2018.11.26 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-ptable/Makefile b/devel/py-ptable/Makefile index 60f4f3d61cc..7eb5dc84a6d 100644 --- a/devel/py-ptable/Makefile +++ b/devel/py-ptable/Makefile @@ -3,6 +3,7 @@ PORTNAME= ptable PORTVERSION= 0.9.2 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-ptpython/Makefile b/devel/py-ptpython/Makefile index 02f8ea275b3..2aff8512f12 100644 --- a/devel/py-ptpython/Makefile +++ b/devel/py-ptpython/Makefile @@ -3,6 +3,7 @@ PORTNAME= ptpython PORTVERSION= 0.41 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-pudb/Makefile b/devel/py-pudb/Makefile index da580849fca..6a2f6c19592 100644 --- a/devel/py-pudb/Makefile +++ b/devel/py-pudb/Makefile @@ -3,6 +3,7 @@ PORTNAME= pudb PORTVERSION= 2018.1 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-pyasn1-modules/Makefile b/devel/py-pyasn1-modules/Makefile index 2081fb46bd6..3330346774d 100644 --- a/devel/py-pyasn1-modules/Makefile +++ b/devel/py-pyasn1-modules/Makefile @@ -2,6 +2,7 @@ PORTNAME= pyasn1-modules PORTVERSION= 0.2.3 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-pycallgraph/Makefile b/devel/py-pycallgraph/Makefile index 2e5e23d7484..45b10b2538f 100644 --- a/devel/py-pycallgraph/Makefile +++ b/devel/py-pycallgraph/Makefile @@ -3,7 +3,7 @@ PORTNAME= pycallgraph PORTVERSION= 0.5.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel python MASTER_SITES= http://pycallgraph.slowchop.com/files/download/ \ http://www.cs.nctu.edu.tw/~lwhsu/ports/distfiles/ diff --git a/devel/py-pycmd/Makefile b/devel/py-pycmd/Makefile index cc498dd45f0..efde327f4d2 100644 --- a/devel/py-pycmd/Makefile +++ b/devel/py-pycmd/Makefile @@ -3,6 +3,7 @@ PORTNAME= pycmd PORTVERSION= 1.2 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-pydevd/Makefile b/devel/py-pydevd/Makefile index c407ee50030..51718f9f4fc 100644 --- a/devel/py-pydevd/Makefile +++ b/devel/py-pydevd/Makefile @@ -2,7 +2,7 @@ PORTNAME= pydevd PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-pydocstyle/Makefile b/devel/py-pydocstyle/Makefile index a6049f0b60c..ab832cc0f9e 100644 --- a/devel/py-pydocstyle/Makefile +++ b/devel/py-pydocstyle/Makefile @@ -3,6 +3,7 @@ PORTNAME= pydocstyle PORTVERSION= 3.0.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-pyelftools/Makefile b/devel/py-pyelftools/Makefile index 727e0aba6c6..b74034bfaf9 100644 --- a/devel/py-pyelftools/Makefile +++ b/devel/py-pyelftools/Makefile @@ -3,6 +3,7 @@ PORTNAME= pyelftools PORTVERSION= 0.25 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-pyflakes/Makefile b/devel/py-pyflakes/Makefile index 9bee292f9aa..1f9077d94fa 100644 --- a/devel/py-pyflakes/Makefile +++ b/devel/py-pyflakes/Makefile @@ -3,6 +3,7 @@ PORTNAME= pyflakes PORTVERSION= 2.1.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-pyparsing/Makefile b/devel/py-pyparsing/Makefile index d7f7bd17348..9c5a629dd6a 100644 --- a/devel/py-pyparsing/Makefile +++ b/devel/py-pyparsing/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pyparsing -PORTVERSION= 2.3.1 +PORTVERSION= 2.4.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-pyparsing/distinfo b/devel/py-pyparsing/distinfo index 97dad94884a..2f5d8b4c3fa 100644 --- a/devel/py-pyparsing/distinfo +++ b/devel/py-pyparsing/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1547477338 -SHA256 (pyparsing-2.3.1.tar.gz) = 66c9268862641abcac4a96ba74506e594c884e3f57690a696d21ad8210ed667a -SIZE (pyparsing-2.3.1.tar.gz) = 596497 +TIMESTAMP = 1554816909 +SHA256 (pyparsing-2.4.0.tar.gz) = 1873c03321fc118f4e9746baf201ff990ceb915f433f23b395f5580d1840cb2a +SIZE (pyparsing-2.4.0.tar.gz) = 611956 diff --git a/devel/py-pyro/Makefile b/devel/py-pyro/Makefile index bc14f0e97d1..7a42d938a0f 100644 --- a/devel/py-pyro/Makefile +++ b/devel/py-pyro/Makefile @@ -3,6 +3,7 @@ PORTNAME= pyro PORTVERSION= 4.74 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-python-bugzilla/Makefile b/devel/py-python-bugzilla/Makefile index d4478660172..cca81c8948c 100644 --- a/devel/py-python-bugzilla/Makefile +++ b/devel/py-python-bugzilla/Makefile @@ -3,6 +3,7 @@ PORTNAME= python-bugzilla PORTVERSION= 2.2.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-python-gflags/Makefile b/devel/py-python-gflags/Makefile index 664d49e1ba2..20e638cb391 100644 --- a/devel/py-python-gflags/Makefile +++ b/devel/py-python-gflags/Makefile @@ -3,6 +3,7 @@ PORTNAME= python-gflags PORTVERSION= 3.1.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-python-gilt/Makefile b/devel/py-python-gilt/Makefile index 71cbd91ada5..0e4642e63da 100644 --- a/devel/py-python-gilt/Makefile +++ b/devel/py-python-gilt/Makefile @@ -2,6 +2,7 @@ PORTNAME= python-gilt PORTVERSION= 1.2.1 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-python-gitlab/Makefile b/devel/py-python-gitlab/Makefile index 2cd3827f3b1..97aeb409c6e 100644 --- a/devel/py-python-gitlab/Makefile +++ b/devel/py-python-gitlab/Makefile @@ -2,6 +2,7 @@ PORTNAME= python-gitlab PORTVERSION= 1.8.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-python-subunit/Makefile b/devel/py-python-subunit/Makefile index 6a7dfd410de..6820c6ac1b7 100644 --- a/devel/py-python-subunit/Makefile +++ b/devel/py-python-subunit/Makefile @@ -2,7 +2,7 @@ PORTNAME= python-subunit DISTVERSION= 1.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-pyvisa/Makefile b/devel/py-pyvisa/Makefile index 79b2fe3d5f4..c819a5bb1a2 100644 --- a/devel/py-pyvisa/Makefile +++ b/devel/py-pyvisa/Makefile @@ -2,6 +2,7 @@ PORTNAME= pyvisa PORTVERSION= 1.9.1 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-pyxb/Makefile b/devel/py-pyxb/Makefile index bd740e3e9b4..ab5f21ab7e0 100644 --- a/devel/py-pyxb/Makefile +++ b/devel/py-pyxb/Makefile @@ -3,6 +3,7 @@ PORTNAME= pyxb PORTVERSION= 1.2.6 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-qt5-core/Makefile b/devel/py-qt5-core/Makefile index 650d5174312..6690c248fb1 100644 --- a/devel/py-qt5-core/Makefile +++ b/devel/py-qt5-core/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= core +PORTREVISION= 1 CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org diff --git a/devel/py-raven/Makefile b/devel/py-raven/Makefile index 37949b74e08..84f0074f8b5 100644 --- a/devel/py-raven/Makefile +++ b/devel/py-raven/Makefile @@ -2,6 +2,7 @@ PORTNAME= raven PORTVERSION= 6.10.0 +PORTREVISION= 1 CATEGORIES= devel python #MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-rwt/Makefile b/devel/py-rwt/Makefile index cb5b014dbb7..53edc67cce8 100644 --- a/devel/py-rwt/Makefile +++ b/devel/py-rwt/Makefile @@ -3,6 +3,7 @@ PORTNAME= rwt PORTVERSION= 4.4.2 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-sip/Makefile b/devel/py-sip/Makefile index 7293d00e53f..e2ee08f3718 100644 --- a/devel/py-sip/Makefile +++ b/devel/py-sip/Makefile @@ -3,6 +3,7 @@ PORTNAME= sip PORTVERSION= ${SIP_VERSION} +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITES_SIP} diff --git a/devel/py-tables/Makefile b/devel/py-tables/Makefile index e37d2c77640..fc85c23d662 100644 --- a/devel/py-tables/Makefile +++ b/devel/py-tables/Makefile @@ -3,6 +3,7 @@ PORTNAME= tables PORTVERSION= 3.5.1 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-tabulate/Makefile b/devel/py-tabulate/Makefile index 040ce87b365..14425463936 100644 --- a/devel/py-tabulate/Makefile +++ b/devel/py-tabulate/Makefile @@ -3,7 +3,7 @@ PORTNAME= tabulate PORTVERSION= 0.8.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-tapi/Makefile b/devel/py-tapi/Makefile index e8b6a5d2e47..08d9776b441 100644 --- a/devel/py-tapi/Makefile +++ b/devel/py-tapi/Makefile @@ -3,7 +3,7 @@ PORTNAME= tapi PORTVERSION= 0.1.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-tempora/Makefile b/devel/py-tempora/Makefile index 37f113c3582..12e59a20a7a 100644 --- a/devel/py-tempora/Makefile +++ b/devel/py-tempora/Makefile @@ -3,6 +3,7 @@ PORTNAME= tempora PORTVERSION= 1.14 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-testrepository/Makefile b/devel/py-testrepository/Makefile index d6efae8f09c..868e08f8962 100644 --- a/devel/py-testrepository/Makefile +++ b/devel/py-testrepository/Makefile @@ -2,6 +2,7 @@ PORTNAME= testrepository DISTVERSION= 0.0.20 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-tox/Makefile b/devel/py-tox/Makefile index 53830654c5b..66441296d92 100644 --- a/devel/py-tox/Makefile +++ b/devel/py-tox/Makefile @@ -3,6 +3,7 @@ PORTNAME= tox PORTVERSION= 3.0.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-twine/Makefile b/devel/py-twine/Makefile index dcae011557d..a9032a383db 100644 --- a/devel/py-twine/Makefile +++ b/devel/py-twine/Makefile @@ -3,6 +3,7 @@ PORTNAME= twine DISTVERSION= 1.13.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-twisted/Makefile b/devel/py-twisted/Makefile index 7456c0c70b1..3d6bc95ca67 100644 --- a/devel/py-twisted/Makefile +++ b/devel/py-twisted/Makefile @@ -3,6 +3,7 @@ PORTNAME= twisted PORTVERSION= 18.9.0 +PORTREVISION= 1 CATEGORIES= devel net python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-virtualenv-clone/Makefile b/devel/py-virtualenv-clone/Makefile index 90aea7fa860..5608bfcc838 100644 --- a/devel/py-virtualenv-clone/Makefile +++ b/devel/py-virtualenv-clone/Makefile @@ -3,6 +3,7 @@ PORTNAME= virtualenv-clone PORTVERSION= 0.4.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-vulture/Makefile b/devel/py-vulture/Makefile index fea83a6129d..170944739c5 100644 --- a/devel/py-vulture/Makefile +++ b/devel/py-vulture/Makefile @@ -3,6 +3,7 @@ PORTNAME= vulture PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-xdis/Makefile b/devel/py-xdis/Makefile index bc12d1ce83f..537e24f614e 100644 --- a/devel/py-xdis/Makefile +++ b/devel/py-xdis/Makefile @@ -3,6 +3,7 @@ PORTNAME= xdis PORTVERSION= 3.9.1 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-yamllint/Makefile b/devel/py-yamllint/Makefile index dacf166f7c2..d77efc87d65 100644 --- a/devel/py-yamllint/Makefile +++ b/devel/py-yamllint/Makefile @@ -2,6 +2,7 @@ PORTNAME= yamllint PORTVERSION= 1.15.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-yappi/Makefile b/devel/py-yappi/Makefile index 07c943ce436..bcccb399325 100644 --- a/devel/py-yappi/Makefile +++ b/devel/py-yappi/Makefile @@ -3,6 +3,7 @@ PORTNAME= yappi PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/pycanberra/Makefile b/devel/pycanberra/Makefile index f923636d07e..28bdddfc392 100644 --- a/devel/pycanberra/Makefile +++ b/devel/pycanberra/Makefile @@ -3,7 +3,7 @@ PORTNAME= pycanberra DISTVERSION= 1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= hello@blubee.me diff --git a/devel/pycos/Makefile b/devel/pycos/Makefile index 143d6154de7..ab362fba642 100644 --- a/devel/pycos/Makefile +++ b/devel/pycos/Makefile @@ -3,6 +3,7 @@ PORTNAME= pycos PORTVERSION= 4.8.11 +PORTREVISION= 1 CATEGORIES= devel net MASTER_SITES= SF/${PORTNAME} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/pylint1/Makefile b/devel/pylint1/Makefile index aac47e91666..fa8a27d03f4 100644 --- a/devel/pylint1/Makefile +++ b/devel/pylint1/Makefile @@ -3,6 +3,7 @@ PORTNAME= pylint PORTVERSION= 1.9.4 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMESUFFIX= 1${PYTHON_PKGNAMESUFFIX} diff --git a/devel/pyobfuscate/Makefile b/devel/pyobfuscate/Makefile index 7021ec15837..3dde802271c 100644 --- a/devel/pyobfuscate/Makefile +++ b/devel/pyobfuscate/Makefile @@ -3,6 +3,7 @@ PORTNAME= pyobfuscate PORTVERSION= 0.3.20131129 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= cs@FreeBSD.org diff --git a/devel/pysvn/Makefile b/devel/pysvn/Makefile index 7f9592546d6..8b021de5b05 100644 --- a/devel/pysvn/Makefile +++ b/devel/pysvn/Makefile @@ -3,6 +3,7 @@ PORTNAME= pysvn PORTVERSION= 1.9.3 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://pysvn.barrys-emacs.org/source_kits/ diff --git a/devel/radian/Makefile b/devel/radian/Makefile index 5702029d3b8..c2903279385 100644 --- a/devel/radian/Makefile +++ b/devel/radian/Makefile @@ -2,6 +2,7 @@ PORTNAME= radian DISTVERSION= 0.3.4 +PORTREVISION= 1 CATEGORIES= devel math python MASTER_SITES= CHEESESHOP diff --git a/devel/remake/Makefile b/devel/remake/Makefile index 90d93c8bf6d..b3c5afa554b 100644 --- a/devel/remake/Makefile +++ b/devel/remake/Makefile @@ -3,7 +3,7 @@ PORTNAME= remake PORTVERSION= 1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= SF/bashdb/remake/4.2+dbg-${PORTVERSION}/ DISTNAME= remake-4.2.1+dbg-${PORTVERSION} diff --git a/devel/rlwrap/Makefile b/devel/rlwrap/Makefile index 806ad3809d4..fb53bfeb780 100644 --- a/devel/rlwrap/Makefile +++ b/devel/rlwrap/Makefile @@ -4,7 +4,7 @@ PORTNAME= rlwrap PORTVERSION= 0.42 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= gamato@users.sf.net diff --git a/devel/rubygem-bindex/Makefile b/devel/rubygem-bindex/Makefile index 68c5c543954..08790a7e675 100644 --- a/devel/rubygem-bindex/Makefile +++ b/devel/rubygem-bindex/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= bindex -PORTVERSION= 0.6.0 +PORTVERSION= 0.7.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-bindex/distinfo b/devel/rubygem-bindex/distinfo index 1ac5881c1ed..6c4b17ed1f6 100644 --- a/devel/rubygem-bindex/distinfo +++ b/devel/rubygem-bindex/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553961895 -SHA256 (rubygem/bindex-0.6.0.gem) = 9d5961eaf3fa8ebbba8776f32485d7f4347626754cc80d60a2c877142419edbc -SIZE (rubygem/bindex-0.6.0.gem) = 18944 +TIMESTAMP = 1554816917 +SHA256 (rubygem/bindex-0.7.0.gem) = 528a47a2a8c3dc1c1cee336eed1e2e692653602855b52323fb1ad5776efe2645 +SIZE (rubygem/bindex-0.7.0.gem) = 19456 diff --git a/devel/rubygem-resque/Makefile b/devel/rubygem-resque/Makefile index 0f94825a3cb..d8845f1e6fb 100644 --- a/devel/rubygem-resque/Makefile +++ b/devel/rubygem-resque/Makefile @@ -1,7 +1,7 @@ -# $FreeBSD$ +#$FreeBSD$ PORTNAME= resque -PORTVERSION= 1.27.4 +PORTVERSION= 2.0.0 CATEGORIES= devel ruby MASTER_SITES= RG diff --git a/devel/rubygem-resque/distinfo b/devel/rubygem-resque/distinfo index ca8eb689154..1334570bcc6 100644 --- a/devel/rubygem-resque/distinfo +++ b/devel/rubygem-resque/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1510680988 -SHA256 (rubygem/resque-1.27.4.gem) = 387c1f7314815ea808cfc6dced3ac295ca91027daa7682b45cd3d9400d391d05 -SIZE (rubygem/resque-1.27.4.gem) = 98304 +TIMESTAMP = 1554741287 +SHA256 (rubygem/resque-2.0.0.gem) = c040661fcdbb432f41e8ec8ebf7ee98d9dca558ce7a980388557308b438ce1fb +SIZE (rubygem/resque-2.0.0.gem) = 98304 diff --git a/devel/rubygem-web-console-rails50/Makefile b/devel/rubygem-web-console-rails50/Makefile index 928fd72efe7..8680ffb7138 100644 --- a/devel/rubygem-web-console-rails50/Makefile +++ b/devel/rubygem-web-console-rails50/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/MIT-LICENSE RUN_DEPENDS= rubygem-activemodel50>=5.0:databases/rubygem-activemodel50 \ rubygem-actionview50>=5.0:devel/rubygem-actionview50 \ - rubygem-bindex>=0:devel/rubygem-bindex \ + rubygem-bindex>=0.4.0:devel/rubygem-bindex \ rubygem-railties50>=5.0:www/rubygem-railties50 USES= gem diff --git a/devel/rubygem-web-console/Makefile b/devel/rubygem-web-console/Makefile index 0dc71def5e2..b542e9263f4 100644 --- a/devel/rubygem-web-console/Makefile +++ b/devel/rubygem-web-console/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/MIT-LICENSE RUN_DEPENDS= rubygem-activemodel5>=5.0:databases/rubygem-activemodel5 \ rubygem-actionview5>=5.0:devel/rubygem-actionview5 \ - rubygem-bindex>=0:devel/rubygem-bindex \ + rubygem-bindex>=0.4.0:devel/rubygem-bindex \ rubygem-railties5>=5.0:www/rubygem-railties5 USES= gem diff --git a/devel/rudiments/Makefile b/devel/rudiments/Makefile index 10c4e0314b5..6026acc8175 100644 --- a/devel/rudiments/Makefile +++ b/devel/rudiments/Makefile @@ -3,6 +3,7 @@ PORTNAME= rudiments PORTVERSION= 1.1.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= SF diff --git a/devel/st/Makefile b/devel/st/Makefile index b8e58cba1c5..8934c22ca26 100644 --- a/devel/st/Makefile +++ b/devel/st/Makefile @@ -7,7 +7,7 @@ PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}ate-threads/${PORTNAME}ate-threads/${PORTVERSION} -MAINTAINER= tobez@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= State Threads Library for Internet Applications USES= uidfix diff --git a/devel/tclreadline/Makefile b/devel/tclreadline/Makefile index e69186ca6e3..1fa4971a23b 100644 --- a/devel/tclreadline/Makefile +++ b/devel/tclreadline/Makefile @@ -3,6 +3,7 @@ PORTNAME= tclreadline PORTVERSION= 2.3.5 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= devel tcl diff --git a/devel/tdl/Makefile b/devel/tdl/Makefile index d403ce3ce90..8f4c1312c71 100644 --- a/devel/tdl/Makefile +++ b/devel/tdl/Makefile @@ -3,7 +3,7 @@ PORTNAME= tdl PORTVERSION= 1.5.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://www.rpcurnow.force9.co.uk/tdl/ diff --git a/devel/tig/Makefile b/devel/tig/Makefile index 839a3643a91..8d7919c7d03 100644 --- a/devel/tig/Makefile +++ b/devel/tig/Makefile @@ -3,7 +3,7 @@ PORTNAME= tig PORTVERSION= 2.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= https://github.com/jonas/tig/releases/download/${DISTNAME}/ diff --git a/devel/urjtag/Makefile b/devel/urjtag/Makefile index ecd4dd8d1ee..22cae09130f 100644 --- a/devel/urjtag/Makefile +++ b/devel/urjtag/Makefile @@ -3,7 +3,7 @@ PORTNAME= urjtag PORTVERSION= 0.10 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= devel MASTER_SITES= SF diff --git a/devel/vitables/Makefile b/devel/vitables/Makefile index e8240e4373b..ad73295373d 100644 --- a/devel/vitables/Makefile +++ b/devel/vitables/Makefile @@ -4,7 +4,7 @@ PORTNAME= vitables DISTVERSIONPREFIX= v DISTVERSION= 3.0.0-55 DISTVERSIONSUFFIX= -gb064ad7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel science python MAINTAINER= yuri@FreeBSD.org diff --git a/devel/yosys/Makefile b/devel/yosys/Makefile index a19a921b8d8..8c5bdc3e3b1 100644 --- a/devel/yosys/Makefile +++ b/devel/yosys/Makefile @@ -4,7 +4,7 @@ PORTNAME= yosys DISTVERSIONPREFIX= yosys- DISTVERSION= 0.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= jsorocil@gmail.com diff --git a/dns/dnsrecon/Makefile b/dns/dnsrecon/Makefile index c079cdba101..e6f9d27b0ef 100644 --- a/dns/dnsrecon/Makefile +++ b/dns/dnsrecon/Makefile @@ -2,7 +2,7 @@ PORTNAME= dnsrecon DISTVERSION= 0.8.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= dns MAINTAINER= rihaz.jerrin@gmail.com diff --git a/dns/dnsviz/Makefile b/dns/dnsviz/Makefile index c9f27117361..2dcd25c0173 100644 --- a/dns/dnsviz/Makefile +++ b/dns/dnsviz/Makefile @@ -2,7 +2,7 @@ PORTNAME= dnsviz PORTVERSION= 0.8.1 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX=v CATEGORIES= dns diff --git a/dns/opendd/Makefile b/dns/opendd/Makefile index 2401a0eadbc..8e68522de42 100644 --- a/dns/opendd/Makefile +++ b/dns/opendd/Makefile @@ -25,6 +25,11 @@ RCNG_DESC= Install RC_NG script .include +.if ${SSL_DEFAULT} == base +BROKEN_FreeBSD_12= undefined symbol: BIO_set_conn_ip +BROKEN_FreeBSD_13= undefined symbol: BIO_set_conn_ip +.endif + .if ${PORT_OPTIONS:MRCNG} USE_RC_SUBR= ${PORTNAME} .endif diff --git a/dns/powerdns-recursor/Makefile b/dns/powerdns-recursor/Makefile index a69a4c1f7b2..26cb360d01f 100644 --- a/dns/powerdns-recursor/Makefile +++ b/dns/powerdns-recursor/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= recursor -DISTVERSION= 4.1.11 -PORTREVISION= 1 +DISTVERSION= 4.1.12 CATEGORIES= dns ipv6 MASTER_SITES= http://downloads.powerdns.com/releases/ PKGNAMEPREFIX= powerdns- diff --git a/dns/powerdns-recursor/distinfo b/dns/powerdns-recursor/distinfo index 1e1c2d78c59..cb297387abd 100644 --- a/dns/powerdns-recursor/distinfo +++ b/dns/powerdns-recursor/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1549022270 -SHA256 (pdns-recursor-4.1.11.tar.bz2) = 9ec7d52b545d3ea4498b17ea5433a686aa0d82e882608dcdcea9a116a3f4d670 -SIZE (pdns-recursor-4.1.11.tar.bz2) = 1239986 +TIMESTAMP = 1554205295 +SHA256 (pdns-recursor-4.1.12.tar.bz2) = e41c0a9825915084794edd86e31bb9bde558a5efa8e178c168b82546fecdb0c8 +SIZE (pdns-recursor-4.1.12.tar.bz2) = 1245110 diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile index ec8814c3f4d..eabd6ced32d 100644 --- a/dns/powerdns/Makefile +++ b/dns/powerdns/Makefile @@ -2,7 +2,7 @@ PORTNAME= powerdns DISTVERSION= 4.1.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= dns ipv6 MASTER_SITES= http://downloads.powerdns.com/releases/ DISTNAME= pdns-${DISTVERSION} diff --git a/dns/py-cloudflare/Makefile b/dns/py-cloudflare/Makefile index 02f85550030..a206758cffb 100644 --- a/dns/py-cloudflare/Makefile +++ b/dns/py-cloudflare/Makefile @@ -2,6 +2,7 @@ PORTNAME= cloudflare PORTVERSION= 2.1.0 +PORTREVISION= 1 CATEGORIES= dns python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/dns/py-dns-lexicon/Makefile b/dns/py-dns-lexicon/Makefile index b5accd1ecfc..a60254f53d0 100644 --- a/dns/py-dns-lexicon/Makefile +++ b/dns/py-dns-lexicon/Makefile @@ -3,6 +3,7 @@ PORTNAME= dns-lexicon DISTVERSION= 3.2.1 +PORTREVISION= 1 CATEGORIES= dns python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/dns/py-publicsuffixlist/Makefile b/dns/py-publicsuffixlist/Makefile index fcb4802a7e1..fb6add1cc73 100644 --- a/dns/py-publicsuffixlist/Makefile +++ b/dns/py-publicsuffixlist/Makefile @@ -3,6 +3,7 @@ PORTNAME= publicsuffixlist PORTVERSION= 0.6.6 +PORTREVISION= 1 CATEGORIES= dns python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/dns/py-tld/Makefile b/dns/py-tld/Makefile index 5765d3d1f54..b53795b5795 100644 --- a/dns/py-tld/Makefile +++ b/dns/py-tld/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= tld -PORTVERSION= 0.9.2 +PORTVERSION= 0.9.3 CATEGORIES= dns python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/dns/py-tld/distinfo b/dns/py-tld/distinfo index 6dd6fb0f258..58d70605af1 100644 --- a/dns/py-tld/distinfo +++ b/dns/py-tld/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1547643676 -SHA256 (tld-0.9.2.tar.gz) = 3fce7d5c8a94dc26aee9eb843a86668d985bed29470bf68899c739994c1cb4f2 -SIZE (tld-0.9.2.tar.gz) = 246039 +TIMESTAMP = 1554668703 +SHA256 (tld-0.9.3.tar.gz) = f766638e4e972445ce18e4dc0fadc0189c0a2a4f7d15e50c3c25d49af9cb1744 +SIZE (tld-0.9.3.tar.gz) = 247523 diff --git a/dns/sshfp/Makefile b/dns/sshfp/Makefile index c50e75b12ca..5400afba073 100644 --- a/dns/sshfp/Makefile +++ b/dns/sshfp/Makefile @@ -3,7 +3,7 @@ PORTNAME= sshfp PORTVERSION= 1.2.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= dns security MAINTAINER= ehaupt@FreeBSD.org diff --git a/editors/encryptpad/Makefile b/editors/encryptpad/Makefile index 23b730aac5a..353d78b4f91 100644 --- a/editors/encryptpad/Makefile +++ b/editors/encryptpad/Makefile @@ -4,7 +4,7 @@ PORTNAME= encryptpad DISTVERSIONPREFIX= v DISTVERSION= 0.4.0.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= editors security MAINTAINER= dg@syrec.org diff --git a/editors/fileobj/Makefile b/editors/fileobj/Makefile index 1bc89ede544..db30c476143 100644 --- a/editors/fileobj/Makefile +++ b/editors/fileobj/Makefile @@ -3,6 +3,7 @@ PORTNAME= fileobj PORTVERSION= 0.7.55 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= editors diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile index 9cc4bba5f5a..7bdc6612c14 100644 --- a/emulators/bochs/Makefile +++ b/emulators/bochs/Makefile @@ -3,7 +3,7 @@ PORTNAME= bochs PORTVERSION= 2.6.9 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 2 CATEGORIES= emulators MASTER_SITES= SF diff --git a/emulators/citra/Makefile b/emulators/citra/Makefile index aa30cad5dda..a7f4d89fa54 100644 --- a/emulators/citra/Makefile +++ b/emulators/citra/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20190406 +PORTVERSION= s20190407 PORTREVISION?= 0 CATEGORIES= emulators @@ -23,7 +23,7 @@ BUILD_DEPENDS= boost-libs>=1.66:devel/boost-libs USE_GITHUB= yes GH_ACCOUNT= citra-emu -GH_TAGNAME= d5bcb45b2 +GH_TAGNAME= 2ff7ed420 GH_TUPLE= citra-emu:ext-libressl-portable:7d01cb0:libressl/externals/libressl \ citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \ MerryMage:dynarmic:r1-992-g4e6848d1:dynarmic/externals/dynarmic \ diff --git a/emulators/citra/distinfo b/emulators/citra/distinfo index 466194224c1..73b0e7523f5 100644 --- a/emulators/citra/distinfo +++ b/emulators/citra/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1554575509 -SHA256 (citra-emu-citra-s20190406-d5bcb45b2_GH0.tar.gz) = 5a804191ec4acd40b5dafbb1ac80712e35f88fb9b17fb5b7e8c000c8d17534c9 -SIZE (citra-emu-citra-s20190406-d5bcb45b2_GH0.tar.gz) = 4926270 +TIMESTAMP = 1554660741 +SHA256 (citra-emu-citra-s20190407-2ff7ed420_GH0.tar.gz) = ae840f2f53f25c78da6434b8c21855d6ae9c1c201aa291deef859f2ab23ddf0e +SIZE (citra-emu-citra-s20190407-2ff7ed420_GH0.tar.gz) = 4929552 SHA256 (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = f3fc8c9d4991b05ca1e1c8f5907ecd3ffd9724a8dccf328087b4784cda5c7db3 SIZE (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = 1762942 SHA256 (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = a593ab188e4feaeef8376c27b554cc413986efc777c195e44c6d3d223de9a63c diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile index f3ad88c34f4..3e689a16c22 100644 --- a/emulators/hatari/Makefile +++ b/emulators/hatari/Makefile @@ -3,6 +3,7 @@ PORTNAME= hatari PORTVERSION= 2.1.0 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://download.tuxfamily.org/hatari/${PORTVERSION}/ diff --git a/emulators/kcemu/Makefile b/emulators/kcemu/Makefile index a9c8b0ce7fb..db24d8c3f25 100644 --- a/emulators/kcemu/Makefile +++ b/emulators/kcemu/Makefile @@ -22,11 +22,11 @@ LIB_DEPENDS= libaudiofile.so:audio/libaudiofile \ libxvidcore.so:multimedia/xvid \ libz80ex.so:devel/z80ex -GNU_CONFIGURE= yes -USE_XORG= xmu -USE_GNOME= gtk20 -USES= gettext ncurses pkgconfig +USES= compiler:c++11-lang gettext ncurses pkgconfig USE_CXXSTD= gnu++98 +USE_GNOME= gtk20 +USE_XORG= xmu +GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib WRKSRC= ${WRKDIR}/KCemu-${PORTVERSION} diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile index 8dfa51b2524..eba0a00cd83 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -3,7 +3,7 @@ PORTNAME= vice PORTVERSION= 3.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= SF/vice-emu/releases diff --git a/finance/Makefile b/finance/Makefile index ffe03cbd2fd..5b9ef55d16a 100644 --- a/finance/Makefile +++ b/finance/Makefile @@ -24,6 +24,7 @@ SUBDIR += aqbanking SUBDIR += beancount SUBDIR += beanie + SUBDIR += bitcoinnodestats SUBDIR += cbb SUBDIR += cointop SUBDIR += electrum diff --git a/finance/bitcoinnodestats/Makefile b/finance/bitcoinnodestats/Makefile new file mode 100644 index 00000000000..3a5e418f759 --- /dev/null +++ b/finance/bitcoinnodestats/Makefile @@ -0,0 +1,43 @@ +# $FreeBSD$ + +PORTNAME= bitcoinnodestats +DISTVERSION= g20171121 +CATEGORIES= finance python + +MAINTAINER= kai@FreeBSD.org +COMMENT= Basic Bitcoin node status and statistics web application + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.md + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=2017.3:devel/py-pytz@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-bitcoinlib>=0.8.0:finance/py-python-bitcoinlib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django111>=1.11.7:www/py-django111@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-bootstrap3>=9.1.0:www/py-django-bootstrap3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-cron>=0.5.0:www/py-django-cron@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-debug-toolbar>=0:www/py-django-debug-toolbar@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonfield>=2.0.2:www/py-jsonfield@${PY_FLAVOR} + +USES= python:3.3+ shebangfix +USE_GITHUB= yes +GH_ACCOUNT= bartromgens +GH_TAGNAME= 5e8772d + +NO_ARCH= yes +NO_BUILD= yes +SHEBANGFILES= create_local_settings.py manage.py + +SUB_FILES= pkg-message +SUB_LIST= DATADIR=${DATADIR} PYTHON_VER=${PYTHON_VER} + +do-install: + @${MKDIR} ${STAGEDIR}${DATADIR} +.for _file in ${SHEBANGFILES} + ${INSTALL_DATA} ${WRKSRC}/${_file} ${STAGEDIR}${DATADIR} +.endfor + +.for _dir in bitcoinnodestats nodedata + (cd ${WRKSRC}/${_dir} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/${_dir} "! -name '*.bak'") +.endfor + +.include diff --git a/finance/bitcoinnodestats/distinfo b/finance/bitcoinnodestats/distinfo new file mode 100644 index 00000000000..525e3f492ef --- /dev/null +++ b/finance/bitcoinnodestats/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1549669415 +SHA256 (bartromgens-bitcoinnodestats-g20171121-5e8772d_GH0.tar.gz) = 2dc24a1646701d602de07045bf1917e605adb194f3a775abb20864f6d8a9f937 +SIZE (bartromgens-bitcoinnodestats-g20171121-5e8772d_GH0.tar.gz) = 151550 diff --git a/finance/bitcoinnodestats/files/pkg-message.in b/finance/bitcoinnodestats/files/pkg-message.in new file mode 100644 index 00000000000..9d7e223f2a8 --- /dev/null +++ b/finance/bitcoinnodestats/files/pkg-message.in @@ -0,0 +1,10 @@ +================================================================================ + +Quick start instructions: + +# cd %%DATADIR%% +# python%%PYTHON_VER%% create_local_settings.py +# python%%PYTHON_VER%% manage.py migrate +# python%%PYTHON_VER%% manage.py runserver + +================================================================================ diff --git a/finance/bitcoinnodestats/pkg-descr b/finance/bitcoinnodestats/pkg-descr new file mode 100644 index 00000000000..909c74e4493 --- /dev/null +++ b/finance/bitcoinnodestats/pkg-descr @@ -0,0 +1,7 @@ +Bitcoin node status and statistics web interface based on Django. + +Features: +* Current node status overview +* Charts of peer count, upload and download history + +WWW: https://github.com/bartromgens/bitcoinnodestats diff --git a/finance/bitcoinnodestats/pkg-plist b/finance/bitcoinnodestats/pkg-plist new file mode 100644 index 00000000000..40414d56c83 --- /dev/null +++ b/finance/bitcoinnodestats/pkg-plist @@ -0,0 +1,49 @@ +%%DATADIR%%/create_local_settings.py +%%DATADIR%%/manage.py +%%DATADIR%%/bitcoinnodestats/__init__.py +%%DATADIR%%/bitcoinnodestats/local_settings_example.py +%%DATADIR%%/bitcoinnodestats/settings.py +%%DATADIR%%/bitcoinnodestats/static/bootstrap/css/bootstrap_cyborg.min.css +%%DATADIR%%/bitcoinnodestats/static/bootstrap/css/bootstrap_readable.min.css +%%DATADIR%%/bitcoinnodestats/static/bootstrap/fonts/glyphicons-halflings-regular.eot +%%DATADIR%%/bitcoinnodestats/static/bootstrap/fonts/glyphicons-halflings-regular.svg +%%DATADIR%%/bitcoinnodestats/static/bootstrap/fonts/glyphicons-halflings-regular.ttf +%%DATADIR%%/bitcoinnodestats/static/bootstrap/fonts/glyphicons-halflings-regular.woff +%%DATADIR%%/bitcoinnodestats/static/bootstrap/fonts/glyphicons-halflings-regular.woff2 +%%DATADIR%%/bitcoinnodestats/static/css/custom.css +%%DATADIR%%/bitcoinnodestats/static/css/plots.css +%%DATADIR%%/bitcoinnodestats/static/js/daterangepicker.js +%%DATADIR%%/bitcoinnodestats/static/js/plots.js +%%DATADIR%%/bitcoinnodestats/static/media/readme.txt +%%DATADIR%%/bitcoinnodestats/templates/base.html +%%DATADIR%%/bitcoinnodestats/templates/footer.html +%%DATADIR%%/bitcoinnodestats/templates/index.html +%%DATADIR%%/bitcoinnodestats/templates/input.html +%%DATADIR%%/bitcoinnodestats/templates/peer_table.html +%%DATADIR%%/bitcoinnodestats/templates/plots.html +%%DATADIR%%/bitcoinnodestats/templates/status_bar.html +%%DATADIR%%/bitcoinnodestats/urls.py +%%DATADIR%%/bitcoinnodestats/views.py +%%DATADIR%%/bitcoinnodestats/wsgi.py +%%DATADIR%%/nodedata/__init__.py +%%DATADIR%%/nodedata/admin.py +%%DATADIR%%/nodedata/apps.py +%%DATADIR%%/nodedata/cronjobs.py +%%DATADIR%%/nodedata/management/__init__.py +%%DATADIR%%/nodedata/management/commands/__init__.py +%%DATADIR%%/nodedata/management/commands/prune_data.py +%%DATADIR%%/nodedata/migrations/0001_initial.py +%%DATADIR%%/nodedata/migrations/0002_auto_20160510_1613.py +%%DATADIR%%/nodedata/migrations/0003_rawnodedata_datetime_created.py +%%DATADIR%%/nodedata/migrations/0004_rawnodedata_peerinfo_json.py +%%DATADIR%%/nodedata/migrations/0005_rawnodedata_networkinfo_json.py +%%DATADIR%%/nodedata/migrations/0006_peer.py +%%DATADIR%%/nodedata/migrations/0007_auto_20160512_0240.py +%%DATADIR%%/nodedata/migrations/0008_peer_peer_json.py +%%DATADIR%%/nodedata/migrations/0009_rawnodedata_node_up.py +%%DATADIR%%/nodedata/migrations/0010_remove_peer_peer_json.py +%%DATADIR%%/nodedata/migrations/__init__.py +%%DATADIR%%/nodedata/models.py +%%DATADIR%%/nodedata/settings.py +%%DATADIR%%/nodedata/tests.py +%%DATADIR%%/nodedata/views.py diff --git a/finance/p5-Business-OnlinePayment-MerchantCommerce/Makefile b/finance/p5-Business-OnlinePayment-MerchantCommerce/Makefile index b50658f7043..c5b07d6918d 100644 --- a/finance/p5-Business-OnlinePayment-MerchantCommerce/Makefile +++ b/finance/p5-Business-OnlinePayment-MerchantCommerce/Makefile @@ -11,10 +11,14 @@ PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org COMMENT= Business::OnlinePayment backend module for MerchantCommerce authorization service +LICENSE= ART10 GPLv1+ +LICENSE_COMB= dual + BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= p5-Business-OnlinePayment>=0:finance/p5-Business-OnlinePayment USES= perl5 USE_PERL5= configure +NO_ARCH= yes .include diff --git a/finance/p5-Business-OnlinePayment-MerchantCommerce/pkg-descr b/finance/p5-Business-OnlinePayment-MerchantCommerce/pkg-descr index b2cba2165c6..bd25046a988 100644 --- a/finance/p5-Business-OnlinePayment-MerchantCommerce/pkg-descr +++ b/finance/p5-Business-OnlinePayment-MerchantCommerce/pkg-descr @@ -1,2 +1,4 @@ This is Business::OnlinePayment::MerchantCommerce, an Business::OnlinePayment backend module for MerchantCommerce authorization service. + +WWW: https://metacpan.org/release/Business-OnlinePayment-MerchantCommerce diff --git a/finance/py-pycoin/Makefile b/finance/py-pycoin/Makefile index 4bb1e3fefce..b30ca7c0ece 100644 --- a/finance/py-pycoin/Makefile +++ b/finance/py-pycoin/Makefile @@ -3,6 +3,7 @@ PORTNAME= pycoin PORTVERSION= 0.80 +PORTREVISION= 1 CATEGORIES= finance MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/ftp/hsftp/Makefile b/ftp/hsftp/Makefile index 53e97491108..624e68ecfa0 100644 --- a/ftp/hsftp/Makefile +++ b/ftp/hsftp/Makefile @@ -3,7 +3,7 @@ PORTNAME= hsftp PORTVERSION= 1.15 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= ftp MASTER_SITES= http://la-samhna.de/hsftp/ \ http://www.alaskaparadise.com/freebsd/ diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile index 95f8806f473..4bacf6a5d75 100644 --- a/ftp/lftp/Makefile +++ b/ftp/lftp/Makefile @@ -3,7 +3,7 @@ PORTNAME= lftp PORTVERSION= 4.8.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= ftp ipv6 MASTER_SITES= http://lftp.tech/ftp/ \ http://lftp.tech/ftp/old/ \ diff --git a/ftp/py-tftpy/Makefile b/ftp/py-tftpy/Makefile index f15522220ef..2e1f0295646 100644 --- a/ftp/py-tftpy/Makefile +++ b/ftp/py-tftpy/Makefile @@ -3,6 +3,7 @@ PORTNAME= tftpy PORTVERSION= 0.8.0 +PORTREVISION= 1 CATEGORIES= ftp python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/ftp/quftp/Makefile b/ftp/quftp/Makefile index c06eb5cd5f9..855c5f2e6a7 100644 --- a/ftp/quftp/Makefile +++ b/ftp/quftp/Makefile @@ -3,7 +3,7 @@ PORTNAME= quftp PORTVERSION= 1.0.7 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= ftp MASTER_SITES= SF diff --git a/ftp/rexx-curl/Makefile b/ftp/rexx-curl/Makefile index 2b4a782373a..3d5826896b9 100644 --- a/ftp/rexx-curl/Makefile +++ b/ftp/rexx-curl/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= curl -PORTVERSION= 2.0.1 -PORTREVISION= 1 +PORTVERSION= 2.1.0 CATEGORIES= ftp MASTER_SITES= SF/rexx${PORTNAME}/rexx${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= rexx- @@ -23,37 +22,34 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ RUN_DEPENDS= rexx:lang/rexx-regina USES= gmake + GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-rexx=regina +CONFIGURE_ARGS= --with-rexx=regina LDFLAGS=-L/usr/lib USE_LDCONFIG= yes -LLD_UNSAFE= yes -DOCSDIR= ${PREFIX}/share/doc/rexx${PORTNAME} +OPTIONS_DEFINE= DOCS EXAMPLES + DATADIR= ${PREFIX}/share/rexx${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/rexx${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/rexx${PORTNAME} -OPTIONS_DEFINE= DOCS +DOCFILES= getright.rexx getmail-pop3.rexx httppost.rexx scp.rexx \ + sendmail-smtp.rexx testcurl.rexx upload.rexx README.txt +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/rexxcurl ${STAGEDIR}${PREFIX}/bin + ${INSTALL_LIB} ${WRKSRC}/librexxcurl.so ${STAGEDIR}${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/librexxcurl.a ${STAGEDIR}${PREFIX}/lib -do-extract: - # avoid extracting circular hard links in distfile! - @${MKDIR} ${WRKDIR} - @tar -x -C ${WRKDIR} --exclude='*common/filterexports*' --exclude='*common/fixrc*' \ - -f ${DISTDIR}/${DISTNAME}.tar.gz - -post-patch: - @${REINPLACE_CMD} -e "s| -lc | |g" \ - -e "/$$.sharedir)\/images/d" \ - -e "/index.html/d" \ - -e "/rxcurl64.png/d" \ - ${WRKSRC}/Makefile.in - -post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rexxcurl - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librexxcurl.so - -post-install-DOCS-on: +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/index.html ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR}/images ${INSTALL_DATA} ${WRKSRC}/doc/images/rxcurl64.png ${STAGEDIR}${DOCSDIR}/images +do-install-EXAMPLES-on: + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} +.for f in ${DOCFILES} + ${INSTALL_DATA} ${WRKSRC}/demo/$f ${STAGEDIR}${EXAMPLESDIR} +.endfor + .include diff --git a/ftp/rexx-curl/distinfo b/ftp/rexx-curl/distinfo index 8117c1e82df..a02c37621d6 100644 --- a/ftp/rexx-curl/distinfo +++ b/ftp/rexx-curl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1472503050 -SHA256 (RexxCURL-2.0.1.tar.gz) = 83b857686af41323f238722dccbb0ded85d1317e7fe95410ebe8978daadaa51a -SIZE (RexxCURL-2.0.1.tar.gz) = 455919 +TIMESTAMP = 1554585945 +SHA256 (RexxCURL-2.1.0.tar.gz) = 734b7d733ceda0f2c189f99b54f0a86e98cb5f04269c726a4b6873c94f1a46a5 +SIZE (RexxCURL-2.1.0.tar.gz) = 461774 diff --git a/ftp/rexx-curl/files/patch-Makefile.in b/ftp/rexx-curl/files/patch-Makefile.in index e87f5211fbd..3b625ec4b99 100644 --- a/ftp/rexx-curl/files/patch-Makefile.in +++ b/ftp/rexx-curl/files/patch-Makefile.in @@ -1,23 +1,14 @@ ---- Makefile.in.orig 2015-04-12 10:29:42 UTC +--- Makefile.in.orig 2019-02-10 22:01:43 UTC +++ Makefile.in -@@ -120,7 +120,6 @@ $(PACKAGE_DIR)/makefile.* $(PACKAGE_DIR) +@@ -123,7 +123,6 @@ $(PACKAGE_DIR)/makefile.* $(PACKAGE_DIR) $(PACKAGE_DIR)/config.guess $(PACKAGE_DIR)/config.sub $(PACKAGE_DIR)/install-sh $(PACKAGE_DIR)/preinst.rexx \ $(PACKAGE_DIR)/aclocal.m4 $(PACKAGE_DIR)/configure.in $(PACKAGE_DIR)/def2exp.rexx \ $(PACKAGE_DIR)/demo/*.rexx $(PACKAGE_DIR)/demo/README.txt $(PACKAGE_DIR)/makew32.rex \ -$(PACKAGE_DIR)/doc/*.html $(PACKAGE_DIR)/doc/images/*.png \ $(PACKAGE_DIR)/RexxCURL.spec \ - $(PACKAGE_DIR)/debian/*.rexxtrans $(PACKAGE_DIR)/debian/*.regina $(PACKAGE_DIR)/debian/*.oorexx $(PACKAGE_DIR)/debian/copyright $(PACKAGE_DIR)/debian/compat $(PACKAGE_DIR)/debian/rules $(PACKAGE_DIR)/debian/control + $(PACKAGE_DIR)/debian/control.rexxtrans $(PACKAGE_DIR)/debian/control.regina $(PACKAGE_DIR)/debian/control.oorexx $(PACKAGE_DIR)/debian/copyright $(PACKAGE_DIR)/debian/compat $(PACKAGE_DIR)/debian/rules.in -@@ -231,8 +230,6 @@ $(RXDEFEXP1): $(srcdir)/$(PACKAGE_NAME)w - - doco: - mkdir images -- cp $(srcdocdir)/index.html . -- cp $(srcdocdir)/images/*.png images - - zip: - zip rexxcurl$(VER) README INSTALL TODO CPLv1.0.txt HISTORY $(ZIPCSRCFILES) $(ZIPHEADERS) $(ZIPCOMMONFILES) -@@ -241,7 +238,6 @@ zip: +@@ -243,7 +242,6 @@ zip: zip rexxcurl$(VER) config.guess config.sub install-sh preinst.rexx zip rexxcurl$(VER) aclocal.m4 configure.in def2exp.rexx zip rexxcurl$(VER) demo/*.rexx demo/README.txt makew32.rex @@ -25,26 +16,7 @@ zip rexxcurl$(VER) debian/*.regina debian/*.oorexx debian/copyright debian/compat zip rexxcurl$(VER) RexxCURL.spec -@@ -259,8 +255,6 @@ installbase: all - $(INSTALL) -d $(DESTDIR)$(bindir) - $(INSTALL) -d $(DESTDIR)$(libdir) - $(INSTALL) -d $(DESTDIR)$(sharedir) -- $(INSTALL) -d $(DESTDIR)$(docdir) -- $(INSTALL) -d $(DESTDIR)$(docdir)/images - $(INSTALL) -c -m 755 ./$(PACKAGE_NAME)$(binarybitprefix)$(EXE) $(DESTDIR)$(bindir)/$(PACKAGE_NAME)$(binarybitprefix)$(EXE) - $(INSTALL) -c -m 755 ./rexxcurl-config $(DESTDIR)$(bindir)/rexxcurl-config - -$(INSTALL) -c -m 755 ./$(SHLPRE)$(PACKAGE_NAME)$(SHLPST) $(DESTDIR)$(libdir)/$(SHLPRE)$(PACKAGE_NAME)$(SHLPST) -@@ -273,9 +267,6 @@ installbase: all - $(INSTALL) -c -m 755 $(srcdir)/demo/upload.rexx $(DESTDIR)$(sharedir)/upload.rexx - $(INSTALL) -c -m 755 $(srcdir)/demo/getright.rexx $(DESTDIR)$(sharedir)/getright.rexx - $(INSTALL) -c -m 644 $(srcdir)/demo/README.txt $(DESTDIR)$(sharedir)/README.txt -- $(INSTALL) -c -m 644 $(srcdocdir)/index.html $(DESTDIR)$(docdir)/index.html -- $(INSTALL) -c -m 644 $(srcdocdir)/images/rxcurl64.png $(DESTDIR)$(docdir)/images/rxcurl64.png -- $(INSTALL) -c -m 644 $(srcdir)/CPLv1.0.txt $(DESTDIR)$(docdir)/CPLv1.0.txt - - uninstall: - rm -f $(DESTDIR)$(bindir)/$(PACKAGE_NAME)$(binarybitprefix)$(EXE) -@@ -313,8 +304,6 @@ beosinstall: all +@@ -331,8 +329,6 @@ beosinstall: all $(INSTALL) -c -m 644 $(srcdir)/demo/README.txt /boot/home/config/bin/rexx/README-rexxcurl.txt # # where to put doc for BeOS ? @@ -53,7 +25,7 @@ # binary: $(BASE_BINARY) -@@ -324,7 +313,6 @@ binarybase: all +@@ -342,7 +338,6 @@ binarybase: all -mkdir -p ./tmpdir/bin -mkdir -p ./tmpdir/lib -mkdir -p ./tmpdir/share/$(PACKAGE_NAME) @@ -61,7 +33,7 @@ cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin cp $(PACKAGE_NAME)-config ./tmpdir/bin cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/lib -@@ -334,8 +322,6 @@ binarybase: all +@@ -352,8 +347,6 @@ binarybase: all cp $(srcdir)/INSTALL ./tmpdir/share/doc/rexxcurl cp $(srcdir)/README ./tmpdir/share/doc/rexxcurl cp $(srcdir)/TODO ./tmpdir/share/doc/rexxcurl @@ -70,7 +42,7 @@ cp $(srcdir)/demo/testcurl.rexx ./tmpdir/share/$(PACKAGE_NAME)/testcurl.rexx cp $(srcdir)/demo/httppost.rexx ./tmpdir/share/$(PACKAGE_NAME)/httppost.rexx cp $(srcdir)/demo/getmail-pop3.rexx ./tmpdir/share/$(PACKAGE_NAME)/getmail-pop3.rexx -@@ -353,7 +339,6 @@ cygwinbinary: all +@@ -371,7 +364,6 @@ cygwinbinary: all -mkdir -p ./tmpdir/lib -mkdir -p ./tmpdir/rexx -mkdir -p ./tmpdir/doc/rexxcurl @@ -78,7 +50,7 @@ cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/bin cp $(LIBPRE)$(PACKAGE_NAME)$(LIBPST) ./tmpdir/lib -@@ -362,8 +347,6 @@ cygwinbinary: all +@@ -380,8 +372,6 @@ cygwinbinary: all cp $(srcdir)/INSTALL ./tmpdir/doc/rexxcurl cp $(srcdir)/README ./tmpdir/doc/rexxcurl cp $(srcdir)/TODO ./tmpdir/doc/rexxcurl @@ -87,7 +59,7 @@ cp $(srcdir)/demo/testcurl.rexx ./tmpdir/rexx/testcurl.rexx cp $(srcdir)/demo/httppost.rexx ./tmpdir/rexx/httppost.rexx cp $(srcdir)/demo/getmail-pop3.rexx ./tmpdir/rexx/getmail-pop3.rexx -@@ -381,7 +364,6 @@ beosbinary: all +@@ -399,7 +389,6 @@ beosbinary: all -mkdir -p ./tmpdir/lib -mkdir -p ./tmpdir/add-ons/rexx -mkdir -p ./tmpdir/doc/rexxcurl @@ -95,7 +67,7 @@ cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/add-ons/rexx cp $(LIBPRE)$(PACKAGE_NAME)$(LIBPST) ./tmpdir/lib -@@ -390,8 +372,6 @@ beosbinary: all +@@ -408,8 +397,6 @@ beosbinary: all cp $(srcdir)/INSTALL ./tmpdir/doc/rexxcurl cp $(srcdir)/README ./tmpdir/doc/rexxcurl cp $(srcdir)/TODO ./tmpdir/doc/rexxcurl diff --git a/ftp/rexx-curl/files/patch-common_loader.c b/ftp/rexx-curl/files/patch-common_loader.c deleted file mode 100644 index bbee81cbfb2..00000000000 --- a/ftp/rexx-curl/files/patch-common_loader.c +++ /dev/null @@ -1,10 +0,0 @@ ---- common/loader.c.orig 2012-08-14 01:16:58 UTC -+++ common/loader.c -@@ -225,6 +225,7 @@ int main - /* - * Get any program options. - */ -+ optind = 1; /* Previously clobbered by regina */ - while ((c = getopt(argc, argv, "Dudivh?f:")) != EOF) - { - switch (c) diff --git a/ftp/rexx-curl/files/patch-rexxcurl.c b/ftp/rexx-curl/files/patch-rexxcurl.c index e380f6fa435..6e64288906f 100644 --- a/ftp/rexx-curl/files/patch-rexxcurl.c +++ b/ftp/rexx-curl/files/patch-rexxcurl.c @@ -1,6 +1,6 @@ ---- rexxcurl.c.orig 2015-04-11 22:53:39 UTC +--- rexxcurl.c.orig 2019-02-10 22:51:41 UTC +++ rexxcurl.c -@@ -53,6 +53,8 @@ +@@ -52,6 +52,8 @@ * internal error set N/A * cURL runtime errors -1 set */ @@ -9,16 +9,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" #else -@@ -1366,7 +1368,7 @@ void RexxCURLSetVersionInfoConstants( Rx - valuelen = 0; - namelen = sprintf( name, "%sLIBSSH_VERSION", RxGetConstantPrefix( RxPackageGlobalData ) ); - #if LIBCURL_VERSION_NUM >= 0x071001 -- support = version_info->libssh_version; -+ support = (char *) version_info->libssh_version; - valuelen = (version_info->libssh_version) ? strlen( version_info->libssh_version ) : 0; - #endif - SetRexxVariable( RxPackageGlobalData, name, namelen, support, valuelen ); -@@ -1841,9 +1843,9 @@ int rexxcurl_sshkey_callback( CURL *easy +@@ -1879,9 +1881,9 @@ int rexxcurl_sshkey_callback( CURL *easy if ( argv == NULL ) return -1; @@ -30,3 +21,18 @@ rx_foundkeytype_len = sprintf( rx_foundkeytype, "%u", foundkey->keytype ); rx_libcurlviewofkey_len = sprintf( rx_libcurlviewofkey, "%u", match ); +@@ -1964,11 +1966,11 @@ int debug_function( CURL *handle, curl_i + int c; + char *prefix = "*<><><>"; + if ( type == CURLINFO_TEXT ) +- fprintf( fp, "text: %c %.*s", prefix[type],size, data ); ++ fprintf( fp, "text: %c %.*s", prefix[type],(int)size, data ); + if ( type == CURLINFO_HEADER_IN ) +- fprintf( fp, "header_in: %c %.*s", prefix[type],size, data ); ++ fprintf( fp, "header_in: %c %.*s", prefix[type],(int)size, data ); + if ( type == CURLINFO_HEADER_OUT ) +- fprintf( fp, "header_out:%c %.*s", prefix[type],size, data ); ++ fprintf( fp, "header_out:%c %.*s", prefix[type],(int)size, data ); + if ( type == CURLINFO_SSL_DATA_IN ) + { + fprintf( fp, "ssl_data_in: " ); diff --git a/ftp/rexx-curl/pkg-plist b/ftp/rexx-curl/pkg-plist index f22cb159739..a60458aeb63 100644 --- a/ftp/rexx-curl/pkg-plist +++ b/ftp/rexx-curl/pkg-plist @@ -1,14 +1,13 @@ bin/rexxcurl -bin/rexxcurl-config lib/librexxcurl.a lib/librexxcurl.so %%PORTDOCS%%%%DOCSDIR%%/images/rxcurl64.png %%PORTDOCS%%%%DOCSDIR%%/index.html -%%DATADIR%%/README.txt -%%DATADIR%%/getmail-pop3.rexx -%%DATADIR%%/getright.rexx -%%DATADIR%%/httppost.rexx -%%DATADIR%%/scp.rexx -%%DATADIR%%/sendmail-smtp.rexx -%%DATADIR%%/testcurl.rexx -%%DATADIR%%/upload.rexx +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.txt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getmail-pop3.rexx +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getright.rexx +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httppost.rexx +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scp.rexx +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sendmail-smtp.rexx +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testcurl.rexx +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/upload.rexx diff --git a/ftp/yafc/Makefile b/ftp/yafc/Makefile index 5251d34675b..dd34bcc6008 100644 --- a/ftp/yafc/Makefile +++ b/ftp/yafc/Makefile @@ -3,7 +3,7 @@ PORTNAME= yafc PORTVERSION= 1.2.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= ftp ipv6 MASTER_SITES= http://www.yafc-ftp.com/downloads/ diff --git a/games/Makefile b/games/Makefile index da8f67e0194..31cb85dfa1c 100644 --- a/games/Makefile +++ b/games/Makefile @@ -1046,6 +1046,7 @@ SUBDIR += xasteroids SUBDIR += xataxx SUBDIR += xbat + SUBDIR += xbill SUBDIR += xbl SUBDIR += xblackjack SUBDIR += xblast diff --git a/games/eif/Makefile b/games/eif/Makefile index a7eadc29b82..cab3cfa9de4 100644 --- a/games/eif/Makefile +++ b/games/eif/Makefile @@ -3,7 +3,7 @@ PORTNAME= eif PORTVERSION= 1.3.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games ipv6 MASTER_SITES= http://www.stack.nl/~marcolz/empire/ \ ftp://ftp.stack.nl/pub/users/johans/eif/ diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile index 8dca7850d43..57cbb9eec1b 100644 --- a/games/freeciv/Makefile +++ b/games/freeciv/Makefile @@ -3,7 +3,7 @@ PORTNAME= freeciv PORTVERSION= 2.5.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/freeciv/Freeciv%20${PORTVERSION:R}/${PORTVERSION} \ http://download.gna.org/freeciv/stable/ diff --git a/games/ggz-txt-client/Makefile b/games/ggz-txt-client/Makefile index dc43db4d14d..e1c3f873673 100644 --- a/games/ggz-txt-client/Makefile +++ b/games/ggz-txt-client/Makefile @@ -3,7 +3,7 @@ PORTNAME= ggz-txt-client PORTVERSION= ${GGZ_VERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MAINTAINER= ports@FreeBSD.org diff --git a/games/gnubg/Makefile b/games/gnubg/Makefile index 8c074dadbc5..cf08cb538ca 100644 --- a/games/gnubg/Makefile +++ b/games/gnubg/Makefile @@ -3,7 +3,7 @@ PORTNAME= gnubg PORTVERSION= 1.06.002 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://files.gnubg.org/media/sources/ DISTFILES= gnubg-release-${PORTVERSION}-sources.tar.gz diff --git a/games/gnurobots/Makefile b/games/gnurobots/Makefile index c307a7bdd0d..ddcec2929ae 100644 --- a/games/gnurobots/Makefile +++ b/games/gnurobots/Makefile @@ -3,7 +3,7 @@ PORTNAME= gnurobots PORTVERSION= 1.2.0 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= games MASTER_SITES= GNU \ SF/nemysisfreebsdp/${CATEGORIES}/:icons diff --git a/games/hoichess/Makefile b/games/hoichess/Makefile index d48ad7983d1..801c2ada2da 100644 --- a/games/hoichess/Makefile +++ b/games/hoichess/Makefile @@ -2,7 +2,7 @@ PORTNAME= hoichess PORTVERSION= 0.12.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.hoicher.de/hoichess/download/ \ ftp://ftp.stack.nl/pub/users/johans/hoichess/ diff --git a/games/hyperrogue/Makefile b/games/hyperrogue/Makefile index d5cb0eb0cef..a4eb9bbe09b 100644 --- a/games/hyperrogue/Makefile +++ b/games/hyperrogue/Makefile @@ -12,14 +12,12 @@ COMMENT= Roguelike in a non-euclidean world LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_powerpc64= fails to link: langen-langen.o: relocation truncated to fit: R_PPC64_TOC16_DS - LIB_DEPENDS= libpng.so:graphics/png USE_GITHUB= yes GH_ACCOUNT= zenorogue -USES= autoreconf gl localbase +USES= autoreconf compiler:c++11-lang gl localbase sdl GNU_CONFIGURE= yes USE_SDL= sdl mixer gfx ttf USE_GL= gl glew diff --git a/games/iortcw/Makefile b/games/iortcw/Makefile index 61930e58783..ef8c25ae61a 100644 --- a/games/iortcw/Makefile +++ b/games/iortcw/Makefile @@ -11,7 +11,7 @@ COMMENT= Game engine for Return to Castle Wolfenstein LICENSE= GPLv3 -NOT_FOR_ARCHS= aarch64 armv6 armv7 powerpc64 +NOT_FOR_ARCHS= aarch64 armv6 armv7 NOT_FOR_ARCHS_REASON= fails to configure: Architecture not supported LIB_DEPENDS= libcurl.so:ftp/curl \ diff --git a/games/iortcw/files/patch-MP_code_qcommon_q__platform.h b/games/iortcw/files/patch-MP_code_qcommon_q__platform.h index df8ffe75c7f..bb3687ed95d 100644 --- a/games/iortcw/files/patch-MP_code_qcommon_q__platform.h +++ b/games/iortcw/files/patch-MP_code_qcommon_q__platform.h @@ -1,6 +1,6 @@ ---- MP/code/qcommon/q_platform.h.orig 2016-07-29 22:00:04 UTC +--- MP/code/qcommon/q_platform.h.orig 2019-03-16 18:09:48 UTC +++ MP/code/qcommon/q_platform.h -@@ -35,11 +35,7 @@ Foundation, Inc., 51 Franklin St, Fifth +@@ -35,11 +35,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, #else @@ -12,7 +12,7 @@ #if (defined(powerc) || defined(powerpc) || defined(ppc) || \ defined(__ppc) || defined(__ppc__)) && !defined(C_ONLY) -@@ -229,8 +225,6 @@ Foundation, Inc., 51 Franklin St, Fifth +@@ -224,11 +220,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, #ifdef __i386__ #define ARCH_STRING "i386" #elif defined __amd64__ @@ -21,3 +21,8 @@ #define ARCH_STRING "amd64" #elif defined __axp__ #define ARCH_STRING "alpha" ++#elif defined __powerpc64__ ++#define ARCH_STRING "powerpc64" + #endif + + #if BYTE_ORDER == BIG_ENDIAN diff --git a/games/iortcw/files/patch-SP_code_qcommon_q__platform.h b/games/iortcw/files/patch-SP_code_qcommon_q__platform.h index e103bf7c91e..5d53ad0dd04 100644 --- a/games/iortcw/files/patch-SP_code_qcommon_q__platform.h +++ b/games/iortcw/files/patch-SP_code_qcommon_q__platform.h @@ -1,6 +1,6 @@ ---- SP/code/qcommon/q_platform.h.orig 2015-12-26 14:21:49 UTC +--- SP/code/qcommon/q_platform.h.orig 2019-03-16 18:09:48 UTC +++ SP/code/qcommon/q_platform.h -@@ -35,11 +35,7 @@ Foundation, Inc., 51 Franklin St, Fifth +@@ -35,11 +35,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, #else @@ -12,7 +12,7 @@ #if (defined(powerc) || defined(powerpc) || defined(ppc) || \ defined(__ppc) || defined(__ppc__)) && !defined(C_ONLY) -@@ -229,8 +225,6 @@ Foundation, Inc., 51 Franklin St, Fifth +@@ -224,11 +220,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, #ifdef __i386__ #define ARCH_STRING "i386" #elif defined __amd64__ @@ -21,3 +21,8 @@ #define ARCH_STRING "amd64" #elif defined __axp__ #define ARCH_STRING "alpha" ++#elif defined __powerpc64__ ++#define ARCH_STRING "powerpc64" + #endif + + #if BYTE_ORDER == BIG_ENDIAN diff --git a/games/jaggedalliance2/Makefile b/games/jaggedalliance2/Makefile index 0c8b4f8b767..680de4a7ed7 100644 --- a/games/jaggedalliance2/Makefile +++ b/games/jaggedalliance2/Makefile @@ -2,43 +2,91 @@ # $FreeBSD$ PORTNAME= ja2 -PORTVERSION= 0.14.01 +DISTVERSIONPREFIX= v +DISTVERSION= 0.16.1 CATEGORIES= games -MASTER_SITES= https://bitbucket.org/gennady/ja2-stracciatella/get/ -DISTNAME= v${PORTVERSION} -DIST_SUBDIR= ${PORTNAME} -MAINTAINER= lme@FreeBSD.org +MAINTAINER= tobik@FreeBSD.org COMMENT= Port of "Jagged Alliance 2" using SDL -BROKEN= fails to build -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2019-05-08 +LICENSE= PD SFI-SCLA +LICENSE_COMB= multi +LICENSE_NAME_SFI-SCLA= Strategy First Inc. Source Code License Agreement +LICENSE_FILE_SFI-SCLA= ${WRKSRC}/SFI\ Source\ Code\ license\ agreement.txt +LICENSE_PERMS_SFI-SCLA= dist-mirror no-dist-sell pkg-mirror no-pkg-sell \ + auto-accept + # Ignore this if you feel adventurous ONLY_FOR_ARCHS= aarch64 amd64 arm armv6 armv7 i386 ONLY_FOR_ARCHS_REASON= Needs a little endian environment -NO_CDROM= License only permits non-commerical use +LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \ + libfltk.so:x11-toolkits/fltk -USES= gmake tar:bzip2 -HAS_CONFIGURE= yes -CONFIGURE_ARGS= --prefix=${PREFIX} -USE_SDL= sdl +USES= cargo cmake:noninja pkgconfig sdl +USE_GITHUB= yes +GH_ACCOUNT= ja2-stracciatella +GH_PROJECT= ja2-stracciatella +USE_LDCONFIG= yes +USE_SDL= sdl2 -MAKE_ENV= Q= +CMAKE_ARGS= -DEXTRA_DATA_DIR:PATH="${DATADIR}" +CMAKE_OFF= WITH_UNITTESTS +LDFLAGS+= -Wl,--as-needed +MAKE_ENV= ${CARGO_ENV} -WRKSRC= ${WRKDIR}/gennady-ja2-stracciatella-5585014471a7 -SUB_FILES= pkg-message +CARGO_CARGOTOML= ${WRKSRC}/rust/Cargo.toml +CARGO_CARGOLOCK= ${WRKSRC}/rust/Cargo.lock +CARGO_TARGET_DIR= ${WRKSRC}/rust +CARGO_BUILD= no +CARGO_INSTALL= no +CARGO_CRATES= aho-corasick-0.5.3 \ + fuchsia-cprng-0.1.1 \ + getopts-0.2.18 \ + itoa-0.4.3 \ + kernel32-sys-0.2.2 \ + libc-0.2.51 \ + memchr-0.1.11 \ + proc-macro2-0.4.27 \ + quote-0.6.11 \ + rand-0.4.6 \ + rand_core-0.3.1 \ + rand_core-0.4.0 \ + rdrand-0.4.0 \ + regex-0.1.80 \ + regex-syntax-0.3.9 \ + remove_dir_all-0.5.1 \ + ryu-0.2.7 \ + serde-1.0.90 \ + serde_derive-1.0.90 \ + serde_json-1.0.39 \ + shell32-sys-0.1.2 \ + syn-0.15.30 \ + tempdir-0.3.7 \ + thread-id-2.0.0 \ + thread_local-0.2.7 \ + unicode-width-0.1.5 \ + unicode-xid-0.1.0 \ + user32-sys-0.2.0 \ + utf8-ranges-0.1.3 \ + winapi-0.2.8 \ + winapi-0.3.7 \ + winapi-build-0.1.1 \ + winapi-i686-pc-windows-gnu-0.4.0 \ + winapi-x86_64-pc-windows-gnu-0.4.0 post-patch: @${REINPLACE_CMD} -e 's|/some/place/where/the/data/is|${DATADIR}|' \ - ${WRKSRC}/sgp/SGP.cc + ${WRKSRC}/rust/src/stracciatella.rs + +post-configure: + @${MKDIR} ${CONFIGURE_WRKSRC} + @cd ${CONFIGURE_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} \ + ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH} post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ja2 - ${INSTALL_DATA} ${WRKSRC}/_build/distr-files-linux/ja2-stracciatella.desktop \ - ${STAGEDIR}${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKSRC}/Build/Res/jagged3.ico \ - ${STAGEDIR}${PREFIX}/share/pixmaps/jagged2.ico + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ja2 \ + ${STAGEDIR}${PREFIX}/bin/ja2-launcher \ + ${STAGEDIR}${PREFIX}/lib/libstracciatella.so .include diff --git a/games/jaggedalliance2/distinfo b/games/jaggedalliance2/distinfo index 21065c8e0f2..1526a246988 100644 --- a/games/jaggedalliance2/distinfo +++ b/games/jaggedalliance2/distinfo @@ -1,2 +1,71 @@ -SHA256 (ja2/v0.14.01.tar.bz2) = 53ba2fa928eded7e1c1e574407fb814234a7040ebd3a28e4000f6d834b110350 -SIZE (ja2/v0.14.01.tar.bz2) = 7752070 +TIMESTAMP = 1554627710 +SHA256 (rust/crates/aho-corasick-0.5.3.tar.gz) = ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66 +SIZE (rust/crates/aho-corasick-0.5.3.tar.gz) = 252052 +SHA256 (rust/crates/fuchsia-cprng-0.1.1.tar.gz) = a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba +SIZE (rust/crates/fuchsia-cprng-0.1.1.tar.gz) = 2950 +SHA256 (rust/crates/getopts-0.2.18.tar.gz) = 0a7292d30132fb5424b354f5dc02512a86e4c516fe544bb7a25e7f266951b797 +SIZE (rust/crates/getopts-0.2.18.tar.gz) = 18416 +SHA256 (rust/crates/itoa-0.4.3.tar.gz) = 1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b +SIZE (rust/crates/itoa-0.4.3.tar.gz) = 11061 +SHA256 (rust/crates/kernel32-sys-0.2.2.tar.gz) = 7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d +SIZE (rust/crates/kernel32-sys-0.2.2.tar.gz) = 24537 +SHA256 (rust/crates/libc-0.2.51.tar.gz) = bedcc7a809076656486ffe045abeeac163da1b558e963a31e29fbfbeba916917 +SIZE (rust/crates/libc-0.2.51.tar.gz) = 397323 +SHA256 (rust/crates/memchr-0.1.11.tar.gz) = d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20 +SIZE (rust/crates/memchr-0.1.11.tar.gz) = 6977 +SHA256 (rust/crates/proc-macro2-0.4.27.tar.gz) = 4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915 +SIZE (rust/crates/proc-macro2-0.4.27.tar.gz) = 34098 +SHA256 (rust/crates/quote-0.6.11.tar.gz) = cdd8e04bd9c52e0342b406469d494fcb033be4bdbe5c606016defbb1681411e1 +SIZE (rust/crates/quote-0.6.11.tar.gz) = 17283 +SHA256 (rust/crates/rand-0.4.6.tar.gz) = 552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293 +SIZE (rust/crates/rand-0.4.6.tar.gz) = 76401 +SHA256 (rust/crates/rand_core-0.3.1.tar.gz) = 7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b +SIZE (rust/crates/rand_core-0.3.1.tar.gz) = 15483 +SHA256 (rust/crates/rand_core-0.4.0.tar.gz) = d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0 +SIZE (rust/crates/rand_core-0.4.0.tar.gz) = 20326 +SHA256 (rust/crates/rdrand-0.4.0.tar.gz) = 678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2 +SIZE (rust/crates/rdrand-0.4.0.tar.gz) = 6456 +SHA256 (rust/crates/regex-0.1.80.tar.gz) = 4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f +SIZE (rust/crates/regex-0.1.80.tar.gz) = 185806 +SHA256 (rust/crates/regex-syntax-0.3.9.tar.gz) = f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957 +SIZE (rust/crates/regex-syntax-0.3.9.tar.gz) = 117427 +SHA256 (rust/crates/remove_dir_all-0.5.1.tar.gz) = 3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5 +SIZE (rust/crates/remove_dir_all-0.5.1.tar.gz) = 8726 +SHA256 (rust/crates/ryu-0.2.7.tar.gz) = eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7 +SIZE (rust/crates/ryu-0.2.7.tar.gz) = 41382 +SHA256 (rust/crates/serde-1.0.90.tar.gz) = aa5f7c20820475babd2c077c3ab5f8c77a31c15e16ea38687b4c02d3e48680f4 +SIZE (rust/crates/serde-1.0.90.tar.gz) = 71415 +SHA256 (rust/crates/serde_derive-1.0.90.tar.gz) = 58fc82bec244f168b23d1963b45c8bf5726e9a15a9d146a067f9081aeed2de79 +SIZE (rust/crates/serde_derive-1.0.90.tar.gz) = 48815 +SHA256 (rust/crates/serde_json-1.0.39.tar.gz) = 5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d +SIZE (rust/crates/serde_json-1.0.39.tar.gz) = 69621 +SHA256 (rust/crates/shell32-sys-0.1.2.tar.gz) = 9ee04b46101f57121c9da2b151988283b6beb79b34f5bb29a58ee48cb695122c +SIZE (rust/crates/shell32-sys-0.1.2.tar.gz) = 6204 +SHA256 (rust/crates/syn-0.15.30.tar.gz) = 66c8865bf5a7cbb662d8b011950060b3c8743dca141b054bf7195b20d314d8e2 +SIZE (rust/crates/syn-0.15.30.tar.gz) = 146358 +SHA256 (rust/crates/tempdir-0.3.7.tar.gz) = 15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8 +SIZE (rust/crates/tempdir-0.3.7.tar.gz) = 11468 +SHA256 (rust/crates/thread-id-2.0.0.tar.gz) = a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03 +SIZE (rust/crates/thread-id-2.0.0.tar.gz) = 6108 +SHA256 (rust/crates/thread_local-0.2.7.tar.gz) = 8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5 +SIZE (rust/crates/thread_local-0.2.7.tar.gz) = 10954 +SHA256 (rust/crates/unicode-width-0.1.5.tar.gz) = 882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526 +SIZE (rust/crates/unicode-width-0.1.5.tar.gz) = 15761 +SHA256 (rust/crates/unicode-xid-0.1.0.tar.gz) = fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc +SIZE (rust/crates/unicode-xid-0.1.0.tar.gz) = 16000 +SHA256 (rust/crates/user32-sys-0.2.0.tar.gz) = 4ef4711d107b21b410a3a974b1204d9accc8b10dad75d8324b5d755de1617d47 +SIZE (rust/crates/user32-sys-0.2.0.tar.gz) = 10624 +SHA256 (rust/crates/utf8-ranges-0.1.3.tar.gz) = a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f +SIZE (rust/crates/utf8-ranges-0.1.3.tar.gz) = 8422 +SHA256 (rust/crates/winapi-0.2.8.tar.gz) = 167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a +SIZE (rust/crates/winapi-0.2.8.tar.gz) = 455145 +SHA256 (rust/crates/winapi-0.3.7.tar.gz) = f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770 +SIZE (rust/crates/winapi-0.3.7.tar.gz) = 1075776 +SHA256 (rust/crates/winapi-build-0.1.1.tar.gz) = 2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc +SIZE (rust/crates/winapi-build-0.1.1.tar.gz) = 669 +SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6 +SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = 2918815 +SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f +SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 2947998 +SHA256 (ja2-stracciatella-ja2-stracciatella-v0.16.1_GH0.tar.gz) = 750c56b7011479dc89ce1f57f3da551d856a75eb87b545bc655dcbb87c42ba43 +SIZE (ja2-stracciatella-ja2-stracciatella-v0.16.1_GH0.tar.gz) = 25971172 diff --git a/games/jaggedalliance2/files/patch-Makefile b/games/jaggedalliance2/files/patch-Makefile deleted file mode 100644 index 26bbb9afb79..00000000000 --- a/games/jaggedalliance2/files/patch-Makefile +++ /dev/null @@ -1,25 +0,0 @@ ---- Makefile.orig 2014-05-09 20:51:45 UTC -+++ Makefile -@@ -607,14 +607,14 @@ clean distclean: - $(Q)rm -fr $(DEPS) $(OBJS) $(BINARY) - - install: $(BINARY) -- test -z "$(INSTALLABLE)" || install -d $(BINARY_DIR) -- test -z "$(INSTALLABLE)" || install -d $(MANPAGE_DIR) -- test -z "$(INSTALLABLE)" || install -d $(FULL_PATH_EXTRA_DATA_DIR) -- test -z "$(INSTALLABLE)" || install -m 555 $(BINARY) $(BINARY_DIR) -- test -z "$(INSTALLABLE)" || cp -r externalized $(FULL_PATH_EXTRA_DATA_DIR) -- test -z "$(INSTALLABLE)" || cp -r mods $(FULL_PATH_EXTRA_DATA_DIR) -- test -z "$(INSTALLABLE)" || cp -r _unittests $(FULL_PATH_EXTRA_DATA_DIR) -- test -z "$(INSTALLABLE)" || install -m 444 ja2_manpage $(MANPAGE_DIR)/ja2.6 -+ test -z "$(INSTALLABLE)" || install -d ${DESTDIR}$(BINARY_DIR) -+ test -z "$(INSTALLABLE)" || install -d ${DESTDIR}$(MANPAGE_DIR) -+ test -z "$(INSTALLABLE)" || install -d ${DESTDIR}$(FULL_PATH_EXTRA_DATA_DIR) -+ test -z "$(INSTALLABLE)" || install -m 555 $(BINARY) ${DESTDIR}$(BINARY_DIR) -+ test -z "$(INSTALLABLE)" || cp -r externalized ${DESTDIR}$(FULL_PATH_EXTRA_DATA_DIR) -+ test -z "$(INSTALLABLE)" || cp -r mods ${DESTDIR}$(FULL_PATH_EXTRA_DATA_DIR) -+ test -z "$(INSTALLABLE)" || cp -r _unittests ${DESTDIR}$(FULL_PATH_EXTRA_DATA_DIR) -+ test -z "$(INSTALLABLE)" || install -m 444 ja2_manpage ${DESTDIR}$(MANPAGE_DIR)/ja2.6 - - @test -n "$(INSTALLABLE)" || echo "------------------------------------------------------------------------------" - @test -n "$(INSTALLABLE)" || echo "This build doesn't support installation." diff --git a/games/jaggedalliance2/files/patch-configure b/games/jaggedalliance2/files/patch-configure deleted file mode 100644 index 911723f0e28..00000000000 --- a/games/jaggedalliance2/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2014-05-09 20:51:45 UTC -+++ configure -@@ -47,7 +47,7 @@ fi - # writing Makefile.config - echo "# configuration options" >Makefile.config - echo "BINARY_DIR := $PREFIX/bin" >>Makefile.config --echo "MANPAGE_DIR := $PREFIX/share/man/man6" >>Makefile.config -+echo "MANPAGE_DIR := $PREFIX/man/man6" >>Makefile.config - echo "FULL_PATH_EXTRA_DATA_DIR := $PREFIX/share/ja2" >>Makefile.config - echo "INSTALLABLE := yes" >>Makefile.config - diff --git a/games/jaggedalliance2/files/pkg-message.in b/games/jaggedalliance2/files/pkg-message.in deleted file mode 100644 index e57582dfec3..00000000000 --- a/games/jaggedalliance2/files/pkg-message.in +++ /dev/null @@ -1,7 +0,0 @@ -========================================================================== - - This Jagged Alliance 2 port requires data files from the original - game CD and installation. Copy Data/ directory from original game - into %%DATADIR%%/ - -========================================================================== diff --git a/games/jaggedalliance2/pkg-descr b/games/jaggedalliance2/pkg-descr index b03e792bf4d..fd529975f12 100644 --- a/games/jaggedalliance2/pkg-descr +++ b/games/jaggedalliance2/pkg-descr @@ -3,4 +3,4 @@ mercenaries to liberate the small country of Arulco. You need an original game CD and installation to use this port. -WWW: https://bitbucket.org/gennady/ja2-stracciatella +WWW: https://ja2-stracciatella.github.io/ diff --git a/games/jaggedalliance2/pkg-message b/games/jaggedalliance2/pkg-message new file mode 100644 index 00000000000..85555303672 --- /dev/null +++ b/games/jaggedalliance2/pkg-message @@ -0,0 +1,2 @@ +This Jagged Alliance 2 port requires data files from the original +game CD and installation. diff --git a/games/jaggedalliance2/pkg-plist b/games/jaggedalliance2/pkg-plist index 2c935f3e4a4..3b365157342 100644 --- a/games/jaggedalliance2/pkg-plist +++ b/games/jaggedalliance2/pkg-plist @@ -1,18 +1,9 @@ bin/ja2 +bin/ja2-launcher +lib/libstracciatella.so man/man6/ja2.6.gz share/applications/ja2-stracciatella.desktop -%%DATADIR%%/_unittests/datatypes/doubles.bin -%%DATADIR%%/_unittests/datatypes/floats.bin -%%DATADIR%%/_unittests/find-files/file-without-extension -%%DATADIR%%/_unittests/find-files/lowercase-ext.txt -%%DATADIR%%/_unittests/find-files/subfolder/file.txt -%%DATADIR%%/_unittests/find-files/uppercase-ext.TXT -%%DATADIR%%/_unittests/saves/strac-linux/SaveGame01.sav -%%DATADIR%%/_unittests/saves/strac-macos/SaveGame09.sav -%%DATADIR%%/_unittests/saves/strac-macos/imp.dat -%%DATADIR%%/_unittests/saves/strac-win/SaveGame09.sav -%%DATADIR%%/_unittests/saves/vanilla-russian/IMP.dat -%%DATADIR%%/_unittests/saves/vanilla-russian/SaveGame06.sav +share/icons/hicolor/scalable/apps/ja2-stracciatella.svg %%DATADIR%%/externalized/ammo_types.json %%DATADIR%%/externalized/army-gun-choice-extended.json %%DATADIR%%/externalized/army-gun-choice-normal.json @@ -41,7 +32,9 @@ share/applications/ja2-stracciatella.desktop %%DATADIR%%/externalized/game.json %%DATADIR%%/externalized/imp.json %%DATADIR%%/externalized/magazines.json +%%DATADIR%%/externalized/music.json %%DATADIR%%/externalized/readme.txt +%%DATADIR%%/externalized/sti/interface/LOADSCREENTAB.STI %%DATADIR%%/externalized/strings/ammo-calibre-bobbyray-dut.json %%DATADIR%%/externalized/strings/ammo-calibre-bobbyray-eng.json %%DATADIR%%/externalized/strings/ammo-calibre-bobbyray-fr.json @@ -67,7 +60,27 @@ share/applications/ja2-stracciatella.desktop %%DATADIR%%/mods/from-russia-with-love/data/maps/A9.dat %%DATADIR%%/mods/from-russia-with-love/license.txt %%DATADIR%%/mods/from-russia-with-love/readme.txt +%%DATADIR%%/mods/generous-rebels/data/Maps/A10_b1.dat +%%DATADIR%%/mods/generous-rebels/Generous Rebels Mod.txt +%%DATADIR%%/mods/generous-rebels/GR mod.jpg +%%DATADIR%%/mods/imp-quiz-honest-answers/data/Binarydata/IMPTEXT.EDT +%%DATADIR%%/mods/imp-quiz-honest-answers/IMP quiz honest answers mod.txt +%%DATADIR%%/mods/o-fortuna/data/music.json +%%DATADIR%%/mods/o-fortuna/data/music/o-fortuna.wav +%%DATADIR%%/mods/o-fortuna/license.txt +%%DATADIR%%/mods/o-fortuna/readme.txt %%DATADIR%%/mods/readme.txt %%DATADIR%%/mods/test-json-dialogs/data/mercedt/009.edt.json %%DATADIR%%/mods/test-json-dialogs/readme.txt -share/pixmaps/jagged2.ico +%%DATADIR%%/unittests/datatypes/doubles.bin +%%DATADIR%%/unittests/datatypes/floats.bin +%%DATADIR%%/unittests/find-files/file-without-extension +%%DATADIR%%/unittests/find-files/lowercase-ext.txt +%%DATADIR%%/unittests/find-files/subfolder/file.txt +%%DATADIR%%/unittests/find-files/uppercase-ext.TXT +%%DATADIR%%/unittests/saves/strac-linux/SaveGame01.sav +%%DATADIR%%/unittests/saves/strac-macos/imp.dat +%%DATADIR%%/unittests/saves/strac-macos/SaveGame09.sav +%%DATADIR%%/unittests/saves/strac-win/SaveGame09.sav +%%DATADIR%%/unittests/saves/vanilla-russian/IMP.dat +%%DATADIR%%/unittests/saves/vanilla-russian/SaveGame06.sav diff --git a/games/manaplus/Makefile b/games/manaplus/Makefile index 607b6dc5dea..c4fb8bd3b88 100644 --- a/games/manaplus/Makefile +++ b/games/manaplus/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= manaplus -DISTVERSION= 1.8.12.8 +DISTVERSION= 1.9.3.23 CATEGORIES= games MASTER_SITES= http://download.evolonline.org/manaplus/download/${PORTVERSION}/ diff --git a/games/manaplus/distinfo b/games/manaplus/distinfo index fa99d02ac04..6238fe7d8a5 100644 --- a/games/manaplus/distinfo +++ b/games/manaplus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1547892526 -SHA256 (manaplus-1.8.12.8.tar.xz) = cb3a17494d625c56c7219bf0b12226ca4d3372002dc2933e7aa16fbcda8fc723 -SIZE (manaplus-1.8.12.8.tar.xz) = 15041612 +TIMESTAMP = 1554573253 +SHA256 (manaplus-1.9.3.23.tar.xz) = 5fbaabe8042ea0718566276882e184b3455890b64b1ec74cc58d6f4dae40c1cf +SIZE (manaplus-1.9.3.23.tar.xz) = 15051860 diff --git a/games/opengfx/Makefile b/games/opengfx/Makefile index a44400b9893..0edb3021d0d 100644 --- a/games/opengfx/Makefile +++ b/games/opengfx/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= opengfx -PORTVERSION= 0.5.4 +PORTVERSION= 0.5.5 CATEGORIES= games MASTER_SITES= http://bundles.openttdcoop.org/${PORTNAME}/releases/${PORTVERSION}/ \ http://m1cro.me/ports/distfiles/${PORTNAME}/releases/${PORTVERSION}/ @@ -13,7 +13,9 @@ COMMENT= Free alternative graphics for OpenTTD game engine LICENSE= GPLv2 USES= zip + NO_BUILD= yes +NO_ARCH= yes # upstream zipped a tar file, unpack it. post-extract: diff --git a/games/opengfx/distinfo b/games/opengfx/distinfo index c230679f0e0..b7827d50767 100644 --- a/games/opengfx/distinfo +++ b/games/opengfx/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1475770623 -SHA256 (opengfx-0.5.4.zip) = 3d136d776906dbe8b5df1434cb9a68d1249511a3c4cfaca55cc24cc0028ae078 -SIZE (opengfx-0.5.4.zip) = 3547720 +TIMESTAMP = 1554736366 +SHA256 (opengfx-0.5.5.zip) = c648d56c41641f04e48873d83f13f089135909cc55342a91ed27c5c1683f0dfe +SIZE (opengfx-0.5.5.zip) = 3548368 diff --git a/games/openttd/Makefile b/games/openttd/Makefile index 470d51ec5f6..3b5d4b23de4 100644 --- a/games/openttd/Makefile +++ b/games/openttd/Makefile @@ -2,16 +2,9 @@ # $FreeBSD$ PORTNAME= openttd -DISTVERSION= 1.8.0 -PORTREVISION= 6 +DISTVERSION= 1.9.0 CATEGORIES= games -MASTER_SITES= http://ca.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \ - http://cz.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \ - http://de.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \ - http://fr.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \ - http://ftp.snt.utwente.nl/pub/games/openttd/binaries/releases/${DISTVERSION}/ \ - http://uk.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \ - http://us.binaries.openttd.org/binaries/releases/${DISTVERSION}/ +MASTER_SITES= https://proxy.binaries.openttd.org/openttd-releases/${DISTVERSION}/ DISTNAME= ${PORTNAME}-${DISTVERSION}-source MAINTAINER= danfe@FreeBSD.org @@ -27,7 +20,8 @@ LIB_DEPENDS= libpng.so:graphics/png \ USES= cpe gmake pkgconfig tar:xz HAS_CONFIGURE= yes CONFIGURE_ENV= STRIP="${STRIP_CMD} ${STRIP}" -CONFIGURE_ARGS= --prefix-dir="${PREFIX}" --data-dir="${DATADIR_REL}" +CONFIGURE_ARGS= --prefix-dir="${PREFIX}" --data-dir="${DATADIR_REL}" \ + --without-libtimidity MAKE_ARGS= VERBOSE=1 WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} @@ -35,11 +29,12 @@ CXXFLAGS= # Set to empty as OpenTTD treats it as an addition to CFLAGS SUB_FILES= pkg-message -PORTDOCS= HOWTO_compile_lang_files.txt admin_network.txt \ - elrail.svg elrail_tile.png elrail_track.png landscape.html \ - landscape_externals.html landscape_grid.html multiplayer.txt \ - obg_format.txt obm_format.txt obs_format.txt \ - ottd-colourtext-palette.png tileh.png +PORTDOCS= HOWTO_compile_lang_files.txt README.md admin_network.txt \ + changelog.txt elrail.svg elrail_tile.png elrail_track.png \ + known-bugs.txt landscape.html landscape_externals.html \ + landscape_grid.html multiplayer.txt obg_format.txt \ + obm_format.txt obs_format.txt ottd-colourtext-palette.png \ + tileh.png DESKTOP_ENTRIES="OpenTTD" "${COMMENT}" "${PORTNAME}" "${PORTNAME}" \ "Game;Simulation;StrategyGame;" false @@ -54,13 +49,19 @@ CONFIGURE_ARGS+= --with-midi="${WITH_MIDI_PLAYER}" CONFIGURE_ARGS+= --with-midi-arg="${WITH_MIDI_PLAYER_ARGS}" .endif +.if defined(WITH_FLUIDSYNTH) +LIB_DEPENDS+= libfluidsynth.so:audio/fluidsynth +.else +CONFIGURE_ARGS+= --without-fluidsynth +.endif + .if defined(WITH_DEDICATED_SERVER_ONLY) CONFIGURE_ARGS+= --enable-dedicated # Aid it to find lzo2 headers; client build gets it via sdl-config CFLAGS+= -I${LOCALBASE}/include USE_RC_SUBR= ${PORTNAME} .else -USES+= compiler:c++11-lib +USES+= compiler:c++11-lib sdl USE_CXXSTD= gnu++11 CXXFLAGS+= -DU_USING_ICU_NAMESPACE=1 LIB_DEPENDS+= libfreetype.so:print/freetype2 \ @@ -91,6 +92,9 @@ pre-everything:: .if !defined(WITH_MIDI_PLAYER_ARGS) @${ECHO_MSG} "Define WITH_MIDI_PLAYER_ARGS=arguments for external MIDI player" .endif +.if !defined(WITH_FLUIDSYNTH) + @${ECHO_MSG} "Define WITH_FLUIDSYNTH to enable new Fluidsynth music driver" +.endif .if !defined(WITH_DEDICATED_SERVER_ONLY) @${ECHO_MSG} "Define WITH_DEDICATED_SERVER_ONLY to build CLI-based dedicated server" .endif @@ -101,15 +105,22 @@ pre-everything:: @${ECHO_MSG} "Define WITH_SAVE_PASSWORDS to save passwords between server restarts" .endif +post-extract: + @${MV} ${WRKSRC}/README.md ${WRKSRC}/changelog.txt \ + ${WRKSRC}/known-bugs.txt ${WRKSRC}/docs + post-patch: @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' ${WRKSRC}/config.lib + @${REINPLACE_CMD} -e 's,OSX,${OPSYS:tu},' ${WRKSRC}/Makefile.grf.in do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DATADIR}/ai ${STAGEDIR}${DATADIR}/baseset \ - ${STAGEDIR}${DATADIR}/lang ${STAGEDIR}${DATADIR}/scripts + ${STAGEDIR}${DATADIR}/game ${STAGEDIR}${DATADIR}/lang \ + ${STAGEDIR}${DATADIR}/scripts ${INSTALL_DATA} ${WRKSRC}/bin/ai/*.nut ${STAGEDIR}${DATADIR}/ai ${INSTALL_DATA} ${WRKSRC}/bin/baseset/* ${STAGEDIR}${DATADIR}/baseset + ${INSTALL_DATA} ${WRKSRC}/bin/game/* ${STAGEDIR}${DATADIR}/game ${INSTALL_DATA} ${WRKSRC}/bin/lang/* ${STAGEDIR}${DATADIR}/lang ${INSTALL_DATA} ${WRKSRC}/bin/scripts/* ${STAGEDIR}${DATADIR}/scripts ${INSTALL_MAN} ${WRKSRC}/docs/${PORTNAME}.6 \ @@ -123,6 +134,8 @@ do-install: ${STAGEDIR}${PREFIX}/share/icons/hicolor/${n}x${n}/apps/openttd.png . endfor .endif + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/docs/,} ${STAGEDIR}${DOCSDIR} diff --git a/games/openttd/distinfo b/games/openttd/distinfo index 167022e095c..78c30cf2cbe 100644 --- a/games/openttd/distinfo +++ b/games/openttd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1522588020 -SHA256 (openttd-1.8.0-source.tar.xz) = c2d32d9d736d27202a020027a3729ae763f5432ae6f424891e57a4095eeb087f -SIZE (openttd-1.8.0-source.tar.xz) = 6521016 +TIMESTAMP = 1554141178 +SHA256 (openttd-1.9.0-source.tar.xz) = 45fded554d973328496f6e01b0769d7b8b64048a8fe2cf252242194c08ea7419 +SIZE (openttd-1.9.0-source.tar.xz) = 6575956 diff --git a/games/openttd/pkg-plist b/games/openttd/pkg-plist index c69b7998971..a0a3b738c8e 100644 --- a/games/openttd/pkg-plist +++ b/games/openttd/pkg-plist @@ -1,6 +1,5 @@ bin/openttd man/man6/openttd.6.gz -share/pixmaps/openttd.32.xpm %%DATADIR%%/ai/compat_0.7.nut %%DATADIR%%/ai/compat_1.0.nut %%DATADIR%%/ai/compat_1.1.nut @@ -11,17 +10,28 @@ share/pixmaps/openttd.32.xpm %%DATADIR%%/ai/compat_1.6.nut %%DATADIR%%/ai/compat_1.7.nut %%DATADIR%%/ai/compat_1.8.nut +%%DATADIR%%/ai/compat_1.9.nut %%DATADIR%%/baseset/no_music.obm %%DATADIR%%/baseset/no_sound.obs %%DATADIR%%/baseset/openttd.grf %%DATADIR%%/baseset/opntitle.dat %%DATADIR%%/baseset/orig_dos.obg +%%DATADIR%%/baseset/orig_dos.obm %%DATADIR%%/baseset/orig_dos.obs %%DATADIR%%/baseset/orig_dos_de.obg %%DATADIR%%/baseset/orig_extra.grf +%%DATADIR%%/baseset/orig_tto.obm %%DATADIR%%/baseset/orig_win.obg %%DATADIR%%/baseset/orig_win.obm %%DATADIR%%/baseset/orig_win.obs +%%DATADIR%%/game/compat_1.2.nut +%%DATADIR%%/game/compat_1.3.nut +%%DATADIR%%/game/compat_1.4.nut +%%DATADIR%%/game/compat_1.5.nut +%%DATADIR%%/game/compat_1.6.nut +%%DATADIR%%/game/compat_1.7.nut +%%DATADIR%%/game/compat_1.8.nut +%%DATADIR%%/game/compat_1.9.nut %%DATADIR%%/lang/afrikaans.lng %%DATADIR%%/lang/arabic_egypt.lng %%DATADIR%%/lang/basque.lng @@ -93,3 +103,4 @@ share/icons/hicolor/48x48/apps/openttd.png share/icons/hicolor/64x64/apps/openttd.png share/icons/hicolor/128x128/apps/openttd.png share/icons/hicolor/256x256/apps/openttd.png +share/pixmaps/openttd.32.xpm diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile index 229fa4aeea2..7316742dea9 100644 --- a/games/wesnoth/Makefile +++ b/games/wesnoth/Makefile @@ -2,6 +2,7 @@ PORTNAME= wesnoth PORTVERSION= 1.14.6 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} \ diff --git a/games/whichwayisup/Makefile b/games/whichwayisup/Makefile index dad75e280bb..598843160a1 100644 --- a/games/whichwayisup/Makefile +++ b/games/whichwayisup/Makefile @@ -3,7 +3,7 @@ PORTNAME= whichwayisup PORTVERSION= 0.7.9 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games python MASTER_SITES= http://www.oletus.fi/static/whichwayisup/ \ SF/nemysisfreebsdp/games/${PORTNAME}/:icons diff --git a/games/xbill/Makefile b/games/xbill/Makefile new file mode 100644 index 00000000000..1c0066cbc83 --- /dev/null +++ b/games/xbill/Makefile @@ -0,0 +1,52 @@ +# Created by: asami +# $FreeBSD$ + +PORTNAME= xbill +PORTVERSION= 2.1 +PORTREVISION= 9 +CATEGORIES= games +MASTER_SITES= http://www.xbill.org/download/ + +MAINTAINER= ak@FreeBSD.org +COMMENT= Save your computers from the evil clutches of Bill + +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --localstatedir=${SCORES_DIR} --disable-gtk + +SCORES_DIR?= ${DATADIR}/scores + +DESKTOP_ENTRIES="xBill" \ + "Save your computers from the evil clutches of Bill" \ + "${DATADIR}/pixmaps/icon.xpm" \ + "xbill" \ + "Game;ArcadeGame;" \ + false + +PLIST_FILES= bin/${PORTNAME} \ + man/man6/${PORTNAME}.6.gz + +PORTDATA= * + +USE_XORG= xt x11 sm ice xpm + +OPTIONS_SINGLE= WIDGETSET +OPTIONS_SINGLE_WIDGETSET= ATHENA MOTIF +OPTIONS_DEFAULT= ATHENA + +ATHENA_DESC= Athena widget set +MOTIF_DESC= Motif widget set + +ATHENA_CONFIGURE_ARGS_ON= --disable-motif +ATHENA_USE= xorg=xaw,xmu + +MOTIF_CONFIGURE_ARGS_ON= --disable-athena +MOTIF_USES= motif + +post-patch: + @${REINPLACE_CMD} -e '/WIDGET_LIBS=/ s|-lXm"$$|-lXm -lXpm"|' \ + ${WRKSRC}/configure + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xbill + +.include diff --git a/games/xbill/distinfo b/games/xbill/distinfo new file mode 100644 index 00000000000..31ff687dd17 --- /dev/null +++ b/games/xbill/distinfo @@ -0,0 +1,2 @@ +SHA256 (xbill-2.1.tar.gz) = 0efdfff1ce2df70b7a15601cb488cd7b2eb918d21d78e877bd773f112945608d +SIZE (xbill-2.1.tar.gz) = 77610 diff --git a/games/xbill/files/patch-configure b/games/xbill/files/patch-configure new file mode 100644 index 00000000000..b7b7bfadd6f --- /dev/null +++ b/games/xbill/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Fri Feb 21 14:21:59 2003 ++++ configure Fri Feb 21 14:22:22 2003 +@@ -9,7 +9,7 @@ + + # Defaults: + ac_help= +-ac_default_prefix=/usr/local ++ac_default_prefix=${PREFIX} + # Any additions from configure.in: + ac_help="$ac_help + --with-x use the X Window System" diff --git a/games/xbill/pkg-descr b/games/xbill/pkg-descr new file mode 100644 index 00000000000..5fb49e810ff --- /dev/null +++ b/games/xbill/pkg-descr @@ -0,0 +1,4 @@ +xbill is a game for Bill-haters. Ah, the escasy to squish the evil Bill +like a bug! :> + +WWW: http://www.xbill.org diff --git a/german/mythes/Makefile b/german/mythes/Makefile index efd379da4a3..66161886e4a 100644 --- a/german/mythes/Makefile +++ b/german/mythes/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= mythes -PORTVERSION= 2019.03.31 +PORTVERSION= 2019.04.07 CATEGORIES= german textproc MASTER_SITES= LOCAL/sunpoet/${PORTNAME} DISTNAME= Deutscher-Thesaurus-${PORTVERSION:C/\.//g} diff --git a/german/mythes/distinfo b/german/mythes/distinfo index c9202ddc849..a7257817e65 100644 --- a/german/mythes/distinfo +++ b/german/mythes/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554235619 -SHA256 (mythes/Deutscher-Thesaurus-20190331.oxt) = 0f4cfd40d68626a1953f389893381e9e39076c713effdc1ad67b7bbbd8227315 -SIZE (mythes/Deutscher-Thesaurus-20190331.oxt) = 9300939 +TIMESTAMP = 1554740480 +SHA256 (mythes/Deutscher-Thesaurus-20190407.oxt) = 772dae442373dc2004a978ced14c3eab58cfe8d11480f1bc9afeff4cbdec398b +SIZE (mythes/Deutscher-Thesaurus-20190407.oxt) = 9305872 diff --git a/graphics/atril/Makefile b/graphics/atril/Makefile index bbc5d036f16..845245d76c4 100644 --- a/graphics/atril/Makefile +++ b/graphics/atril/Makefile @@ -12,7 +12,7 @@ DIST_SUBDIR= mate MAINTAINER= gnome@FreeBSD.org COMMENT= MATE multi-format document viewer -LICENSE= GPLv2 +LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= itstool:textproc/itstool diff --git a/graphics/atril/pkg-descr b/graphics/atril/pkg-descr index 611bf3a7315..162109f6601 100644 --- a/graphics/atril/pkg-descr +++ b/graphics/atril/pkg-descr @@ -2,4 +2,4 @@ Atril is a document viewer for multiple document formats including PDF and Postscript. The goal of Atril is to replace document viewers such as ggv and gpdf with a single, simple application. -WWW: http://mate-desktop.org/ +WWW: https://mate-desktop.org/ diff --git a/graphics/bugle/Makefile b/graphics/bugle/Makefile index e22ceacb6b4..dd41aa9e1cf 100644 --- a/graphics/bugle/Makefile +++ b/graphics/bugle/Makefile @@ -3,7 +3,7 @@ PORTNAME= bugle PORTVERSION= 0.0.20100508 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/curator/Makefile b/graphics/curator/Makefile index 67d3a59581c..2f2740f5ce9 100644 --- a/graphics/curator/Makefile +++ b/graphics/curator/Makefile @@ -3,7 +3,7 @@ PORTNAME= curator PORTVERSION= 2.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics www python MASTER_SITES= SF diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile index 5a6502bbccc..e481fdf85dd 100644 --- a/graphics/gphoto2/Makefile +++ b/graphics/gphoto2/Makefile @@ -3,6 +3,7 @@ PORTNAME= gphoto2 PORTVERSION= 2.5.15 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/gphoto/gphoto/${PORTVERSION} diff --git a/graphics/minder/Makefile b/graphics/minder/Makefile index f3f874da72e..5d13ecdad8d 100644 --- a/graphics/minder/Makefile +++ b/graphics/minder/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ PORTNAME= minder -PORTVERSION= 1.1.3 -PORTREVISION= 1 +PORTVERSION= 1.2 CATEGORIES= graphics -PKGNAMESUFFIX= -app # avoid PKGBASE collision with net-p2p/minder +# avoid PKGBASE collision with net-p2p/minder +PKGNAMESUFFIX= -app MAINTAINER= tobik@FreeBSD.org COMMENT= Mind-mapping application @@ -15,15 +15,15 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= vala:lang/vala LIB_DEPENDS= libgranite.so:x11-toolkits/granite -USES= gettext gnome meson pkgconfig python:3.5+,build +USES= desktop-file-utils gettext gnome meson pkgconfig \ + python:3.5+,build shared-mime-info shebangfix USE_GITHUB= yes GH_ACCOUNT= phase1geo GH_PROJECT= Minder USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 libxml2 pango GLIB_SCHEMAS= com.github.phase1geo.minder.gschema.xml INSTALLS_ICONS= yes - -BINARY_ALIAS= python3=${PYTHON_CMD} # for meson/post_install.py +SHEBANG_FILES= meson/post_install.py OPTIONS_DEFINE= DOCS diff --git a/graphics/minder/distinfo b/graphics/minder/distinfo index a7432d48334..cfc382ef3ed 100644 --- a/graphics/minder/distinfo +++ b/graphics/minder/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1545025763 -SHA256 (phase1geo-Minder-1.1.3_GH0.tar.gz) = ff9a1b5d8e31d070ebd0697009980ed9b58943bc4ac560348d6acf45e1be6718 -SIZE (phase1geo-Minder-1.1.3_GH0.tar.gz) = 872455 +TIMESTAMP = 1554878673 +SHA256 (phase1geo-Minder-1.2_GH0.tar.gz) = b2fc60e4dbe147295c743c2aa24998aa06218fdd709e0dc205de12f6abf80881 +SIZE (phase1geo-Minder-1.2_GH0.tar.gz) = 651188 diff --git a/graphics/minder/files/patch-meson.build b/graphics/minder/files/patch-meson.build index c5b9c7e9e7e..3232d713881 100644 --- a/graphics/minder/files/patch-meson.build +++ b/graphics/minder/files/patch-meson.build @@ -1,12 +1,12 @@ Remove unused libarchive dependency ---- meson.build.orig 2018-09-20 10:32:05 UTC +--- meson.build.orig 2019-04-10 04:39:47 UTC +++ meson.build -@@ -47,7 +47,6 @@ dependencies = [ +@@ -51,7 +51,6 @@ dependencies = [ dependency('granite'), dependency('gtk+-3.0'), dependency('libxml-2.0'), -- dependency('libarchive') +- dependency('libarchive'), + math_dep ] - e = executable('com.github.phase1geo.minder', diff --git a/graphics/minder/pkg-plist b/graphics/minder/pkg-plist index 83b9b06e28e..ed60e6b6f6d 100644 --- a/graphics/minder/pkg-plist +++ b/graphics/minder/pkg-plist @@ -12,3 +12,4 @@ share/locale/fr/LC_MESSAGES/com.github.phase1geo.minder.mo share/locale/pl/LC_MESSAGES/com.github.phase1geo.minder.mo share/locale/pt_BR/LC_MESSAGES/com.github.phase1geo.minder.mo share/metainfo/com.github.phase1geo.minder.appdata.xml +share/mime/packages/com.github.phase1geo.minder.xml diff --git a/graphics/p5-Captcha-reCAPTCHA-Mailhide/Makefile b/graphics/p5-Captcha-reCAPTCHA-Mailhide/Makefile index 0426a067d60..9f3d7b960b3 100644 --- a/graphics/p5-Captcha-reCAPTCHA-Mailhide/Makefile +++ b/graphics/p5-Captcha-reCAPTCHA-Mailhide/Makefile @@ -12,6 +12,9 @@ PKGNAMEPREFIX= p5- MAINTAINER= gerard@seibercom.net COMMENT= Perl implementation of the reCAPTCHA Mailhide API +LICENSE= ART10 GPLv1+ +LICENSE_COMB= dual + BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= p5-Crypt-Rijndael>=0:security/p5-Crypt-Rijndael \ p5-HTML-Tiny>=0.904:textproc/p5-HTML-Tiny @@ -19,5 +22,6 @@ RUN_DEPENDS= p5-Crypt-Rijndael>=0:security/p5-Crypt-Rijndael \ USES= perl5 USE_PERL5= configure +NO_ARCH= yes .include diff --git a/graphics/partio/Makefile b/graphics/partio/Makefile index 25ec025739b..03a411f1a7f 100644 --- a/graphics/partio/Makefile +++ b/graphics/partio/Makefile @@ -2,6 +2,7 @@ PORTNAME= partio PORTVERSION= 1.5.5 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= graphics math diff --git a/graphics/pqiv/Makefile b/graphics/pqiv/Makefile index cbd7032dc3b..1cfba2d226f 100644 --- a/graphics/pqiv/Makefile +++ b/graphics/pqiv/Makefile @@ -10,8 +10,6 @@ COMMENT= Pretty Quick Image Viewer LICENSE= GPLv2 -BROKEN_powerpc64= fails to compile: pqiv.c:1183: \#pragma GCC diagnostic not allowed inside functions - LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 BUILD_DEPENDS= bash:shells/bash @@ -69,6 +67,14 @@ MAKEFILE= GNUmakefile PORTDOCS= README.markdown PLIST_FILES= bin/pqiv man/man1/pqiv.1.gz +post-patch: +.if exists(/usr/lib/libstdc++.so) + @${REINPLACE_CMD} -e '/#pragma GCC diagnostic/d' \ + -e '/PQIV_DISABLE_PEDANTIC/d' \ + -e '/PQIV_ENABLE_PEDANTIC/d' \ + ${WRKSRC}/pqiv.c +.endif + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pqiv ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/pqiv.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 diff --git a/graphics/py-gdal/Makefile b/graphics/py-gdal/Makefile index 40fbb41285b..e2b7cf3b915 100644 --- a/graphics/py-gdal/Makefile +++ b/graphics/py-gdal/Makefile @@ -3,6 +3,7 @@ PORTNAME= gdal PORTVERSION= 2.4.1 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= https://download.osgeo.org/gdal/${PORTVERSION}/ \ LOCAL/sunpoet diff --git a/graphics/py-imageio24/Makefile b/graphics/py-imageio24/Makefile index af52325e20e..7992e6643b1 100644 --- a/graphics/py-imageio24/Makefile +++ b/graphics/py-imageio24/Makefile @@ -2,7 +2,7 @@ PORTNAME= imageio DISTVERSION= 2.4.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/py-mayavi/Makefile b/graphics/py-mayavi/Makefile index 1e3ac75e7e1..f20328538b2 100644 --- a/graphics/py-mayavi/Makefile +++ b/graphics/py-mayavi/Makefile @@ -3,7 +3,7 @@ PORTNAME= mayavi PORTVERSION= 4.5.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics science python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/py-photocollage/Makefile b/graphics/py-photocollage/Makefile index 0b4b2945b8f..6eeb4b72f81 100644 --- a/graphics/py-photocollage/Makefile +++ b/graphics/py-photocollage/Makefile @@ -2,6 +2,7 @@ PORTNAME= photocollage DISTVERSION= 1.4.4 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/py-scikit-image/Makefile b/graphics/py-scikit-image/Makefile index 6bb3403d4a8..6d90e7b240b 100644 --- a/graphics/py-scikit-image/Makefile +++ b/graphics/py-scikit-image/Makefile @@ -2,6 +2,7 @@ PORTNAME= scikit-image PORTVERSION= 0.14.2 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= graphics python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile index 39ebf7b5c54..549888b570e 100644 --- a/graphics/qgis/Makefile +++ b/graphics/qgis/Makefile @@ -3,8 +3,7 @@ PORTNAME= qgis DISTVERSIONPREFIX= final- -DISTVERSION= 3_6_0 -PORTREVISION= 5 +DISTVERSION= 3_6_1 CATEGORIES= graphics geography MAINTAINER= rhurlin@gwdg.de @@ -84,7 +83,8 @@ USE_QT= 3d buildtools_build core concurrent dbus declarative \ printsupport qmake_build script serialport \ sql sql-pgsql sql-sqlite3 svg testlib uitools \ webengine widgets webkit xml -USE_PYQT= core gui network qml qscintilla2 sip sql svg xml webkit_run +USE_PYQT= core gui network qml qscintilla2 sip sql svg xml \ + webkit_run webkitwidgets_run USE_LDCONFIG= yes CONFLICTS_INSTALL= qgis-ltr @@ -110,7 +110,7 @@ CMAKE_OFF+= SUPPRESS_QT_WARNINGS SHEBANG_FILES= src/plugins/grass/scripts/*.py OPTIONS_DEFINE= GRASS SERVER -OPTIONS_DEFAULT= GRASS +OPTIONS_DEFAULT= GRASS SERVER NO_OPTIONS_SORT= yes OPTIONS_SUB= yes diff --git a/graphics/qgis/distinfo b/graphics/qgis/distinfo index 8d3f8d1c2f5..1971e3fab08 100644 --- a/graphics/qgis/distinfo +++ b/graphics/qgis/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1550852779 -SHA256 (qgis-QGIS-final-3_6_0_GH0.tar.gz) = 4e50a3ea3bd4b38b6255c0ca6533528c5507863e9bcb50491e5f6038ebe15d9b -SIZE (qgis-QGIS-final-3_6_0_GH0.tar.gz) = 92695815 +TIMESTAMP = 1554299268 +SHA256 (qgis-QGIS-final-3_6_1_GH0.tar.gz) = e5d891c5d00f3fbfa2a251d4916ce8e2be51534fde23cec5e68f4a351d27b0d3 +SIZE (qgis-QGIS-final-3_6_1_GH0.tar.gz) = 93023810 diff --git a/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py b/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py index ce01c2beff4..c6f92a2503b 100644 --- a/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py +++ b/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py @@ -1,11 +1,20 @@ ---- python/plugins/processing/algs/saga/SagaAlgorithmProvider.py.orig 2018-11-23 12:08:36 UTC +--- python/plugins/processing/algs/saga/SagaAlgorithmProvider.py.orig 2019-03-02 02:07:46 UTC +++ python/plugins/processing/algs/saga/SagaAlgorithmProvider.py +@@ -82,7 +82,7 @@ class SagaAlgorithmProvider(QgsProcessingProvider): + + def canBeActivated(self): + version = SagaUtils.getInstalledVersion(True) +- if version is not None and version.startswith(REQUIRED_VERSION): ++ if version is not None and version >= REQUIRED_VERSION: + return True + return False + @@ -93,7 +93,7 @@ class SagaAlgorithmProvider(QgsProcessingProvider): self.tr('Processing'), Qgis.Critical) return - if not version.startswith(REQUIRED_VERSION): -+ if version < '2.3': ++ if version < REQUIRED_VERSION: QgsMessageLog.logMessage(self.tr('Problem with SAGA installation: unsupported SAGA version (found: {}, required: {}).').format(version, REQUIRED_VERSION), self.tr('Processing'), Qgis.Critical) diff --git a/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaUtils.py b/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaUtils.py deleted file mode 100644 index 510f4553694..00000000000 --- a/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaUtils.py +++ /dev/null @@ -1,55 +0,0 @@ ---- python/plugins/processing/algs/saga/SagaUtils.py.orig 2018-11-23 12:08:36 UTC -+++ python/plugins/processing/algs/saga/SagaUtils.py -@@ -26,6 +26,7 @@ __copyright__ = '(C) 2012, Victor Olaya' - __revision__ = '564579199220ae06abd248f0dc80b7ff57b80128' - - import os -+import platform - import stat - import subprocess - import time -@@ -59,7 +60,7 @@ def sagaBatchJobFilename(): - - def findSagaFolder(): - folder = None -- if isMac(): -+ if isMac() or platform.system() == 'FreeBSD': - testfolder = os.path.join(QgsApplication.prefixPath(), 'bin') - if os.path.exists(os.path.join(testfolder, 'saga_cmd')): - folder = testfolder -@@ -84,7 +85,7 @@ def findSagaFolder(): - - - def sagaPath(): -- if not isWindows() and not isMac(): -+ if not isWindows() and not isMac() and not platform.system() == 'FreeBSD': - return '' - - folder = findSagaFolder() -@@ -102,7 +103,7 @@ def createSagaBatchJobFileFromSagaCommands(commands): - fout.write('set SAGA=' + sagaPath() + '\n') - fout.write('set SAGA_MLB=' + os.path.join(sagaPath(), 'modules') + '\n') - fout.write('PATH=%PATH%;%SAGA%;%SAGA_MLB%\n') -- elif isMac(): -+ elif isMac() or platform.system() == 'FreeBSD': - fout.write('export SAGA_MLB=' + os.path.join(sagaPath(), '../lib/saga') + '\n') - fout.write('export PATH=' + sagaPath() + ':$PATH\n') - else: -@@ -129,7 +130,7 @@ def getInstalledVersion(runSaga=False): - - if isWindows(): - commands = [os.path.join(sagaPath(), "saga_cmd.exe"), "-v"] -- elif isMac(): -+ elif isMac() or platform.system() == 'FreeBSD': - commands = [os.path.join(sagaPath(), "saga_cmd -v")] - else: - # for Linux use just one string instead of separated parameters as the list -@@ -145,7 +146,7 @@ def getInstalledVersion(runSaga=False): - stderr=subprocess.STDOUT, - universal_newlines=True, - ) as proc: -- if isMac(): # This trick avoids having an uninterrupted system call exception if SAGA is not installed -+ if isMac() or platform.system() == 'FreeBSD': # This trick avoids having an uninterrupted system call exception if SAGA is not installed - time.sleep(1) - try: - lines = proc.stdout.readlines() diff --git a/graphics/qgis/files/patch-src_app_main.cpp b/graphics/qgis/files/patch-src_app_main.cpp deleted file mode 100644 index 4f58076973f..00000000000 --- a/graphics/qgis/files/patch-src_app_main.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- src/app/main.cpp.orig 2018-11-23 12:08:36 UTC -+++ src/app/main.cpp -@@ -1025,7 +1025,7 @@ int main( int argc, char *argv[] ) - QCoreApplication::addLibraryPath( QApplication::applicationDirPath() - + QDir::separator() + "qtplugins" ); - #endif --#ifdef Q_OS_MAC -+#if defined(Q_OS_MAC) || defined(Q_OS_UNIX) - // Resulting libraryPaths has critical QGIS plugin paths first, then any Qt plugin paths, then - // any dev-defined paths (in app's qt.conf) and/or user-defined paths (QT_PLUGIN_PATH env var). - // -@@ -1033,7 +1033,7 @@ int main( int argc, char *argv[] ) - // built against a different Qt/QGIS, while still allowing custom C++ plugins to load. - QStringList libPaths( QCoreApplication::libraryPaths() ); - -- QgsDebugMsgLevel( QStringLiteral( "Initial macOS QCoreApplication::libraryPaths: %1" ) -+ QgsDebugMsgLevel( QStringLiteral( "Initial macOS or UNIX QCoreApplication::libraryPaths: %1" ) - .arg( libPaths.join( " " ) ), 4 ); - - // Strip all critical paths that should always be prepended diff --git a/graphics/ristretto/Makefile b/graphics/ristretto/Makefile index b3ec6885126..140898028b1 100644 --- a/graphics/ristretto/Makefile +++ b/graphics/ristretto/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ristretto -PORTVERSION= 0.8.3 +PORTVERSION= 0.8.4 CATEGORIES= graphics xfce MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 @@ -21,7 +21,7 @@ LIB_DEPENDS= libexif.so:graphics/libexif \ USES= desktop-file-utils gettext-tools gmake gnome pkgconfig \ tar:bzip2 xfce -USE_GNOME= cairo gtk20 glib20 intlhack intltool +USE_GNOME= cairo gtk20 glib20 intltool USE_XFCE= libmenu USE_XORG= ice sm x11 diff --git a/graphics/ristretto/distinfo b/graphics/ristretto/distinfo index 5e1a45a7ca2..8991977d099 100644 --- a/graphics/ristretto/distinfo +++ b/graphics/ristretto/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1530202923 -SHA256 (xfce4/ristretto-0.8.3.tar.bz2) = 8c9c11760816dfd9ed57fb8b9df86c6a98a2604ab551be3133996a1c32ca2665 -SIZE (xfce4/ristretto-0.8.3.tar.bz2) = 564745 +TIMESTAMP = 1554707046 +SHA256 (xfce4/ristretto-0.8.4.tar.bz2) = 3a0be4526c93ec0ebbf2e63e69dd0c98f16b20b863d3b6426272592e5b00cea2 +SIZE (xfce4/ristretto-0.8.4.tar.bz2) = 581374 diff --git a/graphics/ristretto/pkg-plist b/graphics/ristretto/pkg-plist index 7b78b483888..f5481815871 100644 --- a/graphics/ristretto/pkg-plist +++ b/graphics/ristretto/pkg-plist @@ -7,6 +7,7 @@ share/icons/hicolor/48x48/apps/ristretto.png share/icons/hicolor/scalable/apps/ristretto.svg %%NLS%%share/locale/ar/LC_MESSAGES/ristretto.mo %%NLS%%share/locale/ast/LC_MESSAGES/ristretto.mo +%%NLS%%share/locale/be/LC_MESSAGES/ristretto.mo %%NLS%%share/locale/bg/LC_MESSAGES/ristretto.mo %%NLS%%share/locale/ca/LC_MESSAGES/ristretto.mo %%NLS%%share/locale/cs/LC_MESSAGES/ristretto.mo diff --git a/graphics/s10sh/Makefile b/graphics/s10sh/Makefile index 1a8693f3fb5..a84af1909f8 100644 --- a/graphics/s10sh/Makefile +++ b/graphics/s10sh/Makefile @@ -3,7 +3,7 @@ PORTNAME= s10sh PORTVERSION= 0.2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://www.reynoldsnet.org/s10sh/ \ http://www.edwinh.org/s10sh/ diff --git a/irc/py-limnoria/Makefile b/irc/py-limnoria/Makefile index 9e4e3faebbb..6f4ad491234 100644 --- a/irc/py-limnoria/Makefile +++ b/irc/py-limnoria/Makefile @@ -3,6 +3,7 @@ PORTNAME= limnoria PORTVERSION= 2018.09.09 +PORTREVISION= 1 CATEGORIES= irc python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/korean/ibus-hangul/Makefile b/korean/ibus-hangul/Makefile index 2e6166c6d33..ed1bc3f9e99 100644 --- a/korean/ibus-hangul/Makefile +++ b/korean/ibus-hangul/Makefile @@ -2,6 +2,7 @@ PORTNAME= ibus-hangul PORTVERSION= 1.5.0 +PORTREVISION= 1 CATEGORIES= korean MASTER_SITES= https://github.com/choehwanjin/ibus-hangul/releases/download/${PORTVERSION}/ diff --git a/lang/Gofer/Makefile b/lang/Gofer/Makefile index 7a0a3cab807..b85a1755777 100644 --- a/lang/Gofer/Makefile +++ b/lang/Gofer/Makefile @@ -3,7 +3,7 @@ PORTNAME= gofer PORTVERSION= 2.30b -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang MASTER_SITES= http://web.cecs.pdx.edu/~mpj/goferarc/ DISTNAME= ${PORTNAME}${PORTVERSION:S/.//} diff --git a/lang/algol68g/Makefile b/lang/algol68g/Makefile index 167183e468c..5605cda82c1 100644 --- a/lang/algol68g/Makefile +++ b/lang/algol68g/Makefile @@ -2,7 +2,7 @@ PORTNAME= algol68g PORTVERSION= 2.8.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= lang MASTER_SITES= http://jmvdveer.home.xs4all.nl/ diff --git a/lang/chaiscript/Makefile b/lang/chaiscript/Makefile index d86e04d1e57..0c90bd58d0b 100644 --- a/lang/chaiscript/Makefile +++ b/lang/chaiscript/Makefile @@ -3,7 +3,7 @@ PORTNAME= ChaiScript DISTVERSIONPREFIX= v DISTVERSION= 6.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MAINTAINER= yuri@FreeBSD.org diff --git a/lang/cint/Makefile b/lang/cint/Makefile index 1f752e284bd..4c1497f24bb 100644 --- a/lang/cint/Makefile +++ b/lang/cint/Makefile @@ -3,7 +3,7 @@ PORTNAME= cint PORTVERSION= 5.18.00 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= lang MASTER_SITES= http://root.cern.ch/drupal/sites/default/files/ diff --git a/lang/erlang-java/Makefile b/lang/erlang-java/Makefile index 3e8fc09c675..4aa504d3e80 100644 --- a/lang/erlang-java/Makefile +++ b/lang/erlang-java/Makefile @@ -1,56 +1,40 @@ # $FreeBSD$ PORTNAME= erlang -PORTVERSION= 19.3.6.12 +DISTVERSIONPREFIX= OTP- +DISTVERSION= 19.3.6.13 PORTEPOCH= 1 CATEGORIES= lang parallel java -MASTER_SITES= http://www.erlang.org/download/:erlangorg \ - http://erlang.stacken.kth.se/download/:erlangorg \ - http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg PKGNAMESUFFIX= -java -DISTNAME= otp_src_${ERL_RELEASE} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:erlangorg DIST_SUBDIR= erlang -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - -PATCH_SITES= http://olgeni.olgeni.com/~olgeni/distfiles/ \ - LOCAL/olgeni -PATCHFILES= patch-otp-19.3.1 patch-otp-19.3.2 patch-otp-19.3.3 \ - patch-otp-19.3.4 patch-otp-19.3.5 patch-otp-19.3.6 \ - patch-otp-19.3.6.1 patch-otp-19.3.6.2 patch-otp-19.3.6.3 \ - patch-otp-19.3.6.4 patch-otp-19.3.6.5 patch-otp-19.3.6.6 \ - patch-otp-19.3.6.7 patch-otp-19.3.6.8 patch-otp-19.3.6.9 \ - patch-otp-19.3.6.10 patch-otp-19.3.6.11 patch-otp-19.3.6.12 MAINTAINER= erlang@FreeBSD.org COMMENT= Erlang interface for Java LICENSE= APACHE20 -RUN_DEPENDS= ${LOCALBASE}/bin/erl:lang/erlang +RUN_DEPENDS= erl:lang/erlang -WRKSRC= ${WRKDIR}/otp_src_${ERL_RELEASE} +USES= autoreconf:build gmake perl5 +USE_GITHUB= yes +GH_PROJECT= otp +USE_JAVA= yes +USE_PERL5= build + +GNU_CONFIGURE= yes +MAKE_JOBS_UNSAFE=yes PLIST_SUB= APP_VERSION=${APP_VERSION} -MAKE_JOBS_UNSAFE=yes - -ERL_RELEASE= 19.3 - -USES= gmake ncurses perl5 -USE_PERL5= build -GNU_CONFIGURE= yes -LDFLAGS+= -L${LOCALBASE}/lib - APP_VERSION= 1.7.1 APP_DIR= ${PREFIX}/lib/erlang/lib/jinterface-${APP_VERSION} +ERLANG_REL= 19.3 -.include - -CONFIGURE_ARGS+=--enable-threads --without-odbc --with-javac +CONFIGURE_ARGS+=--enable-threads --without-odbc --with-javac --without-wx CONFIGURE_ENV+= ac_cv_prog_JAVAC="${JAVAC}" -USE_JAVA= yes +pre-configure: + @cd ${WRKSRC} && ./otp_build autoconf do-build: @${MKDIR} ${WRKSRC}/lib/jinterface/ebin diff --git a/lang/erlang-java/distinfo b/lang/erlang-java/distinfo index 0799314653e..5639baefaa5 100644 --- a/lang/erlang-java/distinfo +++ b/lang/erlang-java/distinfo @@ -1,39 +1,3 @@ -TIMESTAMP = 1540481039 -SHA256 (erlang/otp_src_19.3.tar.gz) = fe4a00651db39b8542b04530a48d24b2f2e7e0b77cbe93d728c9f05325bdfe83 -SIZE (erlang/otp_src_19.3.tar.gz) = 68510871 -SHA256 (erlang/patch-otp-19.3.1) = 2373f890516b58ae006812ba5f15e4af1f8820be98230011b8cd8b345f51dedd -SIZE (erlang/patch-otp-19.3.1) = 30225 -SHA256 (erlang/patch-otp-19.3.2) = 21c56ac188177985c9db11c7066dcee0f7370760da3e15a0d03c235bd2a2cb2a -SIZE (erlang/patch-otp-19.3.2) = 6290 -SHA256 (erlang/patch-otp-19.3.3) = dbe1cab750a3339c3755db27b800e53232519c84a304bd562263ffb060afab55 -SIZE (erlang/patch-otp-19.3.3) = 12525 -SHA256 (erlang/patch-otp-19.3.4) = 02437ac753932f913209102e8cb249a264b774833bfda8c1532b338af60ff8af -SIZE (erlang/patch-otp-19.3.4) = 13504 -SHA256 (erlang/patch-otp-19.3.5) = 5755da205004ae7e724390958db9ecc737d99ec14e0d14abcec8b8603ea6ece5 -SIZE (erlang/patch-otp-19.3.5) = 44563 -SHA256 (erlang/patch-otp-19.3.6) = ee1b5f0fd64db3322031c38722aee96a8ee35aaac454f430c829446a198f6534 -SIZE (erlang/patch-otp-19.3.6) = 13073 -SHA256 (erlang/patch-otp-19.3.6.1) = 65a6de8533ccaeec81bebcee1d6dde08713533e411a123d5ac27141967581600 -SIZE (erlang/patch-otp-19.3.6.1) = 28956 -SHA256 (erlang/patch-otp-19.3.6.2) = 3d12059e02ef31ae6e5dd97820b0d51c4ab0e7304cbaeddeb856fb2097da87fc -SIZE (erlang/patch-otp-19.3.6.2) = 14653 -SHA256 (erlang/patch-otp-19.3.6.3) = 77faeedb827c6793b183b33d161e5b3c4467c3ec9053840442d7fd187cfbfa78 -SIZE (erlang/patch-otp-19.3.6.3) = 24500 -SHA256 (erlang/patch-otp-19.3.6.4) = 662dab96ceed33b4b29c835d82bf6b4f8feaa8f75287f43f3ae7e64badb16255 -SIZE (erlang/patch-otp-19.3.6.4) = 10622 -SHA256 (erlang/patch-otp-19.3.6.5) = f830bd6328f2a9e8cb70750bb7e91a8db045b5fc13fe854710fdffce158788d1 -SIZE (erlang/patch-otp-19.3.6.5) = 13254 -SHA256 (erlang/patch-otp-19.3.6.6) = 6bb2da20ad241e86f847ba351dce23ecf5a82f0e6df8eceb83fe2ed4b05d8d2f -SIZE (erlang/patch-otp-19.3.6.6) = 12542 -SHA256 (erlang/patch-otp-19.3.6.7) = 34bed4599ff19c2bed944dff83e9b640fbf18b6b3a21b42d92c3697e4c50d810 -SIZE (erlang/patch-otp-19.3.6.7) = 11631 -SHA256 (erlang/patch-otp-19.3.6.8) = c3ea86434fe1a4d7baabe17d2e7134065bb19fef7d384a6e289e55a2288a6b61 -SIZE (erlang/patch-otp-19.3.6.8) = 4936 -SHA256 (erlang/patch-otp-19.3.6.9) = c0a243be5693752dc35b0fbe7622618903f130ad944bfa160248ea0e13a6148a -SIZE (erlang/patch-otp-19.3.6.9) = 6989 -SHA256 (erlang/patch-otp-19.3.6.10) = 98968885a53ab75a6abeeba584dc26297d01234866d2797d6c16f1bdd89d72c3 -SIZE (erlang/patch-otp-19.3.6.10) = 12767 -SHA256 (erlang/patch-otp-19.3.6.11) = a79f5a3fe737df191c9fa2eea3c9961b94be4d4d44620b1bed2266f1874f3669 -SIZE (erlang/patch-otp-19.3.6.11) = 4886 -SHA256 (erlang/patch-otp-19.3.6.12) = ea1ef7dba18d4a22d43008c7b9e7664c90887ae42fb87f31974c17b8520f3f0f -SIZE (erlang/patch-otp-19.3.6.12) = 5433 +TIMESTAMP = 1552753439 +SHA256 (erlang/erlang-otp-OTP-19.3.6.13_GH0.tar.gz) = 11a914176a33068226644f4e999ecc6e965ab1c60a324d90020f164641631fae +SIZE (erlang/erlang-otp-OTP-19.3.6.13_GH0.tar.gz) = 34006014 diff --git a/lang/erlang-runtime15/Makefile b/lang/erlang-runtime15/Makefile index 713df32591b..bf5e9f44f9c 100644 --- a/lang/erlang-runtime15/Makefile +++ b/lang/erlang-runtime15/Makefile @@ -2,32 +2,28 @@ # $FreeBSD$ PORTNAME= erlang -PORTVERSION= 15.b.03.1 -PORTREVISION= 13 +DISTVERSIONPREFIX= OTP_R +DISTVERSION= 15B03-1 +PORTEPOCH= 1 CATEGORIES= lang parallel java -MASTER_SITES= http://www.erlang.org/download/:erlangorg \ - http://erlang.stacken.kth.se/download/:erlangorg \ - http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg \ - http://olgeni.olgeni.com/~olgeni/distfiles/:local \ - LOCAL/olgeni:local PKGNAMESUFFIX= -runtime15 -DISTNAME= otp_src_${ERLANG_REL} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:erlangorg DIST_SUBDIR= erlang -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= erlang@FreeBSD.org COMMENT= Functional programming language from Ericsson -WRKSRC= ${WRKDIR}/otp_src_R15B03 +USES= autoreconf:build gmake ncurses perl5 +USE_GITHUB= yes +GH_PROJECT= otp +USE_PERL5= build -ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//} -ERLANG_REL= R${PORTVERSION:S/.//g:tu:S/1$/-1/} +GNU_CONFIGURE= yes +MAKE_JOBS_UNSAFE=yes SUB_FILES= pkg-message SUB_LIST= ERLANG_LIB=${ERLANG_LIB} -MAKE_JOBS_UNSAFE=yes +ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//} OPTIONS_DEFINE= DTRACE GS HIPE JAVA KQUEUE ODBC OPENSSL SCTP SMP THREADS WX OPTIONS_DEFAULT=KQUEUE OPENSSL SCTP SMP THREADS @@ -47,11 +43,6 @@ OPTIONS_EXCLUDE_DragonFly= HIPE SCTP OPENSSL_VARS= BROKEN_SSL=openssl111 -GNU_CONFIGURE= yes -LDFLAGS+= -L${LOCALBASE}/lib -USES= gmake ncurses perl5 -USE_PERL5= build - # If you run Erlang and get a message resembling "WARNING: number of # probes fixed does not match the number of defined probes (54 != 132, # respectively)" you probably misconfigured DTrace in some way. @@ -73,10 +64,9 @@ SCTP_CONFIGURE_ENABLE= sctp SMP_CONFIGURE_ENABLE= smp-support THREADS_CONFIGURE_ENABLE= threads WX_CONFIGURE_WITH= wx-config=${WX_CONFIG} +WX_USES= gl WX_VARS= USE_WX=2.8+ WX_COMPS="wx contrib" USE_GL="gl glu" -.include - .include .if ${OPSYS} == FreeBSD @@ -97,7 +87,13 @@ MAKE_ARGS+= ARCH=x86 MAKE_ARGS+= ARCH=arm .endif -pre-configure-MX-off: +pre-configure: + @cd ${WRKSRC} && ./otp_build autoconf + +pre-configure-WX-off: + echo "disabled by port options" > ${WRKSRC}/lib/debugger/SKIP + echo "disabled by port options" > ${WRKSRC}/lib/et/SKIP + echo "disabled by port options" > ${WRKSRC}/lib/observer/SKIP echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP post-configure-ODBC-on: diff --git a/lang/erlang-runtime15/distinfo b/lang/erlang-runtime15/distinfo index 1318bc931ca..5b6fa6a42ba 100644 --- a/lang/erlang-runtime15/distinfo +++ b/lang/erlang-runtime15/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523228884 -SHA256 (erlang/otp_src_R15B03-1.tar.gz) = 4bccac86dd76aec050252e44276a0283a0df9218e6470cf042a9b9f9dfc9476c -SIZE (erlang/otp_src_R15B03-1.tar.gz) = 76123810 +TIMESTAMP = 1552839129 +SHA256 (erlang/erlang-otp-OTP_R15B03-1_GH0.tar.gz) = bc0defdb2b234e56a39a28ca8341ea102d5aa09a41b64258bee199ef912b47eb +SIZE (erlang/erlang-otp-OTP_R15B03-1_GH0.tar.gz) = 33936773 diff --git a/lang/erlang-runtime16/Makefile b/lang/erlang-runtime16/Makefile index 8c4dc9d0811..715094fee3d 100644 --- a/lang/erlang-runtime16/Makefile +++ b/lang/erlang-runtime16/Makefile @@ -2,32 +2,28 @@ # $FreeBSD$ PORTNAME= erlang -PORTVERSION= 16.b.03.1 -PORTREVISION= 13 +DISTVERSIONPREFIX= OTP_R +DISTVERSION= 16B03-1 +PORTEPOCH= 1 CATEGORIES= lang parallel java -MASTER_SITES= http://www.erlang.org/download/:erlangorg \ - http://erlang.stacken.kth.se/download/:erlangorg \ - http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg \ - http://olgeni.olgeni.com/~olgeni/distfiles/:local \ - LOCAL/olgeni:local PKGNAMESUFFIX= -runtime16 -DISTNAME= otp_src_${ERLANG_REL} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:erlangorg DIST_SUBDIR= erlang -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= erlang@FreeBSD.org COMMENT= Functional programming language from Ericsson -WRKSRC= ${WRKDIR}/otp_src_${ERLANG_REL} +USES= autoreconf:build gmake ncurses perl5 +USE_GITHUB= yes +GH_PROJECT= otp +USE_PERL5= build -ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//} -ERLANG_REL= R${PORTVERSION:S/.//g:tu:S/1$/-1/} +GNU_CONFIGURE= yes +MAKE_JOBS_UNSAFE=yes SUB_FILES= pkg-message SUB_LIST= ERLANG_LIB=${ERLANG_LIB} -MAKE_JOBS_UNSAFE=yes +ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//} OPTIONS_DEFINE= DTRACE GS HIPE JAVA KQUEUE ODBC OPENSSL SCTP SMP THREADS WX OPTIONS_DEFAULT=KQUEUE OPENSSL SCTP SMP THREADS @@ -47,11 +43,6 @@ OPTIONS_EXCLUDE_DragonFly= HIPE SCTP OPENSSL_VARS= BROKEN_SSL=openssl111 -GNU_CONFIGURE= yes -LDFLAGS+= -L${LOCALBASE}/lib -USES= gmake ncurses perl5 -USE_PERL5= build - # If you run Erlang and get a message resembling "WARNING: number of # probes fixed does not match the number of defined probes (54 != 132, # respectively)" you probably misconfigured DTrace in some way. @@ -73,10 +64,9 @@ SCTP_CONFIGURE_ENABLE= sctp SMP_CONFIGURE_ENABLE= smp-support THREADS_CONFIGURE_ENABLE= threads WX_CONFIGURE_WITH= wx-config=${WX_CONFIG} +WX_USES= gl WX_VARS= USE_WX=2.8+ WX_COMPS="wx contrib" USE_GL="gl glu" -.include - .include .if ${OPSYS} == FreeBSD @@ -97,7 +87,13 @@ MAKE_ARGS+= ARCH=x86 MAKE_ARGS+= ARCH=arm .endif -pre-configure-MX-off: +pre-configure: + @cd ${WRKSRC} && ./otp_build autoconf + +pre-configure-WX-off: + echo "disabled by port options" > ${WRKSRC}/lib/debugger/SKIP + echo "disabled by port options" > ${WRKSRC}/lib/et/SKIP + echo "disabled by port options" > ${WRKSRC}/lib/observer/SKIP echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP post-configure-ODBC-on: diff --git a/lang/erlang-runtime16/distinfo b/lang/erlang-runtime16/distinfo index f5e76a09920..46584227b55 100644 --- a/lang/erlang-runtime16/distinfo +++ b/lang/erlang-runtime16/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523227942 -SHA256 (erlang/otp_src_R16B03-1.tar.gz) = 17ce53459bc5ceb34fc2da412e15ac8c23835a15fbd84e62c8d1852704747ee7 -SIZE (erlang/otp_src_R16B03-1.tar.gz) = 66253556 +TIMESTAMP = 1552763013 +SHA256 (erlang/erlang-otp-OTP_R16B03-1_GH0.tar.gz) = bf2aea30104526999d9d1547da84fc115dd706a24fa5b706dfcace1290b351ef +SIZE (erlang/erlang-otp-OTP_R16B03-1_GH0.tar.gz) = 32821912 diff --git a/lang/erlang-runtime17/Makefile b/lang/erlang-runtime17/Makefile index 773e02e1d39..df21e3632dd 100644 --- a/lang/erlang-runtime17/Makefile +++ b/lang/erlang-runtime17/Makefile @@ -2,42 +2,27 @@ # $FreeBSD$ PORTNAME= erlang -PORTVERSION= 17.5.6.10 +DISTVERSIONPREFIX= OTP- +DISTVERSION= 17.5.6.10 CATEGORIES= lang parallel java -MASTER_SITES= http://www.erlang.org/download/:erlangorg \ - http://erlang.stacken.kth.se/download/:erlangorg \ - http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg \ - http://olgeni.olgeni.com/~olgeni/distfiles/:local \ - LOCAL/olgeni:local PKGNAMESUFFIX= -runtime17 -DISTNAME= otp_src_${ERLANG_REL} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:erlangorg \ - preloaded-${PORTVERSION}${EXTRACT_SUFX}:local DIST_SUBDIR= erlang -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - -PATCH_SITES= http://olgeni.olgeni.com/~olgeni/distfiles/ \ - LOCAL/olgeni -PATCHFILES= patch-otp-17.5.1 patch-otp-17.5.2 patch-otp-17.5.3 \ - patch-otp-17.5.4 patch-otp-17.5.5 patch-otp-17.5.6 \ - patch-otp-17.5.6.1 patch-otp-17.5.6.2 patch-otp-17.5.6.3 \ - patch-otp-17.5.6.4 patch-otp-17.5.6.5 patch-otp-17.5.6.6 \ - patch-otp-17.5.6.7 patch-otp-17.5.6.8 patch-otp-17.5.6.9 \ - patch-otp-17.5.6.10 MAINTAINER= erlang@FreeBSD.org COMMENT= Functional programming language from Ericsson -WRKSRC= ${WRKDIR}/otp_src_${ERLANG_REL} +USES= autoreconf:build gmake ncurses perl5 +USE_GITHUB= yes +GH_PROJECT= otp +USE_PERL5= build -ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//} -ERLANG_REL= 17.5 +GNU_CONFIGURE= yes +MAKE_JOBS_UNSAFE=yes -OPTIONS_SUB= yes SUB_FILES= pkg-message SUB_LIST= ERLANG_LIB=${ERLANG_LIB} -MAKE_JOBS_UNSAFE=yes +ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//} OPTIONS_DEFINE= DIRTY DTRACE GS HIPE JAVA KQUEUE NATIVE ODBC OPENSSL SCTP SMP THREADS WX OPTIONS_DEFAULT=DTRACE HIPE KQUEUE OPENSSL SCTP SMP THREADS @@ -66,11 +51,6 @@ OPTIONS_EXCLUDE_i386= DTRACE OPENSSL_VARS= BROKEN_SSL=openssl111 -GNU_CONFIGURE= yes -LDFLAGS+= -L${LOCALBASE}/lib -USES= gmake ncurses perl5 -USE_PERL5= build - # If you run Erlang and get a message resembling "WARNING: number of # probes fixed does not match the number of defined probes (54 != 132, # respectively)" you probably misconfigured DTrace in some way. @@ -94,10 +74,9 @@ SCTP_CONFIGURE_ENABLE= sctp SMP_CONFIGURE_ENABLE= smp-support THREADS_CONFIGURE_ENABLE= threads WX_CONFIGURE_WITH= wx-config=${WX_CONFIG} +WX_USES= gl WX_VARS= USE_WX=2.8+ WX_COMPS="wx contrib" USE_GL="gl glu" -.include - .include .if ${OPSYS} == FreeBSD @@ -119,9 +98,12 @@ MAKE_ARGS+= ARCH=arm .endif pre-configure: - cd ${WRKSRC} && ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/preloaded-${PORTVERSION}${EXTRACT_SUFX} + @cd ${WRKSRC} && ./otp_build autoconf -pre-configure-MX-off: +pre-configure-WX-off: + echo "disabled by port options" > ${WRKSRC}/lib/debugger/SKIP + echo "disabled by port options" > ${WRKSRC}/lib/et/SKIP + echo "disabled by port options" > ${WRKSRC}/lib/observer/SKIP echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP post-configure-ODBC-on: diff --git a/lang/erlang-runtime17/distinfo b/lang/erlang-runtime17/distinfo index a62763c47b5..6b894aae994 100644 --- a/lang/erlang-runtime17/distinfo +++ b/lang/erlang-runtime17/distinfo @@ -1,37 +1,3 @@ -TIMESTAMP = 1540245123 -SHA256 (erlang/otp_src_17.5.tar.gz) = 3c28820c981b30c50df8ac2a4a238e5813454fa3ed2ad530bc7948a282846474 -SIZE (erlang/otp_src_17.5.tar.gz) = 67242289 -SHA256 (erlang/preloaded-17.5.6.10.tar.gz) = 4a44e5a76fdd5b448f35455babc1f74639f5c7f2dcc509bfd6d3237b517d8ff6 -SIZE (erlang/preloaded-17.5.6.10.tar.gz) = 297377 -SHA256 (erlang/patch-otp-17.5.1) = e95b17b539b84b2408cbdd8af68ea96ad239a1b38117243d21ebb809ab3ca1c3 -SIZE (erlang/patch-otp-17.5.1) = 36012 -SHA256 (erlang/patch-otp-17.5.2) = 9c70e90c3b040ab1e136738f355f0925f64afd5a4b28f1c9a6f4035f2bf03b1b -SIZE (erlang/patch-otp-17.5.2) = 17821 -SHA256 (erlang/patch-otp-17.5.3) = fd2879176733c34c002123da9d9b96ac3cf1857c7422a061711be818aecc9e13 -SIZE (erlang/patch-otp-17.5.3) = 135959 -SHA256 (erlang/patch-otp-17.5.4) = dce1130adfabe4fdecd1e5e700bea70a5e9ba7886b51c81a7a2371e204d725ca -SIZE (erlang/patch-otp-17.5.4) = 14618 -SHA256 (erlang/patch-otp-17.5.5) = 78f81dc17c52b73d45819de50fc11df3a19ff0593a6d5c6d105b5875c1e654f6 -SIZE (erlang/patch-otp-17.5.5) = 44523 -SHA256 (erlang/patch-otp-17.5.6) = 25461538cf79af56ee64019cfb76764bc5c2ac7cc9d3f9061ef01dd93d46ef36 -SIZE (erlang/patch-otp-17.5.6) = 57264 -SHA256 (erlang/patch-otp-17.5.6.1) = 695bea19a372d58fc94ca79e84054524e7895516aab3a1d03905dd5971779ed7 -SIZE (erlang/patch-otp-17.5.6.1) = 9062 -SHA256 (erlang/patch-otp-17.5.6.2) = 47fc4468fdc75249f30a4ba120ed39db03dfb5ebc5c2b1c7e94eb43d8c221002 -SIZE (erlang/patch-otp-17.5.6.2) = 14293 -SHA256 (erlang/patch-otp-17.5.6.3) = 75e91ad34a910353452cc1cf26ffb6936e9df3f0d1144793eb83ac7ab3074486 -SIZE (erlang/patch-otp-17.5.6.3) = 63652 -SHA256 (erlang/patch-otp-17.5.6.4) = 9156ea7d173b8fef62ee1eb2483b943cfdbeca80b74177f51aa131a688db8ed5 -SIZE (erlang/patch-otp-17.5.6.4) = 11945 -SHA256 (erlang/patch-otp-17.5.6.5) = 270501a8ab836456aeddf2601996601b3b7f040dc360a438319434b21c26e1b0 -SIZE (erlang/patch-otp-17.5.6.5) = 16967 -SHA256 (erlang/patch-otp-17.5.6.6) = 53125e68a9a8530e1eaa6451a0849b8b458d40b6611ded9c1cae2936166f65bf -SIZE (erlang/patch-otp-17.5.6.6) = 5252 -SHA256 (erlang/patch-otp-17.5.6.7) = cd40675b3d75b0a92617c4ebdc361af420a3eb9af00b851a47bd36a223af0f0a -SIZE (erlang/patch-otp-17.5.6.7) = 25609 -SHA256 (erlang/patch-otp-17.5.6.8) = a5f4b28ecea04a6ba9c5c042963a7d2258f2bc50dc0a4c4d8e42198c7f225c89 -SIZE (erlang/patch-otp-17.5.6.8) = 39537 -SHA256 (erlang/patch-otp-17.5.6.9) = 4380bea95d906eea5c2caaeac4ae830347bd502332c3656d85e0f7642fc52397 -SIZE (erlang/patch-otp-17.5.6.9) = 16067 -SHA256 (erlang/patch-otp-17.5.6.10) = 856461e3efe69629c65c38651c2b46addc7e8f0aaa3ab88221ad27f928a29508 -SIZE (erlang/patch-otp-17.5.6.10) = 19618 +TIMESTAMP = 1552762113 +SHA256 (erlang/erlang-otp-OTP-17.5.6.10_GH0.tar.gz) = ceea65d9326a3a0324b4963a982c610692c087ab23eaf637a626370dfb81fe50 +SIZE (erlang/erlang-otp-OTP-17.5.6.10_GH0.tar.gz) = 33136407 diff --git a/lang/erlang-runtime18/Makefile b/lang/erlang-runtime18/Makefile index d5552410ac8..fc2f0110c33 100644 --- a/lang/erlang-runtime18/Makefile +++ b/lang/erlang-runtime18/Makefile @@ -2,43 +2,29 @@ # $FreeBSD$ PORTNAME= erlang -PORTVERSION= 18.3.4.11 +DISTVERSIONPREFIX= OTP- +DISTVERSION= 18.3.4.11 CATEGORIES= lang parallel java -MASTER_SITES= http://www.erlang.org/download/:erlangorg \ - http://erlang.stacken.kth.se/download/:erlangorg \ - http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg \ - http://olgeni.olgeni.com/~olgeni/distfiles/:local \ - LOCAL/olgeni:local PKGNAMESUFFIX= -runtime18 -DISTNAME= otp_src_${ERLANG_REL} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:erlangorg \ - preloaded-${PORTVERSION}${EXTRACT_SUFX}:local DIST_SUBDIR= erlang -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - -PATCH_SITES= http://olgeni.olgeni.com/~olgeni/distfiles/ \ - LOCAL/olgeni -PATCHFILES= patch-otp-18.3.1 patch-otp-18.3.2 patch-otp-18.3.3 \ - patch-otp-18.3.4 patch-otp-18.3.4.1 patch-otp-18.3.4.2 \ - patch-otp-18.3.4.3 patch-otp-18.3.4.4 patch-otp-18.3.4.5 \ - patch-otp-18.3.4.6 patch-otp-18.3.4.7 patch-otp-18.3.4.8 \ - patch-otp-18.3.4.9 patch-otp-18.3.4.10 patch-otp-18.3.4.11 MAINTAINER= erlang@FreeBSD.org COMMENT= Functional programming language from Ericsson LICENSE= APACHE20 -WRKSRC= ${WRKDIR}/otp_src_${ERLANG_REL} +USES= autoreconf:build gmake ncurses perl5 +USE_GITHUB= yes +GH_PROJECT= otp +USE_PERL5= build -ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//} -ERLANG_REL= 18.3 +GNU_CONFIGURE= yes +MAKE_JOBS_UNSAFE=yes -OPTIONS_SUB= yes SUB_FILES= pkg-message SUB_LIST= ERLANG_LIB=${ERLANG_LIB} -MAKE_JOBS_UNSAFE=yes +ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//} OPTIONS_DEFINE= DIRTY DTRACE GS HIPE JAVA KQUEUE NATIVE ODBC OPENSSL SCTP SMP THREADS WX OPTIONS_DEFAULT=DTRACE HIPE KQUEUE OPENSSL SCTP SMP THREADS @@ -67,11 +53,6 @@ OPTIONS_EXCLUDE_i386= DTRACE OPENSSL_VARS= BROKEN_SSL=openssl111 -GNU_CONFIGURE= yes -LDFLAGS+= -L${LOCALBASE}/lib -USES= gmake ncurses perl5 -USE_PERL5= build - # If you run Erlang and get a message resembling "WARNING: number of # probes fixed does not match the number of defined probes (54 != 132, # respectively)" you probably misconfigured DTrace in some way. @@ -95,10 +76,9 @@ SCTP_CONFIGURE_ENABLE= sctp SMP_CONFIGURE_ENABLE= smp-support THREADS_CONFIGURE_ENABLE= threads WX_CONFIGURE_WITH= wx-config=${WX_CONFIG} +WX_USES= gl WX_VARS= USE_WX=2.8+ WX_COMPS="wx contrib" USE_GL="gl glu" -.include - .include .if ${OPSYS} == FreeBSD @@ -120,9 +100,12 @@ MAKE_ARGS+= ARCH=arm .endif pre-configure: - cd ${WRKSRC} && ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/preloaded-${PORTVERSION}${EXTRACT_SUFX} + @cd ${WRKSRC} && ./otp_build autoconf -pre-configure-MX-off: +pre-configure-WX-off: + echo "disabled by port options" > ${WRKSRC}/lib/debugger/SKIP + echo "disabled by port options" > ${WRKSRC}/lib/et/SKIP + echo "disabled by port options" > ${WRKSRC}/lib/observer/SKIP echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP post-configure-ODBC-on: diff --git a/lang/erlang-runtime18/distinfo b/lang/erlang-runtime18/distinfo index 40fb25da07f..3ec44d5b6f7 100644 --- a/lang/erlang-runtime18/distinfo +++ b/lang/erlang-runtime18/distinfo @@ -1,35 +1,3 @@ -TIMESTAMP = 1542300070 -SHA256 (erlang/otp_src_18.3.tar.gz) = fdab8129a1cb935db09f1832e3a7d511a4aeb2b9bb3602ca6a7ccb9730d5c9c3 -SIZE (erlang/otp_src_18.3.tar.gz) = 68292101 -SHA256 (erlang/preloaded-18.3.4.11.tar.gz) = 70bb83686445e4960ff178dfc9df7ad6e9bf018ec9cf45526fe5300cfb0c1b92 -SIZE (erlang/preloaded-18.3.4.11.tar.gz) = 305266 -SHA256 (erlang/patch-otp-18.3.1) = 19a45ed599f4348dd83540c4c3a60bfe20dac5f83643cff1dd71d1b5af1e9bae -SIZE (erlang/patch-otp-18.3.1) = 20435 -SHA256 (erlang/patch-otp-18.3.2) = 064065ebeadc26a76fcd1b291bc884039117ee8699fe5015809a025dc63a0f35 -SIZE (erlang/patch-otp-18.3.2) = 70255 -SHA256 (erlang/patch-otp-18.3.3) = 5a55b18ee8ec15c8cfe9ffd4687588c0a6f71216538575ae3bbbf67eb5a0485a -SIZE (erlang/patch-otp-18.3.3) = 87238 -SHA256 (erlang/patch-otp-18.3.4) = 33ceea8b53d7d2a67b78085d7bc80c8b04f5cac792aee49410c86ac45895151a -SIZE (erlang/patch-otp-18.3.4) = 31596 -SHA256 (erlang/patch-otp-18.3.4.1) = 5998c9578b92cbc4e12d47ae7001f52150d3a065e8101569977e2caa62674456 -SIZE (erlang/patch-otp-18.3.4.1) = 23095 -SHA256 (erlang/patch-otp-18.3.4.2) = 4bce5c1965d4924463c6a243e014cdf5120cd8e75b903e0d00b8557fc00b7bad -SIZE (erlang/patch-otp-18.3.4.2) = 23520 -SHA256 (erlang/patch-otp-18.3.4.3) = 594be3196ea5a87bebcbc414b189efced68a6de0ddee12bcab7089d5de51f85f -SIZE (erlang/patch-otp-18.3.4.3) = 5893 -SHA256 (erlang/patch-otp-18.3.4.4) = a2cfac97e2ecb09ec53ebe7fcba953382e4b01b567219ad4abdd63652da9dc91 -SIZE (erlang/patch-otp-18.3.4.4) = 6547 -SHA256 (erlang/patch-otp-18.3.4.5) = d539ac9b72adbda634adfc0fe391e32c0a82c7b4a8807dc606f98bf816397821 -SIZE (erlang/patch-otp-18.3.4.5) = 34006 -SHA256 (erlang/patch-otp-18.3.4.6) = dc3682fb9c2f456cd9b4eb9ab8d00c09f6012a2123e416e2fee8e17ce69ac4ef -SIZE (erlang/patch-otp-18.3.4.6) = 37943 -SHA256 (erlang/patch-otp-18.3.4.7) = 8b79ab844e465e790eb4ef016d49b917444371190fead05cee2675b435d8a029 -SIZE (erlang/patch-otp-18.3.4.7) = 10475 -SHA256 (erlang/patch-otp-18.3.4.8) = bcac3fe782e7a4b78f36d9d5c928b1d7a2e67aff20ac7bf8f82e5eaab33a60a1 -SIZE (erlang/patch-otp-18.3.4.8) = 19206 -SHA256 (erlang/patch-otp-18.3.4.9) = 3d031267f0111c9bd9a55d44a4f8cb67ad4cfda44f25d5a01e459640b7905d89 -SIZE (erlang/patch-otp-18.3.4.9) = 5284 -SHA256 (erlang/patch-otp-18.3.4.10) = 51f1840f3969fe28a042507a803871a132a483008e58a80e15877c8938bc0175 -SIZE (erlang/patch-otp-18.3.4.10) = 5159 -SHA256 (erlang/patch-otp-18.3.4.11) = ff2402592d1d6ba44043b8cdb28b7f569c48e1920691e2709dad2e8f9bd2b850 -SIZE (erlang/patch-otp-18.3.4.11) = 34336 +TIMESTAMP = 1552761002 +SHA256 (erlang/erlang-otp-OTP-18.3.4.11_GH0.tar.gz) = 94f84e8ca0db0dcadd3411fa7a05dd937142b6ae830255dc341c30b45261b01a +SIZE (erlang/erlang-otp-OTP-18.3.4.11_GH0.tar.gz) = 33679922 diff --git a/lang/erlang-runtime19/Makefile b/lang/erlang-runtime19/Makefile index 871663fad05..c4f3ee5a939 100644 --- a/lang/erlang-runtime19/Makefile +++ b/lang/erlang-runtime19/Makefile @@ -2,29 +2,11 @@ # $FreeBSD$ PORTNAME= erlang -PORTVERSION= 19.3.6.12 -PORTREVISION= 1 +DISTVERSIONPREFIX= OTP- +DISTVERSION= 19.3.6.13 CATEGORIES= lang parallel java -MASTER_SITES= http://www.erlang.org/download/:erlangorg \ - http://erlang.stacken.kth.se/download/:erlangorg \ - http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg \ - http://olgeni.olgeni.com/~olgeni/distfiles/:local \ - LOCAL/olgeni:local PKGNAMESUFFIX= -runtime19 -DISTNAME= otp_src_${ERLANG_REL} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:erlangorg \ - preloaded-${PORTVERSION}${EXTRACT_SUFX}:local DIST_SUBDIR= erlang -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - -PATCH_SITES= http://olgeni.olgeni.com/~olgeni/distfiles/ \ - LOCAL/olgeni -PATCHFILES= patch-otp-19.3.1 patch-otp-19.3.2 patch-otp-19.3.3 \ - patch-otp-19.3.4 patch-otp-19.3.5 patch-otp-19.3.6 \ - patch-otp-19.3.6.1 patch-otp-19.3.6.2 patch-otp-19.3.6.3 \ - patch-otp-19.3.6.4 patch-otp-19.3.6.5 patch-otp-19.3.6.6 \ - patch-otp-19.3.6.7 patch-otp-19.3.6.8 patch-otp-19.3.6.9 \ - patch-otp-19.3.6.10 patch-otp-19.3.6.11 patch-otp-19.3.6.12 MAINTAINER= erlang@FreeBSD.org COMMENT= Functional programming language from Ericsson @@ -33,16 +15,18 @@ LICENSE= APACHE20 BROKEN_sparc64= Fails to build: error: fp_except undeclared -WRKSRC= ${WRKDIR}/otp_src_${ERLANG_REL} +USES= autoreconf:build gmake ncurses perl5 +USE_GITHUB= yes +GH_PROJECT= otp +USE_PERL5= build -ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//} -ERLANG_REL= 19.3 +GNU_CONFIGURE= yes +MAKE_JOBS_UNSAFE=yes -OPTIONS_SUB= yes SUB_FILES= pkg-message SUB_LIST= ERLANG_LIB=${ERLANG_LIB} -MAKE_JOBS_UNSAFE=yes +ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//} OPTIONS_DEFINE= DIRTY DTRACE GS HIPE JAVA KQUEUE NATIVE ODBC OPENSSL SCTP SMP THREADS WX OPTIONS_DEFAULT=DTRACE HIPE KQUEUE OPENSSL SCTP SMP THREADS @@ -71,11 +55,6 @@ OPTIONS_EXCLUDE_i386= DTRACE OPENSSL_VARS= BROKEN_SSL=openssl111 -GNU_CONFIGURE= yes -LDFLAGS+= -L${LOCALBASE}/lib -USES= gmake ncurses perl5 -USE_PERL5= build - # If you run Erlang and get a message resembling "WARNING: number of # probes fixed does not match the number of defined probes (54 != 132, # respectively)" you probably misconfigured DTrace in some way. @@ -99,9 +78,10 @@ SCTP_CONFIGURE_ENABLE= sctp SMP_CONFIGURE_ENABLE= smp-support THREADS_CONFIGURE_ENABLE= threads WX_CONFIGURE_WITH= wx-config=${WX_CONFIG} +WX_USES= gl WX_VARS= USE_WX=2.8+ WX_COMPS="wx contrib" USE_GL="gl glu" -.include +.include .if ${OPSYS} == FreeBSD CFLAGS+= -DMAP_NORESERVE=0 @@ -116,9 +96,12 @@ MAKE_ARGS+= ARCH=arm .endif pre-configure: - cd ${WRKSRC} && ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/preloaded-${PORTVERSION}${EXTRACT_SUFX} + @cd ${WRKSRC} && ./otp_build autoconf -pre-configure-MX-off: +pre-configure-WX-off: + echo "disabled by port options" > ${WRKSRC}/lib/debugger/SKIP + echo "disabled by port options" > ${WRKSRC}/lib/et/SKIP + echo "disabled by port options" > ${WRKSRC}/lib/observer/SKIP echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP post-configure-ODBC-on: @@ -149,4 +132,4 @@ post-stage: @cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type f -o -type l \ | ${SORT} >> ${TMPPLIST} -.include +.include diff --git a/lang/erlang-runtime19/distinfo b/lang/erlang-runtime19/distinfo index e83a08606f0..b94ac23dcc5 100644 --- a/lang/erlang-runtime19/distinfo +++ b/lang/erlang-runtime19/distinfo @@ -1,41 +1,3 @@ -TIMESTAMP = 1540285165 -SHA256 (erlang/otp_src_19.3.tar.gz) = fe4a00651db39b8542b04530a48d24b2f2e7e0b77cbe93d728c9f05325bdfe83 -SIZE (erlang/otp_src_19.3.tar.gz) = 68510871 -SHA256 (erlang/preloaded-19.3.6.12.tar.gz) = 5046641cea7c9f56ca46674342cde1bf7bc9959d9ed5cef3b55fb725d4d6a4d6 -SIZE (erlang/preloaded-19.3.6.12.tar.gz) = 330073 -SHA256 (erlang/patch-otp-19.3.1) = 2373f890516b58ae006812ba5f15e4af1f8820be98230011b8cd8b345f51dedd -SIZE (erlang/patch-otp-19.3.1) = 30225 -SHA256 (erlang/patch-otp-19.3.2) = 21c56ac188177985c9db11c7066dcee0f7370760da3e15a0d03c235bd2a2cb2a -SIZE (erlang/patch-otp-19.3.2) = 6290 -SHA256 (erlang/patch-otp-19.3.3) = dbe1cab750a3339c3755db27b800e53232519c84a304bd562263ffb060afab55 -SIZE (erlang/patch-otp-19.3.3) = 12525 -SHA256 (erlang/patch-otp-19.3.4) = 02437ac753932f913209102e8cb249a264b774833bfda8c1532b338af60ff8af -SIZE (erlang/patch-otp-19.3.4) = 13504 -SHA256 (erlang/patch-otp-19.3.5) = 5755da205004ae7e724390958db9ecc737d99ec14e0d14abcec8b8603ea6ece5 -SIZE (erlang/patch-otp-19.3.5) = 44563 -SHA256 (erlang/patch-otp-19.3.6) = ee1b5f0fd64db3322031c38722aee96a8ee35aaac454f430c829446a198f6534 -SIZE (erlang/patch-otp-19.3.6) = 13073 -SHA256 (erlang/patch-otp-19.3.6.1) = 65a6de8533ccaeec81bebcee1d6dde08713533e411a123d5ac27141967581600 -SIZE (erlang/patch-otp-19.3.6.1) = 28956 -SHA256 (erlang/patch-otp-19.3.6.2) = 3d12059e02ef31ae6e5dd97820b0d51c4ab0e7304cbaeddeb856fb2097da87fc -SIZE (erlang/patch-otp-19.3.6.2) = 14653 -SHA256 (erlang/patch-otp-19.3.6.3) = 77faeedb827c6793b183b33d161e5b3c4467c3ec9053840442d7fd187cfbfa78 -SIZE (erlang/patch-otp-19.3.6.3) = 24500 -SHA256 (erlang/patch-otp-19.3.6.4) = 662dab96ceed33b4b29c835d82bf6b4f8feaa8f75287f43f3ae7e64badb16255 -SIZE (erlang/patch-otp-19.3.6.4) = 10622 -SHA256 (erlang/patch-otp-19.3.6.5) = f830bd6328f2a9e8cb70750bb7e91a8db045b5fc13fe854710fdffce158788d1 -SIZE (erlang/patch-otp-19.3.6.5) = 13254 -SHA256 (erlang/patch-otp-19.3.6.6) = 6bb2da20ad241e86f847ba351dce23ecf5a82f0e6df8eceb83fe2ed4b05d8d2f -SIZE (erlang/patch-otp-19.3.6.6) = 12542 -SHA256 (erlang/patch-otp-19.3.6.7) = 34bed4599ff19c2bed944dff83e9b640fbf18b6b3a21b42d92c3697e4c50d810 -SIZE (erlang/patch-otp-19.3.6.7) = 11631 -SHA256 (erlang/patch-otp-19.3.6.8) = c3ea86434fe1a4d7baabe17d2e7134065bb19fef7d384a6e289e55a2288a6b61 -SIZE (erlang/patch-otp-19.3.6.8) = 4936 -SHA256 (erlang/patch-otp-19.3.6.9) = c0a243be5693752dc35b0fbe7622618903f130ad944bfa160248ea0e13a6148a -SIZE (erlang/patch-otp-19.3.6.9) = 6989 -SHA256 (erlang/patch-otp-19.3.6.10) = 98968885a53ab75a6abeeba584dc26297d01234866d2797d6c16f1bdd89d72c3 -SIZE (erlang/patch-otp-19.3.6.10) = 12767 -SHA256 (erlang/patch-otp-19.3.6.11) = a79f5a3fe737df191c9fa2eea3c9961b94be4d4d44620b1bed2266f1874f3669 -SIZE (erlang/patch-otp-19.3.6.11) = 4886 -SHA256 (erlang/patch-otp-19.3.6.12) = ea1ef7dba18d4a22d43008c7b9e7664c90887ae42fb87f31974c17b8520f3f0f -SIZE (erlang/patch-otp-19.3.6.12) = 5433 +TIMESTAMP = 1552760892 +SHA256 (erlang/erlang-otp-OTP-19.3.6.13_GH0.tar.gz) = 11a914176a33068226644f4e999ecc6e965ab1c60a324d90020f164641631fae +SIZE (erlang/erlang-otp-OTP-19.3.6.13_GH0.tar.gz) = 34006014 diff --git a/lang/erlang-runtime19/files/patch-lib_wx_configure b/lang/erlang-runtime19/files/patch-lib_wx_configure deleted file mode 100644 index b75764d23f6..00000000000 --- a/lang/erlang-runtime19/files/patch-lib_wx_configure +++ /dev/null @@ -1,10464 +0,0 @@ ---- lib/wx/configure.orig 2017-03-14 20:10:54 UTC -+++ lib/wx/configure -@@ -1,81 +1,459 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.59. -+# Generated by GNU Autoconf 2.69. -+# -+# -+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. -+# - # --# Copyright (C) 2003 Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. --## --------------------- ## --## M4sh Initialization. ## --## --------------------- ## -+## -------------------- ## -+## M4sh Initialization. ## -+## -------------------- ## - --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac - fi --DUALCASE=1; export DUALCASE # for MKS sh - --# Support unset when possible. --if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -- as_unset=unset -+ -+as_nl=' -+' -+export as_nl -+# Printing a long string crashes Solaris 7 /usr/bin/printf. -+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -+# Prefer a ksh shell builtin over an external printf program on Solaris, -+# but without wasting forks for bash or zsh. -+if test -z "$BASH_VERSION$ZSH_VERSION" \ -+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='print -r --' -+ as_echo_n='print -rn --' -+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='printf %s\n' -+ as_echo_n='printf %s' - else -- as_unset=false -+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -+ as_echo_n='/usr/ucb/echo -n' -+ else -+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -+ as_echo_n_body='eval -+ arg=$1; -+ case $arg in #( -+ *"$as_nl"*) -+ expr "X$arg" : "X\\(.*\\)$as_nl"; -+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -+ esac; -+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -+ ' -+ export as_echo_n_body -+ as_echo_n='sh -c $as_echo_n_body as_echo' -+ fi -+ export as_echo_body -+ as_echo='sh -c $as_echo_body as_echo' - fi - -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } -+fi - --# Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH -+ -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+as_myself= -+case $0 in #(( -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ exit 1 -+fi -+ -+# Unset variables that we do not need and which cause bugs (e.g. in -+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -+# suppresses any "Segmentation fault" message there. '((' could -+# trigger a bug in pdksh 5.2.14. -+for as_var in BASH_ENV ENV MAIL MAILPATH -+do eval test x\${$as_var+set} = xset \ -+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -+done - PS1='$ ' - PS2='> ' - PS4='+ ' - - # NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -- LC_TELEPHONE LC_TIME -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE -+ -+# CDPATH. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ -+# Use a proper internal environment variable to ensure we don't fall -+ # into an infinite loop, continuously re-executing ourselves. -+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then -+ _as_can_reexec=no; export _as_can_reexec; -+ # We cannot yet assume a decent shell, so we have to provide a -+# neutralization value for shells without unset; and this also -+# works around shells that cannot unset nonexistent variables. -+# Preserve -v and -x to the replacement shell. -+BASH_ENV=/dev/null -+ENV=/dev/null -+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -+case $- in # (((( -+ *v*x* | *x*v* ) as_opts=-vx ;; -+ *v* ) as_opts=-v ;; -+ *x* ) as_opts=-x ;; -+ * ) as_opts= ;; -+esac -+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -+# Admittedly, this is quite paranoid, since all the known shells bail -+# out after a failed `exec'. -+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -+as_fn_exit 255 -+ fi -+ # We don't want this to propagate to other subprocesses. -+ { _as_can_reexec=; unset _as_can_reexec;} -+if test "x$CONFIG_SHELL" = x; then -+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : -+ emulate sh -+ NULLCMD=: -+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '\${1+\"\$@\"}'='\"\$@\"' -+ setopt NO_GLOB_SUBST -+else -+ case \`(set -o) 2>/dev/null\` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac -+fi -+" -+ as_required="as_fn_return () { (exit \$1); } -+as_fn_success () { as_fn_return 0; } -+as_fn_failure () { as_fn_return 1; } -+as_fn_ret_success () { return 0; } -+as_fn_ret_failure () { return 1; } -+ -+exitcode=0 -+as_fn_success || { exitcode=1; echo as_fn_success failed.; } -+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } -+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } -+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : -+ -+else -+ exitcode=1; echo positional parameters were not saved. -+fi -+test x\$exitcode = x0 || exit 1 -+test -x / || exit 1" -+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO -+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO -+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && -+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -+test \$(( 1 + 1 )) = 2 || exit 1" -+ if (eval "$as_required") 2>/dev/null; then : -+ as_have_required=yes -+else -+ as_have_required=no -+fi -+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -+ -+else -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+as_found=false -+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH - do -- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -- eval $as_var=C; export $as_var -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ as_found=: -+ case $as_dir in #( -+ /*) -+ for as_base in sh bash ksh sh5; do -+ # Try only shells that exist, to save several forks. -+ as_shell=$as_dir/$as_base -+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && -+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : -+ CONFIG_SHELL=$as_shell as_have_required=yes -+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : -+ break 2 -+fi -+fi -+ done;; -+ esac -+ as_found=false -+done -+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && -+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : -+ CONFIG_SHELL=$SHELL as_have_required=yes -+fi; } -+IFS=$as_save_IFS -+ -+ -+ if test "x$CONFIG_SHELL" != x; then : -+ export CONFIG_SHELL -+ # We cannot yet assume a decent shell, so we have to provide a -+# neutralization value for shells without unset; and this also -+# works around shells that cannot unset nonexistent variables. -+# Preserve -v and -x to the replacement shell. -+BASH_ENV=/dev/null -+ENV=/dev/null -+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -+case $- in # (((( -+ *v*x* | *x*v* ) as_opts=-vx ;; -+ *v* ) as_opts=-v ;; -+ *x* ) as_opts=-x ;; -+ * ) as_opts= ;; -+esac -+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -+# Admittedly, this is quite paranoid, since all the known shells bail -+# out after a failed `exec'. -+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -+exit 255 -+fi -+ -+ if test x$as_have_required = xno; then : -+ $as_echo "$0: This script requires a shell more modern than all" -+ $as_echo "$0: the shells that I found on your system." -+ if test x${ZSH_VERSION+set} = xset ; then -+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" -+ $as_echo "$0: be upgraded to zsh 4.3.4 or later." - else -- $as_unset $as_var -+ $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, -+$0: including any error possibly output before this -+$0: message. Then install a modern shell, or manually run -+$0: the script under such a shell if you do have one." - fi --done -+ exit 1 -+fi -+fi -+fi -+SHELL=${CONFIG_SHELL-/bin/sh} -+export SHELL -+# Unset more variables known to interfere with behavior of common tools. -+CLICOLOR_FORCE= GREP_OPTIONS= -+unset CLICOLOR_FORCE GREP_OPTIONS - --# Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -+## --------------------- ## -+## M4sh Shell Functions. ## -+## --------------------- ## -+# as_fn_unset VAR -+# --------------- -+# Portably unset VAR. -+as_fn_unset () -+{ -+ { eval $1=; unset $1;} -+} -+as_unset=as_fn_unset -+ -+# as_fn_set_status STATUS -+# ----------------------- -+# Set $? to STATUS, without forking. -+as_fn_set_status () -+{ -+ return $1 -+} # as_fn_set_status -+ -+# as_fn_exit STATUS -+# ----------------- -+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -+as_fn_exit () -+{ -+ set +e -+ as_fn_set_status $1 -+ exit $1 -+} # as_fn_exit -+ -+# as_fn_mkdir_p -+# ------------- -+# Create "$as_dir" as a directory, including parents if necessary. -+as_fn_mkdir_p () -+{ -+ -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || eval $as_mkdir_p || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" -+ -+ -+} # as_fn_mkdir_p -+ -+# as_fn_executable_p FILE -+# ----------------------- -+# Test if FILE is an executable regular file. -+as_fn_executable_p () -+{ -+ test -f "$1" && test -x "$1" -+} # as_fn_executable_p -+# as_fn_append VAR VALUE -+# ---------------------- -+# Append the text in VALUE to the end of the definition contained in VAR. Take -+# advantage of any shell optimizations that allow amortized linear growth over -+# repeated appends, instead of the typical quadratic growth present in naive -+# implementations. -+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : -+ eval 'as_fn_append () -+ { -+ eval $1+=\$2 -+ }' -+else -+ as_fn_append () -+ { -+ eval $1=\$$1\$2 -+ } -+fi # as_fn_append -+ -+# as_fn_arith ARG... -+# ------------------ -+# Perform arithmetic evaluation on the ARGs, and store the result in the -+# global $as_val. Take advantage of shells that can avoid forks. The arguments -+# must be portable across $(()) and expr. -+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : -+ eval 'as_fn_arith () -+ { -+ as_val=$(( $* )) -+ }' -+else -+ as_fn_arith () -+ { -+ as_val=`expr "$@" || test $? -eq 1` -+ } -+fi # as_fn_arith -+ -+ -+# as_fn_error STATUS ERROR [LINENO LOG_FD] -+# ---------------------------------------- -+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -+# script with STATUS, using 1 if that was 0. -+as_fn_error () -+{ -+ as_status=$1; test $as_status -eq 0 && as_status=1 -+ if test "$4"; then -+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 -+ fi -+ $as_echo "$as_me: error: $2" >&2 -+ as_fn_exit $as_status -+} # as_fn_error -+ -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename - else - as_basename=false - fi - -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi - --# Name of the executable. --as_me=`$as_basename "$0" || -+as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || --echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -- /^X\/\(\/\/\)$/{ s//\1/; q; } -- /^X\/\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - --# PATH needs CR, and LINENO needs CR and PATH. - # Avoid depending upon Character Ranges. - as_cr_letters='abcdefghijklmnopqrstuvwxyz' - as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -@@ -83,146 +461,91 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE - as_cr_digits='0123456789' - as_cr_alnum=$as_cr_Letters$as_cr_digits - --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -- else -- PATH_SEPARATOR=: -- fi -- rm -f conf$$.sh --fi -- -- -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" || { -- # Find who we are. Look in the path if we contain no path at all -- # relative or not. -- case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -- -- ;; -- esac -- # We did not find ourselves, most probably we were run as `sh COMMAND' -- # in which case we are not to be found in the path. -- if test "x$as_myself" = x; then -- as_myself=$0 -- fi -- if test ! -f "$as_myself"; then -- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 -- { (exit 1); exit 1; }; } -- fi -- case $CONFIG_SHELL in -- '') -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for as_base in sh bash ksh sh5; do -- case $as_dir in -- /*) -- if ("$as_dir/$as_base" -c ' -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -- CONFIG_SHELL=$as_dir/$as_base -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" ${1+"$@"} -- fi;; -- esac -- done --done --;; -- esac - -- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -- # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line before each line; the second 'sed' does the real -- # work. The second script uses 'N' to pair each line-number line -- # with the numbered line, and appends trailing '-' during -- # substitution so that $LINENO is not a special case at line end. -- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -+ as_lineno_1=$LINENO as_lineno_1a=$LINENO -+ as_lineno_2=$LINENO as_lineno_2a=$LINENO -+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && -+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { -+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | - sed ' -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno - N -- s,$,-, -- : loop -- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -+ s/-\n.*// - ' >$as_me.lineno && -- chmod +x $as_me.lineno || -- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -- { (exit 1); exit 1; }; } -+ chmod +x "$as_me.lineno" || -+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - -+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have -+ # already done that, so ensure we don't try to do so again and fall -+ # in an infinite loop. This has already happened in practice. -+ _as_can_reexec=no; export _as_can_reexec - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensible to this). -- . ./$as_me.lineno -+ # original and so on. Autoconf is especially sensitive to this). -+ . "./$as_me.lineno" - # Exit status is that of the last command. - exit - } - -- --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in #((((( -+-n*) -+ case `echo 'xy\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ xy) ECHO_C='\c';; -+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null -+ ECHO_T=' ';; -+ esac;; -+*) -+ ECHO_N='-n';; - esac - --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr -+rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file - else -- as_expr=false -+ rm -f conf$$.dir -+ mkdir conf$$.dir 2>/dev/null - fi -- --rm -f conf$$ conf$$.exe conf$$.file --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -- as_ln_s='cp -p' -- else -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -pR'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -pR' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else -+ as_ln_s='cp -pR' - fi --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln - else -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - fi --rm -f conf$$ conf$$.exe conf$$.file -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null - - if mkdir -p . 2>/dev/null; then -- as_mkdir_p=: -+ as_mkdir_p='mkdir -p "$as_dir"' - else - test -d ./-p && rmdir ./-p - as_mkdir_p=false - fi - --as_executable_p="test -f" -+as_test_x='test -x' -+as_executable_p=as_fn_executable_p - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -231,38 +554,25 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P - as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH -- -+test -n "$DJDIR" || exec 7<&0 &1 - - # Name of the host. --# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, - # so uname gets run too. - ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - --exec 6>&1 -- - # - # Initializations. - # - ac_default_prefix=/usr/local -+ac_clean_files= - ac_config_libobj_dir=. -+LIBOBJS= - cross_compiling=no - subdirs= - MFLAGS= - MAKEFLAGS= --SHELL=${CONFIG_SHELL-/bin/sh} -- --# Maximum number of lines to put in a shell here document. --# This variable seems obsolete. It should probably be removed, and --# only ac_max_sed_lines should be used. --: ${ac_max_here_lines=38} - - # Identity of this package. - PACKAGE_NAME= -@@ -270,50 +580,175 @@ PACKAGE_TARNAME= - PACKAGE_VERSION= - PACKAGE_STRING= - PACKAGE_BUGREPORT= -+PACKAGE_URL= - - # Factoring default headers for most tests. - ac_includes_default="\ - #include --#if HAVE_SYS_TYPES_H -+#ifdef HAVE_SYS_TYPES_H - # include - #endif --#if HAVE_SYS_STAT_H -+#ifdef HAVE_SYS_STAT_H - # include - #endif --#if STDC_HEADERS -+#ifdef STDC_HEADERS - # include - # include - #else --# if HAVE_STDLIB_H -+# ifdef HAVE_STDLIB_H - # include - # endif - #endif --#if HAVE_STRING_H --# if !STDC_HEADERS && HAVE_MEMORY_H -+#ifdef HAVE_STRING_H -+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H - # include - # endif - # include - #endif --#if HAVE_STRINGS_H -+#ifdef HAVE_STRINGS_H - # include - #endif --#if HAVE_INTTYPES_H -+#ifdef HAVE_INTTYPES_H - # include --#else --# if HAVE_STDINT_H --# include --# endif - #endif --#if HAVE_UNISTD_H -+#ifdef HAVE_STDINT_H -+# include -+#endif -+#ifdef HAVE_UNISTD_H - # include - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os TARGET CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB CPP MIXED_CYGWIN_VC MIXED_MSYS_VC MIXED_VC MIXED_CYGWIN_MINGW MIXED_CYGWIN MIXED_MSYS EGREP OBJC_CC OBJC_CFLAGS GL_LIBS DEBUG_CFLAGS DEBUG_CXXFLAGS ERLC WX_BUILDING_INSIDE_ERLSRC ERLANG_ROOT_DIR WX_CONFIG_PATH WX_CPPFLAGS WX_CFLAGS WX_CXXFLAGS WX_CFLAGS_ONLY WX_CXXFLAGS_ONLY WX_LIBS WX_LIBS_STATIC WX_VERSION WX_RESCOMP WX_VERSION_MAJOR WX_VERSION_MINOR WX_VERSION_MICRO DEBUG_WX_CFLAGS DEBUG_WX_CXXFLAGS DEBUG_WX_LIBS DEBUG_WX_LIBS_STATIC FORCED_DEBUG_BUILD WX_HAVE_STATIC_LIBS RC_FILE_TYPE HAVE_GL_SUPPORT TESS_CB_TIGER_STYLE WXERL_CAN_BUILD_DRIVER SO_EXT RUN_ERL WXERL_SYS_TYPE LIBOBJS LTLIBOBJS' -+ac_subst_vars='LTLIBOBJS -+LIBOBJS -+WXERL_SYS_TYPE -+RUN_ERL -+SO_EXT -+WXERL_CAN_BUILD_DRIVER -+TESS_CB_TIGER_STYLE -+HAVE_GL_SUPPORT -+RC_FILE_TYPE -+WX_HAVE_STATIC_LIBS -+FORCED_DEBUG_BUILD -+DEBUG_WX_LIBS_STATIC -+DEBUG_WX_LIBS -+DEBUG_WX_CXXFLAGS -+DEBUG_WX_CFLAGS -+WX_VERSION_MICRO -+WX_VERSION_MINOR -+WX_VERSION_MAJOR -+WX_RESCOMP -+WX_VERSION -+WX_LIBS_STATIC -+WX_LIBS -+WX_CXXFLAGS_ONLY -+WX_CFLAGS_ONLY -+WX_CXXFLAGS -+WX_CFLAGS -+WX_CPPFLAGS -+WX_CONFIG_PATH -+ERLANG_ROOT_DIR -+WX_BUILDING_INSIDE_ERLSRC -+ERLC -+DEBUG_CXXFLAGS -+DEBUG_CFLAGS -+GL_LIBS -+OBJC_CFLAGS -+OBJC_CC -+EGREP -+GREP -+MIXED_MSYS -+MIXED_CYGWIN -+MIXED_CYGWIN_MINGW -+MIXED_VC -+MIXED_MSYS_VC -+MIXED_CYGWIN_VC -+CPP -+RANLIB -+ac_ct_CXX -+CXXFLAGS -+CXX -+OBJEXT -+EXEEXT -+ac_ct_CC -+CPPFLAGS -+LDFLAGS -+CFLAGS -+CC -+TARGET -+host_os -+host_vendor -+host_cpu -+host -+build_os -+build_vendor -+build_cpu -+build -+target_alias -+host_alias -+build_alias -+LIBS -+ECHO_T -+ECHO_N -+ECHO_C -+DEFS -+mandir -+localedir -+libdir -+psdir -+pdfdir -+dvidir -+htmldir -+infodir -+docdir -+oldincludedir -+includedir -+localstatedir -+sharedstatedir -+sysconfdir -+datadir -+datarootdir -+libexecdir -+sbindir -+bindir -+program_transform_name -+prefix -+exec_prefix -+PACKAGE_URL -+PACKAGE_BUGREPORT -+PACKAGE_STRING -+PACKAGE_VERSION -+PACKAGE_TARNAME -+PACKAGE_NAME -+PATH_SEPARATOR -+SHELL' - ac_subst_files='' -+ac_user_opts=' -+enable_option_checking -+with_wxdir -+with_wx_config -+with_wx_prefix -+with_wx_exec_prefix -+enable_sanitizers -+' -+ ac_precious_vars='build_alias -+host_alias -+target_alias -+CC -+CFLAGS -+LDFLAGS -+LIBS -+CPPFLAGS -+CXX -+CXXFLAGS -+CCC -+CPP' -+ - - # Initialize some variables set by options. - ac_init_help= - ac_init_version=false -+ac_unrecognized_opts= -+ac_unrecognized_sep= - # The variables have the same names as the options, with - # dashes changed to underlines. - cache_file=/dev/null -@@ -336,34 +771,49 @@ x_libraries=NONE - # and all the variables that are supposed to be based on exec_prefix - # by default will actually change. - # Use braces instead of parens because sh, perl, etc. also accept them. -+# (The list follows the same order as the GNU Coding Standards.) - bindir='${exec_prefix}/bin' - sbindir='${exec_prefix}/sbin' - libexecdir='${exec_prefix}/libexec' --datadir='${prefix}/share' -+datarootdir='${prefix}/share' -+datadir='${datarootdir}' - sysconfdir='${prefix}/etc' - sharedstatedir='${prefix}/com' - localstatedir='${prefix}/var' --libdir='${exec_prefix}/lib' - includedir='${prefix}/include' - oldincludedir='/usr/include' --infodir='${prefix}/info' --mandir='${prefix}/man' -+docdir='${datarootdir}/doc/${PACKAGE}' -+infodir='${datarootdir}/info' -+htmldir='${docdir}' -+dvidir='${docdir}' -+pdfdir='${docdir}' -+psdir='${docdir}' -+libdir='${exec_prefix}/lib' -+localedir='${datarootdir}/locale' -+mandir='${datarootdir}/man' - - ac_prev= -+ac_dashdash= - for ac_option - do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then -- eval "$ac_prev=\$ac_option" -+ eval $ac_prev=\$ac_option - ac_prev= - continue - fi - -- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` -+ case $ac_option in -+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; -+ *=) ac_optarg= ;; -+ *) ac_optarg=yes ;; -+ esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - -- case $ac_option in -+ case $ac_dashdash$ac_option in -+ --) -+ ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; -@@ -385,33 +835,59 @@ do - --config-cache | -C) - cache_file=config.cache ;; - -- -datadir | --datadir | --datadi | --datad | --data | --dat | --da) -+ -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; -- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ -- | --da=*) -+ -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - -+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ -+ | --dataroo | --dataro | --datar) -+ ac_prev=datarootdir ;; -+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ -+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) -+ datarootdir=$ac_optarg ;; -+ - -disable-* | --disable-*) -- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -- { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- eval "enable_$ac_feature=no" ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid feature name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval enable_$ac_useropt=no ;; -+ -+ -docdir | --docdir | --docdi | --doc | --do) -+ ac_prev=docdir ;; -+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) -+ docdir=$ac_optarg ;; -+ -+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) -+ ac_prev=dvidir ;; -+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) -+ dvidir=$ac_optarg ;; - - -enable-* | --enable-*) -- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -- { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -- *) ac_optarg=yes ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid feature name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; - esac -- eval "enable_$ac_feature='$ac_optarg'" ;; -+ eval enable_$ac_useropt=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -@@ -438,6 +914,12 @@ do - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - -+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) -+ ac_prev=htmldir ;; -+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ -+ | --ht=*) -+ htmldir=$ac_optarg ;; -+ - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; -@@ -462,13 +944,16 @@ do - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - -+ -localedir | --localedir | --localedi | --localed | --locale) -+ ac_prev=localedir ;; -+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) -+ localedir=$ac_optarg ;; -+ - -localstatedir | --localstatedir | --localstatedi | --localstated \ -- | --localstate | --localstat | --localsta | --localst \ -- | --locals | --local | --loca | --loc | --lo) -+ | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ -- | --localstate=* | --localstat=* | --localsta=* | --localst=* \ -- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) -+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) -@@ -533,6 +1018,16 @@ do - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - -+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) -+ ac_prev=pdfdir ;; -+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) -+ pdfdir=$ac_optarg ;; -+ -+ -psdir | --psdir | --psdi | --psd | --ps) -+ ac_prev=psdir ;; -+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) -+ psdir=$ac_optarg ;; -+ - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; -@@ -583,26 +1078,36 @@ do - ac_init_version=: ;; - - -with-* | --with-*) -- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -- { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package| sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -- *) ac_optarg=yes ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid package name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; - esac -- eval "with_$ac_package='$ac_optarg'" ;; -+ eval with_$ac_useropt=\$ac_optarg ;; - - -without-* | --without-*) -- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -- { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package | sed 's/-/_/g'` -- eval "with_$ac_package=no" ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid package name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval with_$ac_useropt=no ;; - - --x) - # Obsolete; use --with-x. -@@ -622,27 +1127,26 @@ do - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - -- -*) { echo "$as_me: error: unrecognized option: $ac_option --Try \`$0 --help' for more information." >&2 -- { (exit 1); exit 1; }; } -+ -*) as_fn_error $? "unrecognized option: \`$ac_option' -+Try \`$0 --help' for more information" - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. -- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 -- { (exit 1); exit 1; }; } -- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` -- eval "$ac_envvar='$ac_optarg'" -+ case $ac_envvar in #( -+ '' | [0-9]* | *[!_$as_cr_alnum]* ) -+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; -+ esac -+ eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. -- echo "$as_me: WARNING: you should use --build, --host, --target" >&2 -+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && -- echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} -+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" - ;; - - esac -@@ -650,31 +1154,36 @@ done - - if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` -- { echo "$as_me: error: missing argument to $ac_option" >&2 -- { (exit 1); exit 1; }; } -+ as_fn_error $? "missing argument to $ac_option" - fi - --# Be sure to have absolute paths. --for ac_var in exec_prefix prefix --do -- eval ac_val=$`echo $ac_var` -- case $ac_val in -- [\\/$]* | ?:[\\/]* | NONE | '' ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -+if test -n "$ac_unrecognized_opts"; then -+ case $enable_option_checking in -+ no) ;; -+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; -+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; - esac --done -+fi - --# Be sure to have absolute paths. --for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ -- localstatedir libdir includedir oldincludedir infodir mandir -+# Check all directory arguments for consistency. -+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ -+ datadir sysconfdir sharedstatedir localstatedir includedir \ -+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ -+ libdir localedir mandir - do -- eval ac_val=$`echo $ac_var` -+ eval ac_val=\$$ac_var -+ # Remove trailing slashes. - case $ac_val in -- [\\/$]* | ?:[\\/]* ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -+ */ ) -+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` -+ eval $ac_var=\$ac_val;; -+ esac -+ # Be sure to have absolute directory names. -+ case $ac_val in -+ [\\/$]* | ?:[\\/]* ) continue;; -+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac -+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" - done - - # There might be people who depend on the old broken behavior: `$host' -@@ -688,8 +1197,6 @@ target=$target_alias - if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe -- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. -- If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -@@ -701,82 +1208,72 @@ test -n "$host_alias" && ac_tool_prefix= - test "$silent" = yes && exec 6>/dev/null - - -+ac_pwd=`pwd` && test -n "$ac_pwd" && -+ac_ls_di=`ls -di .` && -+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -+ as_fn_error $? "working directory cannot be determined" -+test "X$ac_ls_di" = "X$ac_pwd_ls_di" || -+ as_fn_error $? "pwd does not report name of working directory" -+ -+ - # Find the source files, if location was not specified. - if test -z "$srcdir"; then - ac_srcdir_defaulted=yes -- # Try the directory containing this script, then its parent. -- ac_confdir=`(dirname "$0") 2>/dev/null || --$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$0" : 'X\(//\)[^/]' \| \ -- X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$0" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ # Try the directory containing this script, then the parent directory. -+ ac_confdir=`$as_dirname -- "$as_myself" || -+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_myself" : 'X\(//\)[^/]' \| \ -+ X"$as_myself" : 'X\(//\)$' \| \ -+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_myself" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - srcdir=$ac_confdir -- if test ! -r $srcdir/$ac_unique_file; then -+ if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. - fi - else - ac_srcdir_defaulted=no - fi --if test ! -r $srcdir/$ac_unique_file; then -- if test "$ac_srcdir_defaulted" = yes; then -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 -- { (exit 1); exit 1; }; } -- else -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -- { (exit 1); exit 1; }; } -- fi -+if test ! -r "$srcdir/$ac_unique_file"; then -+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." -+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" - fi --(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || -- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 -- { (exit 1); exit 1; }; } --srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` --ac_env_build_alias_set=${build_alias+set} --ac_env_build_alias_value=$build_alias --ac_cv_env_build_alias_set=${build_alias+set} --ac_cv_env_build_alias_value=$build_alias --ac_env_host_alias_set=${host_alias+set} --ac_env_host_alias_value=$host_alias --ac_cv_env_host_alias_set=${host_alias+set} --ac_cv_env_host_alias_value=$host_alias --ac_env_target_alias_set=${target_alias+set} --ac_env_target_alias_value=$target_alias --ac_cv_env_target_alias_set=${target_alias+set} --ac_cv_env_target_alias_value=$target_alias --ac_env_CC_set=${CC+set} --ac_env_CC_value=$CC --ac_cv_env_CC_set=${CC+set} --ac_cv_env_CC_value=$CC --ac_env_CFLAGS_set=${CFLAGS+set} --ac_env_CFLAGS_value=$CFLAGS --ac_cv_env_CFLAGS_set=${CFLAGS+set} --ac_cv_env_CFLAGS_value=$CFLAGS --ac_env_LDFLAGS_set=${LDFLAGS+set} --ac_env_LDFLAGS_value=$LDFLAGS --ac_cv_env_LDFLAGS_set=${LDFLAGS+set} --ac_cv_env_LDFLAGS_value=$LDFLAGS --ac_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_env_CPPFLAGS_value=$CPPFLAGS --ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_cv_env_CPPFLAGS_value=$CPPFLAGS --ac_env_CXX_set=${CXX+set} --ac_env_CXX_value=$CXX --ac_cv_env_CXX_set=${CXX+set} --ac_cv_env_CXX_value=$CXX --ac_env_CXXFLAGS_set=${CXXFLAGS+set} --ac_env_CXXFLAGS_value=$CXXFLAGS --ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} --ac_cv_env_CXXFLAGS_value=$CXXFLAGS --ac_env_CPP_set=${CPP+set} --ac_env_CPP_value=$CPP --ac_cv_env_CPP_set=${CPP+set} --ac_cv_env_CPP_value=$CPP -+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -+ac_abs_confdir=`( -+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" -+ pwd)` -+# When building in place, set srcdir=. -+if test "$ac_abs_confdir" = "$ac_pwd"; then -+ srcdir=. -+fi -+# Remove unnecessary trailing slashes from srcdir. -+# Double slashes in file names in object file debugging info -+# mess up M-x gdb in Emacs. -+case $srcdir in -+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -+esac -+for ac_var in $ac_precious_vars; do -+ eval ac_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_env_${ac_var}_value=\$${ac_var} -+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_cv_env_${ac_var}_value=\$${ac_var} -+done - - # - # Report the --help message. -@@ -799,20 +1296,17 @@ Configuration: - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit -- -q, --quiet, --silent do not print \`checking...' messages -+ -q, --quiet, --silent do not print \`checking ...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - --_ACEOF -- -- cat <<_ACEOF - Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX -- [$ac_default_prefix] -+ [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -- [PREFIX] -+ [PREFIX] - - By default, \`make install' will install all the files in - \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -@@ -822,18 +1316,25 @@ for instance \`--prefix=\$HOME'. - For better control, use the options below. - - Fine tuning of the installation directories: -- --bindir=DIR user executables [EPREFIX/bin] -- --sbindir=DIR system admin executables [EPREFIX/sbin] -- --libexecdir=DIR program executables [EPREFIX/libexec] -- --datadir=DIR read-only architecture-independent data [PREFIX/share] -- --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -- --localstatedir=DIR modifiable single-machine data [PREFIX/var] -- --libdir=DIR object code libraries [EPREFIX/lib] -- --includedir=DIR C header files [PREFIX/include] -- --oldincludedir=DIR C header files for non-gcc [/usr/include] -- --infodir=DIR info documentation [PREFIX/info] -- --mandir=DIR man documentation [PREFIX/man] -+ --bindir=DIR user executables [EPREFIX/bin] -+ --sbindir=DIR system admin executables [EPREFIX/sbin] -+ --libexecdir=DIR program executables [EPREFIX/libexec] -+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -+ --localstatedir=DIR modifiable single-machine data [PREFIX/var] -+ --libdir=DIR object code libraries [EPREFIX/lib] -+ --includedir=DIR C header files [PREFIX/include] -+ --oldincludedir=DIR C header files for non-gcc [/usr/include] -+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] -+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] -+ --infodir=DIR info documentation [DATAROOTDIR/info] -+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] -+ --mandir=DIR man documentation [DATAROOTDIR/man] -+ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] -+ --htmldir=DIR html documentation [DOCDIR] -+ --dvidir=DIR dvi documentation [DOCDIR] -+ --pdfdir=DIR pdf documentation [DOCDIR] -+ --psdir=DIR ps documentation [DOCDIR] - _ACEOF - - cat <<\_ACEOF -@@ -849,6 +1350,7 @@ if test -n "$ac_init_help"; then - cat <<\_ACEOF - - Optional Features: -+ --disable-option-checking ignore unrecognized --enable/--with options - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-sanitizers[=comma-separated list of sanitizers] -@@ -868,8 +1370,9 @@ Some influential environment variables: - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory -- CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have -- headers in a nonstandard directory -+ LIBS libraries to pass to the linker, e.g. -l -+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if -+ you have headers in a nonstandard directory - CXX C++ compiler command - CXXFLAGS C++ compiler flags - CPP C preprocessor -@@ -877,119 +1380,680 @@ Some influential environment variables: - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. - -+Report bugs to the package provider. - _ACEOF -+ac_status=$? - fi - - if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. -- ac_popdir=`pwd` - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue -- test -d $ac_dir || continue -+ test -d "$ac_dir" || -+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || -+ continue - ac_builddir=. - --if test "$ac_dir" != .; then -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix - - case $srcdir in -- .) # No --srcdir option. We are building in place. -+ .) # We are building in place. - ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; --esac -- --# Do not use `cd foo && pwd` to compute absolute paths, because --# the directories may not exist. --case `pwd` in --.) ac_abs_builddir="$ac_dir";; --*) -- case "$ac_dir" in -- .) ac_abs_builddir=`pwd`;; -- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -- *) ac_abs_builddir=`pwd`/"$ac_dir";; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_builddir=${ac_top_builddir}.;; --*) -- case ${ac_top_builddir}. in -- .) ac_abs_top_builddir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_srcdir=$ac_srcdir;; --*) -- case $ac_srcdir in -- .) ac_abs_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_srcdir=$ac_top_srcdir;; --*) -- case $ac_top_srcdir in -- .) ac_abs_top_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -- esac;; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; - esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - -- cd $ac_dir -- # Check for guested configure; otherwise get Cygnus style configure. -- if test -f $ac_srcdir/configure.gnu; then -- echo -- $SHELL $ac_srcdir/configure.gnu --help=recursive -- elif test -f $ac_srcdir/configure; then -- echo -- $SHELL $ac_srcdir/configure --help=recursive -- elif test -f $ac_srcdir/configure.ac || -- test -f $ac_srcdir/configure.in; then -- echo -- $ac_configure --help -+ cd "$ac_dir" || { ac_status=$?; continue; } -+ # Check for guested configure. -+ if test -f "$ac_srcdir/configure.gnu"; then -+ echo && -+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive -+ elif test -f "$ac_srcdir/configure"; then -+ echo && -+ $SHELL "$ac_srcdir/configure" --help=recursive - else -- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -- fi -- cd $ac_popdir -+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -+ fi || ac_status=$? -+ cd "$ac_pwd" || { ac_status=$?; break; } - done - fi - --test -n "$ac_init_help" && exit 0 -+test -n "$ac_init_help" && exit $ac_status - if $ac_init_version; then - cat <<\_ACEOF -+configure -+generated by GNU Autoconf 2.69 - --Copyright (C) 2003 Free Software Foundation, Inc. -+Copyright (C) 2012 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - _ACEOF -- exit 0 -+ exit - fi --exec 5>config.log --cat >&5 <<_ACEOF -+ -+## ------------------------ ## -+## Autoconf initialization. ## -+## ------------------------ ## -+ -+# ac_fn_c_try_compile LINENO -+# -------------------------- -+# Try to compile conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_compile () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ rm -f conftest.$ac_objext -+ if { { ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compile") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_c_try_compile -+ -+# ac_fn_cxx_try_compile LINENO -+# ---------------------------- -+# Try to compile conftest.$ac_ext, and return whether this succeeded. -+ac_fn_cxx_try_compile () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ rm -f conftest.$ac_objext -+ if { { ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compile") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_cxx_try_compile -+ -+# ac_fn_c_try_cpp LINENO -+# ---------------------- -+# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_cpp () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if { { ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } > conftest.i && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_c_try_cpp -+ -+# ac_fn_c_try_run LINENO -+# ---------------------- -+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -+# that executables *can* be run. -+ac_fn_c_try_run () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' -+ { { case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: program exited with status $ac_status" >&5 -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=$ac_status -+fi -+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_c_try_run -+ -+# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES -+# -------------------------------------------- -+# Tries to find the compile-time value of EXPR in a program that includes -+# INCLUDES, setting VAR accordingly. Returns whether the value could be -+# computed -+ac_fn_c_compute_int () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if test "$cross_compiling" = yes; then -+ # Depending upon the size, compute the lo and hi bounds. -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+static int test_array [1 - 2 * !(($2) >= 0)]; -+test_array [0] = 0; -+return test_array [0]; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_lo=0 ac_mid=0 -+ while :; do -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -+test_array [0] = 0; -+return test_array [0]; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_hi=$ac_mid; break -+else -+ as_fn_arith $ac_mid + 1 && ac_lo=$as_val -+ if test $ac_lo -le $ac_mid; then -+ ac_lo= ac_hi= -+ break -+ fi -+ as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ done -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+static int test_array [1 - 2 * !(($2) < 0)]; -+test_array [0] = 0; -+return test_array [0]; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_hi=-1 ac_mid=-1 -+ while :; do -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+static int test_array [1 - 2 * !(($2) >= $ac_mid)]; -+test_array [0] = 0; -+return test_array [0]; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_lo=$ac_mid; break -+else -+ as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val -+ if test $ac_mid -le $ac_hi; then -+ ac_lo= ac_hi= -+ break -+ fi -+ as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ done -+else -+ ac_lo= ac_hi= -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+# Binary search between lo and hi bounds. -+while test "x$ac_lo" != "x$ac_hi"; do -+ as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -+test_array [0] = 0; -+return test_array [0]; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_hi=$ac_mid -+else -+ as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+done -+case $ac_lo in #(( -+?*) eval "$3=\$ac_lo"; ac_retval=0 ;; -+'') ac_retval=1 ;; -+esac -+ else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+static long int longval () { return $2; } -+static unsigned long int ulongval () { return $2; } -+#include -+#include -+int -+main () -+{ -+ -+ FILE *f = fopen ("conftest.val", "w"); -+ if (! f) -+ return 1; -+ if (($2) < 0) -+ { -+ long int i = longval (); -+ if (i != ($2)) -+ return 1; -+ fprintf (f, "%ld", i); -+ } -+ else -+ { -+ unsigned long int i = ulongval (); -+ if (i != ($2)) -+ return 1; -+ fprintf (f, "%lu", i); -+ } -+ /* Do not output a trailing newline, as this causes \r\n confusion -+ on some platforms. */ -+ return ferror (f) || fclose (f) != 0; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_run "$LINENO"; then : -+ echo >>conftest.val; read $3 &5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+#include <$2> -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ eval "$3=yes" -+else -+ eval "$3=no" -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ -+} # ac_fn_c_check_header_compile -+ -+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -+# ------------------------------------------------------- -+# Tests whether HEADER exists, giving a warning if it cannot be compiled using -+# the include files in INCLUDES and setting the cache variable VAR -+# accordingly. -+ac_fn_c_check_header_mongrel () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if eval \${$3+:} false; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -+$as_echo_n "checking $2 usability... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+#include <$2> -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_header_compiler=yes -+else -+ ac_header_compiler=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -+$as_echo_n "checking $2 presence... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <$2> -+_ACEOF -+if ac_fn_c_try_cpp "$LINENO"; then : -+ ac_header_preproc=yes -+else -+ ac_header_preproc=no -+fi -+rm -f conftest.err conftest.i conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( -+ yes:no: ) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -+ ;; -+esac -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$3=\$ac_header_compiler" -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ -+} # ac_fn_c_check_header_mongrel -+ -+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES -+# ------------------------------------------- -+# Tests whether TYPE exists after having included INCLUDES, setting cache -+# variable VAR accordingly. -+ac_fn_c_check_type () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$3=no" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+if (sizeof ($2)) -+ return 0; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+if (sizeof (($2))) -+ return 0; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ -+else -+ eval "$3=yes" -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ -+} # ac_fn_c_check_type -+ -+# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES -+# --------------------------------------------------------- -+# Tests whether HEADER exists and can be compiled using the include files in -+# INCLUDES, setting the cache variable VAR accordingly. -+ac_fn_cxx_check_header_compile () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+#include <$2> -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO"; then : -+ eval "$3=yes" -+else -+ eval "$3=no" -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ -+} # ac_fn_cxx_check_header_compile -+ -+# ac_fn_cxx_try_link LINENO -+# ------------------------- -+# Try to link conftest.$ac_ext, and return whether this succeeded. -+ac_fn_cxx_try_link () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ rm -f conftest.$ac_objext conftest$ac_exeext -+ if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ test -x conftest$ac_exeext -+ }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 -+fi -+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information -+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would -+ # interfere with the next link command; also delete a directory that is -+ # left behind by Apple's compiler. We do this before executing the actions. -+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_cxx_try_link -+cat >config.log <<_ACEOF - This file contains any messages produced by compilers while - running configure, to aid debugging if configure makes a mistake. - - It was created by $as_me, which was --generated by GNU Autoconf 2.59. Invocation command line was -+generated by GNU Autoconf 2.69. Invocation command line was - - $ $0 $@ - - _ACEOF -+exec 5>>config.log - { - cat <<_ASUNAME - ## --------- ## -@@ -1008,7 +2072,7 @@ uname -v = `(uname -v) 2>/dev/null || ec - /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` - /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` - /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` --hostinfo = `(hostinfo) 2>/dev/null || echo unknown` -+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` - /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` - /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` - /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -@@ -1020,8 +2084,9 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- echo "PATH: $as_dir" --done -+ $as_echo "PATH: $as_dir" -+ done -+IFS=$as_save_IFS - - } >&5 - -@@ -1043,7 +2108,6 @@ _ACEOF - ac_configure_args= - ac_configure_args0= - ac_configure_args1= --ac_sep= - ac_must_keep_next=false - for ac_pass in 1 2 - do -@@ -1054,13 +2118,13 @@ do - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *\'*) -+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in -- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; - 2) -- ac_configure_args1="$ac_configure_args1 '$ac_arg'" -+ as_fn_append ac_configure_args1 " '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else -@@ -1076,104 +2140,115 @@ do - -* ) ac_must_keep_next=true ;; - esac - fi -- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" -- # Get rid of the leading space. -- ac_sep=" " -+ as_fn_append ac_configure_args " '$ac_arg'" - ;; - esac - done - done --$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } --$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } -+{ ac_configure_args0=; unset ac_configure_args0;} -+{ ac_configure_args1=; unset ac_configure_args1;} - - # When interrupted or exit'd, cleanup temporary files, and complete - # config.log. We remove comments because anyway the quotes in there - # would cause problems or look ugly. --# WARNING: Be sure not to use single quotes in there, as some shells, --# such as our DU 5.0 friend, will then `close' the trap. -+# WARNING: Use '\'' to represent an apostrophe within the trap. -+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. - trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo - -- cat <<\_ASBOX --## ---------------- ## -+ $as_echo "## ---------------- ## - ## Cache variables. ## --## ---------------- ## --_ASBOX -+## ---------------- ##" - echo - # The following way of writing the cache mishandles newlines in values, --{ -+( -+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -+ *) { eval $ac_var=; unset $ac_var;} ;; -+ esac ;; -+ esac -+ done - (set) 2>&1 | -- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) - sed -n \ -- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; -- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" -- ;; -+ "s/'\''/'\''\\\\'\'''\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" -+ ;; #( - *) -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; -- esac; --} -+ esac | -+ sort -+) - echo - -- cat <<\_ASBOX --## ----------------- ## -+ $as_echo "## ----------------- ## - ## Output variables. ## --## ----------------- ## --_ASBOX -+## ----------------- ##" - echo - for ac_var in $ac_subst_vars - do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - - if test -n "$ac_subst_files"; then -- cat <<\_ASBOX --## ------------- ## --## Output files. ## --## ------------- ## --_ASBOX -+ $as_echo "## ------------------- ## -+## File substitutions. ## -+## ------------------- ##" - echo - for ac_var in $ac_subst_files - do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi - - if test -s confdefs.h; then -- cat <<\_ASBOX --## ----------- ## -+ $as_echo "## ----------- ## - ## confdefs.h. ## --## ----------- ## --_ASBOX -+## ----------- ##" - echo -- sed "/^$/d" confdefs.h | sort -+ cat confdefs.h - echo - fi - test "$ac_signal" != 0 && -- echo "$as_me: caught signal $ac_signal" -- echo "$as_me: exit $exit_status" -+ $as_echo "$as_me: caught signal $ac_signal" -+ $as_echo "$as_me: exit $exit_status" - } >&5 -- rm -f core *.core && -- rm -rf conftest* confdefs* conf$$* $ac_clean_files && -+ rm -f core *.core core.conftest.* && -+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -- ' 0 -+' 0 - for ac_signal in 1 2 13 15; do -- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal - done - ac_signal=0 - - # confdefs.h avoids OS command line length limits that DEFS can exceed. --rm -rf conftest* confdefs.h --# AIX cpp loses on an empty file, so make sure it contains at least a newline. --echo >confdefs.h -+rm -f -r conftest* confdefs.h -+ -+$as_echo "/* confdefs.h */" > confdefs.h - - # Predefined preprocessor variables. - -@@ -1181,112 +2256,137 @@ cat >>confdefs.h <<_ACEOF - #define PACKAGE_NAME "$PACKAGE_NAME" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_TARNAME "$PACKAGE_TARNAME" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_VERSION "$PACKAGE_VERSION" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_STRING "$PACKAGE_STRING" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" - _ACEOF - -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_URL "$PACKAGE_URL" -+_ACEOF -+ - - # Let the site file select an alternate cache file if it wants to. --# Prefer explicitly selected file to automatically selected ones. --if test -z "$CONFIG_SITE"; then -- if test "x$prefix" != xNONE; then -- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" -- else -- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" -- fi -+# Prefer an explicitly selected file to automatically selected ones. -+ac_site_file1=NONE -+ac_site_file2=NONE -+if test -n "$CONFIG_SITE"; then -+ # We do not want a PATH search for config.site. -+ case $CONFIG_SITE in #(( -+ -*) ac_site_file1=./$CONFIG_SITE;; -+ */*) ac_site_file1=$CONFIG_SITE;; -+ *) ac_site_file1=./$CONFIG_SITE;; -+ esac -+elif test "x$prefix" != xNONE; then -+ ac_site_file1=$prefix/share/config.site -+ ac_site_file2=$prefix/etc/config.site -+else -+ ac_site_file1=$ac_default_prefix/share/config.site -+ ac_site_file2=$ac_default_prefix/etc/config.site - fi --for ac_site_file in $CONFIG_SITE; do -- if test -r "$ac_site_file"; then -- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 --echo "$as_me: loading site script $ac_site_file" >&6;} -+for ac_site_file in "$ac_site_file1" "$ac_site_file2" -+do -+ test "x$ac_site_file" = xNONE && continue -+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -+$as_echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 -- . "$ac_site_file" -+ . "$ac_site_file" \ -+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "failed to load site script $ac_site_file -+See \`config.log' for more details" "$LINENO" 5; } - fi - done - - if test -r "$cache_file"; then -- # Some versions of bash will fail to source /dev/null (special -- # files actually), so we avoid doing that. -- if test -f "$cache_file"; then -- { echo "$as_me:$LINENO: loading cache $cache_file" >&5 --echo "$as_me: loading cache $cache_file" >&6;} -+ # Some versions of bash will fail to source /dev/null (special files -+ # actually), so we avoid doing that. DJGPP emulates it as a regular file. -+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -+$as_echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in -- [\\/]* | ?:[\\/]* ) . $cache_file;; -- *) . ./$cache_file;; -+ [\\/]* | ?:[\\/]* ) . "$cache_file";; -+ *) . "./$cache_file";; - esac - fi - else -- { echo "$as_me:$LINENO: creating cache $cache_file" >&5 --echo "$as_me: creating cache $cache_file" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -+$as_echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file - fi - - # Check that the precious variables saved in the cache have kept the same - # value. - ac_cache_corrupted=false --for ac_var in `(set) 2>&1 | -- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do -+for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set -- eval ac_old_val="\$ac_cv_env_${ac_var}_value" -- eval ac_new_val="\$ac_env_${ac_var}_value" -+ eval ac_old_val=\$ac_cv_env_${ac_var}_value -+ eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) -- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) -- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then -- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 --echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 --echo "$as_me: former value: $ac_old_val" >&2;} -- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 --echo "$as_me: current value: $ac_new_val" >&2;} -- ac_cache_corrupted=: -+ # differences in whitespace do not lead to failure. -+ ac_old_val_w=`echo x $ac_old_val` -+ ac_new_val_w=`echo x $ac_new_val` -+ if test "$ac_old_val_w" != "$ac_new_val_w"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -+ ac_cache_corrupted=: -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} -+ eval $ac_var=\$ac_old_val -+ fi -+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. -- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; -+ *) as_fn_append ac_configure_args " '$ac_arg'" ;; - esac - fi - done - if $ac_cache_corrupted; then -- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 --echo "$as_me: error: changes in the environment can compromise the build" >&2;} -- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 --echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} -- { (exit 1); exit 1; }; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} -+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 - fi -+## -------------------- ## -+## Main body of script. ## -+## -------------------- ## - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' -@@ -1296,47 +2396,34 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - ac_aux_dir= - for ac_dir in $srcdir/autoconf; do -- if test -f $ac_dir/install-sh; then -+ if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break -- elif test -f $ac_dir/install.sh; then -+ elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break -- elif test -f $ac_dir/shtool; then -+ elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi - done - if test -z "$ac_aux_dir"; then -- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir/autoconf" >&5 --echo "$as_me: error: cannot find install-sh or install.sh in $srcdir/autoconf" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in $srcdir/autoconf" "$LINENO" 5 - fi --ac_config_guess="$SHELL $ac_aux_dir/config.guess" --ac_config_sub="$SHELL $ac_aux_dir/config.sub" --ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -+ -+# These three variables are undocumented and unsupported, -+# and are intended to be withdrawn in a future Autoconf release. -+# They can cause serious problems if a builder's source tree is in a directory -+# whose full name contains unusual characters. -+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -+ - - - -@@ -1349,28 +2436,32 @@ fi - if test -z "$ERL_TOP" || test ! -d $ERL_TOP ; then - ac_aux_dir= - for ac_dir in autoconf; do -- if test -f $ac_dir/install-sh; then -+ if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break -- elif test -f $ac_dir/install.sh; then -+ elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break -- elif test -f $ac_dir/shtool; then -+ elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi - done - if test -z "$ac_aux_dir"; then -- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in autoconf" >&5 --echo "$as_me: error: cannot find install-sh or install.sh in autoconf" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in autoconf" "$LINENO" 5 - fi --ac_config_guess="$SHELL $ac_aux_dir/config.guess" --ac_config_sub="$SHELL $ac_aux_dir/config.sub" --ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -+ -+# These three variables are undocumented and unsupported, -+# and are intended to be withdrawn in a future Autoconf release. -+# They can cause serious problems if a builder's source tree is in a directory -+# whose full name contains unusual characters. -+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -+ - - WX_BUILDING_INSIDE_ERLSRC=false - else -@@ -1378,55 +2469,63 @@ else - if test -d $erl_top/erts/autoconf; then - ac_aux_dir= - for ac_dir in $erl_top/erts/autoconf; do -- if test -f $ac_dir/install-sh; then -+ if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break -- elif test -f $ac_dir/install.sh; then -+ elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break -- elif test -f $ac_dir/shtool; then -+ elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi - done - if test -z "$ac_aux_dir"; then -- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $erl_top/erts/autoconf" >&5 --echo "$as_me: error: cannot find install-sh or install.sh in $erl_top/erts/autoconf" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in $erl_top/erts/autoconf" "$LINENO" 5 - fi --ac_config_guess="$SHELL $ac_aux_dir/config.guess" --ac_config_sub="$SHELL $ac_aux_dir/config.sub" --ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -+ -+# These three variables are undocumented and unsupported, -+# and are intended to be withdrawn in a future Autoconf release. -+# They can cause serious problems if a builder's source tree is in a directory -+# whose full name contains unusual characters. -+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -+ - - WX_BUILDING_INSIDE_ERLSRC=true - else - ac_aux_dir= - for ac_dir in autoconf; do -- if test -f $ac_dir/install-sh; then -+ if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break -- elif test -f $ac_dir/install.sh; then -+ elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break -- elif test -f $ac_dir/shtool; then -+ elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi - done - if test -z "$ac_aux_dir"; then -- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in autoconf" >&5 --echo "$as_me: error: cannot find install-sh or install.sh in autoconf" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in autoconf" "$LINENO" 5 - fi --ac_config_guess="$SHELL $ac_aux_dir/config.guess" --ac_config_sub="$SHELL $ac_aux_dir/config.sub" --ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -+ -+# These three variables are undocumented and unsupported, -+# and are intended to be withdrawn in a future Autoconf release. -+# They can cause serious problems if a builder's source tree is in a directory -+# whose full name contains unusual characters. -+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -+ - - WX_BUILDING_INSIDE_ERLSRC=false - fi -@@ -1434,57 +2533,74 @@ fi - - if test "X$host" != "Xfree_source" -a "X$host" != "Xwin32"; then - # Make sure we can run config.sub. --$ac_config_sub sun4 >/dev/null 2>&1 || -- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 --echo "$as_me: error: cannot run $ac_config_sub" >&2;} -- { (exit 1); exit 1; }; } -+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || -+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - --echo "$as_me:$LINENO: checking build system type" >&5 --echo $ECHO_N "checking build system type... $ECHO_C" >&6 --if test "${ac_cv_build+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -+$as_echo_n "checking build system type... " >&6; } -+if ${ac_cv_build+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- ac_cv_build_alias=$build_alias --test -z "$ac_cv_build_alias" && -- ac_cv_build_alias=`$ac_config_guess` --test -z "$ac_cv_build_alias" && -- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 --echo "$as_me: error: cannot guess build type; you must specify one" >&2;} -- { (exit 1); exit 1; }; } --ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} -- { (exit 1); exit 1; }; } -+ ac_build_alias=$build_alias -+test "x$ac_build_alias" = x && -+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -+test "x$ac_build_alias" = x && -+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || -+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 - - fi --echo "$as_me:$LINENO: result: $ac_cv_build" >&5 --echo "${ECHO_T}$ac_cv_build" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -+$as_echo "$ac_cv_build" >&6; } -+case $ac_cv_build in -+*-*-*) ;; -+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; -+esac - build=$ac_cv_build --build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_build -+shift -+build_cpu=$1 -+build_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+build_os=$* -+IFS=$ac_save_IFS -+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - --echo "$as_me:$LINENO: checking host system type" >&5 --echo $ECHO_N "checking host system type... $ECHO_C" >&6 --if test "${ac_cv_host+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -+$as_echo_n "checking host system type... " >&6; } -+if ${ac_cv_host+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- ac_cv_host_alias=$host_alias --test -z "$ac_cv_host_alias" && -- ac_cv_host_alias=$ac_cv_build_alias --ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} -- { (exit 1); exit 1; }; } -+ if test "x$host_alias" = x; then -+ ac_cv_host=$ac_cv_build -+else -+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || -+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 -+fi - - fi --echo "$as_me:$LINENO: result: $ac_cv_host" >&5 --echo "${ECHO_T}$ac_cv_host" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -+$as_echo "$ac_cv_host" >&6; } -+case $ac_cv_host in -+*-*-*) ;; -+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; -+esac - host=$ac_cv_host --host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_host -+shift -+host_cpu=$1 -+host_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+host_os=$* -+IFS=$ac_save_IFS -+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - - else -@@ -1512,10 +2628,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. - set dummy ${ac_tool_prefix}gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1525,35 +2641,37 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -1563,39 +2681,50 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -+$as_echo "$ac_ct_CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -- CC=$ac_ct_CC -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi - else - CC="$ac_cv_prog_CC" - fi - - if test -z "$CC"; then -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. - set dummy ${ac_tool_prefix}cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1605,77 +2734,37 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- --fi --if test -z "$ac_cv_prog_CC"; then -- ac_ct_CC=$CC -- # Extract the first word of "cc", so it can be a program name with args. --set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$ac_ct_CC"; then -- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- --fi --fi --ac_ct_CC=$ac_cv_prog_ac_ct_CC --if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -- CC=$ac_ct_CC --else -- CC="$ac_cv_prog_CC" --fi - -+ fi - fi - if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1686,18 +2775,19 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. -@@ -1715,24 +2805,25 @@ fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then -- for ac_prog in cl -+ for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1742,39 +2833,41 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - test -n "$CC" && break - done - fi - if test -z "$CC"; then - ac_ct_CC=$CC -- for ac_prog in cl -+ for ac_prog in cl.exe - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -1784,66 +2877,78 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -+$as_echo "$ac_ct_CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - test -n "$ac_ct_CC" && break - done - -- CC=$ac_ct_CC -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi - fi - - fi - - --test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH --See \`config.log' for more details." >&5 --echo "$as_me: error: no acceptable C compiler found in \$PATH --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "no acceptable C compiler found in \$PATH -+See \`config.log' for more details" "$LINENO" 5; } - - # Provide some information about the compiler. --echo "$as_me:$LINENO:" \ -- "checking for C compiler version" >&5 --ac_compiler=`set X $ac_compile; echo $2` --{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 -- (eval $ac_compiler --version &5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 -- (eval $ac_compiler -v &5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 -- (eval $ac_compiler -V &5) 2>&5 -+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -+set X $ac_compile -+ac_compiler=$2 -+for ac_option in --version -v -V -qversion; do -+ { { ac_try="$ac_compiler $ac_option >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } -+ if test -s conftest.err; then -+ sed '10a\ -+... rest of stderr output deleted ... -+ 10q' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ fi -+ rm -f conftest.er1 conftest.err -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+done - --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -1855,112 +2960,108 @@ main () - } - _ACEOF - ac_clean_files_save=$ac_clean_files --ac_clean_files="$ac_clean_files a.out a.exe b.out" -+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" - # Try to create an executable without -o first, disregard a.out. - # It will help us diagnose broken compilers, and finding out an intuition - # of exeext. --echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 --echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 --ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` --if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 -- (eval $ac_link_default) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- # Find the output, starting from the most likely. This scheme is --# not robust to junk in `.', hence go to wildcards (a.*) only as a last --# resort. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -+$as_echo_n "checking whether the C compiler works... " >&6; } -+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` - --# Be careful to initialize this variable, since it used to be cached. --# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. --ac_cv_exeext= --# b.out is created by i960 compilers. --for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out -+# The possible output files: -+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" -+ -+ac_rmfiles= -+for ac_file in $ac_files -+do -+ case $ac_file in -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; -+ * ) ac_rmfiles="$ac_rmfiles $ac_file";; -+ esac -+done -+rm -f $ac_rmfiles -+ -+if { { ac_try="$ac_link_default" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link_default") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : -+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -+# in a Makefile. We should not override ac_cv_exeext if it was cached, -+# so that the user can short-circuit this test for compilers unknown to -+# Autoconf. -+for ac_file in $ac_files '' - do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) -- ;; -- conftest.$ac_ext ) -- # This is the source file. -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) -- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- # FIXME: I believe we export ac_cv_exeext for Libtool, -- # but it would be cool to find out if it's true. Does anybody -- # maintain Libtool? --akim. -- export ac_cv_exeext -+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; -+ then :; else -+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -+ fi -+ # We set ac_cv_exeext here because the later test for it is not -+ # safe: cross compilers may not add the suffix if given an `-o' -+ # argument, so we may need to know it at that point already. -+ # Even if this section looks crufty: it has the advantage of -+ # actually working. - break;; - * ) - break;; - esac - done -+test "$ac_cv_exeext" = no && ac_cv_exeext= -+ - else -- echo "$as_me: failed program was:" >&5 -+ ac_file='' -+fi -+if test -z "$ac_file"; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+$as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { echo "$as_me:$LINENO: error: C compiler cannot create executables --See \`config.log' for more details." >&5 --echo "$as_me: error: C compiler cannot create executables --See \`config.log' for more details." >&2;} -- { (exit 77); exit 77; }; } -+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error 77 "C compiler cannot create executables -+See \`config.log' for more details" "$LINENO" 5; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - fi -- -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -+$as_echo_n "checking for C compiler default output file name... " >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -+$as_echo "$ac_file" >&6; } - ac_exeext=$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_file" >&5 --echo "${ECHO_T}$ac_file" >&6 - --# Check the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --echo "$as_me:$LINENO: checking whether the C compiler works" >&5 --echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 --# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 --# If not cross compiling, check that we can run a simple program. --if test "$cross_compiling" != yes; then -- if { ac_try='./$ac_file' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- cross_compiling=no -- else -- if test "$cross_compiling" = maybe; then -- cross_compiling=yes -- else -- { { echo "$as_me:$LINENO: error: cannot run C compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run C compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -- fi -- fi --fi --echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -- --rm -f a.out a.exe conftest$ac_cv_exeext b.out -+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out - ac_clean_files=$ac_clean_files_save --# Check the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 --echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 --echo "$as_me:$LINENO: result: $cross_compiling" >&5 --echo "${ECHO_T}$cross_compiling" >&6 -- --echo "$as_me:$LINENO: checking for suffix of executables" >&5 --echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -+$as_echo_n "checking for suffix of executables... " >&6; } -+if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) - # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will - # work properly (i.e., refer to `conftest.exe'), while it won't with -@@ -1968,38 +3069,90 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- export ac_cv_exeext - break;; - * ) break;; - esac - done - else -- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "cannot compute suffix of executables: cannot compile and link -+See \`config.log' for more details" "$LINENO" 5; } - fi -- --rm -f conftest$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 --echo "${ECHO_T}$ac_cv_exeext" >&6 -+rm -f conftest conftest$ac_cv_exeext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -+$as_echo "$ac_cv_exeext" >&6; } - - rm -f conftest.$ac_ext - EXEEXT=$ac_cv_exeext - ac_exeext=$EXEEXT --echo "$as_me:$LINENO: checking for suffix of object files" >&5 --echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 --if test "${ac_cv_objext+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main () -+{ -+FILE *f = fopen ("conftest.out", "w"); -+ return ferror (f) || fclose (f) != 0; -+ -+ ; -+ return 0; -+} - _ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ac_clean_files="$ac_clean_files conftest.out" -+# Check that the compiler produces executables we can run. If not, either -+# the compiler is broken, or we cross compile. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -+$as_echo_n "checking whether we are cross compiling... " >&6; } -+if test "$cross_compiling" != yes; then -+ { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if { ac_try='./conftest$ac_cv_exeext' -+ { { case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; }; then -+ cross_compiling=no -+ else -+ if test "$cross_compiling" = maybe; then -+ cross_compiling=yes -+ else -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "cannot run C compiled programs. -+If you meant to cross compile, use \`--host'. -+See \`config.log' for more details" "$LINENO" 5; } -+ fi -+ fi -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -+$as_echo "$cross_compiling" >&6; } -+ -+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out -+ac_clean_files=$ac_clean_files_save -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -+$as_echo_n "checking for suffix of object files... " >&6; } -+if ${ac_cv_objext+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2011,45 +3164,46 @@ main () - } - _ACEOF - rm -f conftest.o conftest.obj --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+if { { ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compile") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : -+ for ac_file in conftest.o conftest.obj conftest.*; do -+ test -f "$ac_file" || continue; - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac - done - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute suffix of object files: cannot compile --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "cannot compute suffix of object files: cannot compile -+See \`config.log' for more details" "$LINENO" 5; } - fi -- - rm -f conftest.$ac_cv_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 --echo "${ECHO_T}$ac_cv_objext" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -+$as_echo "$ac_cv_objext" >&6; } - OBJEXT=$ac_cv_objext - ac_objext=$OBJEXT --echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 --if test "${ac_cv_c_compiler_gnu+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -+if ${ac_cv_c_compiler_gnu+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2063,55 +3217,34 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - ac_compiler_gnu=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_compiler_gnu=no -+ ac_compiler_gnu=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_c_compiler_gnu=$ac_compiler_gnu - - fi --echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 --GCC=`test $ac_compiler_gnu = yes && echo yes` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -+$as_echo "$ac_cv_c_compiler_gnu" >&6; } -+if test $ac_compiler_gnu = yes; then -+ GCC=yes -+else -+ GCC= -+fi - ac_test_CFLAGS=${CFLAGS+set} - ac_save_CFLAGS=$CFLAGS --CFLAGS="-g" --echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 --echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 --if test "${ac_cv_prog_cc_g+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -+$as_echo_n "checking whether $CC accepts -g... " >&6; } -+if ${ac_cv_prog_cc_g+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ ac_save_c_werror_flag=$ac_c_werror_flag -+ ac_c_werror_flag=yes -+ ac_cv_prog_cc_g=no -+ CFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2122,39 +3255,49 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ CFLAGS="" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - --ac_cv_prog_cc_g=no -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ -+else -+ ac_c_werror_flag=$ac_save_c_werror_flag -+ CFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_prog_cc_g=yes - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_c_werror_flag=$ac_save_c_werror_flag -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -+$as_echo "$ac_cv_prog_cc_g" >&6; } - if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS - elif test $ac_cv_prog_cc_g = yes; then -@@ -2170,23 +3313,18 @@ else - CFLAGS= - fi - fi --echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 --echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 --if test "${ac_cv_prog_cc_stdc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -+if ${ac_cv_prog_cc_c89+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- ac_cv_prog_cc_stdc=no -+ ac_cv_prog_cc_c89=no - ac_save_CC=$CC --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - #include --#include --#include -+struct stat; - /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ - struct buf { int x; }; - FILE * (*rcsopen) (struct buf *, struct stat *, int); -@@ -2209,12 +3347,17 @@ static char *f (char * (*g) (char **, in - /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated -- as 'x'. The following induces an error, until -std1 is added to get -+ as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something -- that's true only with -std1. */ -+ that's true only with -std. */ - int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters -+ inside strings and character constants. */ -+#define FOO(x) 'x' -+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; -+ - int test (int i, double x); - struct s1 {int (*f) (int a);}; - struct s2 {int (*f) (double a);}; -@@ -2229,225 +3372,61 @@ return f (e, argv, 0) != argv[0] || f - return 0; - } - _ACEOF --# Don't try gcc -ansi; that turns off useful extensions and --# breaks some systems' header files. --# AIX -qlanglvl=ansi --# Ultrix and OSF/1 -std1 --# HP-UX 10.20 and later -Ae --# HP-UX older versions -Aa -D_HPUX_SOURCE --# SVR4 -Xc -D__EXTENSIONS__ --for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ -+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" - do - CC="$ac_save_CC $ac_arg" -- rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_prog_cc_stdc=$ac_arg --break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -+ if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_prog_cc_c89=$ac_arg - fi --rm -f conftest.err conftest.$ac_objext -+rm -f core conftest.err conftest.$ac_objext -+ test "x$ac_cv_prog_cc_c89" != "xno" && break - done --rm -f conftest.$ac_ext conftest.$ac_objext -+rm -f conftest.$ac_ext - CC=$ac_save_CC - - fi -- --case "x$ac_cv_prog_cc_stdc" in -- x|xno) -- echo "$as_me:$LINENO: result: none needed" >&5 --echo "${ECHO_T}none needed" >&6 ;; -+# AC_CACHE_VAL -+case "x$ac_cv_prog_cc_c89" in -+ x) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -+$as_echo "none needed" >&6; } ;; -+ xno) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -+$as_echo "unsupported" >&6; } ;; - *) -- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 -- CC="$CC $ac_cv_prog_cc_stdc" ;; -+ CC="$CC $ac_cv_prog_cc_c89" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; - esac -+if test "x$ac_cv_prog_cc_c89" != xno; then : - --# Some people use a C++ compiler to compile C. Since we use `exit', --# in C++ we need to declare it. In case someone uses the same compiler --# for both compiling C and C++ we need to have the C++ compiler decide --# the declaration of exit, since it's the most demanding environment. --cat >conftest.$ac_ext <<_ACEOF --#ifndef __cplusplus -- choke me --#endif --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- for ac_declaration in \ -- '' \ -- 'extern "C" void std::exit (int) throw (); using std::exit;' \ -- 'extern "C" void std::exit (int); using std::exit;' \ -- 'extern "C" void exit (int) throw ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_declaration --#include --int --main () --{ --exit (42); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --continue --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_declaration --int --main () --{ --exit (42); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --done --rm -f conftest* --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h - fi - --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - --ac_ext=cc -+ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test -n "$ac_tool_prefix"; then -- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC -+if test -z "$CXX"; then -+ if test -n "$CCC"; then -+ CXX=$CCC -+ else -+ if test -n "$ac_tool_prefix"; then -+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CXX+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_CXX+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -@@ -2457,39 +3436,41 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - CXX=$ac_cv_prog_CXX - if test -n "$CXX"; then -- echo "$as_me:$LINENO: result: $CXX" >&5 --echo "${ECHO_T}$CXX" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -+$as_echo "$CXX" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - test -n "$CXX" && break - done - fi - if test -z "$CXX"; then - ac_ct_CXX=$CXX -- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC -+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_CXX+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -@@ -2499,64 +3480,77 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CXX="$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CXX=$ac_cv_prog_ac_ct_CXX - if test -n "$ac_ct_CXX"; then -- echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 --echo "${ECHO_T}$ac_ct_CXX" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -+$as_echo "$ac_ct_CXX" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - test -n "$ac_ct_CXX" && break - done --test -n "$ac_ct_CXX" || ac_ct_CXX="g++" - -- CXX=$ac_ct_CXX -+ if test "x$ac_ct_CXX" = x; then -+ CXX="g++" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ CXX=$ac_ct_CXX -+ fi - fi - -- -+ fi -+fi - # Provide some information about the compiler. --echo "$as_me:$LINENO:" \ -- "checking for C++ compiler version" >&5 --ac_compiler=`set X $ac_compile; echo $2` --{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 -- (eval $ac_compiler --version &5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 -- (eval $ac_compiler -v &5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 -- (eval $ac_compiler -V &5) 2>&5 -+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 -+set X $ac_compile -+ac_compiler=$2 -+for ac_option in --version -v -V -qversion; do -+ { { ac_try="$ac_compiler $ac_option >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } -+ if test -s conftest.err; then -+ sed '10a\ -+... rest of stderr output deleted ... -+ 10q' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ fi -+ rm -f conftest.er1 conftest.err -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+done - --echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 --if test "${ac_cv_cxx_compiler_gnu+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 -+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -+if ${ac_cv_cxx_compiler_gnu+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2570,55 +3564,34 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_cxx_try_compile "$LINENO"; then : - ac_compiler_gnu=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_compiler_gnu=no -+ ac_compiler_gnu=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - - fi --echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 --GXX=`test $ac_compiler_gnu = yes && echo yes` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -+if test $ac_compiler_gnu = yes; then -+ GXX=yes -+else -+ GXX= -+fi - ac_test_CXXFLAGS=${CXXFLAGS+set} - ac_save_CXXFLAGS=$CXXFLAGS --CXXFLAGS="-g" --echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 --echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 --if test "${ac_cv_prog_cxx_g+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 -+$as_echo_n "checking whether $CXX accepts -g... " >&6; } -+if ${ac_cv_prog_cxx_g+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag -+ ac_cxx_werror_flag=yes -+ ac_cv_prog_cxx_g=no -+ CXXFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2629,160 +3602,64 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_prog_cxx_g=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_prog_cxx_g=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 --echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 --if test "$ac_test_CXXFLAGS" = set; then -- CXXFLAGS=$ac_save_CXXFLAGS --elif test $ac_cv_prog_cxx_g = yes; then -- if test "$GXX" = yes; then -- CXXFLAGS="-g -O2" -- else -- CXXFLAGS="-g" -- fi --else -- if test "$GXX" = yes; then -- CXXFLAGS="-O2" -- else -- CXXFLAGS= -- fi --fi --for ac_declaration in \ -- '' \ -- 'extern "C" void std::exit (int) throw (); using std::exit;' \ -- 'extern "C" void std::exit (int); using std::exit;' \ -- 'extern "C" void exit (int) throw ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ CXXFLAGS="" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --$ac_declaration --#include -+ - int - main () - { --exit (42); -+ - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_cxx_try_compile "$LINENO"; then : - --continue --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+else -+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag -+ CXXFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --$ac_declaration -+ - int - main () - { --exit (42); -+ - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -+if ac_fn_cxx_try_compile "$LINENO"; then : -+ ac_cv_prog_cxx_g=yes - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --done --rm -f conftest* --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -+$as_echo "$ac_cv_prog_cxx_g" >&6; } -+if test "$ac_test_CXXFLAGS" = set; then -+ CXXFLAGS=$ac_save_CXXFLAGS -+elif test $ac_cv_prog_cxx_g = yes; then -+ if test "$GXX" = yes; then -+ CXXFLAGS="-g -O2" -+ else -+ CXXFLAGS="-g" -+ fi -+else -+ if test "$GXX" = yes; then -+ CXXFLAGS="-O2" -+ else -+ CXXFLAGS= -+ fi - fi -- - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -2792,10 +3669,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. - set dummy ${ac_tool_prefix}ranlib; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_RANLIB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_RANLIB+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -@@ -2805,35 +3682,37 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - RANLIB=$ac_cv_prog_RANLIB - if test -n "$RANLIB"; then -- echo "$as_me:$LINENO: result: $RANLIB" >&5 --echo "${ECHO_T}$RANLIB" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -+$as_echo "$RANLIB" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -@@ -2843,28 +3722,38 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_RANLIB="ranlib" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - -- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" - fi - fi - ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB - if test -n "$ac_ct_RANLIB"; then -- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 --echo "${ECHO_T}$ac_ct_RANLIB" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -+$as_echo "$ac_ct_RANLIB" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -- RANLIB=$ac_ct_RANLIB -+ if test "x$ac_ct_RANLIB" = x; then -+ RANLIB=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ RANLIB=$ac_ct_RANLIB -+ fi - else - RANLIB="$ac_cv_prog_RANLIB" - fi -@@ -2874,15 +3763,15 @@ ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu --echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 --echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -+$as_echo_n "checking how to run the C preprocessor... " >&6; } - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= - fi - if test -z "$CPP"; then -- if test "${ac_cv_prog_CPP+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ if ${ac_cv_prog_CPP+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" -@@ -2896,11 +3785,7 @@ do - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #ifdef __STDC__ - # include -@@ -2909,78 +3794,34 @@ cat >>conftest.$ac_ext <<_ACEOF - #endif - Syntax error - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_cpp "$LINENO"; then : - -+else - # Broken: fails on valid input. - continue - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - -- # OK, works on sane cases. Now check whether non-existent headers -+ # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. - continue - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- - # Passes both tests. - ac_preproc_ok=: - break - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - - done - # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -+rm -f conftest.i conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then : - break - fi - -@@ -2992,8 +3833,8 @@ fi - else - ac_cv_prog_CPP=$CPP - fi --echo "$as_me:$LINENO: result: $CPP" >&5 --echo "${ECHO_T}$CPP" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -+$as_echo "$CPP" >&6; } - ac_preproc_ok=false - for ac_c_preproc_warn_flag in '' yes - do -@@ -3003,11 +3844,7 @@ do - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #ifdef __STDC__ - # include -@@ -3016,85 +3853,40 @@ cat >>conftest.$ac_ext <<_ACEOF - #endif - Syntax error - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_cpp "$LINENO"; then : - -+else - # Broken: fails on valid input. - continue - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - -- # OK, works on sane cases. Now check whether non-existent headers -+ # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. - continue - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- - # Passes both tests. - ac_preproc_ok=: - break - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - - done - # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -- : -+rm -f conftest.i conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then : -+ - else -- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check --See \`config.log' for more details." >&5 --echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -+See \`config.log' for more details" "$LINENO" 5; } - fi - - ac_ext=c -@@ -3104,41 +3896,39 @@ ac_link='$CC -o conftest$ac_exeext $CFLA - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - --{ echo "$as_me:$LINENO: Building for $host_os" >&5 --echo "$as_me: Building for $host_os" >&6;} -+{ $as_echo "$as_me:${as_lineno-$LINENO}: Building for $host_os" >&5 -+$as_echo "$as_me: Building for $host_os" >&6;} - WXERL_CAN_BUILD_DRIVER=true - - - MIXED_CYGWIN=no - MIXED_MSYS=no - --echo "$as_me:$LINENO: checking for mixed cygwin or msys and native VC++ environment" >&5 --echo $ECHO_N "checking for mixed cygwin or msys and native VC++ environment... $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mixed cygwin or msys and native VC++ environment" >&5 -+$as_echo_n "checking for mixed cygwin or msys and native VC++ environment... " >&6; } - if test "X$host" = "Xwin32" -a "x$GCC" != "xyes"; then - if test -x /usr/bin/msys-?.0.dll; then - CFLAGS="$CFLAGS -O2" - MIXED_MSYS=yes -- echo "$as_me:$LINENO: result: MSYS and VC" >&5 --echo "${ECHO_T}MSYS and VC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: MSYS and VC" >&5 -+$as_echo "MSYS and VC" >&6; } - MIXED_MSYS_VC=yes - CPPFLAGS="$CPPFLAGS -DERTS_MIXED_MSYS_VC" - elif test -x /usr/bin/cygpath; then - CFLAGS="$CFLAGS -O2" - MIXED_CYGWIN=yes -- echo "$as_me:$LINENO: result: Cygwin and VC" >&5 --echo "${ECHO_T}Cygwin and VC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Cygwin and VC" >&5 -+$as_echo "Cygwin and VC" >&6; } - MIXED_CYGWIN_VC=yes - CPPFLAGS="$CPPFLAGS -DERTS_MIXED_CYGWIN_VC" - else -- echo "$as_me:$LINENO: result: undeterminable" >&5 --echo "${ECHO_T}undeterminable" >&6 -- { { echo "$as_me:$LINENO: error: Seems to be mixed windows but not with cygwin" >&5 --echo "$as_me: error: Seems to be mixed windows but not with cygwin" >&2;} -- { (exit cannot handle this!); exit cannot handle this!; }; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: undeterminable" >&5 -+$as_echo "undeterminable" >&6; } -+ as_fn_error cannot handle this! "Seems to be mixed windows but not with cygwin" "$LINENO" 5 - fi - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - MIXED_CYGWIN_VC=no - MIXED_MSYS_VC=no - fi -@@ -3153,26 +3943,24 @@ fi - - - if test "x$MIXED_MSYS" != "xyes"; then -- echo "$as_me:$LINENO: checking for mixed cygwin and native MinGW environment" >&5 --echo $ECHO_N "checking for mixed cygwin and native MinGW environment... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mixed cygwin and native MinGW environment" >&5 -+$as_echo_n "checking for mixed cygwin and native MinGW environment... " >&6; } - if test "X$host" = "Xwin32" -a "x$GCC" = x"yes"; then - if test -x /usr/bin/cygpath; then - CFLAGS="$CFLAGS -O2" - MIXED_CYGWIN=yes -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - MIXED_CYGWIN_MINGW=yes - CPPFLAGS="$CPPFLAGS -DERTS_MIXED_CYGWIN_MINGW" - else -- echo "$as_me:$LINENO: result: undeterminable" >&5 --echo "${ECHO_T}undeterminable" >&6 -- { { echo "$as_me:$LINENO: error: Seems to be mixed windows but not with cygwin" >&5 --echo "$as_me: error: Seems to be mixed windows but not with cygwin" >&2;} -- { (exit cannot handle this!); exit cannot handle this!; }; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: undeterminable" >&5 -+$as_echo "undeterminable" >&6; } -+ as_fn_error cannot handle this! "Seems to be mixed windows but not with cygwin" "$LINENO" 5 - fi - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - MIXED_CYGWIN_MINGW=no - fi - else -@@ -3180,26 +3968,26 @@ else - fi - - --echo "$as_me:$LINENO: checking if we mix cygwin with any native compiler" >&5 --echo $ECHO_N "checking if we mix cygwin with any native compiler... $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we mix cygwin with any native compiler" >&5 -+$as_echo_n "checking if we mix cygwin with any native compiler... " >&6; } - if test "X$MIXED_CYGWIN" = "Xyes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - - - --echo "$as_me:$LINENO: checking if we mix msys with another native compiler" >&5 --echo $ECHO_N "checking if we mix msys with another native compiler... $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we mix msys with another native compiler" >&5 -+$as_echo_n "checking if we mix msys with another native compiler... " >&6; } - if test "X$MIXED_MSYS" = "Xyes" ; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -3213,31 +4001,142 @@ fi - - - --echo "$as_me:$LINENO: checking for egrep" >&5 --echo $ECHO_N "checking for egrep... $ECHO_C" >&6 --if test "${ac_cv_prog_egrep+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -+$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -+if ${ac_cv_path_GREP+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- if echo a | (grep -E '(a|b)') >/dev/null 2>&1 -- then ac_cv_prog_egrep='grep -E' -- else ac_cv_prog_egrep='egrep' -+ if test -z "$GREP"; then -+ ac_path_GREP_found=false -+ # Loop through the user's path and test for each of PROGNAME-LIST -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in grep ggrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" -+ as_fn_executable_p "$ac_path_GREP" || continue -+# Check for GNU ac_path_GREP and select it if it is found. -+ # Check for GNU $ac_path_GREP -+case `"$ac_path_GREP" --version 2>&1` in -+*GNU*) -+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -+*) -+ ac_count=0 -+ $as_echo_n 0123456789 >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ $as_echo 'GREP' >> "conftest.nl" -+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ as_fn_arith $ac_count + 1 && ac_count=$as_val -+ if test $ac_count -gt ${ac_path_GREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_GREP="$ac_path_GREP" -+ ac_path_GREP_max=$ac_count -+ fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+esac -+ -+ $ac_path_GREP_found && break 3 -+ done -+ done -+ done -+IFS=$as_save_IFS -+ if test -z "$ac_cv_path_GREP"; then -+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 -+ fi -+else -+ ac_cv_path_GREP=$GREP -+fi -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -+$as_echo "$ac_cv_path_GREP" >&6; } -+ GREP="$ac_cv_path_GREP" -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -+$as_echo_n "checking for egrep... " >&6; } -+if ${ac_cv_path_EGREP+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 -+ then ac_cv_path_EGREP="$GREP -E" -+ else -+ if test -z "$EGREP"; then -+ ac_path_EGREP_found=false -+ # Loop through the user's path and test for each of PROGNAME-LIST -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in egrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" -+ as_fn_executable_p "$ac_path_EGREP" || continue -+# Check for GNU ac_path_EGREP and select it if it is found. -+ # Check for GNU $ac_path_EGREP -+case `"$ac_path_EGREP" --version 2>&1` in -+*GNU*) -+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -+*) -+ ac_count=0 -+ $as_echo_n 0123456789 >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ $as_echo 'EGREP' >> "conftest.nl" -+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ as_fn_arith $ac_count + 1 && ac_count=$as_val -+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_EGREP="$ac_path_EGREP" -+ ac_path_EGREP_max=$ac_count - fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+esac -+ -+ $ac_path_EGREP_found && break 3 -+ done -+ done -+ done -+IFS=$as_save_IFS -+ if test -z "$ac_cv_path_EGREP"; then -+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 -+ fi -+else -+ ac_cv_path_EGREP=$EGREP - fi --echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 --echo "${ECHO_T}$ac_cv_prog_egrep" >&6 -- EGREP=$ac_cv_prog_egrep -+ -+ fi -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -+$as_echo "$ac_cv_path_EGREP" >&6; } -+ EGREP="$ac_cv_path_EGREP" - - --echo "$as_me:$LINENO: checking for ANSI C header files" >&5 --echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 --if test "${ac_cv_header_stdc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -+$as_echo_n "checking for ANSI C header files... " >&6; } -+if ${ac_cv_header_stdc+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - #include -@@ -3252,51 +4151,23 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_header_stdc=no -+ ac_cv_header_stdc=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "memchr" >/dev/null 2>&1; then -- : -+ $EGREP "memchr" >/dev/null 2>&1; then : -+ - else - ac_cv_header_stdc=no - fi -@@ -3306,18 +4177,14 @@ fi - - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "free" >/dev/null 2>&1; then -- : -+ $EGREP "free" >/dev/null 2>&1; then : -+ - else - ac_cv_header_stdc=no - fi -@@ -3327,16 +4194,13 @@ fi - - if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -- if test "$cross_compiling" = yes; then -+ if test "$cross_compiling" = yes; then : - : - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include -+#include - #if ((' ' & 0x0FF) == 0x020) - # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') - # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -@@ -3356,109 +4220,39 @@ main () - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) -- exit(2); -- exit (0); -+ return 2; -+ return 0; - } - _ACEOF --rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_run "$LINENO"; then : - --( exit $ac_status ) --ac_cv_header_stdc=no -+else -+ ac_cv_header_stdc=no - fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext - fi -+ - fi - fi --echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 --echo "${ECHO_T}$ac_cv_header_stdc" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -+$as_echo "$ac_cv_header_stdc" >&6; } - if test $ac_cv_header_stdc = yes; then - --cat >>confdefs.h <<\_ACEOF --#define STDC_HEADERS 1 --_ACEOF -+$as_echo "#define STDC_HEADERS 1" >>confdefs.h - - fi - - # On IRIX 5.3, sys/types and inttypes.h are conflicting. -- -- -- -- -- -- -- -- -- - for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default -- --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- eval "$as_ac_Header=yes" --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --eval "$as_ac_Header=no" --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -+" -+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -3466,415 +4260,34 @@ fi - done - - --echo "$as_me:$LINENO: checking for void *" >&5 --echo $ECHO_N "checking for void *... $ECHO_C" >&6 --if test "${ac_cv_type_void_p+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --int --main () --{ --if ((void * *) 0) -- return 0; --if (sizeof (void *)) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_void_p=yes -+# The cast to long int works around a bug in the HP C Compiler -+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+# This bug is HP SR number 8606223364. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5 -+$as_echo_n "checking size of void *... " >&6; } -+if ${ac_cv_sizeof_void_p+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_void_p=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&5 --echo "${ECHO_T}$ac_cv_type_void_p" >&6 -+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then : - --echo "$as_me:$LINENO: checking size of void *" >&5 --echo $ECHO_N "checking size of void *... $ECHO_C" >&6 --if test "${ac_cv_sizeof_void_p+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test "$ac_cv_type_void_p" = yes; then -- # The cast to unsigned long works around a bug in the HP C Compiler -- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -- # This bug is HP SR number 8606223364. -- if test "$cross_compiling" = yes; then -- # Depending upon the size, compute the lo and hi bounds. --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --int --main () --{ --static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= 0)]; --test_array [0] = 0 -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_lo=0 ac_mid=0 -- while :; do -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --int --main () --{ --static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)]; --test_array [0] = 0 -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_hi=$ac_mid; break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_lo=`expr $ac_mid + 1` -- if test $ac_lo -le $ac_mid; then -- ac_lo= ac_hi= -- break -- fi -- ac_mid=`expr 2 '*' $ac_mid + 1` --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- done --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --int --main () --{ --static int test_array [1 - 2 * !(((long) (sizeof (void *))) < 0)]; --test_array [0] = 0 -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_hi=-1 ac_mid=-1 -- while :; do -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --int --main () --{ --static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= $ac_mid)]; --test_array [0] = 0 -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_lo=$ac_mid; break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_hi=`expr '(' $ac_mid ')' - 1` -- if test $ac_mid -le $ac_hi; then -- ac_lo= ac_hi= -- break -- fi -- ac_mid=`expr 2 '*' $ac_mid` --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- done --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_lo= ac_hi= --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error 77 "cannot compute sizeof (void *) -+See \`config.log' for more details" "$LINENO" 5; } -+ else -+ ac_cv_sizeof_void_p=0 -+ fi - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --# Binary search between lo and hi bounds. --while test "x$ac_lo" != "x$ac_hi"; do -- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --int --main () --{ --static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)]; --test_array [0] = 0 - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_hi=$ac_mid --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_lo=`expr '(' $ac_mid ')' + 1` - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --done --case $ac_lo in --?*) ac_cv_sizeof_void_p=$ac_lo;; --'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77 --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute sizeof (void *), 77 --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } ;; --esac --else -- if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --long longval () { return (long) (sizeof (void *)); } --unsigned long ulongval () { return (long) (sizeof (void *)); } --#include --#include --int --main () --{ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5 -+$as_echo "$ac_cv_sizeof_void_p" >&6; } - -- FILE *f = fopen ("conftest.val", "w"); -- if (! f) -- exit (1); -- if (((long) (sizeof (void *))) < 0) -- { -- long i = longval (); -- if (i != ((long) (sizeof (void *)))) -- exit (1); -- fprintf (f, "%ld\n", i); -- } -- else -- { -- unsigned long i = ulongval (); -- if (i != ((long) (sizeof (void *)))) -- exit (1); -- fprintf (f, "%lu\n", i); -- } -- exit (ferror (f) || fclose (f) != 0); - -- ; -- return 0; --} --_ACEOF --rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_sizeof_void_p=`cat conftest.val` --else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - --( exit $ac_status ) --{ { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77 --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute sizeof (void *), 77 --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --fi --fi --rm -f conftest.val --else -- ac_cv_sizeof_void_p=0 --fi --fi --echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5 --echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6 - cat >>confdefs.h <<_ACEOF - #define SIZEOF_VOID_P $ac_cv_sizeof_void_p - _ACEOF -@@ -3888,21 +4301,17 @@ OBJC_CFLAGS="" - CXXFLAGS="" - case $host_os in - darwin*) -- echo "$as_me:$LINENO: checking Checking wxWidgets for min version:" >&5 --echo $ECHO_N "checking Checking wxWidgets for min version:... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Checking wxWidgets for min version:" >&5 -+$as_echo_n "checking Checking wxWidgets for min version:... " >&6; } - WX_CC=`wx-config --cc` - MAC_MIN=`echo "$WX_CC" | sed 's/^[^ ]*\ *//'` -- echo "$as_me:$LINENO: result: $MAC_MIN" >&5 --echo "${ECHO_T}$MAC_MIN" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAC_MIN" >&5 -+$as_echo "$MAC_MIN" >&6; } - -- echo "$as_me:$LINENO: checking if compiler accepts -ObjC" >&5 --echo $ECHO_N "checking if compiler accepts -ObjC... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -ObjC" >&5 -+$as_echo_n "checking if compiler accepts -ObjC... " >&6; } - CFLAGS="$CFLAGS -ObjC" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -3913,45 +4322,21 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - accept_objc_flag=true - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --accept_objc_flag=false -+ accept_objc_flag=false - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test "X$accept_objc_flag" = "Xtrue"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - C_ONLY_FLAGS="-ObjC" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -- echo "$as_me:$LINENO: checking for a Cocoa compliant Objective C compiler" >&5 --echo $ECHO_N "checking for a Cocoa compliant Objective C compiler... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Cocoa compliant Objective C compiler" >&5 -+$as_echo_n "checking for a Cocoa compliant Objective C compiler... " >&6; } - SEARCHFOR="" - SEARCHFORXX="" - save_IFS=$IFS -@@ -3980,22 +4365,20 @@ echo $ECHO_N "checking for a Cocoa compl - done - IFS=$save_IFS - if test X$APPLE_CC = X -o X$APPLE_CXX = X; then -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then -- { { echo "$as_me:$LINENO: error: Can not find compiler to compile Cocoa applications" >&5 --echo "$as_me: error: Can not find compiler to compile Cocoa applications" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "Can not find compiler to compile Cocoa applications" "$LINENO" 5 - else - echo "Can not find compiler to compile Cocoa applications" > ./CONF_INFO - WXERL_CAN_BUILD_DRIVER=false -- { echo "$as_me:$LINENO: WARNING: Can not find compiler to compile Cocoa applications" >&5 --echo "$as_me: WARNING: Can not find compiler to compile Cocoa applications" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can not find compiler to compile Cocoa applications" >&5 -+$as_echo "$as_me: WARNING: Can not find compiler to compile Cocoa applications" >&2;} - fi - WXERL_CAN_BUILD_DRIVER=false - else -- echo "$as_me:$LINENO: result: $APPLE_CC ($APPLE_CXX)" >&5 --echo "${ECHO_T}$APPLE_CC ($APPLE_CXX)" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $APPLE_CC ($APPLE_CXX)" >&5 -+$as_echo "$APPLE_CC ($APPLE_CXX)" >&6; } - CC=$APPLE_CC - CXX=$APPLE_CXX - #CXXFLAGS="-x c++ $CXXFLAGS" -@@ -4009,8 +4392,8 @@ echo "${ECHO_T}$APPLE_CC ($APPLE_CXX)" > - mingw32) - CFLAGS="$CFLAGS -DWIN32 -DWINVER=0x0600 -D_WINDOWS -D_UNICODE -DUNICODE" - CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0600" -- { echo "$as_me:$LINENO: WARNING: Reverting to 32-bit time_t" >&5 --echo "$as_me: WARNING: Reverting to 32-bit time_t" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Reverting to 32-bit time_t" >&5 -+$as_echo "$as_me: WARNING: Reverting to 32-bit time_t" >&2;} - CPPFLAGS="$CPPFLAGS -D_USE_32BIT_TIME_T" - ;; - win32) -@@ -4072,297 +4455,21 @@ esac - - - if test X"$host_os" != X"win32" ; then -- --for ac_header in GL/gl.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in GL/gl.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default" -+if test "x$ac_cv_header_GL_gl_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- --else -- --for ac_header in OpenGL/gl.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> -+#define HAVE_GL_GL_H 1 - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 - --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in OpenGL/gl.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "OpenGL/gl.h" "ac_cv_header_OpenGL_gl_h" "$ac_includes_default" -+if test "x$ac_cv_header_OpenGL_gl_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_OPENGL_GL_H 1 - _ACEOF - - fi -@@ -4377,154 +4484,16 @@ done - test X"$ac_cv_header_OpenGL_gl_h" != Xyes - then - saved_CPPFLAGS="$CPPFLAGS" -- { echo "$as_me:$LINENO: Checking for OpenGL headers in /usr/X11R6" >&5 --echo "$as_me: Checking for OpenGL headers in /usr/X11R6" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: Checking for OpenGL headers in /usr/X11R6" >&5 -+$as_echo "$as_me: Checking for OpenGL headers in /usr/X11R6" >&6;} - CPPFLAGS="-isystem /usr/X11R6/include $CPPFLAGS" - $as_unset ac_cv_header_GL_gl_h -- --for ac_header in GL/gl.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in GL/gl.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default" -+if test "x$ac_cv_header_GL_gl_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_GL_GL_H 1 - _ACEOF - - fi -@@ -4532,154 +4501,16 @@ fi - done - - if test X"$ac_cv_header_GL_gl_h" != Xyes ; then -- { echo "$as_me:$LINENO: Checking for OpenGL headers in /usr/local" >&5 --echo "$as_me: Checking for OpenGL headers in /usr/local" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: Checking for OpenGL headers in /usr/local" >&5 -+$as_echo "$as_me: Checking for OpenGL headers in /usr/local" >&6;} - CPPFLAGS="-isystem /usr/local/include $saved_CPPFLAGS" - $as_unset ac_cv_header_GL_gl_h -- --for ac_header in GL/gl.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in GL/gl.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default" -+if test "x$ac_cv_header_GL_gl_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_GL_GL_H 1 - _ACEOF - - fi -@@ -4687,8 +4518,8 @@ fi - done - - if test X"$ac_cv_header_GL_gl_h" != Xyes ; then -- { echo "$as_me:$LINENO: WARNING: No OpenGL headers found, wx will NOT be usable" >&5 --echo "$as_me: WARNING: No OpenGL headers found, wx will NOT be usable" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No OpenGL headers found, wx will NOT be usable" >&5 -+$as_echo "$as_me: WARNING: No OpenGL headers found, wx will NOT be usable" >&2;} - CPPFLAGS="$saved_CPPFLAGS" - else - GL_LIBS="-L/usr/local/lib $GL_LIBS" -@@ -4698,61 +4529,13 @@ echo "$as_me: WARNING: No OpenGL headers - fi - fi - else -- --for ac_header in gl/gl.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include -- --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- eval "$as_ac_Header=yes" --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --eval "$as_ac_Header=no" --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in gl/gl.h -+do : -+ ac_fn_c_check_header_compile "$LINENO" "gl/gl.h" "ac_cv_header_gl_gl_h" "#include -+" -+if test "x$ac_cv_header_gl_gl_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_GL_GL_H 1 - _ACEOF - - fi -@@ -4762,297 +4545,21 @@ done - fi - - if test X"$host_os" != X"win32" ; then -- --for ac_header in GL/glu.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in GL/glu.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "GL/glu.h" "ac_cv_header_GL_glu_h" "$ac_includes_default" -+if test "x$ac_cv_header_GL_glu_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_GL_GLU_H 1 - _ACEOF - - else -- --for ac_header in OpenGL/glu.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in OpenGL/glu.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "OpenGL/glu.h" "ac_cv_header_OpenGL_glu_h" "$ac_includes_default" -+if test "x$ac_cv_header_OpenGL_glu_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_OPENGL_GLU_H 1 - _ACEOF - - fi -@@ -5066,65 +4573,17 @@ done - if test X"$ac_cv_header_GL_glu_h" != Xyes && - test X"$ac_cv_header_OpenGL_glu_h" != Xyes - then -- { echo "$as_me:$LINENO: WARNING: No GLU headers found, wx will NOT be usable" >&5 --echo "$as_me: WARNING: No GLU headers found, wx will NOT be usable" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No GLU headers found, wx will NOT be usable" >&5 -+$as_echo "$as_me: WARNING: No GLU headers found, wx will NOT be usable" >&2;} - fi - else -- --for ac_header in gl/glu.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include -- --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- eval "$as_ac_Header=yes" --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --eval "$as_ac_Header=no" --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in gl/glu.h -+do : -+ ac_fn_c_check_header_compile "$LINENO" "gl/glu.h" "ac_cv_header_gl_glu_h" "#include -+" -+if test "x$ac_cv_header_gl_glu_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_GL_GLU_H 1 - _ACEOF - - fi -@@ -5146,43 +4605,39 @@ CFLAGS="$CFLAGS $CPPFLAGS $C_ONLY_FLAGS" - - - if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then -- echo "$as_me:$LINENO: checking for erl" >&5 --echo $ECHO_N "checking for erl... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for erl" >&5 -+$as_echo_n "checking for erl... " >&6; } - if test X$ERL != X; then -- echo "$as_me:$LINENO: result: yes; using $ERL" >&5 --echo "${ECHO_T}yes; using $ERL" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes; using $ERL" >&5 -+$as_echo "yes; using $ERL" >&6; } - else - type erl >/dev/null 2>&1 - if test $? -eq 0 ; then - ERL=erl -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - else -- { { echo "$as_me:$LINENO: error: Cannot find erl in path" >&5 --echo "$as_me: error: Cannot find erl in path" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "Cannot find erl in path" "$LINENO" 5 - fi - fi -- echo "$as_me:$LINENO: checking for erlc" >&5 --echo $ECHO_N "checking for erlc... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for erlc" >&5 -+$as_echo_n "checking for erlc... " >&6; } - if test X$ERLC != X; then -- echo "$as_me:$LINENO: result: yes; using $ERLC" >&5 --echo "${ECHO_T}yes; using $ERLC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes; using $ERLC" >&5 -+$as_echo "yes; using $ERLC" >&6; } - else - type erlc >/dev/null 2>&1 - if test $? -eq 0 ; then - ERLC=erlc -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - else -- { { echo "$as_me:$LINENO: error: Cannot find erlc in path" >&5 --echo "$as_me: error: Cannot find erlc in path" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "Cannot find erlc in path" "$LINENO" 5 - fi - fi - ERLANG_ROOT_DIR=`erl -noshell -eval 'io:format("~s~n",[code:root_dir()])' -s erlang halt` -- { echo "$as_me:$LINENO: ERL ROOT DIR: $ERLANG_ROOT_DIR" >&5 --echo "$as_me: ERL ROOT DIR: $ERLANG_ROOT_DIR" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: ERL ROOT DIR: $ERLANG_ROOT_DIR" >&5 -+$as_echo "$as_me: ERL ROOT DIR: $ERLANG_ROOT_DIR" >&6;} - ERLWX_VSN=`grep WX_VSN $srcdir/vsn.mk | sed 's/^.*= *//'` - else - ERLC=erlc -@@ -5272,41 +4727,41 @@ elif test X"$MIXED_CYGWIN_VC" = X"no" - - - - --# Check whether --with-wxdir or --without-wxdir was given. --if test "${with_wxdir+set}" = set; then -- withval="$with_wxdir" -- wx_config_name="$withval/wx-config" -+# Check whether --with-wxdir was given. -+if test "${with_wxdir+set}" = set; then : -+ withval=$with_wxdir; wx_config_name="$withval/wx-config" - wx_config_args="--inplace" --fi; -+fi - --# Check whether --with-wx-config or --without-wx-config was given. --if test "${with_wx_config+set}" = set; then -- withval="$with_wx_config" -- wx_config_name="$withval" --fi; - --# Check whether --with-wx-prefix or --without-wx-prefix was given. --if test "${with_wx_prefix+set}" = set; then -- withval="$with_wx_prefix" -- wx_config_prefix="$withval" -+# Check whether --with-wx-config was given. -+if test "${with_wx_config+set}" = set; then : -+ withval=$with_wx_config; wx_config_name="$withval" -+fi -+ -+ -+# Check whether --with-wx-prefix was given. -+if test "${with_wx_prefix+set}" = set; then : -+ withval=$with_wx_prefix; wx_config_prefix="$withval" - else - wx_config_prefix="" --fi; -+fi - --# Check whether --with-wx-exec-prefix or --without-wx-exec-prefix was given. --if test "${with_wx_exec_prefix+set}" = set; then -- withval="$with_wx_exec_prefix" -- wx_config_exec_prefix="$withval" -+ -+# Check whether --with-wx-exec-prefix was given. -+if test "${with_wx_exec_prefix+set}" = set; then : -+ withval=$with_wx_exec_prefix; wx_config_exec_prefix="$withval" - else - wx_config_exec_prefix="" --fi; -+fi -+ - - reqwx=2.8.4 - # Try to find debug libs first - # wxelibs=core,base,gl,aui,adv - -- echo "$as_me:$LINENO: checking for debug build of wxWidgets" >&5 --echo $ECHO_N "checking for debug build of wxWidgets... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for debug build of wxWidgets" >&5 -+$as_echo_n "checking for debug build of wxWidgets... " >&6; } - - - -@@ -5331,18 +4786,18 @@ echo $ECHO_N "checking for debug build o - fi - - if test -x "$WX_CONFIG_NAME" ; then -- echo "$as_me:$LINENO: checking for wx-config" >&5 --echo $ECHO_N "checking for wx-config... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wx-config" >&5 -+$as_echo_n "checking for wx-config... " >&6; } - WX_CONFIG_PATH="$WX_CONFIG_NAME" -- echo "$as_me:$LINENO: result: $WX_CONFIG_PATH" >&5 --echo "${ECHO_T}$WX_CONFIG_PATH" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WX_CONFIG_PATH" >&5 -+$as_echo "$WX_CONFIG_PATH" >&6; } - else - # Extract the first word of "$WX_CONFIG_NAME", so it can be a program name with args. - set dummy $WX_CONFIG_NAME; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_path_WX_CONFIG_PATH+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_path_WX_CONFIG_PATH+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - case $WX_CONFIG_PATH in - [\\/]* | ?:[\\/]*) -@@ -5355,29 +4810,30 @@ for as_dir in $as_dummy - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_WX_CONFIG_PATH="$as_dir/$ac_word$ac_exec_ext" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - test -z "$ac_cv_path_WX_CONFIG_PATH" && ac_cv_path_WX_CONFIG_PATH="no" - ;; - esac - fi - WX_CONFIG_PATH=$ac_cv_path_WX_CONFIG_PATH -- - if test -n "$WX_CONFIG_PATH"; then -- echo "$as_me:$LINENO: result: $WX_CONFIG_PATH" >&5 --echo "${ECHO_T}$WX_CONFIG_PATH" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WX_CONFIG_PATH" >&5 -+$as_echo "$WX_CONFIG_PATH" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - - if test "$WX_CONFIG_PATH" != "no" ; then -@@ -5385,11 +4841,11 @@ fi - - min_wx_version=$reqwx - if test -z "--unicode --debug=yes" ; then -- echo "$as_me:$LINENO: checking for wxWidgets version >= $min_wx_version" >&5 --echo $ECHO_N "checking for wxWidgets version >= $min_wx_version... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets version >= $min_wx_version" >&5 -+$as_echo_n "checking for wxWidgets version >= $min_wx_version... " >&6; } - else -- echo "$as_me:$LINENO: checking for wxWidgets version >= $min_wx_version (--unicode --debug=yes)" >&5 --echo $ECHO_N "checking for wxWidgets version >= $min_wx_version (--unicode --debug=yes)... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets version >= $min_wx_version (--unicode --debug=yes)" >&5 -+$as_echo_n "checking for wxWidgets version >= $min_wx_version (--unicode --debug=yes)... " >&6; } - fi - - WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args --unicode --debug=yes" -@@ -5431,19 +4887,19 @@ echo $ECHO_N "checking for wxWidgets ver - - - if test -n "$wx_ver_ok"; then -- echo "$as_me:$LINENO: result: yes (version $WX_VERSION)" >&5 --echo "${ECHO_T}yes (version $WX_VERSION)" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $WX_VERSION)" >&5 -+$as_echo "yes (version $WX_VERSION)" >&6; } - WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs stc,xrc,html,adv,xml,core,base,gl,aui` - -- echo "$as_me:$LINENO: checking for wxWidgets static library" >&5 --echo $ECHO_N "checking for wxWidgets static library... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets static library" >&5 -+$as_echo_n "checking for wxWidgets static library... " >&6; } - WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs stc,xrc,html,adv,xml,core,base,gl,aui 2>/dev/null` - if test "x$WX_LIBS_STATIC" = "x"; then -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - else -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - fi - - wx_has_cppflags="" -@@ -5500,11 +4956,11 @@ echo "${ECHO_T}yes" >&6 - else - - if test "x$WX_VERSION" = x; then -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - else -- echo "$as_me:$LINENO: result: no (version $WX_VERSION is not new enough)" >&5 --echo "${ECHO_T}no (version $WX_VERSION is not new enough)" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (version $WX_VERSION is not new enough)" >&5 -+$as_echo "no (version $WX_VERSION is not new enough)" >&6; } - fi - - WX_CFLAGS="" -@@ -5581,8 +5037,8 @@ echo "${ECHO_T}no (version $WX_VERSION i - - - -- echo "$as_me:$LINENO: checking for standard build of wxWidgets" >&5 --echo $ECHO_N "checking for standard build of wxWidgets... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for standard build of wxWidgets" >&5 -+$as_echo_n "checking for standard build of wxWidgets... " >&6; } - - - if test x${WX_CONFIG_NAME+set} != xset ; then -@@ -5606,18 +5062,18 @@ echo $ECHO_N "checking for standard buil - fi - - if test -x "$WX_CONFIG_NAME" ; then -- echo "$as_me:$LINENO: checking for wx-config" >&5 --echo $ECHO_N "checking for wx-config... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wx-config" >&5 -+$as_echo_n "checking for wx-config... " >&6; } - WX_CONFIG_PATH="$WX_CONFIG_NAME" -- echo "$as_me:$LINENO: result: $WX_CONFIG_PATH" >&5 --echo "${ECHO_T}$WX_CONFIG_PATH" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WX_CONFIG_PATH" >&5 -+$as_echo "$WX_CONFIG_PATH" >&6; } - else - # Extract the first word of "$WX_CONFIG_NAME", so it can be a program name with args. - set dummy $WX_CONFIG_NAME; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_path_WX_CONFIG_PATH+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_path_WX_CONFIG_PATH+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - case $WX_CONFIG_PATH in - [\\/]* | ?:[\\/]*) -@@ -5630,29 +5086,30 @@ for as_dir in $as_dummy - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_WX_CONFIG_PATH="$as_dir/$ac_word$ac_exec_ext" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - test -z "$ac_cv_path_WX_CONFIG_PATH" && ac_cv_path_WX_CONFIG_PATH="no" - ;; - esac - fi - WX_CONFIG_PATH=$ac_cv_path_WX_CONFIG_PATH -- - if test -n "$WX_CONFIG_PATH"; then -- echo "$as_me:$LINENO: result: $WX_CONFIG_PATH" >&5 --echo "${ECHO_T}$WX_CONFIG_PATH" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WX_CONFIG_PATH" >&5 -+$as_echo "$WX_CONFIG_PATH" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - - if test "$WX_CONFIG_PATH" != "no" ; then -@@ -5660,11 +5117,11 @@ fi - - min_wx_version=$reqwx - if test -z "--unicode --debug=no" ; then -- echo "$as_me:$LINENO: checking for wxWidgets version >= $min_wx_version" >&5 --echo $ECHO_N "checking for wxWidgets version >= $min_wx_version... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets version >= $min_wx_version" >&5 -+$as_echo_n "checking for wxWidgets version >= $min_wx_version... " >&6; } - else -- echo "$as_me:$LINENO: checking for wxWidgets version >= $min_wx_version (--unicode --debug=no)" >&5 --echo $ECHO_N "checking for wxWidgets version >= $min_wx_version (--unicode --debug=no)... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets version >= $min_wx_version (--unicode --debug=no)" >&5 -+$as_echo_n "checking for wxWidgets version >= $min_wx_version (--unicode --debug=no)... " >&6; } - fi - - WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args --unicode --debug=no" -@@ -5706,19 +5163,19 @@ echo $ECHO_N "checking for wxWidgets ver - - - if test -n "$wx_ver_ok"; then -- echo "$as_me:$LINENO: result: yes (version $WX_VERSION)" >&5 --echo "${ECHO_T}yes (version $WX_VERSION)" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $WX_VERSION)" >&5 -+$as_echo "yes (version $WX_VERSION)" >&6; } - WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs stc,xrc,html,adv,xml,core,base,gl,aui` - -- echo "$as_me:$LINENO: checking for wxWidgets static library" >&5 --echo $ECHO_N "checking for wxWidgets static library... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets static library" >&5 -+$as_echo_n "checking for wxWidgets static library... " >&6; } - WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs stc,xrc,html,adv,xml,core,base,gl,aui 2>/dev/null` - if test "x$WX_LIBS_STATIC" = "x"; then -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - else -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - fi - - wx_has_cppflags="" -@@ -5775,11 +5232,11 @@ echo "${ECHO_T}yes" >&6 - else - - if test "x$WX_VERSION" = x; then -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - else -- echo "$as_me:$LINENO: result: no (version $WX_VERSION is not new enough)" >&5 --echo "${ECHO_T}no (version $WX_VERSION is not new enough)" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (version $WX_VERSION is not new enough)" >&5 -+$as_echo "no (version $WX_VERSION is not new enough)" >&6; } - fi - - WX_CFLAGS="" -@@ -5878,27 +5335,18 @@ echo "${ECHO_T}no (version $WX_VERSION i - - if test "$wxWin" != 1; then - if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then -- { { echo "$as_me:$LINENO: error: -- wxWidgets must be installed on your system. -- -- Please check that wx-config is in path, the directory -- where wxWidgets libraries are installed (returned by -- 'wx-config --libs' or 'wx-config --static --libs' command) -- is in LD_LIBRARY_PATH or equivalent variable and -- wxWidgets version is $reqwx or above." >&5 --echo "$as_me: error: -+ as_fn_error $? " - wxWidgets must be installed on your system. - - Please check that wx-config is in path, the directory - where wxWidgets libraries are installed (returned by - 'wx-config --libs' or 'wx-config --static --libs' command) - is in LD_LIBRARY_PATH or equivalent variable and -- wxWidgets version is $reqwx or above." >&2;} -- { (exit 1); exit 1; }; } -+ wxWidgets version is $reqwx or above." "$LINENO" 5 - else - echo "wxWidgets not found, wx will NOT be usable" > ./CONF_INFO - WXERL_CAN_BUILD_DRIVER=false -- { echo "$as_me:$LINENO: WARNING: -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: - wxWidgets must be installed on your system. - - Please check that wx-config is in path, the directory -@@ -5906,7 +5354,7 @@ echo "$as_me: error: - 'wx-config --libs' or 'wx-config --static --libs' command) - is in LD_LIBRARY_PATH or equivalent variable and - wxWidgets version is $reqwx or above." >&5 --echo "$as_me: WARNING: -+$as_echo "$as_me: WARNING: - wxWidgets must be installed on your system. - - Please check that wx-config is in path, the directory -@@ -5917,12 +5365,12 @@ echo "$as_me: WARNING: - fi - fi - else -- echo "$as_me:$LINENO: checking for wxWidgets in standard locations" >&5 --echo $ECHO_N "checking for wxWidgets in standard locations... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets in standard locations" >&5 -+$as_echo_n "checking for wxWidgets in standard locations... " >&6; } - - # Check whether --with-wxdir was given. -- { echo "$as_me:$LINENO: OptionCheck: $with_wxdir $with_wx_prefix" >&5 --echo "$as_me: OptionCheck: $with_wxdir $with_wx_prefix" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: OptionCheck: $with_wxdir $with_wx_prefix" >&5 -+$as_echo "$as_me: OptionCheck: $with_wxdir $with_wx_prefix" >&6;} - - if test "${with_wxdir+set}" = set; then : - withval=$with_wxdir; CWXWIN0=$withval -@@ -5976,8 +5424,8 @@ echo "$as_me: OptionCheck: $with_wxdir $ - CWXPATH="$CWXWIN0 $CWXWIN1 $CWXWIN2 $CWX_DOCUMENTED $CWXWIN3 $CWXWIN4" - - for dir in $CWXPATH; do -- { echo "$as_me:$LINENO: Checking: $dir" >&5 --echo "$as_me: Checking: $dir" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: Checking: $dir" >&5 -+$as_echo "$as_me: Checking: $dir" >&6;} - if test -f $dir/include/wx/wx.h; then - WXINCLUDE_MSVC=$dir/include/msvc - WXINCLUDE_PLAIN=$dir/include -@@ -6007,25 +5455,23 @@ echo "$as_me: Checking: $dir" >&6;} - for lib in $WX_LIBS0 $WX_LIBS1 $WX_LIBS2 $WX_LIBS3 $WX_SYSLIBS; do - WX_LIBS_STATIC="$WX_LIBS_STATIC -l$lib" - done -- echo "$as_me:$LINENO: result: $dir" >&5 --echo "${ECHO_T}$dir" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dir" >&5 -+$as_echo "$dir" >&6; } - break - fi - fi - done - - if test -z "$WX_LIBS_STATIC"; then -- echo "$as_me:$LINENO: result: failed" >&5 --echo "${ECHO_T}failed" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 -+$as_echo "failed" >&6; } - if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then -- { { echo "$as_me:$LINENO: error: Cannot find core lib version for wxWidgets" >&5 --echo "$as_me: error: Cannot find core lib version for wxWidgets" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "Cannot find core lib version for wxWidgets" "$LINENO" 5 - else - echo "No usable wxWidgets not found, wx will not be useable" > ./CONF_INFO - WXERL_CAN_BUILD_DRIVER=false -- { echo "$as_me:$LINENO: WARNING: Cannot find core lib version for wxWidgets" >&5 --echo "$as_me: WARNING: Cannot find core lib version for wxWidgets" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find core lib version for wxWidgets" >&5 -+$as_echo "$as_me: WARNING: Cannot find core lib version for wxWidgets" >&2;} - fi - fi - WX_HAVE_STATIC_LIBS=true -@@ -6040,9 +5486,9 @@ if test "$WXERL_CAN_BUILD_DRIVER" != "fa - - - --echo "$as_me:$LINENO: checking if wxwidgets have opengl support" >&5 --echo $ECHO_N "checking if wxwidgets have opengl support... $ECHO_C" >&6 --ac_ext=cc -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if wxwidgets have opengl support" >&5 -+$as_echo_n "checking if wxwidgets have opengl support... " >&6; } -+ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -6052,11 +5498,7 @@ saved_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS" - - --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #ifdef WIN32 -@@ -6078,41 +5520,15 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_cxx_try_compile "$LINENO"; then : - HAVE_GL_SUPPORT=yes - --cat >>confdefs.h <<\_ACEOF --#define HAVE_GL_SUPPORT 1 --_ACEOF -+$as_echo "#define HAVE_GL_SUPPORT 1" >>confdefs.h - - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --HAVE_GL_SUPPORT=no -+ HAVE_GL_SUPPORT=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - CXXFLAGS=$saved_CXXFLAGS - ac_ext=c -@@ -6121,8 +5537,8 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - --echo "$as_me:$LINENO: result: $HAVE_GL_SUPPORT" >&5 --echo "${ECHO_T}$HAVE_GL_SUPPORT" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_GL_SUPPORT" >&5 -+$as_echo "$HAVE_GL_SUPPORT" >&6; } - - - if test X"$HAVE_GL_SUPPORT" != X"yes" ; then -@@ -6131,18 +5547,7 @@ if test X"$HAVE_GL_SUPPORT" != X"yes" ; - fi - - --echo "$as_me:$LINENO: checking for GLintptr" >&5 --echo $ECHO_N "checking for GLintptr... $ECHO_C" >&6 --if test "${ac_cv_type_GLintptr+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef WIN32 -+ac_fn_c_check_type "$LINENO" "GLintptr" "ac_cv_type_GLintptr" "#ifdef WIN32 - # include - # include - #elif defined(HAVE_GL_GL_H) -@@ -6151,52 +5556,8 @@ cat >>conftest.$ac_ext <<_ACEOF - # include - #endif - -- --int --main () --{ --if ((GLintptr *) 0) -- return 0; --if (sizeof (GLintptr)) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_GLintptr=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_GLintptr=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_type_GLintptr" >&5 --echo "${ECHO_T}$ac_cv_type_GLintptr" >&6 --if test $ac_cv_type_GLintptr = yes; then -+" -+if test "x$ac_cv_type_GLintptr" = xyes; then : - - cat >>confdefs.h <<_ACEOF - #define HAVE_GLINTPTR 1 -@@ -6204,18 +5565,7 @@ _ACEOF - - - fi --echo "$as_me:$LINENO: checking for GLintptrARB" >&5 --echo $ECHO_N "checking for GLintptrARB... $ECHO_C" >&6 --if test "${ac_cv_type_GLintptrARB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef WIN32 -+ac_fn_c_check_type "$LINENO" "GLintptrARB" "ac_cv_type_GLintptrARB" "#ifdef WIN32 - # include - # include - #elif defined(HAVE_GL_GL_H) -@@ -6224,52 +5574,8 @@ cat >>conftest.$ac_ext <<_ACEOF - # include - #endif - -- --int --main () --{ --if ((GLintptrARB *) 0) -- return 0; --if (sizeof (GLintptrARB)) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_GLintptrARB=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_GLintptrARB=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_type_GLintptrARB" >&5 --echo "${ECHO_T}$ac_cv_type_GLintptrARB" >&6 --if test $ac_cv_type_GLintptrARB = yes; then -+" -+if test "x$ac_cv_type_GLintptrARB" = xyes; then : - - cat >>confdefs.h <<_ACEOF - #define HAVE_GLINTPTRARB 1 -@@ -6277,18 +5583,7 @@ _ACEOF - - - fi --echo "$as_me:$LINENO: checking for GLchar" >&5 --echo $ECHO_N "checking for GLchar... $ECHO_C" >&6 --if test "${ac_cv_type_GLchar+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef WIN32 -+ac_fn_c_check_type "$LINENO" "GLchar" "ac_cv_type_GLchar" "#ifdef WIN32 - # include - # include - #elif defined(HAVE_GL_GL_H) -@@ -6297,52 +5592,8 @@ cat >>conftest.$ac_ext <<_ACEOF - # include - #endif - -- --int --main () --{ --if ((GLchar *) 0) -- return 0; --if (sizeof (GLchar)) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_GLchar=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_GLchar=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_type_GLchar" >&5 --echo "${ECHO_T}$ac_cv_type_GLchar" >&6 --if test $ac_cv_type_GLchar = yes; then -+" -+if test "x$ac_cv_type_GLchar" = xyes; then : - - cat >>confdefs.h <<_ACEOF - #define HAVE_GLCHAR 1 -@@ -6350,18 +5601,7 @@ _ACEOF - - - fi --echo "$as_me:$LINENO: checking for GLcharARB" >&5 --echo $ECHO_N "checking for GLcharARB... $ECHO_C" >&6 --if test "${ac_cv_type_GLcharARB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef WIN32 -+ac_fn_c_check_type "$LINENO" "GLcharARB" "ac_cv_type_GLcharARB" "#ifdef WIN32 - # include - # include - #elif defined(HAVE_GL_GL_H) -@@ -6370,52 +5610,8 @@ cat >>conftest.$ac_ext <<_ACEOF - # include - #endif - -- --int --main () --{ --if ((GLcharARB *) 0) -- return 0; --if (sizeof (GLcharARB)) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_GLcharARB=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_GLcharARB=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_type_GLcharARB" >&5 --echo "${ECHO_T}$ac_cv_type_GLcharARB" >&6 --if test $ac_cv_type_GLcharARB = yes; then -+" -+if test "x$ac_cv_type_GLcharARB" = xyes; then : - - cat >>confdefs.h <<_ACEOF - #define HAVE_GLCHARARB 1 -@@ -6423,18 +5619,7 @@ _ACEOF - - - fi --echo "$as_me:$LINENO: checking for GLhalfARB" >&5 --echo $ECHO_N "checking for GLhalfARB... $ECHO_C" >&6 --if test "${ac_cv_type_GLhalfARB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef WIN32 -+ac_fn_c_check_type "$LINENO" "GLhalfARB" "ac_cv_type_GLhalfARB" "#ifdef WIN32 - # include - # include - #elif defined(HAVE_GL_GL_H) -@@ -6443,52 +5628,8 @@ cat >>conftest.$ac_ext <<_ACEOF - # include - #endif - -- --int --main () --{ --if ((GLhalfARB *) 0) -- return 0; --if (sizeof (GLhalfARB)) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_GLhalfARB=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_GLhalfARB=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_type_GLhalfARB" >&5 --echo "${ECHO_T}$ac_cv_type_GLhalfARB" >&6 --if test $ac_cv_type_GLhalfARB = yes; then -+" -+if test "x$ac_cv_type_GLhalfARB" = xyes; then : - - cat >>confdefs.h <<_ACEOF - #define HAVE_GLHALFARB 1 -@@ -6496,18 +5637,7 @@ _ACEOF - - - fi --echo "$as_me:$LINENO: checking for GLint64EXT" >&5 --echo $ECHO_N "checking for GLint64EXT... $ECHO_C" >&6 --if test "${ac_cv_type_GLint64EXT+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef WIN32 -+ac_fn_c_check_type "$LINENO" "GLint64EXT" "ac_cv_type_GLint64EXT" "#ifdef WIN32 - # include - # include - #elif defined(HAVE_GL_GL_H) -@@ -6516,52 +5646,8 @@ cat >>conftest.$ac_ext <<_ACEOF - # include - #endif - -- --int --main () --{ --if ((GLint64EXT *) 0) -- return 0; --if (sizeof (GLint64EXT)) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_GLint64EXT=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_GLint64EXT=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_type_GLint64EXT" >&5 --echo "${ECHO_T}$ac_cv_type_GLint64EXT" >&6 --if test $ac_cv_type_GLint64EXT = yes; then -+" -+if test "x$ac_cv_type_GLint64EXT" = xyes; then : - - cat >>confdefs.h <<_ACEOF - #define HAVE_GLINT64EXT 1 -@@ -6572,9 +5658,9 @@ fi - - - --echo "$as_me:$LINENO: checking GLU Callbacks uses Tiger Style" >&5 --echo $ECHO_N "checking GLU Callbacks uses Tiger Style... $ECHO_C" >&6 --ac_ext=cc -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking GLU Callbacks uses Tiger Style" >&5 -+$as_echo_n "checking GLU Callbacks uses Tiger Style... " >&6; } -+ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -6583,11 +5669,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - saved_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS" - --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #ifdef WIN32 -@@ -6614,111 +5696,37 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_cxx_try_compile "$LINENO"; then : - TESS_CB_TIGER_STYLE=yes - --cat >>confdefs.h <<\_ACEOF --#define TESS_CB_TIGER_STYLE 1 --_ACEOF -+$as_echo "#define TESS_CB_TIGER_STYLE 1" >>confdefs.h - - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --TESS_CB_TIGER_STYLE=no -+ TESS_CB_TIGER_STYLE=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $TESS_CB_TIGER_STYLE" >&5 --echo "${ECHO_T}$TESS_CB_TIGER_STYLE" >&6 -- -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TESS_CB_TIGER_STYLE" >&5 -+$as_echo "$TESS_CB_TIGER_STYLE" >&6; } - - - - for ac_header in wx/stc/stc.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef WIN32 -+do : -+ ac_fn_cxx_check_header_compile "$LINENO" "wx/stc/stc.h" "ac_cv_header_wx_stc_stc_h" "#ifdef WIN32 - # include - #endif -- #include "wx/wx.h" -- --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- eval "$as_ac_Header=yes" --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --eval "$as_ac_Header=no" --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ #include \"wx/wx.h\" -+" -+if test "x$ac_cv_header_wx_stc_stc_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_WX_STC_STC_H 1 - _ACEOF - - else - WXERL_CAN_BUILD_DRIVER=false - echo "wxWidgets don't have wxStyledTextControl (stc.h), wx will NOT be useable" > ./CONF_INFO -- { echo "$as_me:$LINENO: WARNING: Can not find wx/stc/stc.h $CXXFLAGS" >&5 --echo "$as_me: WARNING: Can not find wx/stc/stc.h $CXXFLAGS" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can not find wx/stc/stc.h $CXXFLAGS" >&5 -+$as_echo "$as_me: WARNING: Can not find wx/stc/stc.h $CXXFLAGS" >&2;} - - fi - -@@ -6726,19 +5734,15 @@ done - - - --echo "$as_me:$LINENO: checking if we can link wxwidgets programs" >&5 --echo $ECHO_N "checking if we can link wxwidgets programs... $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can link wxwidgets programs" >&5 -+$as_echo_n "checking if we can link wxwidgets programs... " >&6; } - saved_LIBS=$LIBS - - if test X"$WX_HAVE_STATIC_LIBS" = X"true" ; then - LIBS=$WX_LIBS_STATIC - fi - --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #ifdef WIN32 -@@ -6769,41 +5773,17 @@ cat >>conftest.$ac_ext <<_ACEOF - IMPLEMENT_APP(MyApp) - - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_cxx_try_link "$LINENO"; then : - - CAN_LINK_WX=yes - - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- - - CAN_LINK_WX=no - - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - - CXXFLAGS=$saved_CXXFLAGS - LIBS=$saved_LIBS -@@ -6813,14 +5793,14 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - --echo "$as_me:$LINENO: result: $CAN_LINK_WX" >&5 --echo "${ECHO_T}$CAN_LINK_WX" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CAN_LINK_WX" >&5 -+$as_echo "$CAN_LINK_WX" >&6; } - - if test X"$CAN_LINK_WX" != X"yes" ; then - echo "Can not link the wx driver, wx will NOT be useable" > ./CONF_INFO - WXERL_CAN_BUILD_DRIVER=false -- { echo "$as_me:$LINENO: WARNING: Can not link wx program are all developer packages installed?" >&5 --echo "$as_me: WARNING: Can not link wx program are all developer packages installed?" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can not link wx program are all developer packages installed?" >&5 -+$as_echo "$as_me: WARNING: Can not link wx program are all developer packages installed?" >&2;} - fi - - fi -@@ -6829,15 +5809,11 @@ fi - if test "x$GCC" = xyes; then - # Treat certain GCC warnings as errors - -- echo "$as_me:$LINENO: checking if we can add -Werror=return-type to CFLAGS (via CFLAGS)" >&5 --echo $ECHO_N "checking if we can add -Werror=return-type to CFLAGS (via CFLAGS)... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can add -Werror=return-type to CFLAGS (via CFLAGS)" >&5 -+$as_echo_n "checking if we can add -Werror=return-type to CFLAGS (via CFLAGS)... " >&6; } - saved_CFLAGS=$CFLAGS; - CFLAGS="-Werror=return-type $CFLAGS"; -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -6848,56 +5824,28 @@ return 0; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - can_enable_flag=true - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --can_enable_flag=false -+ can_enable_flag=false - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS=$saved_CFLAGS; - if test "X$can_enable_flag" = "Xtrue"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - CFLAGS="-Werror=return-type $CFLAGS" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -- echo "$as_me:$LINENO: checking if we can add -Werror=return-type to CXXFLAGS (via CFLAGS)" >&5 --echo $ECHO_N "checking if we can add -Werror=return-type to CXXFLAGS (via CFLAGS)... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can add -Werror=return-type to CXXFLAGS (via CFLAGS)" >&5 -+$as_echo_n "checking if we can add -Werror=return-type to CXXFLAGS (via CFLAGS)... " >&6; } - saved_CFLAGS=$CFLAGS; - CFLAGS="-Werror=return-type $CXXFLAGS"; -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -6908,54 +5856,29 @@ return 0; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - can_enable_flag=true - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --can_enable_flag=false -+ can_enable_flag=false - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS=$saved_CFLAGS; - if test "X$can_enable_flag" = "Xtrue"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - CXXFLAGS="-Werror=return-type $CXXFLAGS" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - - fi - - - --# Check whether --enable-sanitizers or --disable-sanitizers was given. --if test "${enable_sanitizers+set}" = set; then -- enableval="$enable_sanitizers" -- -+# Check whether --enable-sanitizers was given. -+if test "${enable_sanitizers+set}" = set; then : -+ enableval=$enable_sanitizers; - case "$enableval" in - no) sanitizers= ;; - yes) sanitizers="-fsanitize=address,undefined" ;; -@@ -6965,7 +5888,8 @@ CFLAGS="$CFLAGS $sanitizers" - CXXFLAGS="$CXXFLAGS $sanitizers" - LDFLAGS="$LDFLAGS $sanitizers" - --fi; -+fi -+ - - ############################################################################# - -@@ -6997,13 +5921,11 @@ CONFIG_STATUS=$WXERL_SYS_TYPE/config.sta - - if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then - if test X"$WXERL_CAN_BUILD_DRIVER" != X"true" ; then -- { { echo "$as_me:$LINENO: error: Cannot build wxErlang driver, see ./CONF_INFO for information" >&5 --echo "$as_me: error: Cannot build wxErlang driver, see ./CONF_INFO for information" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "Cannot build wxErlang driver, see ./CONF_INFO for information" "$LINENO" 5 - fi - fi - -- ac_config_files="$ac_config_files config.mk c_src/Makefile" -+ac_config_files="$ac_config_files config.mk c_src/Makefile" - - - cat >confcache <<\_ACEOF -@@ -7024,39 +5946,70 @@ _ACEOF - - # The following way of writing the cache mishandles newlines in values, - # but we know of no workaround that is simple, portable, and efficient. --# So, don't put newlines in cache variables' values. -+# So, we kill variables containing newlines. - # Ultrix sh set writes to stderr and can't be redirected directly, - # and sets the high bit in the cache file unless we assign to the vars. --{ -+( -+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -+ *) { eval $ac_var=; unset $ac_var;} ;; -+ esac ;; -+ esac -+ done -+ - (set) 2>&1 | -- case `(ac_space=' '; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -- # `set' does not quote correctly, so add quotes (double-quote -- # substitution turns \\\\ into \\, and sed turns \\ into \). -+ case $as_nl`(ac_space=' '; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) -+ # `set' does not quote correctly, so add quotes: double-quote -+ # substitution turns \\\\ into \\, and sed turns \\ into \. - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -- ;; -+ ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; -- esac; --} | -+ esac | -+ sort -+) | - sed ' -+ /^ac_cv_env_/b end - t clear -- : clear -+ :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end -- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -- : end' >>confcache --if diff $cache_file confcache >/dev/null 2>&1; then :; else -- if test -w $cache_file; then -- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" -- cat confcache >$cache_file -+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -+ :end' >>confcache -+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else -+ if test -w "$cache_file"; then -+ if test "x$cache_file" != "x/dev/null"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -+$as_echo "$as_me: updating cache $cache_file" >&6;} -+ if test ! -f "$cache_file" || test -h "$cache_file"; then -+ cat confcache >"$cache_file" -+ else -+ case $cache_file in #( -+ */* | ?:*) -+ mv -f confcache "$cache_file"$$ && -+ mv -f "$cache_file"$$ "$cache_file" ;; #( -+ *) -+ mv -f confcache "$cache_file" ;; -+ esac -+ fi -+ fi - else -- echo "not updating unwritable cache $cache_file" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi - fi - rm -f confcache -@@ -7065,63 +6018,55 @@ test "x$prefix" = xNONE && prefix=$ac_de - # Let make expand exec_prefix. - test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - --# VPATH may cause trouble with some makes, so we remove $(srcdir), --# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and --# trailing colons and then remove the whole line if VPATH becomes empty --# (actually we leave an empty line to preserve line numbers). --if test "x$srcdir" = x.; then -- ac_vpsub='/^[ ]*VPATH[ ]*=/{ --s/:*\$(srcdir):*/:/; --s/:*\${srcdir}:*/:/; --s/:*@srcdir@:*/:/; --s/^\([^=]*=[ ]*\):*/\1/; --s/:*$//; --s/^[^=]*=[ ]*$//; --}' --fi -- - # Transform confdefs.h into DEFS. - # Protect against shell expansion while executing Makefile rules. - # Protect against Makefile macro expansion. - # - # If the first sed substitution is executed (which looks for macros that --# take arguments), then we branch to the quote section. Otherwise, -+# take arguments), then branch to the quote section. Otherwise, - # look for a macro that doesn't take arguments. --cat >confdef2opt.sed <<\_ACEOF -+ac_script=' -+:mline -+/\\$/{ -+ N -+ s,\\\n,, -+ b mline -+} - t clear --: clear --s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g -+:clear -+s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g - t quote --s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g -+s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g - t quote --d --: quote --s,[ `~#$^&*(){}\\|;'"<>?],\\&,g --s,\[,\\&,g --s,\],\\&,g --s,\$,$$,g --p --_ACEOF --# We use echo to avoid assuming a particular line-breaking character. --# The extra dot is to prevent the shell from consuming trailing --# line-breaks from the sub-command output. A line-break within --# single-quotes doesn't work because, if this script is created in a --# platform that uses two characters for line-breaks (e.g., DOS), tr --# would break. --ac_LF_and_DOT=`echo; echo .` --DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` --rm -f confdef2opt.sed -+b any -+:quote -+s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g -+s/\[/\\&/g -+s/\]/\\&/g -+s/\$/$$/g -+H -+:any -+${ -+ g -+ s/^\n// -+ s/\n/ /g -+ p -+} -+' -+DEFS=`sed -n "$ac_script" confdefs.h` - - - ac_libobjs= - ac_ltlibobjs= -+U= - for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. -- ac_i=`echo "$ac_i" | -- sed 's/\$U\././;s/\.o$//;s/\.obj$//'` -- # 2. Add them. -- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" -- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' -+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' -+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"` -+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR -+ # will be set to the directory where LIBOBJS objects are built. -+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" -+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' - done - LIBOBJS=$ac_libobjs - -@@ -7129,12 +6074,14 @@ LTLIBOBJS=$ac_ltlibobjs - - - --: ${CONFIG_STATUS=./config.status} -+: "${CONFIG_STATUS=./config.status}" -+ac_write_fail=0 - ac_clean_files_save=$ac_clean_files - ac_clean_files="$ac_clean_files $CONFIG_STATUS" --{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 --echo "$as_me: creating $CONFIG_STATUS" >&6;} --cat >$CONFIG_STATUS <<_ACEOF -+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -+as_write_fail=0 -+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 - #! $SHELL - # Generated by $as_me. - # Run this file to recreate the current configuration. -@@ -7144,81 +6091,253 @@ cat >$CONFIG_STATUS <<_ACEOF - debug=false - ac_cs_recheck=false - ac_cs_silent=false --SHELL=\${CONFIG_SHELL-$SHELL} --_ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF --## --------------------- ## --## M4sh Initialization. ## --## --------------------- ## -+SHELL=\${CONFIG_SHELL-$SHELL} -+export SHELL -+_ASEOF -+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 -+## -------------------- ## -+## M4sh Initialization. ## -+## -------------------- ## - --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac - fi --DUALCASE=1; export DUALCASE # for MKS sh - --# Support unset when possible. --if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -- as_unset=unset -+ -+as_nl=' -+' -+export as_nl -+# Printing a long string crashes Solaris 7 /usr/bin/printf. -+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -+# Prefer a ksh shell builtin over an external printf program on Solaris, -+# but without wasting forks for bash or zsh. -+if test -z "$BASH_VERSION$ZSH_VERSION" \ -+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='print -r --' -+ as_echo_n='print -rn --' -+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='printf %s\n' -+ as_echo_n='printf %s' - else -- as_unset=false -+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -+ as_echo_n='/usr/ucb/echo -n' -+ else -+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -+ as_echo_n_body='eval -+ arg=$1; -+ case $arg in #( -+ *"$as_nl"*) -+ expr "X$arg" : "X\\(.*\\)$as_nl"; -+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -+ esac; -+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -+ ' -+ export as_echo_n_body -+ as_echo_n='sh -c $as_echo_n_body as_echo' -+ fi -+ export as_echo_body -+ as_echo='sh -c $as_echo_body as_echo' -+fi -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } - fi - - --# Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+as_myself= -+case $0 in #(( -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ exit 1 -+fi -+ -+# Unset variables that we do not need and which cause bugs (e.g. in -+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -+# suppresses any "Segmentation fault" message there. '((' could -+# trigger a bug in pdksh 5.2.14. -+for as_var in BASH_ENV ENV MAIL MAILPATH -+do eval test x\${$as_var+set} = xset \ -+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -+done - PS1='$ ' - PS2='> ' - PS4='+ ' - - # NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -- LC_TELEPHONE LC_TIME --do -- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -- eval $as_var=C; export $as_var -- else -- $as_unset $as_var -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE -+ -+# CDPATH. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ -+ -+# as_fn_error STATUS ERROR [LINENO LOG_FD] -+# ---------------------------------------- -+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -+# script with STATUS, using 1 if that was 0. -+as_fn_error () -+{ -+ as_status=$1; test $as_status -eq 0 && as_status=1 -+ if test "$4"; then -+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 - fi --done -+ $as_echo "$as_me: error: $2" >&2 -+ as_fn_exit $as_status -+} # as_fn_error - --# Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -+ -+# as_fn_set_status STATUS -+# ----------------------- -+# Set $? to STATUS, without forking. -+as_fn_set_status () -+{ -+ return $1 -+} # as_fn_set_status -+ -+# as_fn_exit STATUS -+# ----------------- -+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -+as_fn_exit () -+{ -+ set +e -+ as_fn_set_status $1 -+ exit $1 -+} # as_fn_exit -+ -+# as_fn_unset VAR -+# --------------- -+# Portably unset VAR. -+as_fn_unset () -+{ -+ { eval $1=; unset $1;} -+} -+as_unset=as_fn_unset -+# as_fn_append VAR VALUE -+# ---------------------- -+# Append the text in VALUE to the end of the definition contained in VAR. Take -+# advantage of any shell optimizations that allow amortized linear growth over -+# repeated appends, instead of the typical quadratic growth present in naive -+# implementations. -+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : -+ eval 'as_fn_append () -+ { -+ eval $1+=\$2 -+ }' -+else -+ as_fn_append () -+ { -+ eval $1=\$$1\$2 -+ } -+fi # as_fn_append -+ -+# as_fn_arith ARG... -+# ------------------ -+# Perform arithmetic evaluation on the ARGs, and store the result in the -+# global $as_val. Take advantage of shells that can avoid forks. The arguments -+# must be portable across $(()) and expr. -+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : -+ eval 'as_fn_arith () -+ { -+ as_val=$(( $* )) -+ }' -+else -+ as_fn_arith () -+ { -+ as_val=`expr "$@" || test $? -eq 1` -+ } -+fi # as_fn_arith -+ -+ -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename - else - as_basename=false - fi - -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi - --# Name of the executable. --as_me=`$as_basename "$0" || -+as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || --echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -- /^X\/\(\/\/\)$/{ s//\1/; q; } -- /^X\/\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - --# PATH needs CR, and LINENO needs CR and PATH. - # Avoid depending upon Character Ranges. - as_cr_letters='abcdefghijklmnopqrstuvwxyz' - as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -@@ -7226,148 +6345,111 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE - as_cr_digits='0123456789' - as_cr_alnum=$as_cr_Letters$as_cr_digits - --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -- else -- PATH_SEPARATOR=: -- fi -- rm -f conf$$.sh --fi -- -- -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" || { -- # Find who we are. Look in the path if we contain no path at all -- # relative or not. -- case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -- -- ;; -- esac -- # We did not find ourselves, most probably we were run as `sh COMMAND' -- # in which case we are not to be found in the path. -- if test "x$as_myself" = x; then -- as_myself=$0 -- fi -- if test ! -f "$as_myself"; then -- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 --echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} -- { (exit 1); exit 1; }; } -- fi -- case $CONFIG_SHELL in -- '') -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for as_base in sh bash ksh sh5; do -- case $as_dir in -- /*) -- if ("$as_dir/$as_base" -c ' -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -- CONFIG_SHELL=$as_dir/$as_base -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" ${1+"$@"} -- fi;; -- esac -- done --done --;; -- esac -- -- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -- # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line before each line; the second 'sed' does the real -- # work. The second script uses 'N' to pair each line-number line -- # with the numbered line, and appends trailing '-' during -- # substitution so that $LINENO is not a special case at line end. -- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -- sed ' -- N -- s,$,-, -- : loop -- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -- t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -- ' >$as_me.lineno && -- chmod +x $as_me.lineno || -- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 --echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} -- { (exit 1); exit 1; }; } -- -- # Don't try to exec as it changes $[0], causing all sort of problems -- # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensible to this). -- . ./$as_me.lineno -- # Exit status is that of the last command. -- exit --} -- -- --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in #((((( -+-n*) -+ case `echo 'xy\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ xy) ECHO_C='\c';; -+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null -+ ECHO_T=' ';; -+ esac;; -+*) -+ ECHO_N='-n';; - esac - --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr -+rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file - else -- as_expr=false -+ rm -f conf$$.dir -+ mkdir conf$$.dir 2>/dev/null - fi -- --rm -f conf$$ conf$$.exe conf$$.file --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -- as_ln_s='cp -p' -- else -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -pR'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -pR' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else -+ as_ln_s='cp -pR' - fi --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln - else -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - fi --rm -f conf$$ conf$$.exe conf$$.file -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null -+ -+ -+# as_fn_mkdir_p -+# ------------- -+# Create "$as_dir" as a directory, including parents if necessary. -+as_fn_mkdir_p () -+{ - -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || eval $as_mkdir_p || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" -+ -+ -+} # as_fn_mkdir_p - if mkdir -p . 2>/dev/null; then -- as_mkdir_p=: -+ as_mkdir_p='mkdir -p "$as_dir"' - else - test -d ./-p && rmdir ./-p - as_mkdir_p=false - fi - --as_executable_p="test -f" -+ -+# as_fn_executable_p FILE -+# ----------------------- -+# Test if FILE is an executable regular file. -+as_fn_executable_p () -+{ -+ test -f "$1" && test -x "$1" -+} # as_fn_executable_p -+as_test_x='test -x' -+as_executable_p=as_fn_executable_p - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -7376,31 +6458,20 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P - as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH -- - exec 6>&1 -+## ----------------------------------- ## -+## Main body of $CONFIG_STATUS script. ## -+## ----------------------------------- ## -+_ASEOF -+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 - --# Open the log real soon, to keep \$[0] and so on meaningful, and to -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# Save the log message, to keep $0 and so on meaningful, and to - # report actual input values of CONFIG_FILES etc. instead of their --# values after options handling. Logging --version etc. is OK. --exec 5>>config.log --{ -- echo -- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX --## Running $as_me. ## --_ASBOX --} >&5 --cat >&5 <<_CSEOF -- -+# values after options handling. -+ac_log=" - This file was extended by $as_me, which was --generated by GNU Autoconf 2.59. Invocation command line was -+generated by GNU Autoconf 2.69. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -7408,124 +6479,116 @@ generated by GNU Autoconf 2.59. Invocat - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - --_CSEOF --echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 --echo >&5 -+on `(hostname || uname -n) 2>/dev/null | sed 1q` -+" -+ - _ACEOF - --# Files that config.status was made for. --if test -n "$ac_config_files"; then -- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS --fi -+case $ac_config_files in *" -+"*) set x $ac_config_files; shift; ac_config_files=$*;; -+esac - --if test -n "$ac_config_headers"; then -- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS --fi - --if test -n "$ac_config_links"; then -- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS --fi - --if test -n "$ac_config_commands"; then -- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS --fi -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+# Files that config.status was made for. -+config_files="$ac_config_files" - --cat >>$CONFIG_STATUS <<\_ACEOF -+_ACEOF - -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - ac_cs_usage="\ --\`$as_me' instantiates files from templates according to the --current configuration. -+\`$as_me' instantiates files and other configuration actions -+from templates according to the current configuration. Unless the files -+and actions are specified as TAGs, all are instantiated by default. - --Usage: $0 [OPTIONS] [FILE]... -+Usage: $0 [OPTION]... [TAG]... - - -h, --help print this help, then exit -- -V, --version print version number, then exit -- -q, --quiet do not print progress messages -+ -V, --version print version number and configuration settings, then exit -+ --config print configuration, then exit -+ -q, --quiet, --silent -+ do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions -- --file=FILE[:TEMPLATE] -- instantiate the configuration file FILE -+ --file=FILE[:TEMPLATE] -+ instantiate the configuration file FILE - - Configuration files: - $config_files - --Report bugs to ." --_ACEOF -+Report bugs to the package provider." - --cat >>$CONFIG_STATUS <<_ACEOF -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" - ac_cs_version="\\ - config.status --configured by $0, generated by GNU Autoconf 2.59, -- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -+configured by $0, generated by GNU Autoconf 2.69, -+ with options \\"\$ac_cs_config\\" - --Copyright (C) 2003 Free Software Foundation, Inc. -+Copyright (C) 2012 Free Software Foundation, Inc. - This config.status script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it." --srcdir=$srcdir -+ -+ac_pwd='$ac_pwd' -+srcdir='$srcdir' -+test -n "\$AWK" || AWK=awk - _ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF --# If no file are specified by the user, then we need to provide default --# value. By we need to know if files were specified by the user. -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# The default lists apply if the user does not specify any file. - ac_need_defaults=: - while test $# != 0 - do - case $1 in -- --*=*) -- ac_option=`expr "x$1" : 'x\([^=]*\)='` -- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` -+ --*=?*) -+ ac_option=`expr "X$1" : 'X\([^=]*\)='` -+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; -- -*) -+ --*=) -+ ac_option=`expr "X$1" : 'X\([^=]*\)='` -+ ac_optarg= -+ ac_shift=: -+ ;; -+ *) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; -- *) # This is not an option, so the user has probably given explicit -- # arguments. -- ac_option=$1 -- ac_need_defaults=false;; - esac - - case $ac_option in - # Handling of the options. --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; -- --version | --vers* | -V ) -- echo "$ac_cs_version"; exit 0 ;; -- --he | --h) -- # Conflict between --help and --header -- { { echo "$as_me:$LINENO: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; };; -- --help | --hel | -h ) -- echo "$ac_cs_usage"; exit 0 ;; -- --debug | --d* | -d ) -+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) -+ $as_echo "$ac_cs_version"; exit ;; -+ --config | --confi | --conf | --con | --co | --c ) -+ $as_echo "$ac_cs_config"; exit ;; -+ --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift -- CONFIG_FILES="$CONFIG_FILES $ac_optarg" -- ac_need_defaults=false;; -- --header | --heade | --head | --hea ) -- $ac_shift -- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" -+ case $ac_optarg in -+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ '') as_fn_error $? "missing file argument" ;; -+ esac -+ as_fn_append CONFIG_FILES " '$ac_optarg'" - ac_need_defaults=false;; -+ --he | --h | --help | --hel | -h ) -+ $as_echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. -- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; } ;; -+ -*) as_fn_error $? "unrecognized option: \`$1' -+Try \`$0 --help' for more information." ;; - -- *) ac_config_targets="$ac_config_targets $1" ;; -+ *) as_fn_append ac_config_targets " $1" -+ ac_need_defaults=false ;; - - esac - shift -@@ -7539,31 +6602,45 @@ if $ac_cs_silent; then - fi - - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - if \$ac_cs_recheck; then -- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 -- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ shift -+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 -+ CONFIG_SHELL='$SHELL' -+ export CONFIG_SHELL -+ exec "\$@" - fi - - _ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+exec 5>>config.log -+{ -+ echo -+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -+## Running $as_me. ## -+_ASBOX -+ $as_echo "$ac_log" -+} >&5 - -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+_ACEOF - -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - -- -- --cat >>$CONFIG_STATUS <<\_ACEOF -+# Handling of arguments. - for ac_config_target in $ac_config_targets - do -- case "$ac_config_target" in -- # Handling of arguments. -- "config.mk" ) CONFIG_FILES="$CONFIG_FILES config.mk" ;; -- "c_src/Makefile" ) CONFIG_FILES="$CONFIG_FILES c_src/Makefile" ;; -- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 --echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -- { (exit 1); exit 1; }; };; -+ case $ac_config_target in -+ "config.mk") CONFIG_FILES="$CONFIG_FILES config.mk" ;; -+ "c_src/Makefile") CONFIG_FILES="$CONFIG_FILES c_src/Makefile" ;; -+ -+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; - esac - done - -+ - # If the user did not use the arguments to specify the items to instantiate, - # then the envvar interface is used. Set only those that are not. - # We use the long form for the default assignment because of an extremely -@@ -7573,380 +6650,414 @@ if $ac_need_defaults; then - fi - - # Have a temporary directory for convenience. Make it in the build tree --# simply because there is no reason to put it here, and in addition, -+# simply because there is no reason against having it here, and in addition, - # creating and moving files from /tmp can sometimes cause problems. --# Create a temporary directory, and hook for its removal unless debugging. -+# Hook for its removal unless debugging. -+# Note that there is a small window in which the directory will not be cleaned: -+# after its creation but before its name has been assigned to `$tmp'. - $debug || - { -- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 -- trap '{ (exit 1); exit 1; }' 1 2 13 15 -+ tmp= ac_tmp= -+ trap 'exit_status=$? -+ : "${ac_tmp:=$tmp}" -+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status -+' 0 -+ trap 'as_fn_exit 1' 1 2 13 15 - } -- - # Create a (secure) tmp directory for tmp files. - - { -- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && -- test -n "$tmp" && test -d "$tmp" -+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && -+ test -d "$tmp" - } || - { -- tmp=./confstat$$-$RANDOM -- (umask 077 && mkdir $tmp) --} || -+ tmp=./conf$$-$RANDOM -+ (umask 077 && mkdir "$tmp") -+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 -+ac_tmp=$tmp -+ -+# Set up the scripts for CONFIG_FILES section. -+# No need to generate them if there are no CONFIG_FILES. -+# This happens for instance with `./config.status config.h'. -+if test -n "$CONFIG_FILES"; then -+ -+ -+ac_cr=`echo X | tr X '\015'` -+# On cygwin, bash can eat \r inside `` if the user requested igncr. -+# But we know of no other shell where ac_cr would be empty at this -+# point, so we can use a bashism as a fallback. -+if test "x$ac_cr" = x; then -+ eval ac_cr=\$\'\\r\' -+fi -+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` -+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then -+ ac_cs_awk_cr='\\r' -+else -+ ac_cs_awk_cr=$ac_cr -+fi -+ -+echo 'BEGIN {' >"$ac_tmp/subs1.awk" && -+_ACEOF -+ -+ - { -- echo "$me: cannot create a temporary directory in ." >&2 -- { (exit 1); exit 1; } -+ echo "cat >conf$$subs.awk <<_ACEOF" && -+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && -+ echo "_ACEOF" -+} >conf$$subs.sh || -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` -+ac_delim='%!_!# ' -+for ac_last_try in false false false false false :; do -+ . ./conf$$subs.sh || -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -+ -+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` -+ if test $ac_delim_n = $ac_delim_num; then -+ break -+ elif $ac_last_try; then -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -+ else -+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " -+ fi -+done -+rm -f conf$$subs.sh -+ -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && -+_ACEOF -+sed -n ' -+h -+s/^/S["/; s/!.*/"]=/ -+p -+g -+s/^[^!]*!// -+:repl -+t repl -+s/'"$ac_delim"'$// -+t delim -+:nl -+h -+s/\(.\{148\}\)..*/\1/ -+t more1 -+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ -+p -+n -+b repl -+:more1 -+s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -+p -+g -+s/.\{148\}// -+t nl -+:delim -+h -+s/\(.\{148\}\)..*/\1/ -+t more2 -+s/["\\]/\\&/g; s/^/"/; s/$/"/ -+p -+b -+:more2 -+s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -+p -+g -+s/.\{148\}// -+t delim -+' >$CONFIG_STATUS || ac_write_fail=1 -+rm -f conf$$subs.awk -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+_ACAWK -+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && -+ for (key in S) S_is_set[key] = 1 -+ FS = "" - -+} -+{ -+ line = $ 0 -+ nfields = split(line, field, "@") -+ substed = 0 -+ len = length(field[1]) -+ for (i = 2; i < nfields; i++) { -+ key = field[i] -+ keylen = length(key) -+ if (S_is_set[key]) { -+ value = S[key] -+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) -+ len += length(value) + length(field[++i]) -+ substed = 1 -+ } else -+ len += 1 + keylen -+ } -+ -+ print line -+} -+ -+_ACAWK -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then -+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" -+else -+ cat -+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ -+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 - _ACEOF - --cat >>$CONFIG_STATUS <<_ACEOF -+# VPATH may cause trouble with some makes, so we remove sole $(srcdir), -+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and -+# trailing colons and then remove the whole line if VPATH becomes empty -+# (actually we leave an empty line to preserve line numbers). -+if test "x$srcdir" = x.; then -+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ -+h -+s/// -+s/^/:/ -+s/[ ]*$/:/ -+s/:\$(srcdir):/:/g -+s/:\${srcdir}:/:/g -+s/:@srcdir@:/:/g -+s/^:*// -+s/:*$// -+x -+s/\(=[ ]*\).*/\1/ -+G -+s/\n// -+s/^[^=]*=[ ]*$// -+}' -+fi - --# --# CONFIG_FILES section. --# -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+fi # test -n "$CONFIG_FILES" - --# No need to generate the scripts if there are no CONFIG_FILES. --# This happens for instance when ./config.status config.h --if test -n "\$CONFIG_FILES"; then -- # Protect against being on the right side of a sed subst in config.status. -- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; -- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF --s,@SHELL@,$SHELL,;t t --s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t --s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t --s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t --s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t --s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t --s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t --s,@exec_prefix@,$exec_prefix,;t t --s,@prefix@,$prefix,;t t --s,@program_transform_name@,$program_transform_name,;t t --s,@bindir@,$bindir,;t t --s,@sbindir@,$sbindir,;t t --s,@libexecdir@,$libexecdir,;t t --s,@datadir@,$datadir,;t t --s,@sysconfdir@,$sysconfdir,;t t --s,@sharedstatedir@,$sharedstatedir,;t t --s,@localstatedir@,$localstatedir,;t t --s,@libdir@,$libdir,;t t --s,@includedir@,$includedir,;t t --s,@oldincludedir@,$oldincludedir,;t t --s,@infodir@,$infodir,;t t --s,@mandir@,$mandir,;t t --s,@build_alias@,$build_alias,;t t --s,@host_alias@,$host_alias,;t t --s,@target_alias@,$target_alias,;t t --s,@DEFS@,$DEFS,;t t --s,@ECHO_C@,$ECHO_C,;t t --s,@ECHO_N@,$ECHO_N,;t t --s,@ECHO_T@,$ECHO_T,;t t --s,@LIBS@,$LIBS,;t t --s,@build@,$build,;t t --s,@build_cpu@,$build_cpu,;t t --s,@build_vendor@,$build_vendor,;t t --s,@build_os@,$build_os,;t t --s,@host@,$host,;t t --s,@host_cpu@,$host_cpu,;t t --s,@host_vendor@,$host_vendor,;t t --s,@host_os@,$host_os,;t t --s,@TARGET@,$TARGET,;t t --s,@CC@,$CC,;t t --s,@CFLAGS@,$CFLAGS,;t t --s,@LDFLAGS@,$LDFLAGS,;t t --s,@CPPFLAGS@,$CPPFLAGS,;t t --s,@ac_ct_CC@,$ac_ct_CC,;t t --s,@EXEEXT@,$EXEEXT,;t t --s,@OBJEXT@,$OBJEXT,;t t --s,@CXX@,$CXX,;t t --s,@CXXFLAGS@,$CXXFLAGS,;t t --s,@ac_ct_CXX@,$ac_ct_CXX,;t t --s,@RANLIB@,$RANLIB,;t t --s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t --s,@CPP@,$CPP,;t t --s,@MIXED_CYGWIN_VC@,$MIXED_CYGWIN_VC,;t t --s,@MIXED_MSYS_VC@,$MIXED_MSYS_VC,;t t --s,@MIXED_VC@,$MIXED_VC,;t t --s,@MIXED_CYGWIN_MINGW@,$MIXED_CYGWIN_MINGW,;t t --s,@MIXED_CYGWIN@,$MIXED_CYGWIN,;t t --s,@MIXED_MSYS@,$MIXED_MSYS,;t t --s,@EGREP@,$EGREP,;t t --s,@OBJC_CC@,$OBJC_CC,;t t --s,@OBJC_CFLAGS@,$OBJC_CFLAGS,;t t --s,@GL_LIBS@,$GL_LIBS,;t t --s,@DEBUG_CFLAGS@,$DEBUG_CFLAGS,;t t --s,@DEBUG_CXXFLAGS@,$DEBUG_CXXFLAGS,;t t --s,@ERLC@,$ERLC,;t t --s,@WX_BUILDING_INSIDE_ERLSRC@,$WX_BUILDING_INSIDE_ERLSRC,;t t --s,@ERLANG_ROOT_DIR@,$ERLANG_ROOT_DIR,;t t --s,@WX_CONFIG_PATH@,$WX_CONFIG_PATH,;t t --s,@WX_CPPFLAGS@,$WX_CPPFLAGS,;t t --s,@WX_CFLAGS@,$WX_CFLAGS,;t t --s,@WX_CXXFLAGS@,$WX_CXXFLAGS,;t t --s,@WX_CFLAGS_ONLY@,$WX_CFLAGS_ONLY,;t t --s,@WX_CXXFLAGS_ONLY@,$WX_CXXFLAGS_ONLY,;t t --s,@WX_LIBS@,$WX_LIBS,;t t --s,@WX_LIBS_STATIC@,$WX_LIBS_STATIC,;t t --s,@WX_VERSION@,$WX_VERSION,;t t --s,@WX_RESCOMP@,$WX_RESCOMP,;t t --s,@WX_VERSION_MAJOR@,$WX_VERSION_MAJOR,;t t --s,@WX_VERSION_MINOR@,$WX_VERSION_MINOR,;t t --s,@WX_VERSION_MICRO@,$WX_VERSION_MICRO,;t t --s,@DEBUG_WX_CFLAGS@,$DEBUG_WX_CFLAGS,;t t --s,@DEBUG_WX_CXXFLAGS@,$DEBUG_WX_CXXFLAGS,;t t --s,@DEBUG_WX_LIBS@,$DEBUG_WX_LIBS,;t t --s,@DEBUG_WX_LIBS_STATIC@,$DEBUG_WX_LIBS_STATIC,;t t --s,@FORCED_DEBUG_BUILD@,$FORCED_DEBUG_BUILD,;t t --s,@WX_HAVE_STATIC_LIBS@,$WX_HAVE_STATIC_LIBS,;t t --s,@RC_FILE_TYPE@,$RC_FILE_TYPE,;t t --s,@HAVE_GL_SUPPORT@,$HAVE_GL_SUPPORT,;t t --s,@TESS_CB_TIGER_STYLE@,$TESS_CB_TIGER_STYLE,;t t --s,@WXERL_CAN_BUILD_DRIVER@,$WXERL_CAN_BUILD_DRIVER,;t t --s,@SO_EXT@,$SO_EXT,;t t --s,@RUN_ERL@,$RUN_ERL,;t t --s,@WXERL_SYS_TYPE@,$WXERL_SYS_TYPE,;t t --s,@LIBOBJS@,$LIBOBJS,;t t --s,@LTLIBOBJS@,$LTLIBOBJS,;t t --CEOF - --_ACEOF -+eval set X " :F $CONFIG_FILES " -+shift -+for ac_tag -+do -+ case $ac_tag in -+ :[FHLC]) ac_mode=$ac_tag; continue;; -+ esac -+ case $ac_mode$ac_tag in -+ :[FHL]*:*);; -+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; -+ :[FH]-) ac_tag=-:-;; -+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; -+ esac -+ ac_save_IFS=$IFS -+ IFS=: -+ set x $ac_tag -+ IFS=$ac_save_IFS -+ shift -+ ac_file=$1 -+ shift - -- cat >>$CONFIG_STATUS <<\_ACEOF -- # Split the substitutions into bite-sized pieces for seds with -- # small command number limits, like on Digital OSF/1 and HP-UX. -- ac_max_sed_lines=48 -- ac_sed_frag=1 # Number of current file. -- ac_beg=1 # First line for current file. -- ac_end=$ac_max_sed_lines # Line after last line for current file. -- ac_more_lines=: -- ac_sed_cmds= -- while $ac_more_lines; do -- if test $ac_beg -gt 1; then -- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- else -- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- fi -- if test ! -s $tmp/subs.frag; then -- ac_more_lines=false -- else -- # The purpose of the label and of the branching condition is to -- # speed up the sed processing (if there are no `@' at all, there -- # is no need to browse any of the substitutions). -- # These are the two extra sed commands mentioned above. -- (echo ':t -- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" -- else -- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" -- fi -- ac_sed_frag=`expr $ac_sed_frag + 1` -- ac_beg=$ac_end -- ac_end=`expr $ac_end + $ac_max_sed_lines` -+ case $ac_mode in -+ :L) ac_source=$1;; -+ :[FH]) -+ ac_file_inputs= -+ for ac_f -+ do -+ case $ac_f in -+ -) ac_f="$ac_tmp/stdin";; -+ *) # Look for the file first in the build tree, then in the source tree -+ # (if the path is not absolute). The absolute path cannot be DOS-style, -+ # because $ac_f cannot contain `:'. -+ test -f "$ac_f" || -+ case $ac_f in -+ [\\/$]*) false;; -+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; -+ esac || -+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; -+ esac -+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac -+ as_fn_append ac_file_inputs " '$ac_f'" -+ done -+ -+ # Let's still pretend it is `configure' which instantiates (i.e., don't -+ # use $as_me), people would be surprised to read: -+ # /* config.h. Generated by config.status. */ -+ configure_input='Generated from '` -+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' -+ `' by configure.' -+ if test x"$ac_file" != x-; then -+ configure_input="$ac_file. $configure_input" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -+$as_echo "$as_me: creating $ac_file" >&6;} - fi -- done -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds=cat -- fi --fi # test -n "$CONFIG_FILES" -+ # Neutralize special characters interpreted by sed in replacement strings. -+ case $configure_input in #( -+ *\&* | *\|* | *\\* ) -+ ac_sed_conf_input=`$as_echo "$configure_input" | -+ sed 's/[\\\\&|]/\\\\&/g'`;; #( -+ *) ac_sed_conf_input=$configure_input;; -+ esac - --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF --for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue -- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". -- case $ac_file in -- - | *:- | *:-:* ) # input from stdin -- cat >$tmp/stdin -- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- * ) ac_file_in=$ac_file.in ;; -+ case $ac_tag in -+ *:-:* | *:-) cat >"$ac_tmp/stdin" \ -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; -+ esac -+ ;; - esac - -- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. -- ac_dir=`(dirname "$ac_file") 2>/dev/null || -+ ac_dir=`$as_dirname -- "$ac_file" || - $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ -- X"$ac_file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$ac_file" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- { if $as_mkdir_p; then -- mkdir -p "$ac_dir" -- else -- as_dir="$ac_dir" -- as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- done -- test ! -n "$as_dirs" || mkdir $as_dirs -- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 --echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -- { (exit 1); exit 1; }; }; } -- -+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$ac_file" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ as_dir="$ac_dir"; as_fn_mkdir_p - ac_builddir=. - --if test "$ac_dir" != .; then -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix - - case $srcdir in -- .) # No --srcdir option. We are building in place. -+ .) # We are building in place. - ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; --esac -- --# Do not use `cd foo && pwd` to compute absolute paths, because --# the directories may not exist. --case `pwd` in --.) ac_abs_builddir="$ac_dir";; --*) -- case "$ac_dir" in -- .) ac_abs_builddir=`pwd`;; -- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -- *) ac_abs_builddir=`pwd`/"$ac_dir";; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_builddir=${ac_top_builddir}.;; --*) -- case ${ac_top_builddir}. in -- .) ac_abs_top_builddir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_srcdir=$ac_srcdir;; --*) -- case $ac_srcdir in -- .) ac_abs_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_srcdir=$ac_top_srcdir;; --*) -- case $ac_top_srcdir in -- .) ac_abs_top_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -- esac;; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; - esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - -+ case $ac_mode in -+ :F) -+ # -+ # CONFIG_FILE -+ # - -- if test x"$ac_file" != x-; then -- { echo "$as_me:$LINENO: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -- rm -f "$ac_file" -- fi -- # Let's still pretend it is `configure' which instantiates (i.e., don't -- # use $as_me), people would be surprised to read: -- # /* config.h. Generated by config.status. */ -- if test x"$ac_file" = x-; then -- configure_input= -- else -- configure_input="$ac_file. " -- fi -- configure_input=$configure_input"Generated from `echo $ac_file_in | -- sed 's,.*/,,'` by configure." -+_ACEOF - -- # First look for the input files in the build tree, otherwise in the -- # src tree. -- ac_file_inputs=`IFS=: -- for f in $ac_file_in; do -- case $f in -- -) echo $tmp/stdin ;; -- [\\/$]*) -- # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- echo "$f";; -- *) # Relative -- if test -f "$f"; then -- # Build tree -- echo "$f" -- elif test -f "$srcdir/$f"; then -- # Source tree -- echo "$srcdir/$f" -- else -- # /dev/null tree -- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- fi;; -- esac -- done` || { (exit 1); exit 1; } -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# If the template does not know about datarootdir, expand it. -+# FIXME: This hack should be removed a few years after 2.60. -+ac_datarootdir_hack=; ac_datarootdir_seen= -+ac_sed_dataroot=' -+/datarootdir/ { -+ p -+ q -+} -+/@datadir@/p -+/@docdir@/p -+/@infodir@/p -+/@localedir@/p -+/@mandir@/p' -+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in -+*datarootdir*) ac_datarootdir_seen=yes;; -+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -- sed "$ac_vpsub -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ ac_datarootdir_hack=' -+ s&@datadir@&$datadir&g -+ s&@docdir@&$docdir&g -+ s&@infodir@&$infodir&g -+ s&@localedir@&$localedir&g -+ s&@mandir@&$mandir&g -+ s&\\\${datarootdir}&$datarootdir&g' ;; -+esac -+_ACEOF -+ -+# Neutralize VPATH when `$srcdir' = `.'. -+# Shell code in configure.ac might set extrasub. -+# FIXME: do we really want to maintain this feature? -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ac_sed_extra="$ac_vpsub - $extrasub - _ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - :t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b --s,@configure_input@,$configure_input,;t t --s,@srcdir@,$ac_srcdir,;t t --s,@abs_srcdir@,$ac_abs_srcdir,;t t --s,@top_srcdir@,$ac_top_srcdir,;t t --s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t --s,@builddir@,$ac_builddir,;t t --s,@abs_builddir@,$ac_abs_builddir,;t t --s,@top_builddir@,$ac_top_builddir,;t t --s,@abs_top_builddir@,$ac_abs_top_builddir,;t t --" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out -- rm -f $tmp/stdin -- if test x"$ac_file" != x-; then -- mv $tmp/out $ac_file -- else -- cat $tmp/out -- rm -f $tmp/out -- fi -+s|@configure_input@|$ac_sed_conf_input|;t t -+s&@top_builddir@&$ac_top_builddir_sub&;t t -+s&@top_build_prefix@&$ac_top_build_prefix&;t t -+s&@srcdir@&$ac_srcdir&;t t -+s&@abs_srcdir@&$ac_abs_srcdir&;t t -+s&@top_srcdir@&$ac_top_srcdir&;t t -+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -+s&@builddir@&$ac_builddir&;t t -+s&@abs_builddir@&$ac_abs_builddir&;t t -+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -+$ac_datarootdir_hack -+" -+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ -+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - --done --_ACEOF -+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && -+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && -+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ -+ "$ac_tmp/out"`; test -z "$ac_out"; } && -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined" >&5 -+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined" >&2;} - --cat >>$CONFIG_STATUS <<\_ACEOF -+ rm -f "$ac_tmp/stdin" -+ case $ac_file in -+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; -+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; -+ esac \ -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 -+ ;; - --{ (exit 0); exit 0; } -+ -+ -+ esac -+ -+done # for ac_tag -+ -+ -+as_fn_exit 0 - _ACEOF --chmod +x $CONFIG_STATUS - ac_clean_files=$ac_clean_files_save - -+test $ac_write_fail = 0 || -+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 -+ - - # configure is writing to config.log, and then calls config.status. - # config.status does its own redirection, appending to config.log. -@@ -7966,23 +7077,27 @@ if test "$no_create" != yes; then - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. -- $ac_cs_success || { (exit 1); exit 1; } -+ $ac_cs_success || as_fn_exit 1 -+fi -+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} - fi - - - if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then -- { echo "$as_me:$LINENO: " >&5 --echo "$as_me: " >&6;} -- { echo "$as_me:$LINENO: --------------------------------------------------" >&5 --echo "$as_me: --------------------------------------------------" >&6;} -- { echo "$as_me:$LINENO: Using erlang compiler: $ERLC" >&5 --echo "$as_me: Using erlang compiler: $ERLC" >&6;} -- { echo "$as_me:$LINENO: wxErlang Install in: $ERLANG_ROOT_DIR/lib/wx-$ERLWX_VSN" >&5 --echo "$as_me: wxErlang Install in: $ERLANG_ROOT_DIR/lib/wx-$ERLWX_VSN" >&6;} -- { echo "$as_me:$LINENO: Erlang driver in priv/$WXERL_SYS_TYPE/wxe_driver$SO_EXT" >&5 --echo "$as_me: Erlang driver in priv/$WXERL_SYS_TYPE/wxe_driver$SO_EXT" >&6;} -- { echo "$as_me:$LINENO: --------------------------------------------------" >&5 --echo "$as_me: --------------------------------------------------" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 -+$as_echo "$as_me: " >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: --------------------------------------------------" >&5 -+$as_echo "$as_me: --------------------------------------------------" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: Using erlang compiler: $ERLC" >&5 -+$as_echo "$as_me: Using erlang compiler: $ERLC" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: wxErlang Install in: $ERLANG_ROOT_DIR/lib/wx-$ERLWX_VSN" >&5 -+$as_echo "$as_me: wxErlang Install in: $ERLANG_ROOT_DIR/lib/wx-$ERLWX_VSN" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: Erlang driver in priv/$WXERL_SYS_TYPE/wxe_driver$SO_EXT" >&5 -+$as_echo "$as_me: Erlang driver in priv/$WXERL_SYS_TYPE/wxe_driver$SO_EXT" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: --------------------------------------------------" >&5 -+$as_echo "$as_me: --------------------------------------------------" >&6;} - fi - - if test X"$WX_BUILDING_INSIDE_ERLSRC" = X"true" ; then diff --git a/lang/erlang-runtime20/Makefile b/lang/erlang-runtime20/Makefile index 21bc023118f..3b8604bf3e4 100644 --- a/lang/erlang-runtime20/Makefile +++ b/lang/erlang-runtime20/Makefile @@ -2,30 +2,11 @@ # $FreeBSD$ PORTNAME= erlang -PORTVERSION= 20.3.8.15 +DISTVERSIONPREFIX= OTP- +DISTVERSION= 20.3.8.20 CATEGORIES= lang parallel java -MASTER_SITES= http://www.erlang.org/download/:erlangorg \ - http://erlang.stacken.kth.se/download/:erlangorg \ - http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg \ - http://olgeni.olgeni.com/~olgeni/distfiles/:local \ - LOCAL/olgeni:local PKGNAMESUFFIX= -runtime20 -DISTNAME= otp_src_${ERLANG_REL} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:erlangorg \ - preloaded-${PORTVERSION}${EXTRACT_SUFX}:local DIST_SUBDIR= erlang -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - -PATCH_SITES= http://olgeni.olgeni.com/~olgeni/distfiles/ \ - LOCAL/olgeni -PATCHFILES= patch-otp-20.3.1 patch-otp-20.3.2 patch-otp-20.3.3 \ - patch-otp-20.3.4 patch-otp-20.3.5 patch-otp-20.3.6 \ - patch-otp-20.3.7 patch-otp-20.3.8 patch-otp-20.3.8.1 \ - patch-otp-20.3.8.2 patch-otp-20.3.8.3 patch-otp-20.3.8.4 \ - patch-otp-20.3.8.5 patch-otp-20.3.8.6 patch-otp-20.3.8.7 \ - patch-otp-20.3.8.8 patch-otp-20.3.8.9 patch-otp-20.3.8.10 \ - patch-otp-20.3.8.11 patch-otp-20.3.8.12 patch-otp-20.3.8.13 \ - patch-otp-20.3.8.14 patch-otp-20.3.8.15 MAINTAINER= erlang@FreeBSD.org COMMENT= Functional programming language from Ericsson @@ -34,16 +15,18 @@ LICENSE= APACHE20 BROKEN_sparc64= Fails to build: error: fp_except undeclared -WRKSRC= ${WRKDIR}/otp_src_${ERLANG_REL} +USES= autoreconf:build gmake ncurses perl5 +USE_GITHUB= yes +GH_PROJECT= otp +USE_PERL5= build -ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//} -ERLANG_REL= 20.3 +GNU_CONFIGURE= yes +MAKE_JOBS_UNSAFE=yes -OPTIONS_SUB= yes SUB_FILES= pkg-message SUB_LIST= ERLANG_LIB=${ERLANG_LIB} -MAKE_JOBS_UNSAFE=yes +ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//} OPTIONS_DEFINE= DIRTY DTRACE GS HIPE JAVA KQUEUE NATIVE ODBC OPENSSL SCTP THREADS WX OPTIONS_DEFAULT=DIRTY DTRACE HIPE KQUEUE OPENSSL SCTP THREADS @@ -63,10 +46,6 @@ NATIVE_IMPLIES= HIPE OPTIONS_EXCLUDE+= DTRACE .endif -# If you run Erlang and get a message resembling "WARNING: number of -# probes fixed does not match the number of defined probes (54 != 132, -# respectively)" you probably misconfigured DTrace in some way. - OPTIONS_EXCLUDE_DragonFly= HIPE NATIVE SCTP # ld(1) fails to link probes: missing __dtrace_erlang___* symbols OPTIONS_EXCLUDE_aarch64= DTRACE @@ -76,10 +55,10 @@ OPTIONS_EXCLUDE_i386= DTRACE OPENSSL_VARS= BROKEN_SSL=openssl111 -GNU_CONFIGURE= yes -LDFLAGS+= -L${LOCALBASE}/lib -USES= gmake ncurses perl5 -USE_PERL5= build +# If you run Erlang and get a message resembling "WARNING: number of +# probes fixed does not match the number of defined probes (54 != 132, +# respectively)" you probably misconfigured DTrace in some way. + CONFIGURE_ENABLE= smp-support DIRTY_CONFIGURE_ENABLE= dirty-schedulers @@ -100,9 +79,10 @@ OPENSSL_USES= ssl SCTP_CONFIGURE_ENABLE= sctp THREADS_CONFIGURE_ENABLE= threads WX_CONFIGURE_WITH= wx-config=${WX_CONFIG} +WX_USES= gl WX_VARS= USE_WX=2.8+ WX_COMPS="wx contrib" USE_GL="gl glu" -.include +.include .if ${OPSYS} == FreeBSD CFLAGS+= -DMAP_NORESERVE=0 @@ -117,9 +97,12 @@ MAKE_ARGS+= ARCH=arm .endif pre-configure: - cd ${WRKSRC} && ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/preloaded-${PORTVERSION}${EXTRACT_SUFX} + @cd ${WRKSRC} && ./otp_build autoconf -pre-configure-MX-off: +pre-configure-WX-off: + echo "disabled by port options" > ${WRKSRC}/lib/debugger/SKIP + echo "disabled by port options" > ${WRKSRC}/lib/et/SKIP + echo "disabled by port options" > ${WRKSRC}/lib/observer/SKIP echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP post-configure-ODBC-on: @@ -150,4 +133,4 @@ post-stage: @cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type f -o -type l \ | ${SORT} >> ${TMPPLIST} -.include +.include diff --git a/lang/erlang-runtime20/distinfo b/lang/erlang-runtime20/distinfo index a4425ef1859..a32e14a7ee8 100644 --- a/lang/erlang-runtime20/distinfo +++ b/lang/erlang-runtime20/distinfo @@ -1,51 +1,3 @@ -TIMESTAMP = 1544291427 -SHA256 (erlang/otp_src_20.3.tar.gz) = 4e19e6c403d5255531c0b870f19511c8b8e3b080618e4f9efcb44d905935b2a1 -SIZE (erlang/otp_src_20.3.tar.gz) = 88170904 -SHA256 (erlang/preloaded-20.3.8.15.tar.gz) = 378c9c29b74eb55785e16b7261a57178a87110d8e9fce1db4110974187ed810e -SIZE (erlang/preloaded-20.3.8.15.tar.gz) = 334977 -SHA256 (erlang/patch-otp-20.3.1) = 3d43c6ecb867c64318466eb7adeb8953669cb092bb4b43bbe1b51cfb8d640ee8 -SIZE (erlang/patch-otp-20.3.1) = 5316 -SHA256 (erlang/patch-otp-20.3.2) = b4fa80bab29f1382510ad5b3fc66fd5d1aba35bb48ce390763eb05c88a3e44b1 -SIZE (erlang/patch-otp-20.3.2) = 8201 -SHA256 (erlang/patch-otp-20.3.3) = 8049bb676ac703bab6036f2682ca8cd11b787fd3f94aa4f294ec2c0d37c2dbc9 -SIZE (erlang/patch-otp-20.3.3) = 20074 -SHA256 (erlang/patch-otp-20.3.4) = d76846ea1a2adf62d48781416628297a116331d130f2b5dc66770ed0132c9496 -SIZE (erlang/patch-otp-20.3.4) = 28465 -SHA256 (erlang/patch-otp-20.3.5) = 9f3da1a6c1cec2c30934d088fa101611553590139db3e89433cf101058d60029 -SIZE (erlang/patch-otp-20.3.5) = 15964 -SHA256 (erlang/patch-otp-20.3.6) = edcfba7dd5efee0f0739c919aea542bad33b788b7b2fef212983f686401dda39 -SIZE (erlang/patch-otp-20.3.6) = 10837 -SHA256 (erlang/patch-otp-20.3.7) = 3b55f718ef9d863b7616f22f9a90c01766f9d42a69cbfb5fe949d37aec6ac341 -SIZE (erlang/patch-otp-20.3.7) = 19324 -SHA256 (erlang/patch-otp-20.3.8) = ea17d780d1e14ac7419ab57b7393d493124cd2b32da248bbc273e71e87496a92 -SIZE (erlang/patch-otp-20.3.8) = 13102 -SHA256 (erlang/patch-otp-20.3.8.1) = 8c04290f5a66b03501b52a1680838a9f4bd25bcc3a8550a9ce5f7e9ae990916d -SIZE (erlang/patch-otp-20.3.8.1) = 27058 -SHA256 (erlang/patch-otp-20.3.8.2) = aac9c7b3c93609cc5cf9d3cffa92254da8e0aa22266620ab1d8a4324dfc7f259 -SIZE (erlang/patch-otp-20.3.8.2) = 24822 -SHA256 (erlang/patch-otp-20.3.8.3) = da2a425c0d443199cb5a31826184435334d92e3dad0c502ee4376227c61ed186 -SIZE (erlang/patch-otp-20.3.8.3) = 146618 -SHA256 (erlang/patch-otp-20.3.8.4) = bdd8437c9b4e4f7dec52c3a281dcb85f97c28ed75a868655bf6fe411c6df1c25 -SIZE (erlang/patch-otp-20.3.8.4) = 8486 -SHA256 (erlang/patch-otp-20.3.8.5) = aab67a4a4e122d6f93684c50e7255d6b7cf482c4ef3d9c41f0e4c5db941bcb44 -SIZE (erlang/patch-otp-20.3.8.5) = 35434 -SHA256 (erlang/patch-otp-20.3.8.6) = 5fc321ea92e05dcd4bcbce516d550de97ade4518a4da3c7e50579db980be59ca -SIZE (erlang/patch-otp-20.3.8.6) = 10965 -SHA256 (erlang/patch-otp-20.3.8.7) = 62aec37d1ef5db75324121dd0178a045becbd225b9bb2126f2b27a03ed19733f -SIZE (erlang/patch-otp-20.3.8.7) = 68400 -SHA256 (erlang/patch-otp-20.3.8.8) = c9d0364c5bdf3f531de7701a1d2f25a7949b3cb2c0378c08db6a3383cd0c7fa9 -SIZE (erlang/patch-otp-20.3.8.8) = 14280 -SHA256 (erlang/patch-otp-20.3.8.9) = 8e7cf6057eba34c2cebfd23f4466824ac886249d7fcbeacc2c844771c0b9206f -SIZE (erlang/patch-otp-20.3.8.9) = 4425 -SHA256 (erlang/patch-otp-20.3.8.10) = c30b12322ae08bd29dfded719b3769216806500beffbe8d72575361ddf9139d6 -SIZE (erlang/patch-otp-20.3.8.10) = 9510 -SHA256 (erlang/patch-otp-20.3.8.11) = c142174a35e9d6911ea27bbbf4316cffacc3a87aa67683b24edc95f0fd2ebdf1 -SIZE (erlang/patch-otp-20.3.8.11) = 5408 -SHA256 (erlang/patch-otp-20.3.8.12) = d207aa52384f9ec151b6a697938c1b9f3fedd74e1de357b12e154d25935eaf58 -SIZE (erlang/patch-otp-20.3.8.12) = 36832 -SHA256 (erlang/patch-otp-20.3.8.13) = 5409e03f3ff57fefe4ab1366d470bcdeea4e395ab07f27e8ce771de12c4844f3 -SIZE (erlang/patch-otp-20.3.8.13) = 7279 -SHA256 (erlang/patch-otp-20.3.8.14) = e8f7ac2f1f10185e1666785ba4a3cc60c46f14d46ceb04c45672bf323c83cef7 -SIZE (erlang/patch-otp-20.3.8.14) = 6822 -SHA256 (erlang/patch-otp-20.3.8.15) = 664cc80d24fbe506c90f54af11dcae3cf5ad11ac7ef6c19832c997654be90082 -SIZE (erlang/patch-otp-20.3.8.15) = 6127 +TIMESTAMP = 1552764544 +SHA256 (erlang/erlang-otp-OTP-20.3.8.20_GH0.tar.gz) = 7151e78f7c1d48e05459cec723ca75c3bc92e66e1e4ec47d876b6f6f5aae771e +SIZE (erlang/erlang-otp-OTP-20.3.8.20_GH0.tar.gz) = 53523729 diff --git a/lang/erlang-runtime20/files/patch-lib_wx_configure b/lang/erlang-runtime20/files/patch-lib_wx_configure deleted file mode 100644 index b75764d23f6..00000000000 --- a/lang/erlang-runtime20/files/patch-lib_wx_configure +++ /dev/null @@ -1,10464 +0,0 @@ ---- lib/wx/configure.orig 2017-03-14 20:10:54 UTC -+++ lib/wx/configure -@@ -1,81 +1,459 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.59. -+# Generated by GNU Autoconf 2.69. -+# -+# -+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. -+# - # --# Copyright (C) 2003 Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. --## --------------------- ## --## M4sh Initialization. ## --## --------------------- ## -+## -------------------- ## -+## M4sh Initialization. ## -+## -------------------- ## - --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac - fi --DUALCASE=1; export DUALCASE # for MKS sh - --# Support unset when possible. --if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -- as_unset=unset -+ -+as_nl=' -+' -+export as_nl -+# Printing a long string crashes Solaris 7 /usr/bin/printf. -+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -+# Prefer a ksh shell builtin over an external printf program on Solaris, -+# but without wasting forks for bash or zsh. -+if test -z "$BASH_VERSION$ZSH_VERSION" \ -+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='print -r --' -+ as_echo_n='print -rn --' -+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='printf %s\n' -+ as_echo_n='printf %s' - else -- as_unset=false -+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -+ as_echo_n='/usr/ucb/echo -n' -+ else -+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -+ as_echo_n_body='eval -+ arg=$1; -+ case $arg in #( -+ *"$as_nl"*) -+ expr "X$arg" : "X\\(.*\\)$as_nl"; -+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -+ esac; -+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -+ ' -+ export as_echo_n_body -+ as_echo_n='sh -c $as_echo_n_body as_echo' -+ fi -+ export as_echo_body -+ as_echo='sh -c $as_echo_body as_echo' - fi - -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } -+fi - --# Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH -+ -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+as_myself= -+case $0 in #(( -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ exit 1 -+fi -+ -+# Unset variables that we do not need and which cause bugs (e.g. in -+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -+# suppresses any "Segmentation fault" message there. '((' could -+# trigger a bug in pdksh 5.2.14. -+for as_var in BASH_ENV ENV MAIL MAILPATH -+do eval test x\${$as_var+set} = xset \ -+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -+done - PS1='$ ' - PS2='> ' - PS4='+ ' - - # NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -- LC_TELEPHONE LC_TIME -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE -+ -+# CDPATH. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ -+# Use a proper internal environment variable to ensure we don't fall -+ # into an infinite loop, continuously re-executing ourselves. -+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then -+ _as_can_reexec=no; export _as_can_reexec; -+ # We cannot yet assume a decent shell, so we have to provide a -+# neutralization value for shells without unset; and this also -+# works around shells that cannot unset nonexistent variables. -+# Preserve -v and -x to the replacement shell. -+BASH_ENV=/dev/null -+ENV=/dev/null -+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -+case $- in # (((( -+ *v*x* | *x*v* ) as_opts=-vx ;; -+ *v* ) as_opts=-v ;; -+ *x* ) as_opts=-x ;; -+ * ) as_opts= ;; -+esac -+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -+# Admittedly, this is quite paranoid, since all the known shells bail -+# out after a failed `exec'. -+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -+as_fn_exit 255 -+ fi -+ # We don't want this to propagate to other subprocesses. -+ { _as_can_reexec=; unset _as_can_reexec;} -+if test "x$CONFIG_SHELL" = x; then -+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : -+ emulate sh -+ NULLCMD=: -+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '\${1+\"\$@\"}'='\"\$@\"' -+ setopt NO_GLOB_SUBST -+else -+ case \`(set -o) 2>/dev/null\` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac -+fi -+" -+ as_required="as_fn_return () { (exit \$1); } -+as_fn_success () { as_fn_return 0; } -+as_fn_failure () { as_fn_return 1; } -+as_fn_ret_success () { return 0; } -+as_fn_ret_failure () { return 1; } -+ -+exitcode=0 -+as_fn_success || { exitcode=1; echo as_fn_success failed.; } -+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } -+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } -+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : -+ -+else -+ exitcode=1; echo positional parameters were not saved. -+fi -+test x\$exitcode = x0 || exit 1 -+test -x / || exit 1" -+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO -+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO -+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && -+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -+test \$(( 1 + 1 )) = 2 || exit 1" -+ if (eval "$as_required") 2>/dev/null; then : -+ as_have_required=yes -+else -+ as_have_required=no -+fi -+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -+ -+else -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+as_found=false -+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH - do -- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -- eval $as_var=C; export $as_var -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ as_found=: -+ case $as_dir in #( -+ /*) -+ for as_base in sh bash ksh sh5; do -+ # Try only shells that exist, to save several forks. -+ as_shell=$as_dir/$as_base -+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && -+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : -+ CONFIG_SHELL=$as_shell as_have_required=yes -+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : -+ break 2 -+fi -+fi -+ done;; -+ esac -+ as_found=false -+done -+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && -+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : -+ CONFIG_SHELL=$SHELL as_have_required=yes -+fi; } -+IFS=$as_save_IFS -+ -+ -+ if test "x$CONFIG_SHELL" != x; then : -+ export CONFIG_SHELL -+ # We cannot yet assume a decent shell, so we have to provide a -+# neutralization value for shells without unset; and this also -+# works around shells that cannot unset nonexistent variables. -+# Preserve -v and -x to the replacement shell. -+BASH_ENV=/dev/null -+ENV=/dev/null -+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -+case $- in # (((( -+ *v*x* | *x*v* ) as_opts=-vx ;; -+ *v* ) as_opts=-v ;; -+ *x* ) as_opts=-x ;; -+ * ) as_opts= ;; -+esac -+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -+# Admittedly, this is quite paranoid, since all the known shells bail -+# out after a failed `exec'. -+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -+exit 255 -+fi -+ -+ if test x$as_have_required = xno; then : -+ $as_echo "$0: This script requires a shell more modern than all" -+ $as_echo "$0: the shells that I found on your system." -+ if test x${ZSH_VERSION+set} = xset ; then -+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" -+ $as_echo "$0: be upgraded to zsh 4.3.4 or later." - else -- $as_unset $as_var -+ $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, -+$0: including any error possibly output before this -+$0: message. Then install a modern shell, or manually run -+$0: the script under such a shell if you do have one." - fi --done -+ exit 1 -+fi -+fi -+fi -+SHELL=${CONFIG_SHELL-/bin/sh} -+export SHELL -+# Unset more variables known to interfere with behavior of common tools. -+CLICOLOR_FORCE= GREP_OPTIONS= -+unset CLICOLOR_FORCE GREP_OPTIONS - --# Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -+## --------------------- ## -+## M4sh Shell Functions. ## -+## --------------------- ## -+# as_fn_unset VAR -+# --------------- -+# Portably unset VAR. -+as_fn_unset () -+{ -+ { eval $1=; unset $1;} -+} -+as_unset=as_fn_unset -+ -+# as_fn_set_status STATUS -+# ----------------------- -+# Set $? to STATUS, without forking. -+as_fn_set_status () -+{ -+ return $1 -+} # as_fn_set_status -+ -+# as_fn_exit STATUS -+# ----------------- -+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -+as_fn_exit () -+{ -+ set +e -+ as_fn_set_status $1 -+ exit $1 -+} # as_fn_exit -+ -+# as_fn_mkdir_p -+# ------------- -+# Create "$as_dir" as a directory, including parents if necessary. -+as_fn_mkdir_p () -+{ -+ -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || eval $as_mkdir_p || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" -+ -+ -+} # as_fn_mkdir_p -+ -+# as_fn_executable_p FILE -+# ----------------------- -+# Test if FILE is an executable regular file. -+as_fn_executable_p () -+{ -+ test -f "$1" && test -x "$1" -+} # as_fn_executable_p -+# as_fn_append VAR VALUE -+# ---------------------- -+# Append the text in VALUE to the end of the definition contained in VAR. Take -+# advantage of any shell optimizations that allow amortized linear growth over -+# repeated appends, instead of the typical quadratic growth present in naive -+# implementations. -+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : -+ eval 'as_fn_append () -+ { -+ eval $1+=\$2 -+ }' -+else -+ as_fn_append () -+ { -+ eval $1=\$$1\$2 -+ } -+fi # as_fn_append -+ -+# as_fn_arith ARG... -+# ------------------ -+# Perform arithmetic evaluation on the ARGs, and store the result in the -+# global $as_val. Take advantage of shells that can avoid forks. The arguments -+# must be portable across $(()) and expr. -+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : -+ eval 'as_fn_arith () -+ { -+ as_val=$(( $* )) -+ }' -+else -+ as_fn_arith () -+ { -+ as_val=`expr "$@" || test $? -eq 1` -+ } -+fi # as_fn_arith -+ -+ -+# as_fn_error STATUS ERROR [LINENO LOG_FD] -+# ---------------------------------------- -+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -+# script with STATUS, using 1 if that was 0. -+as_fn_error () -+{ -+ as_status=$1; test $as_status -eq 0 && as_status=1 -+ if test "$4"; then -+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 -+ fi -+ $as_echo "$as_me: error: $2" >&2 -+ as_fn_exit $as_status -+} # as_fn_error -+ -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename - else - as_basename=false - fi - -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi - --# Name of the executable. --as_me=`$as_basename "$0" || -+as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || --echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -- /^X\/\(\/\/\)$/{ s//\1/; q; } -- /^X\/\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - --# PATH needs CR, and LINENO needs CR and PATH. - # Avoid depending upon Character Ranges. - as_cr_letters='abcdefghijklmnopqrstuvwxyz' - as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -@@ -83,146 +461,91 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE - as_cr_digits='0123456789' - as_cr_alnum=$as_cr_Letters$as_cr_digits - --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -- else -- PATH_SEPARATOR=: -- fi -- rm -f conf$$.sh --fi -- -- -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" || { -- # Find who we are. Look in the path if we contain no path at all -- # relative or not. -- case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -- -- ;; -- esac -- # We did not find ourselves, most probably we were run as `sh COMMAND' -- # in which case we are not to be found in the path. -- if test "x$as_myself" = x; then -- as_myself=$0 -- fi -- if test ! -f "$as_myself"; then -- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 -- { (exit 1); exit 1; }; } -- fi -- case $CONFIG_SHELL in -- '') -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for as_base in sh bash ksh sh5; do -- case $as_dir in -- /*) -- if ("$as_dir/$as_base" -c ' -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -- CONFIG_SHELL=$as_dir/$as_base -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" ${1+"$@"} -- fi;; -- esac -- done --done --;; -- esac - -- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -- # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line before each line; the second 'sed' does the real -- # work. The second script uses 'N' to pair each line-number line -- # with the numbered line, and appends trailing '-' during -- # substitution so that $LINENO is not a special case at line end. -- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -+ as_lineno_1=$LINENO as_lineno_1a=$LINENO -+ as_lineno_2=$LINENO as_lineno_2a=$LINENO -+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && -+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { -+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | - sed ' -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno - N -- s,$,-, -- : loop -- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -+ s/-\n.*// - ' >$as_me.lineno && -- chmod +x $as_me.lineno || -- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -- { (exit 1); exit 1; }; } -+ chmod +x "$as_me.lineno" || -+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - -+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have -+ # already done that, so ensure we don't try to do so again and fall -+ # in an infinite loop. This has already happened in practice. -+ _as_can_reexec=no; export _as_can_reexec - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensible to this). -- . ./$as_me.lineno -+ # original and so on. Autoconf is especially sensitive to this). -+ . "./$as_me.lineno" - # Exit status is that of the last command. - exit - } - -- --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in #((((( -+-n*) -+ case `echo 'xy\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ xy) ECHO_C='\c';; -+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null -+ ECHO_T=' ';; -+ esac;; -+*) -+ ECHO_N='-n';; - esac - --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr -+rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file - else -- as_expr=false -+ rm -f conf$$.dir -+ mkdir conf$$.dir 2>/dev/null - fi -- --rm -f conf$$ conf$$.exe conf$$.file --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -- as_ln_s='cp -p' -- else -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -pR'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -pR' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else -+ as_ln_s='cp -pR' - fi --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln - else -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - fi --rm -f conf$$ conf$$.exe conf$$.file -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null - - if mkdir -p . 2>/dev/null; then -- as_mkdir_p=: -+ as_mkdir_p='mkdir -p "$as_dir"' - else - test -d ./-p && rmdir ./-p - as_mkdir_p=false - fi - --as_executable_p="test -f" -+as_test_x='test -x' -+as_executable_p=as_fn_executable_p - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -231,38 +554,25 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P - as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH -- -+test -n "$DJDIR" || exec 7<&0 &1 - - # Name of the host. --# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, - # so uname gets run too. - ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - --exec 6>&1 -- - # - # Initializations. - # - ac_default_prefix=/usr/local -+ac_clean_files= - ac_config_libobj_dir=. -+LIBOBJS= - cross_compiling=no - subdirs= - MFLAGS= - MAKEFLAGS= --SHELL=${CONFIG_SHELL-/bin/sh} -- --# Maximum number of lines to put in a shell here document. --# This variable seems obsolete. It should probably be removed, and --# only ac_max_sed_lines should be used. --: ${ac_max_here_lines=38} - - # Identity of this package. - PACKAGE_NAME= -@@ -270,50 +580,175 @@ PACKAGE_TARNAME= - PACKAGE_VERSION= - PACKAGE_STRING= - PACKAGE_BUGREPORT= -+PACKAGE_URL= - - # Factoring default headers for most tests. - ac_includes_default="\ - #include --#if HAVE_SYS_TYPES_H -+#ifdef HAVE_SYS_TYPES_H - # include - #endif --#if HAVE_SYS_STAT_H -+#ifdef HAVE_SYS_STAT_H - # include - #endif --#if STDC_HEADERS -+#ifdef STDC_HEADERS - # include - # include - #else --# if HAVE_STDLIB_H -+# ifdef HAVE_STDLIB_H - # include - # endif - #endif --#if HAVE_STRING_H --# if !STDC_HEADERS && HAVE_MEMORY_H -+#ifdef HAVE_STRING_H -+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H - # include - # endif - # include - #endif --#if HAVE_STRINGS_H -+#ifdef HAVE_STRINGS_H - # include - #endif --#if HAVE_INTTYPES_H -+#ifdef HAVE_INTTYPES_H - # include --#else --# if HAVE_STDINT_H --# include --# endif - #endif --#if HAVE_UNISTD_H -+#ifdef HAVE_STDINT_H -+# include -+#endif -+#ifdef HAVE_UNISTD_H - # include - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os TARGET CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB CPP MIXED_CYGWIN_VC MIXED_MSYS_VC MIXED_VC MIXED_CYGWIN_MINGW MIXED_CYGWIN MIXED_MSYS EGREP OBJC_CC OBJC_CFLAGS GL_LIBS DEBUG_CFLAGS DEBUG_CXXFLAGS ERLC WX_BUILDING_INSIDE_ERLSRC ERLANG_ROOT_DIR WX_CONFIG_PATH WX_CPPFLAGS WX_CFLAGS WX_CXXFLAGS WX_CFLAGS_ONLY WX_CXXFLAGS_ONLY WX_LIBS WX_LIBS_STATIC WX_VERSION WX_RESCOMP WX_VERSION_MAJOR WX_VERSION_MINOR WX_VERSION_MICRO DEBUG_WX_CFLAGS DEBUG_WX_CXXFLAGS DEBUG_WX_LIBS DEBUG_WX_LIBS_STATIC FORCED_DEBUG_BUILD WX_HAVE_STATIC_LIBS RC_FILE_TYPE HAVE_GL_SUPPORT TESS_CB_TIGER_STYLE WXERL_CAN_BUILD_DRIVER SO_EXT RUN_ERL WXERL_SYS_TYPE LIBOBJS LTLIBOBJS' -+ac_subst_vars='LTLIBOBJS -+LIBOBJS -+WXERL_SYS_TYPE -+RUN_ERL -+SO_EXT -+WXERL_CAN_BUILD_DRIVER -+TESS_CB_TIGER_STYLE -+HAVE_GL_SUPPORT -+RC_FILE_TYPE -+WX_HAVE_STATIC_LIBS -+FORCED_DEBUG_BUILD -+DEBUG_WX_LIBS_STATIC -+DEBUG_WX_LIBS -+DEBUG_WX_CXXFLAGS -+DEBUG_WX_CFLAGS -+WX_VERSION_MICRO -+WX_VERSION_MINOR -+WX_VERSION_MAJOR -+WX_RESCOMP -+WX_VERSION -+WX_LIBS_STATIC -+WX_LIBS -+WX_CXXFLAGS_ONLY -+WX_CFLAGS_ONLY -+WX_CXXFLAGS -+WX_CFLAGS -+WX_CPPFLAGS -+WX_CONFIG_PATH -+ERLANG_ROOT_DIR -+WX_BUILDING_INSIDE_ERLSRC -+ERLC -+DEBUG_CXXFLAGS -+DEBUG_CFLAGS -+GL_LIBS -+OBJC_CFLAGS -+OBJC_CC -+EGREP -+GREP -+MIXED_MSYS -+MIXED_CYGWIN -+MIXED_CYGWIN_MINGW -+MIXED_VC -+MIXED_MSYS_VC -+MIXED_CYGWIN_VC -+CPP -+RANLIB -+ac_ct_CXX -+CXXFLAGS -+CXX -+OBJEXT -+EXEEXT -+ac_ct_CC -+CPPFLAGS -+LDFLAGS -+CFLAGS -+CC -+TARGET -+host_os -+host_vendor -+host_cpu -+host -+build_os -+build_vendor -+build_cpu -+build -+target_alias -+host_alias -+build_alias -+LIBS -+ECHO_T -+ECHO_N -+ECHO_C -+DEFS -+mandir -+localedir -+libdir -+psdir -+pdfdir -+dvidir -+htmldir -+infodir -+docdir -+oldincludedir -+includedir -+localstatedir -+sharedstatedir -+sysconfdir -+datadir -+datarootdir -+libexecdir -+sbindir -+bindir -+program_transform_name -+prefix -+exec_prefix -+PACKAGE_URL -+PACKAGE_BUGREPORT -+PACKAGE_STRING -+PACKAGE_VERSION -+PACKAGE_TARNAME -+PACKAGE_NAME -+PATH_SEPARATOR -+SHELL' - ac_subst_files='' -+ac_user_opts=' -+enable_option_checking -+with_wxdir -+with_wx_config -+with_wx_prefix -+with_wx_exec_prefix -+enable_sanitizers -+' -+ ac_precious_vars='build_alias -+host_alias -+target_alias -+CC -+CFLAGS -+LDFLAGS -+LIBS -+CPPFLAGS -+CXX -+CXXFLAGS -+CCC -+CPP' -+ - - # Initialize some variables set by options. - ac_init_help= - ac_init_version=false -+ac_unrecognized_opts= -+ac_unrecognized_sep= - # The variables have the same names as the options, with - # dashes changed to underlines. - cache_file=/dev/null -@@ -336,34 +771,49 @@ x_libraries=NONE - # and all the variables that are supposed to be based on exec_prefix - # by default will actually change. - # Use braces instead of parens because sh, perl, etc. also accept them. -+# (The list follows the same order as the GNU Coding Standards.) - bindir='${exec_prefix}/bin' - sbindir='${exec_prefix}/sbin' - libexecdir='${exec_prefix}/libexec' --datadir='${prefix}/share' -+datarootdir='${prefix}/share' -+datadir='${datarootdir}' - sysconfdir='${prefix}/etc' - sharedstatedir='${prefix}/com' - localstatedir='${prefix}/var' --libdir='${exec_prefix}/lib' - includedir='${prefix}/include' - oldincludedir='/usr/include' --infodir='${prefix}/info' --mandir='${prefix}/man' -+docdir='${datarootdir}/doc/${PACKAGE}' -+infodir='${datarootdir}/info' -+htmldir='${docdir}' -+dvidir='${docdir}' -+pdfdir='${docdir}' -+psdir='${docdir}' -+libdir='${exec_prefix}/lib' -+localedir='${datarootdir}/locale' -+mandir='${datarootdir}/man' - - ac_prev= -+ac_dashdash= - for ac_option - do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then -- eval "$ac_prev=\$ac_option" -+ eval $ac_prev=\$ac_option - ac_prev= - continue - fi - -- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` -+ case $ac_option in -+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; -+ *=) ac_optarg= ;; -+ *) ac_optarg=yes ;; -+ esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - -- case $ac_option in -+ case $ac_dashdash$ac_option in -+ --) -+ ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; -@@ -385,33 +835,59 @@ do - --config-cache | -C) - cache_file=config.cache ;; - -- -datadir | --datadir | --datadi | --datad | --data | --dat | --da) -+ -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; -- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ -- | --da=*) -+ -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - -+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ -+ | --dataroo | --dataro | --datar) -+ ac_prev=datarootdir ;; -+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ -+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) -+ datarootdir=$ac_optarg ;; -+ - -disable-* | --disable-*) -- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -- { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- eval "enable_$ac_feature=no" ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid feature name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval enable_$ac_useropt=no ;; -+ -+ -docdir | --docdir | --docdi | --doc | --do) -+ ac_prev=docdir ;; -+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) -+ docdir=$ac_optarg ;; -+ -+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) -+ ac_prev=dvidir ;; -+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) -+ dvidir=$ac_optarg ;; - - -enable-* | --enable-*) -- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -- { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -- *) ac_optarg=yes ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid feature name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; - esac -- eval "enable_$ac_feature='$ac_optarg'" ;; -+ eval enable_$ac_useropt=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -@@ -438,6 +914,12 @@ do - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - -+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) -+ ac_prev=htmldir ;; -+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ -+ | --ht=*) -+ htmldir=$ac_optarg ;; -+ - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; -@@ -462,13 +944,16 @@ do - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - -+ -localedir | --localedir | --localedi | --localed | --locale) -+ ac_prev=localedir ;; -+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) -+ localedir=$ac_optarg ;; -+ - -localstatedir | --localstatedir | --localstatedi | --localstated \ -- | --localstate | --localstat | --localsta | --localst \ -- | --locals | --local | --loca | --loc | --lo) -+ | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ -- | --localstate=* | --localstat=* | --localsta=* | --localst=* \ -- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) -+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) -@@ -533,6 +1018,16 @@ do - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - -+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) -+ ac_prev=pdfdir ;; -+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) -+ pdfdir=$ac_optarg ;; -+ -+ -psdir | --psdir | --psdi | --psd | --ps) -+ ac_prev=psdir ;; -+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) -+ psdir=$ac_optarg ;; -+ - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; -@@ -583,26 +1078,36 @@ do - ac_init_version=: ;; - - -with-* | --with-*) -- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -- { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package| sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -- *) ac_optarg=yes ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid package name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; - esac -- eval "with_$ac_package='$ac_optarg'" ;; -+ eval with_$ac_useropt=\$ac_optarg ;; - - -without-* | --without-*) -- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -- { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package | sed 's/-/_/g'` -- eval "with_$ac_package=no" ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid package name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval with_$ac_useropt=no ;; - - --x) - # Obsolete; use --with-x. -@@ -622,27 +1127,26 @@ do - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - -- -*) { echo "$as_me: error: unrecognized option: $ac_option --Try \`$0 --help' for more information." >&2 -- { (exit 1); exit 1; }; } -+ -*) as_fn_error $? "unrecognized option: \`$ac_option' -+Try \`$0 --help' for more information" - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. -- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 -- { (exit 1); exit 1; }; } -- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` -- eval "$ac_envvar='$ac_optarg'" -+ case $ac_envvar in #( -+ '' | [0-9]* | *[!_$as_cr_alnum]* ) -+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; -+ esac -+ eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. -- echo "$as_me: WARNING: you should use --build, --host, --target" >&2 -+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && -- echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} -+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" - ;; - - esac -@@ -650,31 +1154,36 @@ done - - if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` -- { echo "$as_me: error: missing argument to $ac_option" >&2 -- { (exit 1); exit 1; }; } -+ as_fn_error $? "missing argument to $ac_option" - fi - --# Be sure to have absolute paths. --for ac_var in exec_prefix prefix --do -- eval ac_val=$`echo $ac_var` -- case $ac_val in -- [\\/$]* | ?:[\\/]* | NONE | '' ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -+if test -n "$ac_unrecognized_opts"; then -+ case $enable_option_checking in -+ no) ;; -+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; -+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; - esac --done -+fi - --# Be sure to have absolute paths. --for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ -- localstatedir libdir includedir oldincludedir infodir mandir -+# Check all directory arguments for consistency. -+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ -+ datadir sysconfdir sharedstatedir localstatedir includedir \ -+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ -+ libdir localedir mandir - do -- eval ac_val=$`echo $ac_var` -+ eval ac_val=\$$ac_var -+ # Remove trailing slashes. - case $ac_val in -- [\\/$]* | ?:[\\/]* ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -+ */ ) -+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` -+ eval $ac_var=\$ac_val;; -+ esac -+ # Be sure to have absolute directory names. -+ case $ac_val in -+ [\\/$]* | ?:[\\/]* ) continue;; -+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac -+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" - done - - # There might be people who depend on the old broken behavior: `$host' -@@ -688,8 +1197,6 @@ target=$target_alias - if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe -- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. -- If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -@@ -701,82 +1208,72 @@ test -n "$host_alias" && ac_tool_prefix= - test "$silent" = yes && exec 6>/dev/null - - -+ac_pwd=`pwd` && test -n "$ac_pwd" && -+ac_ls_di=`ls -di .` && -+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -+ as_fn_error $? "working directory cannot be determined" -+test "X$ac_ls_di" = "X$ac_pwd_ls_di" || -+ as_fn_error $? "pwd does not report name of working directory" -+ -+ - # Find the source files, if location was not specified. - if test -z "$srcdir"; then - ac_srcdir_defaulted=yes -- # Try the directory containing this script, then its parent. -- ac_confdir=`(dirname "$0") 2>/dev/null || --$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$0" : 'X\(//\)[^/]' \| \ -- X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$0" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ # Try the directory containing this script, then the parent directory. -+ ac_confdir=`$as_dirname -- "$as_myself" || -+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_myself" : 'X\(//\)[^/]' \| \ -+ X"$as_myself" : 'X\(//\)$' \| \ -+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_myself" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - srcdir=$ac_confdir -- if test ! -r $srcdir/$ac_unique_file; then -+ if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. - fi - else - ac_srcdir_defaulted=no - fi --if test ! -r $srcdir/$ac_unique_file; then -- if test "$ac_srcdir_defaulted" = yes; then -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 -- { (exit 1); exit 1; }; } -- else -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -- { (exit 1); exit 1; }; } -- fi -+if test ! -r "$srcdir/$ac_unique_file"; then -+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." -+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" - fi --(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || -- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 -- { (exit 1); exit 1; }; } --srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` --ac_env_build_alias_set=${build_alias+set} --ac_env_build_alias_value=$build_alias --ac_cv_env_build_alias_set=${build_alias+set} --ac_cv_env_build_alias_value=$build_alias --ac_env_host_alias_set=${host_alias+set} --ac_env_host_alias_value=$host_alias --ac_cv_env_host_alias_set=${host_alias+set} --ac_cv_env_host_alias_value=$host_alias --ac_env_target_alias_set=${target_alias+set} --ac_env_target_alias_value=$target_alias --ac_cv_env_target_alias_set=${target_alias+set} --ac_cv_env_target_alias_value=$target_alias --ac_env_CC_set=${CC+set} --ac_env_CC_value=$CC --ac_cv_env_CC_set=${CC+set} --ac_cv_env_CC_value=$CC --ac_env_CFLAGS_set=${CFLAGS+set} --ac_env_CFLAGS_value=$CFLAGS --ac_cv_env_CFLAGS_set=${CFLAGS+set} --ac_cv_env_CFLAGS_value=$CFLAGS --ac_env_LDFLAGS_set=${LDFLAGS+set} --ac_env_LDFLAGS_value=$LDFLAGS --ac_cv_env_LDFLAGS_set=${LDFLAGS+set} --ac_cv_env_LDFLAGS_value=$LDFLAGS --ac_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_env_CPPFLAGS_value=$CPPFLAGS --ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_cv_env_CPPFLAGS_value=$CPPFLAGS --ac_env_CXX_set=${CXX+set} --ac_env_CXX_value=$CXX --ac_cv_env_CXX_set=${CXX+set} --ac_cv_env_CXX_value=$CXX --ac_env_CXXFLAGS_set=${CXXFLAGS+set} --ac_env_CXXFLAGS_value=$CXXFLAGS --ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} --ac_cv_env_CXXFLAGS_value=$CXXFLAGS --ac_env_CPP_set=${CPP+set} --ac_env_CPP_value=$CPP --ac_cv_env_CPP_set=${CPP+set} --ac_cv_env_CPP_value=$CPP -+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -+ac_abs_confdir=`( -+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" -+ pwd)` -+# When building in place, set srcdir=. -+if test "$ac_abs_confdir" = "$ac_pwd"; then -+ srcdir=. -+fi -+# Remove unnecessary trailing slashes from srcdir. -+# Double slashes in file names in object file debugging info -+# mess up M-x gdb in Emacs. -+case $srcdir in -+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -+esac -+for ac_var in $ac_precious_vars; do -+ eval ac_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_env_${ac_var}_value=\$${ac_var} -+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_cv_env_${ac_var}_value=\$${ac_var} -+done - - # - # Report the --help message. -@@ -799,20 +1296,17 @@ Configuration: - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit -- -q, --quiet, --silent do not print \`checking...' messages -+ -q, --quiet, --silent do not print \`checking ...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - --_ACEOF -- -- cat <<_ACEOF - Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX -- [$ac_default_prefix] -+ [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -- [PREFIX] -+ [PREFIX] - - By default, \`make install' will install all the files in - \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -@@ -822,18 +1316,25 @@ for instance \`--prefix=\$HOME'. - For better control, use the options below. - - Fine tuning of the installation directories: -- --bindir=DIR user executables [EPREFIX/bin] -- --sbindir=DIR system admin executables [EPREFIX/sbin] -- --libexecdir=DIR program executables [EPREFIX/libexec] -- --datadir=DIR read-only architecture-independent data [PREFIX/share] -- --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -- --localstatedir=DIR modifiable single-machine data [PREFIX/var] -- --libdir=DIR object code libraries [EPREFIX/lib] -- --includedir=DIR C header files [PREFIX/include] -- --oldincludedir=DIR C header files for non-gcc [/usr/include] -- --infodir=DIR info documentation [PREFIX/info] -- --mandir=DIR man documentation [PREFIX/man] -+ --bindir=DIR user executables [EPREFIX/bin] -+ --sbindir=DIR system admin executables [EPREFIX/sbin] -+ --libexecdir=DIR program executables [EPREFIX/libexec] -+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -+ --localstatedir=DIR modifiable single-machine data [PREFIX/var] -+ --libdir=DIR object code libraries [EPREFIX/lib] -+ --includedir=DIR C header files [PREFIX/include] -+ --oldincludedir=DIR C header files for non-gcc [/usr/include] -+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] -+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] -+ --infodir=DIR info documentation [DATAROOTDIR/info] -+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] -+ --mandir=DIR man documentation [DATAROOTDIR/man] -+ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] -+ --htmldir=DIR html documentation [DOCDIR] -+ --dvidir=DIR dvi documentation [DOCDIR] -+ --pdfdir=DIR pdf documentation [DOCDIR] -+ --psdir=DIR ps documentation [DOCDIR] - _ACEOF - - cat <<\_ACEOF -@@ -849,6 +1350,7 @@ if test -n "$ac_init_help"; then - cat <<\_ACEOF - - Optional Features: -+ --disable-option-checking ignore unrecognized --enable/--with options - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-sanitizers[=comma-separated list of sanitizers] -@@ -868,8 +1370,9 @@ Some influential environment variables: - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory -- CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have -- headers in a nonstandard directory -+ LIBS libraries to pass to the linker, e.g. -l -+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if -+ you have headers in a nonstandard directory - CXX C++ compiler command - CXXFLAGS C++ compiler flags - CPP C preprocessor -@@ -877,119 +1380,680 @@ Some influential environment variables: - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. - -+Report bugs to the package provider. - _ACEOF -+ac_status=$? - fi - - if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. -- ac_popdir=`pwd` - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue -- test -d $ac_dir || continue -+ test -d "$ac_dir" || -+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || -+ continue - ac_builddir=. - --if test "$ac_dir" != .; then -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix - - case $srcdir in -- .) # No --srcdir option. We are building in place. -+ .) # We are building in place. - ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; --esac -- --# Do not use `cd foo && pwd` to compute absolute paths, because --# the directories may not exist. --case `pwd` in --.) ac_abs_builddir="$ac_dir";; --*) -- case "$ac_dir" in -- .) ac_abs_builddir=`pwd`;; -- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -- *) ac_abs_builddir=`pwd`/"$ac_dir";; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_builddir=${ac_top_builddir}.;; --*) -- case ${ac_top_builddir}. in -- .) ac_abs_top_builddir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_srcdir=$ac_srcdir;; --*) -- case $ac_srcdir in -- .) ac_abs_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_srcdir=$ac_top_srcdir;; --*) -- case $ac_top_srcdir in -- .) ac_abs_top_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -- esac;; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; - esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - -- cd $ac_dir -- # Check for guested configure; otherwise get Cygnus style configure. -- if test -f $ac_srcdir/configure.gnu; then -- echo -- $SHELL $ac_srcdir/configure.gnu --help=recursive -- elif test -f $ac_srcdir/configure; then -- echo -- $SHELL $ac_srcdir/configure --help=recursive -- elif test -f $ac_srcdir/configure.ac || -- test -f $ac_srcdir/configure.in; then -- echo -- $ac_configure --help -+ cd "$ac_dir" || { ac_status=$?; continue; } -+ # Check for guested configure. -+ if test -f "$ac_srcdir/configure.gnu"; then -+ echo && -+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive -+ elif test -f "$ac_srcdir/configure"; then -+ echo && -+ $SHELL "$ac_srcdir/configure" --help=recursive - else -- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -- fi -- cd $ac_popdir -+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -+ fi || ac_status=$? -+ cd "$ac_pwd" || { ac_status=$?; break; } - done - fi - --test -n "$ac_init_help" && exit 0 -+test -n "$ac_init_help" && exit $ac_status - if $ac_init_version; then - cat <<\_ACEOF -+configure -+generated by GNU Autoconf 2.69 - --Copyright (C) 2003 Free Software Foundation, Inc. -+Copyright (C) 2012 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - _ACEOF -- exit 0 -+ exit - fi --exec 5>config.log --cat >&5 <<_ACEOF -+ -+## ------------------------ ## -+## Autoconf initialization. ## -+## ------------------------ ## -+ -+# ac_fn_c_try_compile LINENO -+# -------------------------- -+# Try to compile conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_compile () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ rm -f conftest.$ac_objext -+ if { { ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compile") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_c_try_compile -+ -+# ac_fn_cxx_try_compile LINENO -+# ---------------------------- -+# Try to compile conftest.$ac_ext, and return whether this succeeded. -+ac_fn_cxx_try_compile () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ rm -f conftest.$ac_objext -+ if { { ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compile") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_cxx_try_compile -+ -+# ac_fn_c_try_cpp LINENO -+# ---------------------- -+# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_cpp () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if { { ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } > conftest.i && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_c_try_cpp -+ -+# ac_fn_c_try_run LINENO -+# ---------------------- -+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -+# that executables *can* be run. -+ac_fn_c_try_run () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' -+ { { case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: program exited with status $ac_status" >&5 -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=$ac_status -+fi -+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_c_try_run -+ -+# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES -+# -------------------------------------------- -+# Tries to find the compile-time value of EXPR in a program that includes -+# INCLUDES, setting VAR accordingly. Returns whether the value could be -+# computed -+ac_fn_c_compute_int () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if test "$cross_compiling" = yes; then -+ # Depending upon the size, compute the lo and hi bounds. -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+static int test_array [1 - 2 * !(($2) >= 0)]; -+test_array [0] = 0; -+return test_array [0]; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_lo=0 ac_mid=0 -+ while :; do -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -+test_array [0] = 0; -+return test_array [0]; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_hi=$ac_mid; break -+else -+ as_fn_arith $ac_mid + 1 && ac_lo=$as_val -+ if test $ac_lo -le $ac_mid; then -+ ac_lo= ac_hi= -+ break -+ fi -+ as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ done -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+static int test_array [1 - 2 * !(($2) < 0)]; -+test_array [0] = 0; -+return test_array [0]; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_hi=-1 ac_mid=-1 -+ while :; do -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+static int test_array [1 - 2 * !(($2) >= $ac_mid)]; -+test_array [0] = 0; -+return test_array [0]; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_lo=$ac_mid; break -+else -+ as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val -+ if test $ac_mid -le $ac_hi; then -+ ac_lo= ac_hi= -+ break -+ fi -+ as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ done -+else -+ ac_lo= ac_hi= -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+# Binary search between lo and hi bounds. -+while test "x$ac_lo" != "x$ac_hi"; do -+ as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -+test_array [0] = 0; -+return test_array [0]; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_hi=$ac_mid -+else -+ as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+done -+case $ac_lo in #(( -+?*) eval "$3=\$ac_lo"; ac_retval=0 ;; -+'') ac_retval=1 ;; -+esac -+ else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+static long int longval () { return $2; } -+static unsigned long int ulongval () { return $2; } -+#include -+#include -+int -+main () -+{ -+ -+ FILE *f = fopen ("conftest.val", "w"); -+ if (! f) -+ return 1; -+ if (($2) < 0) -+ { -+ long int i = longval (); -+ if (i != ($2)) -+ return 1; -+ fprintf (f, "%ld", i); -+ } -+ else -+ { -+ unsigned long int i = ulongval (); -+ if (i != ($2)) -+ return 1; -+ fprintf (f, "%lu", i); -+ } -+ /* Do not output a trailing newline, as this causes \r\n confusion -+ on some platforms. */ -+ return ferror (f) || fclose (f) != 0; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_run "$LINENO"; then : -+ echo >>conftest.val; read $3 &5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+#include <$2> -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ eval "$3=yes" -+else -+ eval "$3=no" -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ -+} # ac_fn_c_check_header_compile -+ -+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -+# ------------------------------------------------------- -+# Tests whether HEADER exists, giving a warning if it cannot be compiled using -+# the include files in INCLUDES and setting the cache variable VAR -+# accordingly. -+ac_fn_c_check_header_mongrel () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if eval \${$3+:} false; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -+$as_echo_n "checking $2 usability... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+#include <$2> -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_header_compiler=yes -+else -+ ac_header_compiler=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -+$as_echo_n "checking $2 presence... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <$2> -+_ACEOF -+if ac_fn_c_try_cpp "$LINENO"; then : -+ ac_header_preproc=yes -+else -+ ac_header_preproc=no -+fi -+rm -f conftest.err conftest.i conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( -+ yes:no: ) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -+ ;; -+esac -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$3=\$ac_header_compiler" -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ -+} # ac_fn_c_check_header_mongrel -+ -+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES -+# ------------------------------------------- -+# Tests whether TYPE exists after having included INCLUDES, setting cache -+# variable VAR accordingly. -+ac_fn_c_check_type () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$3=no" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+if (sizeof ($2)) -+ return 0; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+if (sizeof (($2))) -+ return 0; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ -+else -+ eval "$3=yes" -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ -+} # ac_fn_c_check_type -+ -+# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES -+# --------------------------------------------------------- -+# Tests whether HEADER exists and can be compiled using the include files in -+# INCLUDES, setting the cache variable VAR accordingly. -+ac_fn_cxx_check_header_compile () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+#include <$2> -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO"; then : -+ eval "$3=yes" -+else -+ eval "$3=no" -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ -+} # ac_fn_cxx_check_header_compile -+ -+# ac_fn_cxx_try_link LINENO -+# ------------------------- -+# Try to link conftest.$ac_ext, and return whether this succeeded. -+ac_fn_cxx_try_link () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ rm -f conftest.$ac_objext conftest$ac_exeext -+ if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ test -x conftest$ac_exeext -+ }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 -+fi -+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information -+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would -+ # interfere with the next link command; also delete a directory that is -+ # left behind by Apple's compiler. We do this before executing the actions. -+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_cxx_try_link -+cat >config.log <<_ACEOF - This file contains any messages produced by compilers while - running configure, to aid debugging if configure makes a mistake. - - It was created by $as_me, which was --generated by GNU Autoconf 2.59. Invocation command line was -+generated by GNU Autoconf 2.69. Invocation command line was - - $ $0 $@ - - _ACEOF -+exec 5>>config.log - { - cat <<_ASUNAME - ## --------- ## -@@ -1008,7 +2072,7 @@ uname -v = `(uname -v) 2>/dev/null || ec - /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` - /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` - /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` --hostinfo = `(hostinfo) 2>/dev/null || echo unknown` -+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` - /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` - /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` - /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -@@ -1020,8 +2084,9 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- echo "PATH: $as_dir" --done -+ $as_echo "PATH: $as_dir" -+ done -+IFS=$as_save_IFS - - } >&5 - -@@ -1043,7 +2108,6 @@ _ACEOF - ac_configure_args= - ac_configure_args0= - ac_configure_args1= --ac_sep= - ac_must_keep_next=false - for ac_pass in 1 2 - do -@@ -1054,13 +2118,13 @@ do - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *\'*) -+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in -- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; - 2) -- ac_configure_args1="$ac_configure_args1 '$ac_arg'" -+ as_fn_append ac_configure_args1 " '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else -@@ -1076,104 +2140,115 @@ do - -* ) ac_must_keep_next=true ;; - esac - fi -- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" -- # Get rid of the leading space. -- ac_sep=" " -+ as_fn_append ac_configure_args " '$ac_arg'" - ;; - esac - done - done --$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } --$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } -+{ ac_configure_args0=; unset ac_configure_args0;} -+{ ac_configure_args1=; unset ac_configure_args1;} - - # When interrupted or exit'd, cleanup temporary files, and complete - # config.log. We remove comments because anyway the quotes in there - # would cause problems or look ugly. --# WARNING: Be sure not to use single quotes in there, as some shells, --# such as our DU 5.0 friend, will then `close' the trap. -+# WARNING: Use '\'' to represent an apostrophe within the trap. -+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. - trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo - -- cat <<\_ASBOX --## ---------------- ## -+ $as_echo "## ---------------- ## - ## Cache variables. ## --## ---------------- ## --_ASBOX -+## ---------------- ##" - echo - # The following way of writing the cache mishandles newlines in values, --{ -+( -+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -+ *) { eval $ac_var=; unset $ac_var;} ;; -+ esac ;; -+ esac -+ done - (set) 2>&1 | -- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) - sed -n \ -- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; -- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" -- ;; -+ "s/'\''/'\''\\\\'\'''\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" -+ ;; #( - *) -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; -- esac; --} -+ esac | -+ sort -+) - echo - -- cat <<\_ASBOX --## ----------------- ## -+ $as_echo "## ----------------- ## - ## Output variables. ## --## ----------------- ## --_ASBOX -+## ----------------- ##" - echo - for ac_var in $ac_subst_vars - do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - - if test -n "$ac_subst_files"; then -- cat <<\_ASBOX --## ------------- ## --## Output files. ## --## ------------- ## --_ASBOX -+ $as_echo "## ------------------- ## -+## File substitutions. ## -+## ------------------- ##" - echo - for ac_var in $ac_subst_files - do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi - - if test -s confdefs.h; then -- cat <<\_ASBOX --## ----------- ## -+ $as_echo "## ----------- ## - ## confdefs.h. ## --## ----------- ## --_ASBOX -+## ----------- ##" - echo -- sed "/^$/d" confdefs.h | sort -+ cat confdefs.h - echo - fi - test "$ac_signal" != 0 && -- echo "$as_me: caught signal $ac_signal" -- echo "$as_me: exit $exit_status" -+ $as_echo "$as_me: caught signal $ac_signal" -+ $as_echo "$as_me: exit $exit_status" - } >&5 -- rm -f core *.core && -- rm -rf conftest* confdefs* conf$$* $ac_clean_files && -+ rm -f core *.core core.conftest.* && -+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -- ' 0 -+' 0 - for ac_signal in 1 2 13 15; do -- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal - done - ac_signal=0 - - # confdefs.h avoids OS command line length limits that DEFS can exceed. --rm -rf conftest* confdefs.h --# AIX cpp loses on an empty file, so make sure it contains at least a newline. --echo >confdefs.h -+rm -f -r conftest* confdefs.h -+ -+$as_echo "/* confdefs.h */" > confdefs.h - - # Predefined preprocessor variables. - -@@ -1181,112 +2256,137 @@ cat >>confdefs.h <<_ACEOF - #define PACKAGE_NAME "$PACKAGE_NAME" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_TARNAME "$PACKAGE_TARNAME" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_VERSION "$PACKAGE_VERSION" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_STRING "$PACKAGE_STRING" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" - _ACEOF - -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_URL "$PACKAGE_URL" -+_ACEOF -+ - - # Let the site file select an alternate cache file if it wants to. --# Prefer explicitly selected file to automatically selected ones. --if test -z "$CONFIG_SITE"; then -- if test "x$prefix" != xNONE; then -- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" -- else -- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" -- fi -+# Prefer an explicitly selected file to automatically selected ones. -+ac_site_file1=NONE -+ac_site_file2=NONE -+if test -n "$CONFIG_SITE"; then -+ # We do not want a PATH search for config.site. -+ case $CONFIG_SITE in #(( -+ -*) ac_site_file1=./$CONFIG_SITE;; -+ */*) ac_site_file1=$CONFIG_SITE;; -+ *) ac_site_file1=./$CONFIG_SITE;; -+ esac -+elif test "x$prefix" != xNONE; then -+ ac_site_file1=$prefix/share/config.site -+ ac_site_file2=$prefix/etc/config.site -+else -+ ac_site_file1=$ac_default_prefix/share/config.site -+ ac_site_file2=$ac_default_prefix/etc/config.site - fi --for ac_site_file in $CONFIG_SITE; do -- if test -r "$ac_site_file"; then -- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 --echo "$as_me: loading site script $ac_site_file" >&6;} -+for ac_site_file in "$ac_site_file1" "$ac_site_file2" -+do -+ test "x$ac_site_file" = xNONE && continue -+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -+$as_echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 -- . "$ac_site_file" -+ . "$ac_site_file" \ -+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "failed to load site script $ac_site_file -+See \`config.log' for more details" "$LINENO" 5; } - fi - done - - if test -r "$cache_file"; then -- # Some versions of bash will fail to source /dev/null (special -- # files actually), so we avoid doing that. -- if test -f "$cache_file"; then -- { echo "$as_me:$LINENO: loading cache $cache_file" >&5 --echo "$as_me: loading cache $cache_file" >&6;} -+ # Some versions of bash will fail to source /dev/null (special files -+ # actually), so we avoid doing that. DJGPP emulates it as a regular file. -+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -+$as_echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in -- [\\/]* | ?:[\\/]* ) . $cache_file;; -- *) . ./$cache_file;; -+ [\\/]* | ?:[\\/]* ) . "$cache_file";; -+ *) . "./$cache_file";; - esac - fi - else -- { echo "$as_me:$LINENO: creating cache $cache_file" >&5 --echo "$as_me: creating cache $cache_file" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -+$as_echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file - fi - - # Check that the precious variables saved in the cache have kept the same - # value. - ac_cache_corrupted=false --for ac_var in `(set) 2>&1 | -- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do -+for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set -- eval ac_old_val="\$ac_cv_env_${ac_var}_value" -- eval ac_new_val="\$ac_env_${ac_var}_value" -+ eval ac_old_val=\$ac_cv_env_${ac_var}_value -+ eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) -- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) -- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then -- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 --echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 --echo "$as_me: former value: $ac_old_val" >&2;} -- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 --echo "$as_me: current value: $ac_new_val" >&2;} -- ac_cache_corrupted=: -+ # differences in whitespace do not lead to failure. -+ ac_old_val_w=`echo x $ac_old_val` -+ ac_new_val_w=`echo x $ac_new_val` -+ if test "$ac_old_val_w" != "$ac_new_val_w"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -+ ac_cache_corrupted=: -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} -+ eval $ac_var=\$ac_old_val -+ fi -+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. -- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; -+ *) as_fn_append ac_configure_args " '$ac_arg'" ;; - esac - fi - done - if $ac_cache_corrupted; then -- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 --echo "$as_me: error: changes in the environment can compromise the build" >&2;} -- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 --echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} -- { (exit 1); exit 1; }; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} -+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 - fi -+## -------------------- ## -+## Main body of script. ## -+## -------------------- ## - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' -@@ -1296,47 +2396,34 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - ac_aux_dir= - for ac_dir in $srcdir/autoconf; do -- if test -f $ac_dir/install-sh; then -+ if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break -- elif test -f $ac_dir/install.sh; then -+ elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break -- elif test -f $ac_dir/shtool; then -+ elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi - done - if test -z "$ac_aux_dir"; then -- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir/autoconf" >&5 --echo "$as_me: error: cannot find install-sh or install.sh in $srcdir/autoconf" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in $srcdir/autoconf" "$LINENO" 5 - fi --ac_config_guess="$SHELL $ac_aux_dir/config.guess" --ac_config_sub="$SHELL $ac_aux_dir/config.sub" --ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -+ -+# These three variables are undocumented and unsupported, -+# and are intended to be withdrawn in a future Autoconf release. -+# They can cause serious problems if a builder's source tree is in a directory -+# whose full name contains unusual characters. -+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -+ - - - -@@ -1349,28 +2436,32 @@ fi - if test -z "$ERL_TOP" || test ! -d $ERL_TOP ; then - ac_aux_dir= - for ac_dir in autoconf; do -- if test -f $ac_dir/install-sh; then -+ if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break -- elif test -f $ac_dir/install.sh; then -+ elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break -- elif test -f $ac_dir/shtool; then -+ elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi - done - if test -z "$ac_aux_dir"; then -- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in autoconf" >&5 --echo "$as_me: error: cannot find install-sh or install.sh in autoconf" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in autoconf" "$LINENO" 5 - fi --ac_config_guess="$SHELL $ac_aux_dir/config.guess" --ac_config_sub="$SHELL $ac_aux_dir/config.sub" --ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -+ -+# These three variables are undocumented and unsupported, -+# and are intended to be withdrawn in a future Autoconf release. -+# They can cause serious problems if a builder's source tree is in a directory -+# whose full name contains unusual characters. -+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -+ - - WX_BUILDING_INSIDE_ERLSRC=false - else -@@ -1378,55 +2469,63 @@ else - if test -d $erl_top/erts/autoconf; then - ac_aux_dir= - for ac_dir in $erl_top/erts/autoconf; do -- if test -f $ac_dir/install-sh; then -+ if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break -- elif test -f $ac_dir/install.sh; then -+ elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break -- elif test -f $ac_dir/shtool; then -+ elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi - done - if test -z "$ac_aux_dir"; then -- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $erl_top/erts/autoconf" >&5 --echo "$as_me: error: cannot find install-sh or install.sh in $erl_top/erts/autoconf" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in $erl_top/erts/autoconf" "$LINENO" 5 - fi --ac_config_guess="$SHELL $ac_aux_dir/config.guess" --ac_config_sub="$SHELL $ac_aux_dir/config.sub" --ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -+ -+# These three variables are undocumented and unsupported, -+# and are intended to be withdrawn in a future Autoconf release. -+# They can cause serious problems if a builder's source tree is in a directory -+# whose full name contains unusual characters. -+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -+ - - WX_BUILDING_INSIDE_ERLSRC=true - else - ac_aux_dir= - for ac_dir in autoconf; do -- if test -f $ac_dir/install-sh; then -+ if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break -- elif test -f $ac_dir/install.sh; then -+ elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break -- elif test -f $ac_dir/shtool; then -+ elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi - done - if test -z "$ac_aux_dir"; then -- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in autoconf" >&5 --echo "$as_me: error: cannot find install-sh or install.sh in autoconf" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in autoconf" "$LINENO" 5 - fi --ac_config_guess="$SHELL $ac_aux_dir/config.guess" --ac_config_sub="$SHELL $ac_aux_dir/config.sub" --ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -+ -+# These three variables are undocumented and unsupported, -+# and are intended to be withdrawn in a future Autoconf release. -+# They can cause serious problems if a builder's source tree is in a directory -+# whose full name contains unusual characters. -+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -+ - - WX_BUILDING_INSIDE_ERLSRC=false - fi -@@ -1434,57 +2533,74 @@ fi - - if test "X$host" != "Xfree_source" -a "X$host" != "Xwin32"; then - # Make sure we can run config.sub. --$ac_config_sub sun4 >/dev/null 2>&1 || -- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 --echo "$as_me: error: cannot run $ac_config_sub" >&2;} -- { (exit 1); exit 1; }; } -+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || -+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - --echo "$as_me:$LINENO: checking build system type" >&5 --echo $ECHO_N "checking build system type... $ECHO_C" >&6 --if test "${ac_cv_build+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -+$as_echo_n "checking build system type... " >&6; } -+if ${ac_cv_build+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- ac_cv_build_alias=$build_alias --test -z "$ac_cv_build_alias" && -- ac_cv_build_alias=`$ac_config_guess` --test -z "$ac_cv_build_alias" && -- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 --echo "$as_me: error: cannot guess build type; you must specify one" >&2;} -- { (exit 1); exit 1; }; } --ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} -- { (exit 1); exit 1; }; } -+ ac_build_alias=$build_alias -+test "x$ac_build_alias" = x && -+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -+test "x$ac_build_alias" = x && -+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || -+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 - - fi --echo "$as_me:$LINENO: result: $ac_cv_build" >&5 --echo "${ECHO_T}$ac_cv_build" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -+$as_echo "$ac_cv_build" >&6; } -+case $ac_cv_build in -+*-*-*) ;; -+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; -+esac - build=$ac_cv_build --build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_build -+shift -+build_cpu=$1 -+build_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+build_os=$* -+IFS=$ac_save_IFS -+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - --echo "$as_me:$LINENO: checking host system type" >&5 --echo $ECHO_N "checking host system type... $ECHO_C" >&6 --if test "${ac_cv_host+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -+$as_echo_n "checking host system type... " >&6; } -+if ${ac_cv_host+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- ac_cv_host_alias=$host_alias --test -z "$ac_cv_host_alias" && -- ac_cv_host_alias=$ac_cv_build_alias --ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} -- { (exit 1); exit 1; }; } -+ if test "x$host_alias" = x; then -+ ac_cv_host=$ac_cv_build -+else -+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || -+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 -+fi - - fi --echo "$as_me:$LINENO: result: $ac_cv_host" >&5 --echo "${ECHO_T}$ac_cv_host" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -+$as_echo "$ac_cv_host" >&6; } -+case $ac_cv_host in -+*-*-*) ;; -+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; -+esac - host=$ac_cv_host --host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_host -+shift -+host_cpu=$1 -+host_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+host_os=$* -+IFS=$ac_save_IFS -+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - - else -@@ -1512,10 +2628,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. - set dummy ${ac_tool_prefix}gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1525,35 +2641,37 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -1563,39 +2681,50 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -+$as_echo "$ac_ct_CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -- CC=$ac_ct_CC -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi - else - CC="$ac_cv_prog_CC" - fi - - if test -z "$CC"; then -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. - set dummy ${ac_tool_prefix}cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1605,77 +2734,37 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- --fi --if test -z "$ac_cv_prog_CC"; then -- ac_ct_CC=$CC -- # Extract the first word of "cc", so it can be a program name with args. --set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$ac_ct_CC"; then -- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- --fi --fi --ac_ct_CC=$ac_cv_prog_ac_ct_CC --if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -- CC=$ac_ct_CC --else -- CC="$ac_cv_prog_CC" --fi - -+ fi - fi - if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1686,18 +2775,19 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. -@@ -1715,24 +2805,25 @@ fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then -- for ac_prog in cl -+ for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1742,39 +2833,41 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - test -n "$CC" && break - done - fi - if test -z "$CC"; then - ac_ct_CC=$CC -- for ac_prog in cl -+ for ac_prog in cl.exe - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -1784,66 +2877,78 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -+$as_echo "$ac_ct_CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - test -n "$ac_ct_CC" && break - done - -- CC=$ac_ct_CC -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi - fi - - fi - - --test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH --See \`config.log' for more details." >&5 --echo "$as_me: error: no acceptable C compiler found in \$PATH --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "no acceptable C compiler found in \$PATH -+See \`config.log' for more details" "$LINENO" 5; } - - # Provide some information about the compiler. --echo "$as_me:$LINENO:" \ -- "checking for C compiler version" >&5 --ac_compiler=`set X $ac_compile; echo $2` --{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 -- (eval $ac_compiler --version &5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 -- (eval $ac_compiler -v &5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 -- (eval $ac_compiler -V &5) 2>&5 -+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -+set X $ac_compile -+ac_compiler=$2 -+for ac_option in --version -v -V -qversion; do -+ { { ac_try="$ac_compiler $ac_option >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } -+ if test -s conftest.err; then -+ sed '10a\ -+... rest of stderr output deleted ... -+ 10q' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ fi -+ rm -f conftest.er1 conftest.err -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+done - --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -1855,112 +2960,108 @@ main () - } - _ACEOF - ac_clean_files_save=$ac_clean_files --ac_clean_files="$ac_clean_files a.out a.exe b.out" -+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" - # Try to create an executable without -o first, disregard a.out. - # It will help us diagnose broken compilers, and finding out an intuition - # of exeext. --echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 --echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 --ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` --if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 -- (eval $ac_link_default) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- # Find the output, starting from the most likely. This scheme is --# not robust to junk in `.', hence go to wildcards (a.*) only as a last --# resort. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -+$as_echo_n "checking whether the C compiler works... " >&6; } -+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` - --# Be careful to initialize this variable, since it used to be cached. --# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. --ac_cv_exeext= --# b.out is created by i960 compilers. --for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out -+# The possible output files: -+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" -+ -+ac_rmfiles= -+for ac_file in $ac_files -+do -+ case $ac_file in -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; -+ * ) ac_rmfiles="$ac_rmfiles $ac_file";; -+ esac -+done -+rm -f $ac_rmfiles -+ -+if { { ac_try="$ac_link_default" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link_default") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : -+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -+# in a Makefile. We should not override ac_cv_exeext if it was cached, -+# so that the user can short-circuit this test for compilers unknown to -+# Autoconf. -+for ac_file in $ac_files '' - do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) -- ;; -- conftest.$ac_ext ) -- # This is the source file. -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) -- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- # FIXME: I believe we export ac_cv_exeext for Libtool, -- # but it would be cool to find out if it's true. Does anybody -- # maintain Libtool? --akim. -- export ac_cv_exeext -+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; -+ then :; else -+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -+ fi -+ # We set ac_cv_exeext here because the later test for it is not -+ # safe: cross compilers may not add the suffix if given an `-o' -+ # argument, so we may need to know it at that point already. -+ # Even if this section looks crufty: it has the advantage of -+ # actually working. - break;; - * ) - break;; - esac - done -+test "$ac_cv_exeext" = no && ac_cv_exeext= -+ - else -- echo "$as_me: failed program was:" >&5 -+ ac_file='' -+fi -+if test -z "$ac_file"; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+$as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { echo "$as_me:$LINENO: error: C compiler cannot create executables --See \`config.log' for more details." >&5 --echo "$as_me: error: C compiler cannot create executables --See \`config.log' for more details." >&2;} -- { (exit 77); exit 77; }; } -+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error 77 "C compiler cannot create executables -+See \`config.log' for more details" "$LINENO" 5; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - fi -- -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -+$as_echo_n "checking for C compiler default output file name... " >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -+$as_echo "$ac_file" >&6; } - ac_exeext=$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_file" >&5 --echo "${ECHO_T}$ac_file" >&6 - --# Check the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --echo "$as_me:$LINENO: checking whether the C compiler works" >&5 --echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 --# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 --# If not cross compiling, check that we can run a simple program. --if test "$cross_compiling" != yes; then -- if { ac_try='./$ac_file' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- cross_compiling=no -- else -- if test "$cross_compiling" = maybe; then -- cross_compiling=yes -- else -- { { echo "$as_me:$LINENO: error: cannot run C compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run C compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -- fi -- fi --fi --echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -- --rm -f a.out a.exe conftest$ac_cv_exeext b.out -+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out - ac_clean_files=$ac_clean_files_save --# Check the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 --echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 --echo "$as_me:$LINENO: result: $cross_compiling" >&5 --echo "${ECHO_T}$cross_compiling" >&6 -- --echo "$as_me:$LINENO: checking for suffix of executables" >&5 --echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -+$as_echo_n "checking for suffix of executables... " >&6; } -+if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) - # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will - # work properly (i.e., refer to `conftest.exe'), while it won't with -@@ -1968,38 +3069,90 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- export ac_cv_exeext - break;; - * ) break;; - esac - done - else -- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "cannot compute suffix of executables: cannot compile and link -+See \`config.log' for more details" "$LINENO" 5; } - fi -- --rm -f conftest$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 --echo "${ECHO_T}$ac_cv_exeext" >&6 -+rm -f conftest conftest$ac_cv_exeext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -+$as_echo "$ac_cv_exeext" >&6; } - - rm -f conftest.$ac_ext - EXEEXT=$ac_cv_exeext - ac_exeext=$EXEEXT --echo "$as_me:$LINENO: checking for suffix of object files" >&5 --echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 --if test "${ac_cv_objext+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main () -+{ -+FILE *f = fopen ("conftest.out", "w"); -+ return ferror (f) || fclose (f) != 0; -+ -+ ; -+ return 0; -+} - _ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ac_clean_files="$ac_clean_files conftest.out" -+# Check that the compiler produces executables we can run. If not, either -+# the compiler is broken, or we cross compile. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -+$as_echo_n "checking whether we are cross compiling... " >&6; } -+if test "$cross_compiling" != yes; then -+ { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if { ac_try='./conftest$ac_cv_exeext' -+ { { case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; }; then -+ cross_compiling=no -+ else -+ if test "$cross_compiling" = maybe; then -+ cross_compiling=yes -+ else -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "cannot run C compiled programs. -+If you meant to cross compile, use \`--host'. -+See \`config.log' for more details" "$LINENO" 5; } -+ fi -+ fi -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -+$as_echo "$cross_compiling" >&6; } -+ -+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out -+ac_clean_files=$ac_clean_files_save -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -+$as_echo_n "checking for suffix of object files... " >&6; } -+if ${ac_cv_objext+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2011,45 +3164,46 @@ main () - } - _ACEOF - rm -f conftest.o conftest.obj --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+if { { ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compile") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : -+ for ac_file in conftest.o conftest.obj conftest.*; do -+ test -f "$ac_file" || continue; - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac - done - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute suffix of object files: cannot compile --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "cannot compute suffix of object files: cannot compile -+See \`config.log' for more details" "$LINENO" 5; } - fi -- - rm -f conftest.$ac_cv_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 --echo "${ECHO_T}$ac_cv_objext" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -+$as_echo "$ac_cv_objext" >&6; } - OBJEXT=$ac_cv_objext - ac_objext=$OBJEXT --echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 --if test "${ac_cv_c_compiler_gnu+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -+if ${ac_cv_c_compiler_gnu+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2063,55 +3217,34 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - ac_compiler_gnu=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_compiler_gnu=no -+ ac_compiler_gnu=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_c_compiler_gnu=$ac_compiler_gnu - - fi --echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 --GCC=`test $ac_compiler_gnu = yes && echo yes` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -+$as_echo "$ac_cv_c_compiler_gnu" >&6; } -+if test $ac_compiler_gnu = yes; then -+ GCC=yes -+else -+ GCC= -+fi - ac_test_CFLAGS=${CFLAGS+set} - ac_save_CFLAGS=$CFLAGS --CFLAGS="-g" --echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 --echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 --if test "${ac_cv_prog_cc_g+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -+$as_echo_n "checking whether $CC accepts -g... " >&6; } -+if ${ac_cv_prog_cc_g+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ ac_save_c_werror_flag=$ac_c_werror_flag -+ ac_c_werror_flag=yes -+ ac_cv_prog_cc_g=no -+ CFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2122,39 +3255,49 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ CFLAGS="" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - --ac_cv_prog_cc_g=no -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ -+else -+ ac_c_werror_flag=$ac_save_c_werror_flag -+ CFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_prog_cc_g=yes - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_c_werror_flag=$ac_save_c_werror_flag -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -+$as_echo "$ac_cv_prog_cc_g" >&6; } - if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS - elif test $ac_cv_prog_cc_g = yes; then -@@ -2170,23 +3313,18 @@ else - CFLAGS= - fi - fi --echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 --echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 --if test "${ac_cv_prog_cc_stdc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -+if ${ac_cv_prog_cc_c89+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- ac_cv_prog_cc_stdc=no -+ ac_cv_prog_cc_c89=no - ac_save_CC=$CC --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - #include --#include --#include -+struct stat; - /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ - struct buf { int x; }; - FILE * (*rcsopen) (struct buf *, struct stat *, int); -@@ -2209,12 +3347,17 @@ static char *f (char * (*g) (char **, in - /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated -- as 'x'. The following induces an error, until -std1 is added to get -+ as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something -- that's true only with -std1. */ -+ that's true only with -std. */ - int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters -+ inside strings and character constants. */ -+#define FOO(x) 'x' -+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; -+ - int test (int i, double x); - struct s1 {int (*f) (int a);}; - struct s2 {int (*f) (double a);}; -@@ -2229,225 +3372,61 @@ return f (e, argv, 0) != argv[0] || f - return 0; - } - _ACEOF --# Don't try gcc -ansi; that turns off useful extensions and --# breaks some systems' header files. --# AIX -qlanglvl=ansi --# Ultrix and OSF/1 -std1 --# HP-UX 10.20 and later -Ae --# HP-UX older versions -Aa -D_HPUX_SOURCE --# SVR4 -Xc -D__EXTENSIONS__ --for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ -+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" - do - CC="$ac_save_CC $ac_arg" -- rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_prog_cc_stdc=$ac_arg --break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -+ if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_prog_cc_c89=$ac_arg - fi --rm -f conftest.err conftest.$ac_objext -+rm -f core conftest.err conftest.$ac_objext -+ test "x$ac_cv_prog_cc_c89" != "xno" && break - done --rm -f conftest.$ac_ext conftest.$ac_objext -+rm -f conftest.$ac_ext - CC=$ac_save_CC - - fi -- --case "x$ac_cv_prog_cc_stdc" in -- x|xno) -- echo "$as_me:$LINENO: result: none needed" >&5 --echo "${ECHO_T}none needed" >&6 ;; -+# AC_CACHE_VAL -+case "x$ac_cv_prog_cc_c89" in -+ x) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -+$as_echo "none needed" >&6; } ;; -+ xno) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -+$as_echo "unsupported" >&6; } ;; - *) -- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 -- CC="$CC $ac_cv_prog_cc_stdc" ;; -+ CC="$CC $ac_cv_prog_cc_c89" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; - esac -+if test "x$ac_cv_prog_cc_c89" != xno; then : - --# Some people use a C++ compiler to compile C. Since we use `exit', --# in C++ we need to declare it. In case someone uses the same compiler --# for both compiling C and C++ we need to have the C++ compiler decide --# the declaration of exit, since it's the most demanding environment. --cat >conftest.$ac_ext <<_ACEOF --#ifndef __cplusplus -- choke me --#endif --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- for ac_declaration in \ -- '' \ -- 'extern "C" void std::exit (int) throw (); using std::exit;' \ -- 'extern "C" void std::exit (int); using std::exit;' \ -- 'extern "C" void exit (int) throw ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_declaration --#include --int --main () --{ --exit (42); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --continue --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_declaration --int --main () --{ --exit (42); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --done --rm -f conftest* --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h - fi - --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - --ac_ext=cc -+ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test -n "$ac_tool_prefix"; then -- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC -+if test -z "$CXX"; then -+ if test -n "$CCC"; then -+ CXX=$CCC -+ else -+ if test -n "$ac_tool_prefix"; then -+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CXX+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_CXX+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -@@ -2457,39 +3436,41 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - CXX=$ac_cv_prog_CXX - if test -n "$CXX"; then -- echo "$as_me:$LINENO: result: $CXX" >&5 --echo "${ECHO_T}$CXX" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -+$as_echo "$CXX" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - test -n "$CXX" && break - done - fi - if test -z "$CXX"; then - ac_ct_CXX=$CXX -- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC -+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_CXX+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -@@ -2499,64 +3480,77 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CXX="$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CXX=$ac_cv_prog_ac_ct_CXX - if test -n "$ac_ct_CXX"; then -- echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 --echo "${ECHO_T}$ac_ct_CXX" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -+$as_echo "$ac_ct_CXX" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - test -n "$ac_ct_CXX" && break - done --test -n "$ac_ct_CXX" || ac_ct_CXX="g++" - -- CXX=$ac_ct_CXX -+ if test "x$ac_ct_CXX" = x; then -+ CXX="g++" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ CXX=$ac_ct_CXX -+ fi - fi - -- -+ fi -+fi - # Provide some information about the compiler. --echo "$as_me:$LINENO:" \ -- "checking for C++ compiler version" >&5 --ac_compiler=`set X $ac_compile; echo $2` --{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 -- (eval $ac_compiler --version &5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 -- (eval $ac_compiler -v &5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 -- (eval $ac_compiler -V &5) 2>&5 -+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 -+set X $ac_compile -+ac_compiler=$2 -+for ac_option in --version -v -V -qversion; do -+ { { ac_try="$ac_compiler $ac_option >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } -+ if test -s conftest.err; then -+ sed '10a\ -+... rest of stderr output deleted ... -+ 10q' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ fi -+ rm -f conftest.er1 conftest.err -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+done - --echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 --if test "${ac_cv_cxx_compiler_gnu+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 -+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -+if ${ac_cv_cxx_compiler_gnu+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2570,55 +3564,34 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_cxx_try_compile "$LINENO"; then : - ac_compiler_gnu=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_compiler_gnu=no -+ ac_compiler_gnu=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - - fi --echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 --GXX=`test $ac_compiler_gnu = yes && echo yes` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -+if test $ac_compiler_gnu = yes; then -+ GXX=yes -+else -+ GXX= -+fi - ac_test_CXXFLAGS=${CXXFLAGS+set} - ac_save_CXXFLAGS=$CXXFLAGS --CXXFLAGS="-g" --echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 --echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 --if test "${ac_cv_prog_cxx_g+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 -+$as_echo_n "checking whether $CXX accepts -g... " >&6; } -+if ${ac_cv_prog_cxx_g+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag -+ ac_cxx_werror_flag=yes -+ ac_cv_prog_cxx_g=no -+ CXXFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2629,160 +3602,64 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_prog_cxx_g=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_prog_cxx_g=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 --echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 --if test "$ac_test_CXXFLAGS" = set; then -- CXXFLAGS=$ac_save_CXXFLAGS --elif test $ac_cv_prog_cxx_g = yes; then -- if test "$GXX" = yes; then -- CXXFLAGS="-g -O2" -- else -- CXXFLAGS="-g" -- fi --else -- if test "$GXX" = yes; then -- CXXFLAGS="-O2" -- else -- CXXFLAGS= -- fi --fi --for ac_declaration in \ -- '' \ -- 'extern "C" void std::exit (int) throw (); using std::exit;' \ -- 'extern "C" void std::exit (int); using std::exit;' \ -- 'extern "C" void exit (int) throw ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ CXXFLAGS="" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --$ac_declaration --#include -+ - int - main () - { --exit (42); -+ - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_cxx_try_compile "$LINENO"; then : - --continue --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+else -+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag -+ CXXFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --$ac_declaration -+ - int - main () - { --exit (42); -+ - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -+if ac_fn_cxx_try_compile "$LINENO"; then : -+ ac_cv_prog_cxx_g=yes - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --done --rm -f conftest* --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -+$as_echo "$ac_cv_prog_cxx_g" >&6; } -+if test "$ac_test_CXXFLAGS" = set; then -+ CXXFLAGS=$ac_save_CXXFLAGS -+elif test $ac_cv_prog_cxx_g = yes; then -+ if test "$GXX" = yes; then -+ CXXFLAGS="-g -O2" -+ else -+ CXXFLAGS="-g" -+ fi -+else -+ if test "$GXX" = yes; then -+ CXXFLAGS="-O2" -+ else -+ CXXFLAGS= -+ fi - fi -- - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -2792,10 +3669,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. - set dummy ${ac_tool_prefix}ranlib; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_RANLIB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_RANLIB+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -@@ -2805,35 +3682,37 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - RANLIB=$ac_cv_prog_RANLIB - if test -n "$RANLIB"; then -- echo "$as_me:$LINENO: result: $RANLIB" >&5 --echo "${ECHO_T}$RANLIB" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -+$as_echo "$RANLIB" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -@@ -2843,28 +3722,38 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_RANLIB="ranlib" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - -- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" - fi - fi - ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB - if test -n "$ac_ct_RANLIB"; then -- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 --echo "${ECHO_T}$ac_ct_RANLIB" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -+$as_echo "$ac_ct_RANLIB" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -- RANLIB=$ac_ct_RANLIB -+ if test "x$ac_ct_RANLIB" = x; then -+ RANLIB=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ RANLIB=$ac_ct_RANLIB -+ fi - else - RANLIB="$ac_cv_prog_RANLIB" - fi -@@ -2874,15 +3763,15 @@ ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu --echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 --echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -+$as_echo_n "checking how to run the C preprocessor... " >&6; } - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= - fi - if test -z "$CPP"; then -- if test "${ac_cv_prog_CPP+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ if ${ac_cv_prog_CPP+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" -@@ -2896,11 +3785,7 @@ do - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #ifdef __STDC__ - # include -@@ -2909,78 +3794,34 @@ cat >>conftest.$ac_ext <<_ACEOF - #endif - Syntax error - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_cpp "$LINENO"; then : - -+else - # Broken: fails on valid input. - continue - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - -- # OK, works on sane cases. Now check whether non-existent headers -+ # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. - continue - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- - # Passes both tests. - ac_preproc_ok=: - break - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - - done - # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -+rm -f conftest.i conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then : - break - fi - -@@ -2992,8 +3833,8 @@ fi - else - ac_cv_prog_CPP=$CPP - fi --echo "$as_me:$LINENO: result: $CPP" >&5 --echo "${ECHO_T}$CPP" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -+$as_echo "$CPP" >&6; } - ac_preproc_ok=false - for ac_c_preproc_warn_flag in '' yes - do -@@ -3003,11 +3844,7 @@ do - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #ifdef __STDC__ - # include -@@ -3016,85 +3853,40 @@ cat >>conftest.$ac_ext <<_ACEOF - #endif - Syntax error - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_cpp "$LINENO"; then : - -+else - # Broken: fails on valid input. - continue - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - -- # OK, works on sane cases. Now check whether non-existent headers -+ # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. - continue - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- - # Passes both tests. - ac_preproc_ok=: - break - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - - done - # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -- : -+rm -f conftest.i conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then : -+ - else -- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check --See \`config.log' for more details." >&5 --echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -+See \`config.log' for more details" "$LINENO" 5; } - fi - - ac_ext=c -@@ -3104,41 +3896,39 @@ ac_link='$CC -o conftest$ac_exeext $CFLA - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - --{ echo "$as_me:$LINENO: Building for $host_os" >&5 --echo "$as_me: Building for $host_os" >&6;} -+{ $as_echo "$as_me:${as_lineno-$LINENO}: Building for $host_os" >&5 -+$as_echo "$as_me: Building for $host_os" >&6;} - WXERL_CAN_BUILD_DRIVER=true - - - MIXED_CYGWIN=no - MIXED_MSYS=no - --echo "$as_me:$LINENO: checking for mixed cygwin or msys and native VC++ environment" >&5 --echo $ECHO_N "checking for mixed cygwin or msys and native VC++ environment... $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mixed cygwin or msys and native VC++ environment" >&5 -+$as_echo_n "checking for mixed cygwin or msys and native VC++ environment... " >&6; } - if test "X$host" = "Xwin32" -a "x$GCC" != "xyes"; then - if test -x /usr/bin/msys-?.0.dll; then - CFLAGS="$CFLAGS -O2" - MIXED_MSYS=yes -- echo "$as_me:$LINENO: result: MSYS and VC" >&5 --echo "${ECHO_T}MSYS and VC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: MSYS and VC" >&5 -+$as_echo "MSYS and VC" >&6; } - MIXED_MSYS_VC=yes - CPPFLAGS="$CPPFLAGS -DERTS_MIXED_MSYS_VC" - elif test -x /usr/bin/cygpath; then - CFLAGS="$CFLAGS -O2" - MIXED_CYGWIN=yes -- echo "$as_me:$LINENO: result: Cygwin and VC" >&5 --echo "${ECHO_T}Cygwin and VC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Cygwin and VC" >&5 -+$as_echo "Cygwin and VC" >&6; } - MIXED_CYGWIN_VC=yes - CPPFLAGS="$CPPFLAGS -DERTS_MIXED_CYGWIN_VC" - else -- echo "$as_me:$LINENO: result: undeterminable" >&5 --echo "${ECHO_T}undeterminable" >&6 -- { { echo "$as_me:$LINENO: error: Seems to be mixed windows but not with cygwin" >&5 --echo "$as_me: error: Seems to be mixed windows but not with cygwin" >&2;} -- { (exit cannot handle this!); exit cannot handle this!; }; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: undeterminable" >&5 -+$as_echo "undeterminable" >&6; } -+ as_fn_error cannot handle this! "Seems to be mixed windows but not with cygwin" "$LINENO" 5 - fi - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - MIXED_CYGWIN_VC=no - MIXED_MSYS_VC=no - fi -@@ -3153,26 +3943,24 @@ fi - - - if test "x$MIXED_MSYS" != "xyes"; then -- echo "$as_me:$LINENO: checking for mixed cygwin and native MinGW environment" >&5 --echo $ECHO_N "checking for mixed cygwin and native MinGW environment... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mixed cygwin and native MinGW environment" >&5 -+$as_echo_n "checking for mixed cygwin and native MinGW environment... " >&6; } - if test "X$host" = "Xwin32" -a "x$GCC" = x"yes"; then - if test -x /usr/bin/cygpath; then - CFLAGS="$CFLAGS -O2" - MIXED_CYGWIN=yes -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - MIXED_CYGWIN_MINGW=yes - CPPFLAGS="$CPPFLAGS -DERTS_MIXED_CYGWIN_MINGW" - else -- echo "$as_me:$LINENO: result: undeterminable" >&5 --echo "${ECHO_T}undeterminable" >&6 -- { { echo "$as_me:$LINENO: error: Seems to be mixed windows but not with cygwin" >&5 --echo "$as_me: error: Seems to be mixed windows but not with cygwin" >&2;} -- { (exit cannot handle this!); exit cannot handle this!; }; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: undeterminable" >&5 -+$as_echo "undeterminable" >&6; } -+ as_fn_error cannot handle this! "Seems to be mixed windows but not with cygwin" "$LINENO" 5 - fi - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - MIXED_CYGWIN_MINGW=no - fi - else -@@ -3180,26 +3968,26 @@ else - fi - - --echo "$as_me:$LINENO: checking if we mix cygwin with any native compiler" >&5 --echo $ECHO_N "checking if we mix cygwin with any native compiler... $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we mix cygwin with any native compiler" >&5 -+$as_echo_n "checking if we mix cygwin with any native compiler... " >&6; } - if test "X$MIXED_CYGWIN" = "Xyes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - - - --echo "$as_me:$LINENO: checking if we mix msys with another native compiler" >&5 --echo $ECHO_N "checking if we mix msys with another native compiler... $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we mix msys with another native compiler" >&5 -+$as_echo_n "checking if we mix msys with another native compiler... " >&6; } - if test "X$MIXED_MSYS" = "Xyes" ; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -3213,31 +4001,142 @@ fi - - - --echo "$as_me:$LINENO: checking for egrep" >&5 --echo $ECHO_N "checking for egrep... $ECHO_C" >&6 --if test "${ac_cv_prog_egrep+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -+$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -+if ${ac_cv_path_GREP+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- if echo a | (grep -E '(a|b)') >/dev/null 2>&1 -- then ac_cv_prog_egrep='grep -E' -- else ac_cv_prog_egrep='egrep' -+ if test -z "$GREP"; then -+ ac_path_GREP_found=false -+ # Loop through the user's path and test for each of PROGNAME-LIST -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in grep ggrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" -+ as_fn_executable_p "$ac_path_GREP" || continue -+# Check for GNU ac_path_GREP and select it if it is found. -+ # Check for GNU $ac_path_GREP -+case `"$ac_path_GREP" --version 2>&1` in -+*GNU*) -+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -+*) -+ ac_count=0 -+ $as_echo_n 0123456789 >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ $as_echo 'GREP' >> "conftest.nl" -+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ as_fn_arith $ac_count + 1 && ac_count=$as_val -+ if test $ac_count -gt ${ac_path_GREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_GREP="$ac_path_GREP" -+ ac_path_GREP_max=$ac_count -+ fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+esac -+ -+ $ac_path_GREP_found && break 3 -+ done -+ done -+ done -+IFS=$as_save_IFS -+ if test -z "$ac_cv_path_GREP"; then -+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 -+ fi -+else -+ ac_cv_path_GREP=$GREP -+fi -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -+$as_echo "$ac_cv_path_GREP" >&6; } -+ GREP="$ac_cv_path_GREP" -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -+$as_echo_n "checking for egrep... " >&6; } -+if ${ac_cv_path_EGREP+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 -+ then ac_cv_path_EGREP="$GREP -E" -+ else -+ if test -z "$EGREP"; then -+ ac_path_EGREP_found=false -+ # Loop through the user's path and test for each of PROGNAME-LIST -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in egrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" -+ as_fn_executable_p "$ac_path_EGREP" || continue -+# Check for GNU ac_path_EGREP and select it if it is found. -+ # Check for GNU $ac_path_EGREP -+case `"$ac_path_EGREP" --version 2>&1` in -+*GNU*) -+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -+*) -+ ac_count=0 -+ $as_echo_n 0123456789 >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ $as_echo 'EGREP' >> "conftest.nl" -+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ as_fn_arith $ac_count + 1 && ac_count=$as_val -+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_EGREP="$ac_path_EGREP" -+ ac_path_EGREP_max=$ac_count - fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+esac -+ -+ $ac_path_EGREP_found && break 3 -+ done -+ done -+ done -+IFS=$as_save_IFS -+ if test -z "$ac_cv_path_EGREP"; then -+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 -+ fi -+else -+ ac_cv_path_EGREP=$EGREP - fi --echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 --echo "${ECHO_T}$ac_cv_prog_egrep" >&6 -- EGREP=$ac_cv_prog_egrep -+ -+ fi -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -+$as_echo "$ac_cv_path_EGREP" >&6; } -+ EGREP="$ac_cv_path_EGREP" - - --echo "$as_me:$LINENO: checking for ANSI C header files" >&5 --echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 --if test "${ac_cv_header_stdc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -+$as_echo_n "checking for ANSI C header files... " >&6; } -+if ${ac_cv_header_stdc+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - #include -@@ -3252,51 +4151,23 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_header_stdc=no -+ ac_cv_header_stdc=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "memchr" >/dev/null 2>&1; then -- : -+ $EGREP "memchr" >/dev/null 2>&1; then : -+ - else - ac_cv_header_stdc=no - fi -@@ -3306,18 +4177,14 @@ fi - - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "free" >/dev/null 2>&1; then -- : -+ $EGREP "free" >/dev/null 2>&1; then : -+ - else - ac_cv_header_stdc=no - fi -@@ -3327,16 +4194,13 @@ fi - - if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -- if test "$cross_compiling" = yes; then -+ if test "$cross_compiling" = yes; then : - : - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include -+#include - #if ((' ' & 0x0FF) == 0x020) - # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') - # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -@@ -3356,109 +4220,39 @@ main () - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) -- exit(2); -- exit (0); -+ return 2; -+ return 0; - } - _ACEOF --rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_run "$LINENO"; then : - --( exit $ac_status ) --ac_cv_header_stdc=no -+else -+ ac_cv_header_stdc=no - fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext - fi -+ - fi - fi --echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 --echo "${ECHO_T}$ac_cv_header_stdc" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -+$as_echo "$ac_cv_header_stdc" >&6; } - if test $ac_cv_header_stdc = yes; then - --cat >>confdefs.h <<\_ACEOF --#define STDC_HEADERS 1 --_ACEOF -+$as_echo "#define STDC_HEADERS 1" >>confdefs.h - - fi - - # On IRIX 5.3, sys/types and inttypes.h are conflicting. -- -- -- -- -- -- -- -- -- - for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default -- --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- eval "$as_ac_Header=yes" --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --eval "$as_ac_Header=no" --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -+" -+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -3466,415 +4260,34 @@ fi - done - - --echo "$as_me:$LINENO: checking for void *" >&5 --echo $ECHO_N "checking for void *... $ECHO_C" >&6 --if test "${ac_cv_type_void_p+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --int --main () --{ --if ((void * *) 0) -- return 0; --if (sizeof (void *)) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_void_p=yes -+# The cast to long int works around a bug in the HP C Compiler -+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+# This bug is HP SR number 8606223364. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5 -+$as_echo_n "checking size of void *... " >&6; } -+if ${ac_cv_sizeof_void_p+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_void_p=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&5 --echo "${ECHO_T}$ac_cv_type_void_p" >&6 -+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then : - --echo "$as_me:$LINENO: checking size of void *" >&5 --echo $ECHO_N "checking size of void *... $ECHO_C" >&6 --if test "${ac_cv_sizeof_void_p+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test "$ac_cv_type_void_p" = yes; then -- # The cast to unsigned long works around a bug in the HP C Compiler -- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -- # This bug is HP SR number 8606223364. -- if test "$cross_compiling" = yes; then -- # Depending upon the size, compute the lo and hi bounds. --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --int --main () --{ --static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= 0)]; --test_array [0] = 0 -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_lo=0 ac_mid=0 -- while :; do -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --int --main () --{ --static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)]; --test_array [0] = 0 -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_hi=$ac_mid; break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_lo=`expr $ac_mid + 1` -- if test $ac_lo -le $ac_mid; then -- ac_lo= ac_hi= -- break -- fi -- ac_mid=`expr 2 '*' $ac_mid + 1` --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- done --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --int --main () --{ --static int test_array [1 - 2 * !(((long) (sizeof (void *))) < 0)]; --test_array [0] = 0 -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_hi=-1 ac_mid=-1 -- while :; do -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --int --main () --{ --static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= $ac_mid)]; --test_array [0] = 0 -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_lo=$ac_mid; break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_hi=`expr '(' $ac_mid ')' - 1` -- if test $ac_mid -le $ac_hi; then -- ac_lo= ac_hi= -- break -- fi -- ac_mid=`expr 2 '*' $ac_mid` --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- done --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_lo= ac_hi= --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error 77 "cannot compute sizeof (void *) -+See \`config.log' for more details" "$LINENO" 5; } -+ else -+ ac_cv_sizeof_void_p=0 -+ fi - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --# Binary search between lo and hi bounds. --while test "x$ac_lo" != "x$ac_hi"; do -- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --int --main () --{ --static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)]; --test_array [0] = 0 - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_hi=$ac_mid --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_lo=`expr '(' $ac_mid ')' + 1` - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --done --case $ac_lo in --?*) ac_cv_sizeof_void_p=$ac_lo;; --'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77 --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute sizeof (void *), 77 --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } ;; --esac --else -- if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --long longval () { return (long) (sizeof (void *)); } --unsigned long ulongval () { return (long) (sizeof (void *)); } --#include --#include --int --main () --{ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5 -+$as_echo "$ac_cv_sizeof_void_p" >&6; } - -- FILE *f = fopen ("conftest.val", "w"); -- if (! f) -- exit (1); -- if (((long) (sizeof (void *))) < 0) -- { -- long i = longval (); -- if (i != ((long) (sizeof (void *)))) -- exit (1); -- fprintf (f, "%ld\n", i); -- } -- else -- { -- unsigned long i = ulongval (); -- if (i != ((long) (sizeof (void *)))) -- exit (1); -- fprintf (f, "%lu\n", i); -- } -- exit (ferror (f) || fclose (f) != 0); - -- ; -- return 0; --} --_ACEOF --rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_sizeof_void_p=`cat conftest.val` --else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - --( exit $ac_status ) --{ { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77 --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute sizeof (void *), 77 --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --fi --fi --rm -f conftest.val --else -- ac_cv_sizeof_void_p=0 --fi --fi --echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5 --echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6 - cat >>confdefs.h <<_ACEOF - #define SIZEOF_VOID_P $ac_cv_sizeof_void_p - _ACEOF -@@ -3888,21 +4301,17 @@ OBJC_CFLAGS="" - CXXFLAGS="" - case $host_os in - darwin*) -- echo "$as_me:$LINENO: checking Checking wxWidgets for min version:" >&5 --echo $ECHO_N "checking Checking wxWidgets for min version:... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Checking wxWidgets for min version:" >&5 -+$as_echo_n "checking Checking wxWidgets for min version:... " >&6; } - WX_CC=`wx-config --cc` - MAC_MIN=`echo "$WX_CC" | sed 's/^[^ ]*\ *//'` -- echo "$as_me:$LINENO: result: $MAC_MIN" >&5 --echo "${ECHO_T}$MAC_MIN" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAC_MIN" >&5 -+$as_echo "$MAC_MIN" >&6; } - -- echo "$as_me:$LINENO: checking if compiler accepts -ObjC" >&5 --echo $ECHO_N "checking if compiler accepts -ObjC... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -ObjC" >&5 -+$as_echo_n "checking if compiler accepts -ObjC... " >&6; } - CFLAGS="$CFLAGS -ObjC" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -3913,45 +4322,21 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - accept_objc_flag=true - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --accept_objc_flag=false -+ accept_objc_flag=false - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test "X$accept_objc_flag" = "Xtrue"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - C_ONLY_FLAGS="-ObjC" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -- echo "$as_me:$LINENO: checking for a Cocoa compliant Objective C compiler" >&5 --echo $ECHO_N "checking for a Cocoa compliant Objective C compiler... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Cocoa compliant Objective C compiler" >&5 -+$as_echo_n "checking for a Cocoa compliant Objective C compiler... " >&6; } - SEARCHFOR="" - SEARCHFORXX="" - save_IFS=$IFS -@@ -3980,22 +4365,20 @@ echo $ECHO_N "checking for a Cocoa compl - done - IFS=$save_IFS - if test X$APPLE_CC = X -o X$APPLE_CXX = X; then -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then -- { { echo "$as_me:$LINENO: error: Can not find compiler to compile Cocoa applications" >&5 --echo "$as_me: error: Can not find compiler to compile Cocoa applications" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "Can not find compiler to compile Cocoa applications" "$LINENO" 5 - else - echo "Can not find compiler to compile Cocoa applications" > ./CONF_INFO - WXERL_CAN_BUILD_DRIVER=false -- { echo "$as_me:$LINENO: WARNING: Can not find compiler to compile Cocoa applications" >&5 --echo "$as_me: WARNING: Can not find compiler to compile Cocoa applications" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can not find compiler to compile Cocoa applications" >&5 -+$as_echo "$as_me: WARNING: Can not find compiler to compile Cocoa applications" >&2;} - fi - WXERL_CAN_BUILD_DRIVER=false - else -- echo "$as_me:$LINENO: result: $APPLE_CC ($APPLE_CXX)" >&5 --echo "${ECHO_T}$APPLE_CC ($APPLE_CXX)" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $APPLE_CC ($APPLE_CXX)" >&5 -+$as_echo "$APPLE_CC ($APPLE_CXX)" >&6; } - CC=$APPLE_CC - CXX=$APPLE_CXX - #CXXFLAGS="-x c++ $CXXFLAGS" -@@ -4009,8 +4392,8 @@ echo "${ECHO_T}$APPLE_CC ($APPLE_CXX)" > - mingw32) - CFLAGS="$CFLAGS -DWIN32 -DWINVER=0x0600 -D_WINDOWS -D_UNICODE -DUNICODE" - CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0600" -- { echo "$as_me:$LINENO: WARNING: Reverting to 32-bit time_t" >&5 --echo "$as_me: WARNING: Reverting to 32-bit time_t" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Reverting to 32-bit time_t" >&5 -+$as_echo "$as_me: WARNING: Reverting to 32-bit time_t" >&2;} - CPPFLAGS="$CPPFLAGS -D_USE_32BIT_TIME_T" - ;; - win32) -@@ -4072,297 +4455,21 @@ esac - - - if test X"$host_os" != X"win32" ; then -- --for ac_header in GL/gl.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in GL/gl.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default" -+if test "x$ac_cv_header_GL_gl_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- --else -- --for ac_header in OpenGL/gl.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> -+#define HAVE_GL_GL_H 1 - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 - --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in OpenGL/gl.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "OpenGL/gl.h" "ac_cv_header_OpenGL_gl_h" "$ac_includes_default" -+if test "x$ac_cv_header_OpenGL_gl_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_OPENGL_GL_H 1 - _ACEOF - - fi -@@ -4377,154 +4484,16 @@ done - test X"$ac_cv_header_OpenGL_gl_h" != Xyes - then - saved_CPPFLAGS="$CPPFLAGS" -- { echo "$as_me:$LINENO: Checking for OpenGL headers in /usr/X11R6" >&5 --echo "$as_me: Checking for OpenGL headers in /usr/X11R6" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: Checking for OpenGL headers in /usr/X11R6" >&5 -+$as_echo "$as_me: Checking for OpenGL headers in /usr/X11R6" >&6;} - CPPFLAGS="-isystem /usr/X11R6/include $CPPFLAGS" - $as_unset ac_cv_header_GL_gl_h -- --for ac_header in GL/gl.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in GL/gl.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default" -+if test "x$ac_cv_header_GL_gl_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_GL_GL_H 1 - _ACEOF - - fi -@@ -4532,154 +4501,16 @@ fi - done - - if test X"$ac_cv_header_GL_gl_h" != Xyes ; then -- { echo "$as_me:$LINENO: Checking for OpenGL headers in /usr/local" >&5 --echo "$as_me: Checking for OpenGL headers in /usr/local" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: Checking for OpenGL headers in /usr/local" >&5 -+$as_echo "$as_me: Checking for OpenGL headers in /usr/local" >&6;} - CPPFLAGS="-isystem /usr/local/include $saved_CPPFLAGS" - $as_unset ac_cv_header_GL_gl_h -- --for ac_header in GL/gl.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in GL/gl.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default" -+if test "x$ac_cv_header_GL_gl_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_GL_GL_H 1 - _ACEOF - - fi -@@ -4687,8 +4518,8 @@ fi - done - - if test X"$ac_cv_header_GL_gl_h" != Xyes ; then -- { echo "$as_me:$LINENO: WARNING: No OpenGL headers found, wx will NOT be usable" >&5 --echo "$as_me: WARNING: No OpenGL headers found, wx will NOT be usable" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No OpenGL headers found, wx will NOT be usable" >&5 -+$as_echo "$as_me: WARNING: No OpenGL headers found, wx will NOT be usable" >&2;} - CPPFLAGS="$saved_CPPFLAGS" - else - GL_LIBS="-L/usr/local/lib $GL_LIBS" -@@ -4698,61 +4529,13 @@ echo "$as_me: WARNING: No OpenGL headers - fi - fi - else -- --for ac_header in gl/gl.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include -- --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- eval "$as_ac_Header=yes" --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --eval "$as_ac_Header=no" --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in gl/gl.h -+do : -+ ac_fn_c_check_header_compile "$LINENO" "gl/gl.h" "ac_cv_header_gl_gl_h" "#include -+" -+if test "x$ac_cv_header_gl_gl_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_GL_GL_H 1 - _ACEOF - - fi -@@ -4762,297 +4545,21 @@ done - fi - - if test X"$host_os" != X"win32" ; then -- --for ac_header in GL/glu.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in GL/glu.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "GL/glu.h" "ac_cv_header_GL_glu_h" "$ac_includes_default" -+if test "x$ac_cv_header_GL_glu_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_GL_GLU_H 1 - _ACEOF - - else -- --for ac_header in OpenGL/glu.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in OpenGL/glu.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "OpenGL/glu.h" "ac_cv_header_OpenGL_glu_h" "$ac_includes_default" -+if test "x$ac_cv_header_OpenGL_glu_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_OPENGL_GLU_H 1 - _ACEOF - - fi -@@ -5066,65 +4573,17 @@ done - if test X"$ac_cv_header_GL_glu_h" != Xyes && - test X"$ac_cv_header_OpenGL_glu_h" != Xyes - then -- { echo "$as_me:$LINENO: WARNING: No GLU headers found, wx will NOT be usable" >&5 --echo "$as_me: WARNING: No GLU headers found, wx will NOT be usable" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No GLU headers found, wx will NOT be usable" >&5 -+$as_echo "$as_me: WARNING: No GLU headers found, wx will NOT be usable" >&2;} - fi - else -- --for ac_header in gl/glu.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include -- --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- eval "$as_ac_Header=yes" --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --eval "$as_ac_Header=no" --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in gl/glu.h -+do : -+ ac_fn_c_check_header_compile "$LINENO" "gl/glu.h" "ac_cv_header_gl_glu_h" "#include -+" -+if test "x$ac_cv_header_gl_glu_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_GL_GLU_H 1 - _ACEOF - - fi -@@ -5146,43 +4605,39 @@ CFLAGS="$CFLAGS $CPPFLAGS $C_ONLY_FLAGS" - - - if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then -- echo "$as_me:$LINENO: checking for erl" >&5 --echo $ECHO_N "checking for erl... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for erl" >&5 -+$as_echo_n "checking for erl... " >&6; } - if test X$ERL != X; then -- echo "$as_me:$LINENO: result: yes; using $ERL" >&5 --echo "${ECHO_T}yes; using $ERL" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes; using $ERL" >&5 -+$as_echo "yes; using $ERL" >&6; } - else - type erl >/dev/null 2>&1 - if test $? -eq 0 ; then - ERL=erl -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - else -- { { echo "$as_me:$LINENO: error: Cannot find erl in path" >&5 --echo "$as_me: error: Cannot find erl in path" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "Cannot find erl in path" "$LINENO" 5 - fi - fi -- echo "$as_me:$LINENO: checking for erlc" >&5 --echo $ECHO_N "checking for erlc... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for erlc" >&5 -+$as_echo_n "checking for erlc... " >&6; } - if test X$ERLC != X; then -- echo "$as_me:$LINENO: result: yes; using $ERLC" >&5 --echo "${ECHO_T}yes; using $ERLC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes; using $ERLC" >&5 -+$as_echo "yes; using $ERLC" >&6; } - else - type erlc >/dev/null 2>&1 - if test $? -eq 0 ; then - ERLC=erlc -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - else -- { { echo "$as_me:$LINENO: error: Cannot find erlc in path" >&5 --echo "$as_me: error: Cannot find erlc in path" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "Cannot find erlc in path" "$LINENO" 5 - fi - fi - ERLANG_ROOT_DIR=`erl -noshell -eval 'io:format("~s~n",[code:root_dir()])' -s erlang halt` -- { echo "$as_me:$LINENO: ERL ROOT DIR: $ERLANG_ROOT_DIR" >&5 --echo "$as_me: ERL ROOT DIR: $ERLANG_ROOT_DIR" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: ERL ROOT DIR: $ERLANG_ROOT_DIR" >&5 -+$as_echo "$as_me: ERL ROOT DIR: $ERLANG_ROOT_DIR" >&6;} - ERLWX_VSN=`grep WX_VSN $srcdir/vsn.mk | sed 's/^.*= *//'` - else - ERLC=erlc -@@ -5272,41 +4727,41 @@ elif test X"$MIXED_CYGWIN_VC" = X"no" - - - - --# Check whether --with-wxdir or --without-wxdir was given. --if test "${with_wxdir+set}" = set; then -- withval="$with_wxdir" -- wx_config_name="$withval/wx-config" -+# Check whether --with-wxdir was given. -+if test "${with_wxdir+set}" = set; then : -+ withval=$with_wxdir; wx_config_name="$withval/wx-config" - wx_config_args="--inplace" --fi; -+fi - --# Check whether --with-wx-config or --without-wx-config was given. --if test "${with_wx_config+set}" = set; then -- withval="$with_wx_config" -- wx_config_name="$withval" --fi; - --# Check whether --with-wx-prefix or --without-wx-prefix was given. --if test "${with_wx_prefix+set}" = set; then -- withval="$with_wx_prefix" -- wx_config_prefix="$withval" -+# Check whether --with-wx-config was given. -+if test "${with_wx_config+set}" = set; then : -+ withval=$with_wx_config; wx_config_name="$withval" -+fi -+ -+ -+# Check whether --with-wx-prefix was given. -+if test "${with_wx_prefix+set}" = set; then : -+ withval=$with_wx_prefix; wx_config_prefix="$withval" - else - wx_config_prefix="" --fi; -+fi - --# Check whether --with-wx-exec-prefix or --without-wx-exec-prefix was given. --if test "${with_wx_exec_prefix+set}" = set; then -- withval="$with_wx_exec_prefix" -- wx_config_exec_prefix="$withval" -+ -+# Check whether --with-wx-exec-prefix was given. -+if test "${with_wx_exec_prefix+set}" = set; then : -+ withval=$with_wx_exec_prefix; wx_config_exec_prefix="$withval" - else - wx_config_exec_prefix="" --fi; -+fi -+ - - reqwx=2.8.4 - # Try to find debug libs first - # wxelibs=core,base,gl,aui,adv - -- echo "$as_me:$LINENO: checking for debug build of wxWidgets" >&5 --echo $ECHO_N "checking for debug build of wxWidgets... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for debug build of wxWidgets" >&5 -+$as_echo_n "checking for debug build of wxWidgets... " >&6; } - - - -@@ -5331,18 +4786,18 @@ echo $ECHO_N "checking for debug build o - fi - - if test -x "$WX_CONFIG_NAME" ; then -- echo "$as_me:$LINENO: checking for wx-config" >&5 --echo $ECHO_N "checking for wx-config... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wx-config" >&5 -+$as_echo_n "checking for wx-config... " >&6; } - WX_CONFIG_PATH="$WX_CONFIG_NAME" -- echo "$as_me:$LINENO: result: $WX_CONFIG_PATH" >&5 --echo "${ECHO_T}$WX_CONFIG_PATH" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WX_CONFIG_PATH" >&5 -+$as_echo "$WX_CONFIG_PATH" >&6; } - else - # Extract the first word of "$WX_CONFIG_NAME", so it can be a program name with args. - set dummy $WX_CONFIG_NAME; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_path_WX_CONFIG_PATH+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_path_WX_CONFIG_PATH+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - case $WX_CONFIG_PATH in - [\\/]* | ?:[\\/]*) -@@ -5355,29 +4810,30 @@ for as_dir in $as_dummy - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_WX_CONFIG_PATH="$as_dir/$ac_word$ac_exec_ext" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - test -z "$ac_cv_path_WX_CONFIG_PATH" && ac_cv_path_WX_CONFIG_PATH="no" - ;; - esac - fi - WX_CONFIG_PATH=$ac_cv_path_WX_CONFIG_PATH -- - if test -n "$WX_CONFIG_PATH"; then -- echo "$as_me:$LINENO: result: $WX_CONFIG_PATH" >&5 --echo "${ECHO_T}$WX_CONFIG_PATH" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WX_CONFIG_PATH" >&5 -+$as_echo "$WX_CONFIG_PATH" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - - if test "$WX_CONFIG_PATH" != "no" ; then -@@ -5385,11 +4841,11 @@ fi - - min_wx_version=$reqwx - if test -z "--unicode --debug=yes" ; then -- echo "$as_me:$LINENO: checking for wxWidgets version >= $min_wx_version" >&5 --echo $ECHO_N "checking for wxWidgets version >= $min_wx_version... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets version >= $min_wx_version" >&5 -+$as_echo_n "checking for wxWidgets version >= $min_wx_version... " >&6; } - else -- echo "$as_me:$LINENO: checking for wxWidgets version >= $min_wx_version (--unicode --debug=yes)" >&5 --echo $ECHO_N "checking for wxWidgets version >= $min_wx_version (--unicode --debug=yes)... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets version >= $min_wx_version (--unicode --debug=yes)" >&5 -+$as_echo_n "checking for wxWidgets version >= $min_wx_version (--unicode --debug=yes)... " >&6; } - fi - - WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args --unicode --debug=yes" -@@ -5431,19 +4887,19 @@ echo $ECHO_N "checking for wxWidgets ver - - - if test -n "$wx_ver_ok"; then -- echo "$as_me:$LINENO: result: yes (version $WX_VERSION)" >&5 --echo "${ECHO_T}yes (version $WX_VERSION)" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $WX_VERSION)" >&5 -+$as_echo "yes (version $WX_VERSION)" >&6; } - WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs stc,xrc,html,adv,xml,core,base,gl,aui` - -- echo "$as_me:$LINENO: checking for wxWidgets static library" >&5 --echo $ECHO_N "checking for wxWidgets static library... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets static library" >&5 -+$as_echo_n "checking for wxWidgets static library... " >&6; } - WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs stc,xrc,html,adv,xml,core,base,gl,aui 2>/dev/null` - if test "x$WX_LIBS_STATIC" = "x"; then -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - else -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - fi - - wx_has_cppflags="" -@@ -5500,11 +4956,11 @@ echo "${ECHO_T}yes" >&6 - else - - if test "x$WX_VERSION" = x; then -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - else -- echo "$as_me:$LINENO: result: no (version $WX_VERSION is not new enough)" >&5 --echo "${ECHO_T}no (version $WX_VERSION is not new enough)" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (version $WX_VERSION is not new enough)" >&5 -+$as_echo "no (version $WX_VERSION is not new enough)" >&6; } - fi - - WX_CFLAGS="" -@@ -5581,8 +5037,8 @@ echo "${ECHO_T}no (version $WX_VERSION i - - - -- echo "$as_me:$LINENO: checking for standard build of wxWidgets" >&5 --echo $ECHO_N "checking for standard build of wxWidgets... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for standard build of wxWidgets" >&5 -+$as_echo_n "checking for standard build of wxWidgets... " >&6; } - - - if test x${WX_CONFIG_NAME+set} != xset ; then -@@ -5606,18 +5062,18 @@ echo $ECHO_N "checking for standard buil - fi - - if test -x "$WX_CONFIG_NAME" ; then -- echo "$as_me:$LINENO: checking for wx-config" >&5 --echo $ECHO_N "checking for wx-config... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wx-config" >&5 -+$as_echo_n "checking for wx-config... " >&6; } - WX_CONFIG_PATH="$WX_CONFIG_NAME" -- echo "$as_me:$LINENO: result: $WX_CONFIG_PATH" >&5 --echo "${ECHO_T}$WX_CONFIG_PATH" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WX_CONFIG_PATH" >&5 -+$as_echo "$WX_CONFIG_PATH" >&6; } - else - # Extract the first word of "$WX_CONFIG_NAME", so it can be a program name with args. - set dummy $WX_CONFIG_NAME; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_path_WX_CONFIG_PATH+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_path_WX_CONFIG_PATH+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - case $WX_CONFIG_PATH in - [\\/]* | ?:[\\/]*) -@@ -5630,29 +5086,30 @@ for as_dir in $as_dummy - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_WX_CONFIG_PATH="$as_dir/$ac_word$ac_exec_ext" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - test -z "$ac_cv_path_WX_CONFIG_PATH" && ac_cv_path_WX_CONFIG_PATH="no" - ;; - esac - fi - WX_CONFIG_PATH=$ac_cv_path_WX_CONFIG_PATH -- - if test -n "$WX_CONFIG_PATH"; then -- echo "$as_me:$LINENO: result: $WX_CONFIG_PATH" >&5 --echo "${ECHO_T}$WX_CONFIG_PATH" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WX_CONFIG_PATH" >&5 -+$as_echo "$WX_CONFIG_PATH" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - - if test "$WX_CONFIG_PATH" != "no" ; then -@@ -5660,11 +5117,11 @@ fi - - min_wx_version=$reqwx - if test -z "--unicode --debug=no" ; then -- echo "$as_me:$LINENO: checking for wxWidgets version >= $min_wx_version" >&5 --echo $ECHO_N "checking for wxWidgets version >= $min_wx_version... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets version >= $min_wx_version" >&5 -+$as_echo_n "checking for wxWidgets version >= $min_wx_version... " >&6; } - else -- echo "$as_me:$LINENO: checking for wxWidgets version >= $min_wx_version (--unicode --debug=no)" >&5 --echo $ECHO_N "checking for wxWidgets version >= $min_wx_version (--unicode --debug=no)... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets version >= $min_wx_version (--unicode --debug=no)" >&5 -+$as_echo_n "checking for wxWidgets version >= $min_wx_version (--unicode --debug=no)... " >&6; } - fi - - WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args --unicode --debug=no" -@@ -5706,19 +5163,19 @@ echo $ECHO_N "checking for wxWidgets ver - - - if test -n "$wx_ver_ok"; then -- echo "$as_me:$LINENO: result: yes (version $WX_VERSION)" >&5 --echo "${ECHO_T}yes (version $WX_VERSION)" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $WX_VERSION)" >&5 -+$as_echo "yes (version $WX_VERSION)" >&6; } - WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs stc,xrc,html,adv,xml,core,base,gl,aui` - -- echo "$as_me:$LINENO: checking for wxWidgets static library" >&5 --echo $ECHO_N "checking for wxWidgets static library... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets static library" >&5 -+$as_echo_n "checking for wxWidgets static library... " >&6; } - WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs stc,xrc,html,adv,xml,core,base,gl,aui 2>/dev/null` - if test "x$WX_LIBS_STATIC" = "x"; then -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - else -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - fi - - wx_has_cppflags="" -@@ -5775,11 +5232,11 @@ echo "${ECHO_T}yes" >&6 - else - - if test "x$WX_VERSION" = x; then -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - else -- echo "$as_me:$LINENO: result: no (version $WX_VERSION is not new enough)" >&5 --echo "${ECHO_T}no (version $WX_VERSION is not new enough)" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (version $WX_VERSION is not new enough)" >&5 -+$as_echo "no (version $WX_VERSION is not new enough)" >&6; } - fi - - WX_CFLAGS="" -@@ -5878,27 +5335,18 @@ echo "${ECHO_T}no (version $WX_VERSION i - - if test "$wxWin" != 1; then - if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then -- { { echo "$as_me:$LINENO: error: -- wxWidgets must be installed on your system. -- -- Please check that wx-config is in path, the directory -- where wxWidgets libraries are installed (returned by -- 'wx-config --libs' or 'wx-config --static --libs' command) -- is in LD_LIBRARY_PATH or equivalent variable and -- wxWidgets version is $reqwx or above." >&5 --echo "$as_me: error: -+ as_fn_error $? " - wxWidgets must be installed on your system. - - Please check that wx-config is in path, the directory - where wxWidgets libraries are installed (returned by - 'wx-config --libs' or 'wx-config --static --libs' command) - is in LD_LIBRARY_PATH or equivalent variable and -- wxWidgets version is $reqwx or above." >&2;} -- { (exit 1); exit 1; }; } -+ wxWidgets version is $reqwx or above." "$LINENO" 5 - else - echo "wxWidgets not found, wx will NOT be usable" > ./CONF_INFO - WXERL_CAN_BUILD_DRIVER=false -- { echo "$as_me:$LINENO: WARNING: -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: - wxWidgets must be installed on your system. - - Please check that wx-config is in path, the directory -@@ -5906,7 +5354,7 @@ echo "$as_me: error: - 'wx-config --libs' or 'wx-config --static --libs' command) - is in LD_LIBRARY_PATH or equivalent variable and - wxWidgets version is $reqwx or above." >&5 --echo "$as_me: WARNING: -+$as_echo "$as_me: WARNING: - wxWidgets must be installed on your system. - - Please check that wx-config is in path, the directory -@@ -5917,12 +5365,12 @@ echo "$as_me: WARNING: - fi - fi - else -- echo "$as_me:$LINENO: checking for wxWidgets in standard locations" >&5 --echo $ECHO_N "checking for wxWidgets in standard locations... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets in standard locations" >&5 -+$as_echo_n "checking for wxWidgets in standard locations... " >&6; } - - # Check whether --with-wxdir was given. -- { echo "$as_me:$LINENO: OptionCheck: $with_wxdir $with_wx_prefix" >&5 --echo "$as_me: OptionCheck: $with_wxdir $with_wx_prefix" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: OptionCheck: $with_wxdir $with_wx_prefix" >&5 -+$as_echo "$as_me: OptionCheck: $with_wxdir $with_wx_prefix" >&6;} - - if test "${with_wxdir+set}" = set; then : - withval=$with_wxdir; CWXWIN0=$withval -@@ -5976,8 +5424,8 @@ echo "$as_me: OptionCheck: $with_wxdir $ - CWXPATH="$CWXWIN0 $CWXWIN1 $CWXWIN2 $CWX_DOCUMENTED $CWXWIN3 $CWXWIN4" - - for dir in $CWXPATH; do -- { echo "$as_me:$LINENO: Checking: $dir" >&5 --echo "$as_me: Checking: $dir" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: Checking: $dir" >&5 -+$as_echo "$as_me: Checking: $dir" >&6;} - if test -f $dir/include/wx/wx.h; then - WXINCLUDE_MSVC=$dir/include/msvc - WXINCLUDE_PLAIN=$dir/include -@@ -6007,25 +5455,23 @@ echo "$as_me: Checking: $dir" >&6;} - for lib in $WX_LIBS0 $WX_LIBS1 $WX_LIBS2 $WX_LIBS3 $WX_SYSLIBS; do - WX_LIBS_STATIC="$WX_LIBS_STATIC -l$lib" - done -- echo "$as_me:$LINENO: result: $dir" >&5 --echo "${ECHO_T}$dir" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dir" >&5 -+$as_echo "$dir" >&6; } - break - fi - fi - done - - if test -z "$WX_LIBS_STATIC"; then -- echo "$as_me:$LINENO: result: failed" >&5 --echo "${ECHO_T}failed" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 -+$as_echo "failed" >&6; } - if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then -- { { echo "$as_me:$LINENO: error: Cannot find core lib version for wxWidgets" >&5 --echo "$as_me: error: Cannot find core lib version for wxWidgets" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "Cannot find core lib version for wxWidgets" "$LINENO" 5 - else - echo "No usable wxWidgets not found, wx will not be useable" > ./CONF_INFO - WXERL_CAN_BUILD_DRIVER=false -- { echo "$as_me:$LINENO: WARNING: Cannot find core lib version for wxWidgets" >&5 --echo "$as_me: WARNING: Cannot find core lib version for wxWidgets" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find core lib version for wxWidgets" >&5 -+$as_echo "$as_me: WARNING: Cannot find core lib version for wxWidgets" >&2;} - fi - fi - WX_HAVE_STATIC_LIBS=true -@@ -6040,9 +5486,9 @@ if test "$WXERL_CAN_BUILD_DRIVER" != "fa - - - --echo "$as_me:$LINENO: checking if wxwidgets have opengl support" >&5 --echo $ECHO_N "checking if wxwidgets have opengl support... $ECHO_C" >&6 --ac_ext=cc -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if wxwidgets have opengl support" >&5 -+$as_echo_n "checking if wxwidgets have opengl support... " >&6; } -+ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -6052,11 +5498,7 @@ saved_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS" - - --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #ifdef WIN32 -@@ -6078,41 +5520,15 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_cxx_try_compile "$LINENO"; then : - HAVE_GL_SUPPORT=yes - --cat >>confdefs.h <<\_ACEOF --#define HAVE_GL_SUPPORT 1 --_ACEOF -+$as_echo "#define HAVE_GL_SUPPORT 1" >>confdefs.h - - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --HAVE_GL_SUPPORT=no -+ HAVE_GL_SUPPORT=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - CXXFLAGS=$saved_CXXFLAGS - ac_ext=c -@@ -6121,8 +5537,8 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - --echo "$as_me:$LINENO: result: $HAVE_GL_SUPPORT" >&5 --echo "${ECHO_T}$HAVE_GL_SUPPORT" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_GL_SUPPORT" >&5 -+$as_echo "$HAVE_GL_SUPPORT" >&6; } - - - if test X"$HAVE_GL_SUPPORT" != X"yes" ; then -@@ -6131,18 +5547,7 @@ if test X"$HAVE_GL_SUPPORT" != X"yes" ; - fi - - --echo "$as_me:$LINENO: checking for GLintptr" >&5 --echo $ECHO_N "checking for GLintptr... $ECHO_C" >&6 --if test "${ac_cv_type_GLintptr+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef WIN32 -+ac_fn_c_check_type "$LINENO" "GLintptr" "ac_cv_type_GLintptr" "#ifdef WIN32 - # include - # include - #elif defined(HAVE_GL_GL_H) -@@ -6151,52 +5556,8 @@ cat >>conftest.$ac_ext <<_ACEOF - # include - #endif - -- --int --main () --{ --if ((GLintptr *) 0) -- return 0; --if (sizeof (GLintptr)) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_GLintptr=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_GLintptr=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_type_GLintptr" >&5 --echo "${ECHO_T}$ac_cv_type_GLintptr" >&6 --if test $ac_cv_type_GLintptr = yes; then -+" -+if test "x$ac_cv_type_GLintptr" = xyes; then : - - cat >>confdefs.h <<_ACEOF - #define HAVE_GLINTPTR 1 -@@ -6204,18 +5565,7 @@ _ACEOF - - - fi --echo "$as_me:$LINENO: checking for GLintptrARB" >&5 --echo $ECHO_N "checking for GLintptrARB... $ECHO_C" >&6 --if test "${ac_cv_type_GLintptrARB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef WIN32 -+ac_fn_c_check_type "$LINENO" "GLintptrARB" "ac_cv_type_GLintptrARB" "#ifdef WIN32 - # include - # include - #elif defined(HAVE_GL_GL_H) -@@ -6224,52 +5574,8 @@ cat >>conftest.$ac_ext <<_ACEOF - # include - #endif - -- --int --main () --{ --if ((GLintptrARB *) 0) -- return 0; --if (sizeof (GLintptrARB)) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_GLintptrARB=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_GLintptrARB=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_type_GLintptrARB" >&5 --echo "${ECHO_T}$ac_cv_type_GLintptrARB" >&6 --if test $ac_cv_type_GLintptrARB = yes; then -+" -+if test "x$ac_cv_type_GLintptrARB" = xyes; then : - - cat >>confdefs.h <<_ACEOF - #define HAVE_GLINTPTRARB 1 -@@ -6277,18 +5583,7 @@ _ACEOF - - - fi --echo "$as_me:$LINENO: checking for GLchar" >&5 --echo $ECHO_N "checking for GLchar... $ECHO_C" >&6 --if test "${ac_cv_type_GLchar+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef WIN32 -+ac_fn_c_check_type "$LINENO" "GLchar" "ac_cv_type_GLchar" "#ifdef WIN32 - # include - # include - #elif defined(HAVE_GL_GL_H) -@@ -6297,52 +5592,8 @@ cat >>conftest.$ac_ext <<_ACEOF - # include - #endif - -- --int --main () --{ --if ((GLchar *) 0) -- return 0; --if (sizeof (GLchar)) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_GLchar=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_GLchar=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_type_GLchar" >&5 --echo "${ECHO_T}$ac_cv_type_GLchar" >&6 --if test $ac_cv_type_GLchar = yes; then -+" -+if test "x$ac_cv_type_GLchar" = xyes; then : - - cat >>confdefs.h <<_ACEOF - #define HAVE_GLCHAR 1 -@@ -6350,18 +5601,7 @@ _ACEOF - - - fi --echo "$as_me:$LINENO: checking for GLcharARB" >&5 --echo $ECHO_N "checking for GLcharARB... $ECHO_C" >&6 --if test "${ac_cv_type_GLcharARB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef WIN32 -+ac_fn_c_check_type "$LINENO" "GLcharARB" "ac_cv_type_GLcharARB" "#ifdef WIN32 - # include - # include - #elif defined(HAVE_GL_GL_H) -@@ -6370,52 +5610,8 @@ cat >>conftest.$ac_ext <<_ACEOF - # include - #endif - -- --int --main () --{ --if ((GLcharARB *) 0) -- return 0; --if (sizeof (GLcharARB)) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_GLcharARB=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_GLcharARB=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_type_GLcharARB" >&5 --echo "${ECHO_T}$ac_cv_type_GLcharARB" >&6 --if test $ac_cv_type_GLcharARB = yes; then -+" -+if test "x$ac_cv_type_GLcharARB" = xyes; then : - - cat >>confdefs.h <<_ACEOF - #define HAVE_GLCHARARB 1 -@@ -6423,18 +5619,7 @@ _ACEOF - - - fi --echo "$as_me:$LINENO: checking for GLhalfARB" >&5 --echo $ECHO_N "checking for GLhalfARB... $ECHO_C" >&6 --if test "${ac_cv_type_GLhalfARB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef WIN32 -+ac_fn_c_check_type "$LINENO" "GLhalfARB" "ac_cv_type_GLhalfARB" "#ifdef WIN32 - # include - # include - #elif defined(HAVE_GL_GL_H) -@@ -6443,52 +5628,8 @@ cat >>conftest.$ac_ext <<_ACEOF - # include - #endif - -- --int --main () --{ --if ((GLhalfARB *) 0) -- return 0; --if (sizeof (GLhalfARB)) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_GLhalfARB=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_GLhalfARB=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_type_GLhalfARB" >&5 --echo "${ECHO_T}$ac_cv_type_GLhalfARB" >&6 --if test $ac_cv_type_GLhalfARB = yes; then -+" -+if test "x$ac_cv_type_GLhalfARB" = xyes; then : - - cat >>confdefs.h <<_ACEOF - #define HAVE_GLHALFARB 1 -@@ -6496,18 +5637,7 @@ _ACEOF - - - fi --echo "$as_me:$LINENO: checking for GLint64EXT" >&5 --echo $ECHO_N "checking for GLint64EXT... $ECHO_C" >&6 --if test "${ac_cv_type_GLint64EXT+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef WIN32 -+ac_fn_c_check_type "$LINENO" "GLint64EXT" "ac_cv_type_GLint64EXT" "#ifdef WIN32 - # include - # include - #elif defined(HAVE_GL_GL_H) -@@ -6516,52 +5646,8 @@ cat >>conftest.$ac_ext <<_ACEOF - # include - #endif - -- --int --main () --{ --if ((GLint64EXT *) 0) -- return 0; --if (sizeof (GLint64EXT)) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_GLint64EXT=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_GLint64EXT=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_type_GLint64EXT" >&5 --echo "${ECHO_T}$ac_cv_type_GLint64EXT" >&6 --if test $ac_cv_type_GLint64EXT = yes; then -+" -+if test "x$ac_cv_type_GLint64EXT" = xyes; then : - - cat >>confdefs.h <<_ACEOF - #define HAVE_GLINT64EXT 1 -@@ -6572,9 +5658,9 @@ fi - - - --echo "$as_me:$LINENO: checking GLU Callbacks uses Tiger Style" >&5 --echo $ECHO_N "checking GLU Callbacks uses Tiger Style... $ECHO_C" >&6 --ac_ext=cc -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking GLU Callbacks uses Tiger Style" >&5 -+$as_echo_n "checking GLU Callbacks uses Tiger Style... " >&6; } -+ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -6583,11 +5669,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - saved_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS" - --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #ifdef WIN32 -@@ -6614,111 +5696,37 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_cxx_try_compile "$LINENO"; then : - TESS_CB_TIGER_STYLE=yes - --cat >>confdefs.h <<\_ACEOF --#define TESS_CB_TIGER_STYLE 1 --_ACEOF -+$as_echo "#define TESS_CB_TIGER_STYLE 1" >>confdefs.h - - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --TESS_CB_TIGER_STYLE=no -+ TESS_CB_TIGER_STYLE=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $TESS_CB_TIGER_STYLE" >&5 --echo "${ECHO_T}$TESS_CB_TIGER_STYLE" >&6 -- -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TESS_CB_TIGER_STYLE" >&5 -+$as_echo "$TESS_CB_TIGER_STYLE" >&6; } - - - - for ac_header in wx/stc/stc.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef WIN32 -+do : -+ ac_fn_cxx_check_header_compile "$LINENO" "wx/stc/stc.h" "ac_cv_header_wx_stc_stc_h" "#ifdef WIN32 - # include - #endif -- #include "wx/wx.h" -- --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- eval "$as_ac_Header=yes" --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --eval "$as_ac_Header=no" --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ #include \"wx/wx.h\" -+" -+if test "x$ac_cv_header_wx_stc_stc_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_WX_STC_STC_H 1 - _ACEOF - - else - WXERL_CAN_BUILD_DRIVER=false - echo "wxWidgets don't have wxStyledTextControl (stc.h), wx will NOT be useable" > ./CONF_INFO -- { echo "$as_me:$LINENO: WARNING: Can not find wx/stc/stc.h $CXXFLAGS" >&5 --echo "$as_me: WARNING: Can not find wx/stc/stc.h $CXXFLAGS" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can not find wx/stc/stc.h $CXXFLAGS" >&5 -+$as_echo "$as_me: WARNING: Can not find wx/stc/stc.h $CXXFLAGS" >&2;} - - fi - -@@ -6726,19 +5734,15 @@ done - - - --echo "$as_me:$LINENO: checking if we can link wxwidgets programs" >&5 --echo $ECHO_N "checking if we can link wxwidgets programs... $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can link wxwidgets programs" >&5 -+$as_echo_n "checking if we can link wxwidgets programs... " >&6; } - saved_LIBS=$LIBS - - if test X"$WX_HAVE_STATIC_LIBS" = X"true" ; then - LIBS=$WX_LIBS_STATIC - fi - --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #ifdef WIN32 -@@ -6769,41 +5773,17 @@ cat >>conftest.$ac_ext <<_ACEOF - IMPLEMENT_APP(MyApp) - - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_cxx_try_link "$LINENO"; then : - - CAN_LINK_WX=yes - - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- - - CAN_LINK_WX=no - - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - - CXXFLAGS=$saved_CXXFLAGS - LIBS=$saved_LIBS -@@ -6813,14 +5793,14 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - --echo "$as_me:$LINENO: result: $CAN_LINK_WX" >&5 --echo "${ECHO_T}$CAN_LINK_WX" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CAN_LINK_WX" >&5 -+$as_echo "$CAN_LINK_WX" >&6; } - - if test X"$CAN_LINK_WX" != X"yes" ; then - echo "Can not link the wx driver, wx will NOT be useable" > ./CONF_INFO - WXERL_CAN_BUILD_DRIVER=false -- { echo "$as_me:$LINENO: WARNING: Can not link wx program are all developer packages installed?" >&5 --echo "$as_me: WARNING: Can not link wx program are all developer packages installed?" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can not link wx program are all developer packages installed?" >&5 -+$as_echo "$as_me: WARNING: Can not link wx program are all developer packages installed?" >&2;} - fi - - fi -@@ -6829,15 +5809,11 @@ fi - if test "x$GCC" = xyes; then - # Treat certain GCC warnings as errors - -- echo "$as_me:$LINENO: checking if we can add -Werror=return-type to CFLAGS (via CFLAGS)" >&5 --echo $ECHO_N "checking if we can add -Werror=return-type to CFLAGS (via CFLAGS)... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can add -Werror=return-type to CFLAGS (via CFLAGS)" >&5 -+$as_echo_n "checking if we can add -Werror=return-type to CFLAGS (via CFLAGS)... " >&6; } - saved_CFLAGS=$CFLAGS; - CFLAGS="-Werror=return-type $CFLAGS"; -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -6848,56 +5824,28 @@ return 0; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - can_enable_flag=true - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --can_enable_flag=false -+ can_enable_flag=false - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS=$saved_CFLAGS; - if test "X$can_enable_flag" = "Xtrue"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - CFLAGS="-Werror=return-type $CFLAGS" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -- echo "$as_me:$LINENO: checking if we can add -Werror=return-type to CXXFLAGS (via CFLAGS)" >&5 --echo $ECHO_N "checking if we can add -Werror=return-type to CXXFLAGS (via CFLAGS)... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can add -Werror=return-type to CXXFLAGS (via CFLAGS)" >&5 -+$as_echo_n "checking if we can add -Werror=return-type to CXXFLAGS (via CFLAGS)... " >&6; } - saved_CFLAGS=$CFLAGS; - CFLAGS="-Werror=return-type $CXXFLAGS"; -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -6908,54 +5856,29 @@ return 0; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - can_enable_flag=true - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --can_enable_flag=false -+ can_enable_flag=false - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS=$saved_CFLAGS; - if test "X$can_enable_flag" = "Xtrue"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - CXXFLAGS="-Werror=return-type $CXXFLAGS" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - - fi - - - --# Check whether --enable-sanitizers or --disable-sanitizers was given. --if test "${enable_sanitizers+set}" = set; then -- enableval="$enable_sanitizers" -- -+# Check whether --enable-sanitizers was given. -+if test "${enable_sanitizers+set}" = set; then : -+ enableval=$enable_sanitizers; - case "$enableval" in - no) sanitizers= ;; - yes) sanitizers="-fsanitize=address,undefined" ;; -@@ -6965,7 +5888,8 @@ CFLAGS="$CFLAGS $sanitizers" - CXXFLAGS="$CXXFLAGS $sanitizers" - LDFLAGS="$LDFLAGS $sanitizers" - --fi; -+fi -+ - - ############################################################################# - -@@ -6997,13 +5921,11 @@ CONFIG_STATUS=$WXERL_SYS_TYPE/config.sta - - if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then - if test X"$WXERL_CAN_BUILD_DRIVER" != X"true" ; then -- { { echo "$as_me:$LINENO: error: Cannot build wxErlang driver, see ./CONF_INFO for information" >&5 --echo "$as_me: error: Cannot build wxErlang driver, see ./CONF_INFO for information" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "Cannot build wxErlang driver, see ./CONF_INFO for information" "$LINENO" 5 - fi - fi - -- ac_config_files="$ac_config_files config.mk c_src/Makefile" -+ac_config_files="$ac_config_files config.mk c_src/Makefile" - - - cat >confcache <<\_ACEOF -@@ -7024,39 +5946,70 @@ _ACEOF - - # The following way of writing the cache mishandles newlines in values, - # but we know of no workaround that is simple, portable, and efficient. --# So, don't put newlines in cache variables' values. -+# So, we kill variables containing newlines. - # Ultrix sh set writes to stderr and can't be redirected directly, - # and sets the high bit in the cache file unless we assign to the vars. --{ -+( -+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -+ *) { eval $ac_var=; unset $ac_var;} ;; -+ esac ;; -+ esac -+ done -+ - (set) 2>&1 | -- case `(ac_space=' '; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -- # `set' does not quote correctly, so add quotes (double-quote -- # substitution turns \\\\ into \\, and sed turns \\ into \). -+ case $as_nl`(ac_space=' '; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) -+ # `set' does not quote correctly, so add quotes: double-quote -+ # substitution turns \\\\ into \\, and sed turns \\ into \. - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -- ;; -+ ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; -- esac; --} | -+ esac | -+ sort -+) | - sed ' -+ /^ac_cv_env_/b end - t clear -- : clear -+ :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end -- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -- : end' >>confcache --if diff $cache_file confcache >/dev/null 2>&1; then :; else -- if test -w $cache_file; then -- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" -- cat confcache >$cache_file -+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -+ :end' >>confcache -+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else -+ if test -w "$cache_file"; then -+ if test "x$cache_file" != "x/dev/null"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -+$as_echo "$as_me: updating cache $cache_file" >&6;} -+ if test ! -f "$cache_file" || test -h "$cache_file"; then -+ cat confcache >"$cache_file" -+ else -+ case $cache_file in #( -+ */* | ?:*) -+ mv -f confcache "$cache_file"$$ && -+ mv -f "$cache_file"$$ "$cache_file" ;; #( -+ *) -+ mv -f confcache "$cache_file" ;; -+ esac -+ fi -+ fi - else -- echo "not updating unwritable cache $cache_file" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi - fi - rm -f confcache -@@ -7065,63 +6018,55 @@ test "x$prefix" = xNONE && prefix=$ac_de - # Let make expand exec_prefix. - test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - --# VPATH may cause trouble with some makes, so we remove $(srcdir), --# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and --# trailing colons and then remove the whole line if VPATH becomes empty --# (actually we leave an empty line to preserve line numbers). --if test "x$srcdir" = x.; then -- ac_vpsub='/^[ ]*VPATH[ ]*=/{ --s/:*\$(srcdir):*/:/; --s/:*\${srcdir}:*/:/; --s/:*@srcdir@:*/:/; --s/^\([^=]*=[ ]*\):*/\1/; --s/:*$//; --s/^[^=]*=[ ]*$//; --}' --fi -- - # Transform confdefs.h into DEFS. - # Protect against shell expansion while executing Makefile rules. - # Protect against Makefile macro expansion. - # - # If the first sed substitution is executed (which looks for macros that --# take arguments), then we branch to the quote section. Otherwise, -+# take arguments), then branch to the quote section. Otherwise, - # look for a macro that doesn't take arguments. --cat >confdef2opt.sed <<\_ACEOF -+ac_script=' -+:mline -+/\\$/{ -+ N -+ s,\\\n,, -+ b mline -+} - t clear --: clear --s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g -+:clear -+s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g - t quote --s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g -+s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g - t quote --d --: quote --s,[ `~#$^&*(){}\\|;'"<>?],\\&,g --s,\[,\\&,g --s,\],\\&,g --s,\$,$$,g --p --_ACEOF --# We use echo to avoid assuming a particular line-breaking character. --# The extra dot is to prevent the shell from consuming trailing --# line-breaks from the sub-command output. A line-break within --# single-quotes doesn't work because, if this script is created in a --# platform that uses two characters for line-breaks (e.g., DOS), tr --# would break. --ac_LF_and_DOT=`echo; echo .` --DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` --rm -f confdef2opt.sed -+b any -+:quote -+s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g -+s/\[/\\&/g -+s/\]/\\&/g -+s/\$/$$/g -+H -+:any -+${ -+ g -+ s/^\n// -+ s/\n/ /g -+ p -+} -+' -+DEFS=`sed -n "$ac_script" confdefs.h` - - - ac_libobjs= - ac_ltlibobjs= -+U= - for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. -- ac_i=`echo "$ac_i" | -- sed 's/\$U\././;s/\.o$//;s/\.obj$//'` -- # 2. Add them. -- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" -- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' -+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' -+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"` -+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR -+ # will be set to the directory where LIBOBJS objects are built. -+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" -+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' - done - LIBOBJS=$ac_libobjs - -@@ -7129,12 +6074,14 @@ LTLIBOBJS=$ac_ltlibobjs - - - --: ${CONFIG_STATUS=./config.status} -+: "${CONFIG_STATUS=./config.status}" -+ac_write_fail=0 - ac_clean_files_save=$ac_clean_files - ac_clean_files="$ac_clean_files $CONFIG_STATUS" --{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 --echo "$as_me: creating $CONFIG_STATUS" >&6;} --cat >$CONFIG_STATUS <<_ACEOF -+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -+as_write_fail=0 -+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 - #! $SHELL - # Generated by $as_me. - # Run this file to recreate the current configuration. -@@ -7144,81 +6091,253 @@ cat >$CONFIG_STATUS <<_ACEOF - debug=false - ac_cs_recheck=false - ac_cs_silent=false --SHELL=\${CONFIG_SHELL-$SHELL} --_ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF --## --------------------- ## --## M4sh Initialization. ## --## --------------------- ## -+SHELL=\${CONFIG_SHELL-$SHELL} -+export SHELL -+_ASEOF -+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 -+## -------------------- ## -+## M4sh Initialization. ## -+## -------------------- ## - --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac - fi --DUALCASE=1; export DUALCASE # for MKS sh - --# Support unset when possible. --if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -- as_unset=unset -+ -+as_nl=' -+' -+export as_nl -+# Printing a long string crashes Solaris 7 /usr/bin/printf. -+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -+# Prefer a ksh shell builtin over an external printf program on Solaris, -+# but without wasting forks for bash or zsh. -+if test -z "$BASH_VERSION$ZSH_VERSION" \ -+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='print -r --' -+ as_echo_n='print -rn --' -+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='printf %s\n' -+ as_echo_n='printf %s' - else -- as_unset=false -+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -+ as_echo_n='/usr/ucb/echo -n' -+ else -+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -+ as_echo_n_body='eval -+ arg=$1; -+ case $arg in #( -+ *"$as_nl"*) -+ expr "X$arg" : "X\\(.*\\)$as_nl"; -+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -+ esac; -+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -+ ' -+ export as_echo_n_body -+ as_echo_n='sh -c $as_echo_n_body as_echo' -+ fi -+ export as_echo_body -+ as_echo='sh -c $as_echo_body as_echo' -+fi -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } - fi - - --# Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+as_myself= -+case $0 in #(( -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ exit 1 -+fi -+ -+# Unset variables that we do not need and which cause bugs (e.g. in -+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -+# suppresses any "Segmentation fault" message there. '((' could -+# trigger a bug in pdksh 5.2.14. -+for as_var in BASH_ENV ENV MAIL MAILPATH -+do eval test x\${$as_var+set} = xset \ -+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -+done - PS1='$ ' - PS2='> ' - PS4='+ ' - - # NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -- LC_TELEPHONE LC_TIME --do -- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -- eval $as_var=C; export $as_var -- else -- $as_unset $as_var -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE -+ -+# CDPATH. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ -+ -+# as_fn_error STATUS ERROR [LINENO LOG_FD] -+# ---------------------------------------- -+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -+# script with STATUS, using 1 if that was 0. -+as_fn_error () -+{ -+ as_status=$1; test $as_status -eq 0 && as_status=1 -+ if test "$4"; then -+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 - fi --done -+ $as_echo "$as_me: error: $2" >&2 -+ as_fn_exit $as_status -+} # as_fn_error - --# Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -+ -+# as_fn_set_status STATUS -+# ----------------------- -+# Set $? to STATUS, without forking. -+as_fn_set_status () -+{ -+ return $1 -+} # as_fn_set_status -+ -+# as_fn_exit STATUS -+# ----------------- -+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -+as_fn_exit () -+{ -+ set +e -+ as_fn_set_status $1 -+ exit $1 -+} # as_fn_exit -+ -+# as_fn_unset VAR -+# --------------- -+# Portably unset VAR. -+as_fn_unset () -+{ -+ { eval $1=; unset $1;} -+} -+as_unset=as_fn_unset -+# as_fn_append VAR VALUE -+# ---------------------- -+# Append the text in VALUE to the end of the definition contained in VAR. Take -+# advantage of any shell optimizations that allow amortized linear growth over -+# repeated appends, instead of the typical quadratic growth present in naive -+# implementations. -+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : -+ eval 'as_fn_append () -+ { -+ eval $1+=\$2 -+ }' -+else -+ as_fn_append () -+ { -+ eval $1=\$$1\$2 -+ } -+fi # as_fn_append -+ -+# as_fn_arith ARG... -+# ------------------ -+# Perform arithmetic evaluation on the ARGs, and store the result in the -+# global $as_val. Take advantage of shells that can avoid forks. The arguments -+# must be portable across $(()) and expr. -+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : -+ eval 'as_fn_arith () -+ { -+ as_val=$(( $* )) -+ }' -+else -+ as_fn_arith () -+ { -+ as_val=`expr "$@" || test $? -eq 1` -+ } -+fi # as_fn_arith -+ -+ -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename - else - as_basename=false - fi - -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi - --# Name of the executable. --as_me=`$as_basename "$0" || -+as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || --echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -- /^X\/\(\/\/\)$/{ s//\1/; q; } -- /^X\/\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - --# PATH needs CR, and LINENO needs CR and PATH. - # Avoid depending upon Character Ranges. - as_cr_letters='abcdefghijklmnopqrstuvwxyz' - as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -@@ -7226,148 +6345,111 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE - as_cr_digits='0123456789' - as_cr_alnum=$as_cr_Letters$as_cr_digits - --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -- else -- PATH_SEPARATOR=: -- fi -- rm -f conf$$.sh --fi -- -- -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" || { -- # Find who we are. Look in the path if we contain no path at all -- # relative or not. -- case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -- -- ;; -- esac -- # We did not find ourselves, most probably we were run as `sh COMMAND' -- # in which case we are not to be found in the path. -- if test "x$as_myself" = x; then -- as_myself=$0 -- fi -- if test ! -f "$as_myself"; then -- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 --echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} -- { (exit 1); exit 1; }; } -- fi -- case $CONFIG_SHELL in -- '') -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for as_base in sh bash ksh sh5; do -- case $as_dir in -- /*) -- if ("$as_dir/$as_base" -c ' -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -- CONFIG_SHELL=$as_dir/$as_base -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" ${1+"$@"} -- fi;; -- esac -- done --done --;; -- esac -- -- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -- # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line before each line; the second 'sed' does the real -- # work. The second script uses 'N' to pair each line-number line -- # with the numbered line, and appends trailing '-' during -- # substitution so that $LINENO is not a special case at line end. -- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -- sed ' -- N -- s,$,-, -- : loop -- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -- t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -- ' >$as_me.lineno && -- chmod +x $as_me.lineno || -- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 --echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} -- { (exit 1); exit 1; }; } -- -- # Don't try to exec as it changes $[0], causing all sort of problems -- # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensible to this). -- . ./$as_me.lineno -- # Exit status is that of the last command. -- exit --} -- -- --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in #((((( -+-n*) -+ case `echo 'xy\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ xy) ECHO_C='\c';; -+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null -+ ECHO_T=' ';; -+ esac;; -+*) -+ ECHO_N='-n';; - esac - --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr -+rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file - else -- as_expr=false -+ rm -f conf$$.dir -+ mkdir conf$$.dir 2>/dev/null - fi -- --rm -f conf$$ conf$$.exe conf$$.file --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -- as_ln_s='cp -p' -- else -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -pR'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -pR' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else -+ as_ln_s='cp -pR' - fi --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln - else -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - fi --rm -f conf$$ conf$$.exe conf$$.file -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null -+ -+ -+# as_fn_mkdir_p -+# ------------- -+# Create "$as_dir" as a directory, including parents if necessary. -+as_fn_mkdir_p () -+{ - -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || eval $as_mkdir_p || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" -+ -+ -+} # as_fn_mkdir_p - if mkdir -p . 2>/dev/null; then -- as_mkdir_p=: -+ as_mkdir_p='mkdir -p "$as_dir"' - else - test -d ./-p && rmdir ./-p - as_mkdir_p=false - fi - --as_executable_p="test -f" -+ -+# as_fn_executable_p FILE -+# ----------------------- -+# Test if FILE is an executable regular file. -+as_fn_executable_p () -+{ -+ test -f "$1" && test -x "$1" -+} # as_fn_executable_p -+as_test_x='test -x' -+as_executable_p=as_fn_executable_p - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -7376,31 +6458,20 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P - as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH -- - exec 6>&1 -+## ----------------------------------- ## -+## Main body of $CONFIG_STATUS script. ## -+## ----------------------------------- ## -+_ASEOF -+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 - --# Open the log real soon, to keep \$[0] and so on meaningful, and to -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# Save the log message, to keep $0 and so on meaningful, and to - # report actual input values of CONFIG_FILES etc. instead of their --# values after options handling. Logging --version etc. is OK. --exec 5>>config.log --{ -- echo -- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX --## Running $as_me. ## --_ASBOX --} >&5 --cat >&5 <<_CSEOF -- -+# values after options handling. -+ac_log=" - This file was extended by $as_me, which was --generated by GNU Autoconf 2.59. Invocation command line was -+generated by GNU Autoconf 2.69. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -7408,124 +6479,116 @@ generated by GNU Autoconf 2.59. Invocat - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - --_CSEOF --echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 --echo >&5 -+on `(hostname || uname -n) 2>/dev/null | sed 1q` -+" -+ - _ACEOF - --# Files that config.status was made for. --if test -n "$ac_config_files"; then -- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS --fi -+case $ac_config_files in *" -+"*) set x $ac_config_files; shift; ac_config_files=$*;; -+esac - --if test -n "$ac_config_headers"; then -- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS --fi - --if test -n "$ac_config_links"; then -- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS --fi - --if test -n "$ac_config_commands"; then -- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS --fi -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+# Files that config.status was made for. -+config_files="$ac_config_files" - --cat >>$CONFIG_STATUS <<\_ACEOF -+_ACEOF - -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - ac_cs_usage="\ --\`$as_me' instantiates files from templates according to the --current configuration. -+\`$as_me' instantiates files and other configuration actions -+from templates according to the current configuration. Unless the files -+and actions are specified as TAGs, all are instantiated by default. - --Usage: $0 [OPTIONS] [FILE]... -+Usage: $0 [OPTION]... [TAG]... - - -h, --help print this help, then exit -- -V, --version print version number, then exit -- -q, --quiet do not print progress messages -+ -V, --version print version number and configuration settings, then exit -+ --config print configuration, then exit -+ -q, --quiet, --silent -+ do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions -- --file=FILE[:TEMPLATE] -- instantiate the configuration file FILE -+ --file=FILE[:TEMPLATE] -+ instantiate the configuration file FILE - - Configuration files: - $config_files - --Report bugs to ." --_ACEOF -+Report bugs to the package provider." - --cat >>$CONFIG_STATUS <<_ACEOF -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" - ac_cs_version="\\ - config.status --configured by $0, generated by GNU Autoconf 2.59, -- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -+configured by $0, generated by GNU Autoconf 2.69, -+ with options \\"\$ac_cs_config\\" - --Copyright (C) 2003 Free Software Foundation, Inc. -+Copyright (C) 2012 Free Software Foundation, Inc. - This config.status script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it." --srcdir=$srcdir -+ -+ac_pwd='$ac_pwd' -+srcdir='$srcdir' -+test -n "\$AWK" || AWK=awk - _ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF --# If no file are specified by the user, then we need to provide default --# value. By we need to know if files were specified by the user. -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# The default lists apply if the user does not specify any file. - ac_need_defaults=: - while test $# != 0 - do - case $1 in -- --*=*) -- ac_option=`expr "x$1" : 'x\([^=]*\)='` -- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` -+ --*=?*) -+ ac_option=`expr "X$1" : 'X\([^=]*\)='` -+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; -- -*) -+ --*=) -+ ac_option=`expr "X$1" : 'X\([^=]*\)='` -+ ac_optarg= -+ ac_shift=: -+ ;; -+ *) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; -- *) # This is not an option, so the user has probably given explicit -- # arguments. -- ac_option=$1 -- ac_need_defaults=false;; - esac - - case $ac_option in - # Handling of the options. --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; -- --version | --vers* | -V ) -- echo "$ac_cs_version"; exit 0 ;; -- --he | --h) -- # Conflict between --help and --header -- { { echo "$as_me:$LINENO: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; };; -- --help | --hel | -h ) -- echo "$ac_cs_usage"; exit 0 ;; -- --debug | --d* | -d ) -+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) -+ $as_echo "$ac_cs_version"; exit ;; -+ --config | --confi | --conf | --con | --co | --c ) -+ $as_echo "$ac_cs_config"; exit ;; -+ --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift -- CONFIG_FILES="$CONFIG_FILES $ac_optarg" -- ac_need_defaults=false;; -- --header | --heade | --head | --hea ) -- $ac_shift -- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" -+ case $ac_optarg in -+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ '') as_fn_error $? "missing file argument" ;; -+ esac -+ as_fn_append CONFIG_FILES " '$ac_optarg'" - ac_need_defaults=false;; -+ --he | --h | --help | --hel | -h ) -+ $as_echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. -- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; } ;; -+ -*) as_fn_error $? "unrecognized option: \`$1' -+Try \`$0 --help' for more information." ;; - -- *) ac_config_targets="$ac_config_targets $1" ;; -+ *) as_fn_append ac_config_targets " $1" -+ ac_need_defaults=false ;; - - esac - shift -@@ -7539,31 +6602,45 @@ if $ac_cs_silent; then - fi - - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - if \$ac_cs_recheck; then -- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 -- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ shift -+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 -+ CONFIG_SHELL='$SHELL' -+ export CONFIG_SHELL -+ exec "\$@" - fi - - _ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+exec 5>>config.log -+{ -+ echo -+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -+## Running $as_me. ## -+_ASBOX -+ $as_echo "$ac_log" -+} >&5 - -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+_ACEOF - -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - -- -- --cat >>$CONFIG_STATUS <<\_ACEOF -+# Handling of arguments. - for ac_config_target in $ac_config_targets - do -- case "$ac_config_target" in -- # Handling of arguments. -- "config.mk" ) CONFIG_FILES="$CONFIG_FILES config.mk" ;; -- "c_src/Makefile" ) CONFIG_FILES="$CONFIG_FILES c_src/Makefile" ;; -- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 --echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -- { (exit 1); exit 1; }; };; -+ case $ac_config_target in -+ "config.mk") CONFIG_FILES="$CONFIG_FILES config.mk" ;; -+ "c_src/Makefile") CONFIG_FILES="$CONFIG_FILES c_src/Makefile" ;; -+ -+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; - esac - done - -+ - # If the user did not use the arguments to specify the items to instantiate, - # then the envvar interface is used. Set only those that are not. - # We use the long form for the default assignment because of an extremely -@@ -7573,380 +6650,414 @@ if $ac_need_defaults; then - fi - - # Have a temporary directory for convenience. Make it in the build tree --# simply because there is no reason to put it here, and in addition, -+# simply because there is no reason against having it here, and in addition, - # creating and moving files from /tmp can sometimes cause problems. --# Create a temporary directory, and hook for its removal unless debugging. -+# Hook for its removal unless debugging. -+# Note that there is a small window in which the directory will not be cleaned: -+# after its creation but before its name has been assigned to `$tmp'. - $debug || - { -- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 -- trap '{ (exit 1); exit 1; }' 1 2 13 15 -+ tmp= ac_tmp= -+ trap 'exit_status=$? -+ : "${ac_tmp:=$tmp}" -+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status -+' 0 -+ trap 'as_fn_exit 1' 1 2 13 15 - } -- - # Create a (secure) tmp directory for tmp files. - - { -- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && -- test -n "$tmp" && test -d "$tmp" -+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && -+ test -d "$tmp" - } || - { -- tmp=./confstat$$-$RANDOM -- (umask 077 && mkdir $tmp) --} || -+ tmp=./conf$$-$RANDOM -+ (umask 077 && mkdir "$tmp") -+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 -+ac_tmp=$tmp -+ -+# Set up the scripts for CONFIG_FILES section. -+# No need to generate them if there are no CONFIG_FILES. -+# This happens for instance with `./config.status config.h'. -+if test -n "$CONFIG_FILES"; then -+ -+ -+ac_cr=`echo X | tr X '\015'` -+# On cygwin, bash can eat \r inside `` if the user requested igncr. -+# But we know of no other shell where ac_cr would be empty at this -+# point, so we can use a bashism as a fallback. -+if test "x$ac_cr" = x; then -+ eval ac_cr=\$\'\\r\' -+fi -+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` -+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then -+ ac_cs_awk_cr='\\r' -+else -+ ac_cs_awk_cr=$ac_cr -+fi -+ -+echo 'BEGIN {' >"$ac_tmp/subs1.awk" && -+_ACEOF -+ -+ - { -- echo "$me: cannot create a temporary directory in ." >&2 -- { (exit 1); exit 1; } -+ echo "cat >conf$$subs.awk <<_ACEOF" && -+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && -+ echo "_ACEOF" -+} >conf$$subs.sh || -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` -+ac_delim='%!_!# ' -+for ac_last_try in false false false false false :; do -+ . ./conf$$subs.sh || -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -+ -+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` -+ if test $ac_delim_n = $ac_delim_num; then -+ break -+ elif $ac_last_try; then -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -+ else -+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " -+ fi -+done -+rm -f conf$$subs.sh -+ -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && -+_ACEOF -+sed -n ' -+h -+s/^/S["/; s/!.*/"]=/ -+p -+g -+s/^[^!]*!// -+:repl -+t repl -+s/'"$ac_delim"'$// -+t delim -+:nl -+h -+s/\(.\{148\}\)..*/\1/ -+t more1 -+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ -+p -+n -+b repl -+:more1 -+s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -+p -+g -+s/.\{148\}// -+t nl -+:delim -+h -+s/\(.\{148\}\)..*/\1/ -+t more2 -+s/["\\]/\\&/g; s/^/"/; s/$/"/ -+p -+b -+:more2 -+s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -+p -+g -+s/.\{148\}// -+t delim -+' >$CONFIG_STATUS || ac_write_fail=1 -+rm -f conf$$subs.awk -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+_ACAWK -+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && -+ for (key in S) S_is_set[key] = 1 -+ FS = "" - -+} -+{ -+ line = $ 0 -+ nfields = split(line, field, "@") -+ substed = 0 -+ len = length(field[1]) -+ for (i = 2; i < nfields; i++) { -+ key = field[i] -+ keylen = length(key) -+ if (S_is_set[key]) { -+ value = S[key] -+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) -+ len += length(value) + length(field[++i]) -+ substed = 1 -+ } else -+ len += 1 + keylen -+ } -+ -+ print line -+} -+ -+_ACAWK -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then -+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" -+else -+ cat -+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ -+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 - _ACEOF - --cat >>$CONFIG_STATUS <<_ACEOF -+# VPATH may cause trouble with some makes, so we remove sole $(srcdir), -+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and -+# trailing colons and then remove the whole line if VPATH becomes empty -+# (actually we leave an empty line to preserve line numbers). -+if test "x$srcdir" = x.; then -+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ -+h -+s/// -+s/^/:/ -+s/[ ]*$/:/ -+s/:\$(srcdir):/:/g -+s/:\${srcdir}:/:/g -+s/:@srcdir@:/:/g -+s/^:*// -+s/:*$// -+x -+s/\(=[ ]*\).*/\1/ -+G -+s/\n// -+s/^[^=]*=[ ]*$// -+}' -+fi - --# --# CONFIG_FILES section. --# -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+fi # test -n "$CONFIG_FILES" - --# No need to generate the scripts if there are no CONFIG_FILES. --# This happens for instance when ./config.status config.h --if test -n "\$CONFIG_FILES"; then -- # Protect against being on the right side of a sed subst in config.status. -- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; -- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF --s,@SHELL@,$SHELL,;t t --s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t --s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t --s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t --s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t --s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t --s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t --s,@exec_prefix@,$exec_prefix,;t t --s,@prefix@,$prefix,;t t --s,@program_transform_name@,$program_transform_name,;t t --s,@bindir@,$bindir,;t t --s,@sbindir@,$sbindir,;t t --s,@libexecdir@,$libexecdir,;t t --s,@datadir@,$datadir,;t t --s,@sysconfdir@,$sysconfdir,;t t --s,@sharedstatedir@,$sharedstatedir,;t t --s,@localstatedir@,$localstatedir,;t t --s,@libdir@,$libdir,;t t --s,@includedir@,$includedir,;t t --s,@oldincludedir@,$oldincludedir,;t t --s,@infodir@,$infodir,;t t --s,@mandir@,$mandir,;t t --s,@build_alias@,$build_alias,;t t --s,@host_alias@,$host_alias,;t t --s,@target_alias@,$target_alias,;t t --s,@DEFS@,$DEFS,;t t --s,@ECHO_C@,$ECHO_C,;t t --s,@ECHO_N@,$ECHO_N,;t t --s,@ECHO_T@,$ECHO_T,;t t --s,@LIBS@,$LIBS,;t t --s,@build@,$build,;t t --s,@build_cpu@,$build_cpu,;t t --s,@build_vendor@,$build_vendor,;t t --s,@build_os@,$build_os,;t t --s,@host@,$host,;t t --s,@host_cpu@,$host_cpu,;t t --s,@host_vendor@,$host_vendor,;t t --s,@host_os@,$host_os,;t t --s,@TARGET@,$TARGET,;t t --s,@CC@,$CC,;t t --s,@CFLAGS@,$CFLAGS,;t t --s,@LDFLAGS@,$LDFLAGS,;t t --s,@CPPFLAGS@,$CPPFLAGS,;t t --s,@ac_ct_CC@,$ac_ct_CC,;t t --s,@EXEEXT@,$EXEEXT,;t t --s,@OBJEXT@,$OBJEXT,;t t --s,@CXX@,$CXX,;t t --s,@CXXFLAGS@,$CXXFLAGS,;t t --s,@ac_ct_CXX@,$ac_ct_CXX,;t t --s,@RANLIB@,$RANLIB,;t t --s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t --s,@CPP@,$CPP,;t t --s,@MIXED_CYGWIN_VC@,$MIXED_CYGWIN_VC,;t t --s,@MIXED_MSYS_VC@,$MIXED_MSYS_VC,;t t --s,@MIXED_VC@,$MIXED_VC,;t t --s,@MIXED_CYGWIN_MINGW@,$MIXED_CYGWIN_MINGW,;t t --s,@MIXED_CYGWIN@,$MIXED_CYGWIN,;t t --s,@MIXED_MSYS@,$MIXED_MSYS,;t t --s,@EGREP@,$EGREP,;t t --s,@OBJC_CC@,$OBJC_CC,;t t --s,@OBJC_CFLAGS@,$OBJC_CFLAGS,;t t --s,@GL_LIBS@,$GL_LIBS,;t t --s,@DEBUG_CFLAGS@,$DEBUG_CFLAGS,;t t --s,@DEBUG_CXXFLAGS@,$DEBUG_CXXFLAGS,;t t --s,@ERLC@,$ERLC,;t t --s,@WX_BUILDING_INSIDE_ERLSRC@,$WX_BUILDING_INSIDE_ERLSRC,;t t --s,@ERLANG_ROOT_DIR@,$ERLANG_ROOT_DIR,;t t --s,@WX_CONFIG_PATH@,$WX_CONFIG_PATH,;t t --s,@WX_CPPFLAGS@,$WX_CPPFLAGS,;t t --s,@WX_CFLAGS@,$WX_CFLAGS,;t t --s,@WX_CXXFLAGS@,$WX_CXXFLAGS,;t t --s,@WX_CFLAGS_ONLY@,$WX_CFLAGS_ONLY,;t t --s,@WX_CXXFLAGS_ONLY@,$WX_CXXFLAGS_ONLY,;t t --s,@WX_LIBS@,$WX_LIBS,;t t --s,@WX_LIBS_STATIC@,$WX_LIBS_STATIC,;t t --s,@WX_VERSION@,$WX_VERSION,;t t --s,@WX_RESCOMP@,$WX_RESCOMP,;t t --s,@WX_VERSION_MAJOR@,$WX_VERSION_MAJOR,;t t --s,@WX_VERSION_MINOR@,$WX_VERSION_MINOR,;t t --s,@WX_VERSION_MICRO@,$WX_VERSION_MICRO,;t t --s,@DEBUG_WX_CFLAGS@,$DEBUG_WX_CFLAGS,;t t --s,@DEBUG_WX_CXXFLAGS@,$DEBUG_WX_CXXFLAGS,;t t --s,@DEBUG_WX_LIBS@,$DEBUG_WX_LIBS,;t t --s,@DEBUG_WX_LIBS_STATIC@,$DEBUG_WX_LIBS_STATIC,;t t --s,@FORCED_DEBUG_BUILD@,$FORCED_DEBUG_BUILD,;t t --s,@WX_HAVE_STATIC_LIBS@,$WX_HAVE_STATIC_LIBS,;t t --s,@RC_FILE_TYPE@,$RC_FILE_TYPE,;t t --s,@HAVE_GL_SUPPORT@,$HAVE_GL_SUPPORT,;t t --s,@TESS_CB_TIGER_STYLE@,$TESS_CB_TIGER_STYLE,;t t --s,@WXERL_CAN_BUILD_DRIVER@,$WXERL_CAN_BUILD_DRIVER,;t t --s,@SO_EXT@,$SO_EXT,;t t --s,@RUN_ERL@,$RUN_ERL,;t t --s,@WXERL_SYS_TYPE@,$WXERL_SYS_TYPE,;t t --s,@LIBOBJS@,$LIBOBJS,;t t --s,@LTLIBOBJS@,$LTLIBOBJS,;t t --CEOF - --_ACEOF -+eval set X " :F $CONFIG_FILES " -+shift -+for ac_tag -+do -+ case $ac_tag in -+ :[FHLC]) ac_mode=$ac_tag; continue;; -+ esac -+ case $ac_mode$ac_tag in -+ :[FHL]*:*);; -+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; -+ :[FH]-) ac_tag=-:-;; -+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; -+ esac -+ ac_save_IFS=$IFS -+ IFS=: -+ set x $ac_tag -+ IFS=$ac_save_IFS -+ shift -+ ac_file=$1 -+ shift - -- cat >>$CONFIG_STATUS <<\_ACEOF -- # Split the substitutions into bite-sized pieces for seds with -- # small command number limits, like on Digital OSF/1 and HP-UX. -- ac_max_sed_lines=48 -- ac_sed_frag=1 # Number of current file. -- ac_beg=1 # First line for current file. -- ac_end=$ac_max_sed_lines # Line after last line for current file. -- ac_more_lines=: -- ac_sed_cmds= -- while $ac_more_lines; do -- if test $ac_beg -gt 1; then -- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- else -- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- fi -- if test ! -s $tmp/subs.frag; then -- ac_more_lines=false -- else -- # The purpose of the label and of the branching condition is to -- # speed up the sed processing (if there are no `@' at all, there -- # is no need to browse any of the substitutions). -- # These are the two extra sed commands mentioned above. -- (echo ':t -- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" -- else -- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" -- fi -- ac_sed_frag=`expr $ac_sed_frag + 1` -- ac_beg=$ac_end -- ac_end=`expr $ac_end + $ac_max_sed_lines` -+ case $ac_mode in -+ :L) ac_source=$1;; -+ :[FH]) -+ ac_file_inputs= -+ for ac_f -+ do -+ case $ac_f in -+ -) ac_f="$ac_tmp/stdin";; -+ *) # Look for the file first in the build tree, then in the source tree -+ # (if the path is not absolute). The absolute path cannot be DOS-style, -+ # because $ac_f cannot contain `:'. -+ test -f "$ac_f" || -+ case $ac_f in -+ [\\/$]*) false;; -+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; -+ esac || -+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; -+ esac -+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac -+ as_fn_append ac_file_inputs " '$ac_f'" -+ done -+ -+ # Let's still pretend it is `configure' which instantiates (i.e., don't -+ # use $as_me), people would be surprised to read: -+ # /* config.h. Generated by config.status. */ -+ configure_input='Generated from '` -+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' -+ `' by configure.' -+ if test x"$ac_file" != x-; then -+ configure_input="$ac_file. $configure_input" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -+$as_echo "$as_me: creating $ac_file" >&6;} - fi -- done -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds=cat -- fi --fi # test -n "$CONFIG_FILES" -+ # Neutralize special characters interpreted by sed in replacement strings. -+ case $configure_input in #( -+ *\&* | *\|* | *\\* ) -+ ac_sed_conf_input=`$as_echo "$configure_input" | -+ sed 's/[\\\\&|]/\\\\&/g'`;; #( -+ *) ac_sed_conf_input=$configure_input;; -+ esac - --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF --for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue -- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". -- case $ac_file in -- - | *:- | *:-:* ) # input from stdin -- cat >$tmp/stdin -- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- * ) ac_file_in=$ac_file.in ;; -+ case $ac_tag in -+ *:-:* | *:-) cat >"$ac_tmp/stdin" \ -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; -+ esac -+ ;; - esac - -- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. -- ac_dir=`(dirname "$ac_file") 2>/dev/null || -+ ac_dir=`$as_dirname -- "$ac_file" || - $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ -- X"$ac_file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$ac_file" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- { if $as_mkdir_p; then -- mkdir -p "$ac_dir" -- else -- as_dir="$ac_dir" -- as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- done -- test ! -n "$as_dirs" || mkdir $as_dirs -- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 --echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -- { (exit 1); exit 1; }; }; } -- -+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$ac_file" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ as_dir="$ac_dir"; as_fn_mkdir_p - ac_builddir=. - --if test "$ac_dir" != .; then -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix - - case $srcdir in -- .) # No --srcdir option. We are building in place. -+ .) # We are building in place. - ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; --esac -- --# Do not use `cd foo && pwd` to compute absolute paths, because --# the directories may not exist. --case `pwd` in --.) ac_abs_builddir="$ac_dir";; --*) -- case "$ac_dir" in -- .) ac_abs_builddir=`pwd`;; -- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -- *) ac_abs_builddir=`pwd`/"$ac_dir";; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_builddir=${ac_top_builddir}.;; --*) -- case ${ac_top_builddir}. in -- .) ac_abs_top_builddir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_srcdir=$ac_srcdir;; --*) -- case $ac_srcdir in -- .) ac_abs_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_srcdir=$ac_top_srcdir;; --*) -- case $ac_top_srcdir in -- .) ac_abs_top_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -- esac;; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; - esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - -+ case $ac_mode in -+ :F) -+ # -+ # CONFIG_FILE -+ # - -- if test x"$ac_file" != x-; then -- { echo "$as_me:$LINENO: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -- rm -f "$ac_file" -- fi -- # Let's still pretend it is `configure' which instantiates (i.e., don't -- # use $as_me), people would be surprised to read: -- # /* config.h. Generated by config.status. */ -- if test x"$ac_file" = x-; then -- configure_input= -- else -- configure_input="$ac_file. " -- fi -- configure_input=$configure_input"Generated from `echo $ac_file_in | -- sed 's,.*/,,'` by configure." -+_ACEOF - -- # First look for the input files in the build tree, otherwise in the -- # src tree. -- ac_file_inputs=`IFS=: -- for f in $ac_file_in; do -- case $f in -- -) echo $tmp/stdin ;; -- [\\/$]*) -- # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- echo "$f";; -- *) # Relative -- if test -f "$f"; then -- # Build tree -- echo "$f" -- elif test -f "$srcdir/$f"; then -- # Source tree -- echo "$srcdir/$f" -- else -- # /dev/null tree -- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- fi;; -- esac -- done` || { (exit 1); exit 1; } -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# If the template does not know about datarootdir, expand it. -+# FIXME: This hack should be removed a few years after 2.60. -+ac_datarootdir_hack=; ac_datarootdir_seen= -+ac_sed_dataroot=' -+/datarootdir/ { -+ p -+ q -+} -+/@datadir@/p -+/@docdir@/p -+/@infodir@/p -+/@localedir@/p -+/@mandir@/p' -+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in -+*datarootdir*) ac_datarootdir_seen=yes;; -+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -- sed "$ac_vpsub -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ ac_datarootdir_hack=' -+ s&@datadir@&$datadir&g -+ s&@docdir@&$docdir&g -+ s&@infodir@&$infodir&g -+ s&@localedir@&$localedir&g -+ s&@mandir@&$mandir&g -+ s&\\\${datarootdir}&$datarootdir&g' ;; -+esac -+_ACEOF -+ -+# Neutralize VPATH when `$srcdir' = `.'. -+# Shell code in configure.ac might set extrasub. -+# FIXME: do we really want to maintain this feature? -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ac_sed_extra="$ac_vpsub - $extrasub - _ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - :t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b --s,@configure_input@,$configure_input,;t t --s,@srcdir@,$ac_srcdir,;t t --s,@abs_srcdir@,$ac_abs_srcdir,;t t --s,@top_srcdir@,$ac_top_srcdir,;t t --s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t --s,@builddir@,$ac_builddir,;t t --s,@abs_builddir@,$ac_abs_builddir,;t t --s,@top_builddir@,$ac_top_builddir,;t t --s,@abs_top_builddir@,$ac_abs_top_builddir,;t t --" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out -- rm -f $tmp/stdin -- if test x"$ac_file" != x-; then -- mv $tmp/out $ac_file -- else -- cat $tmp/out -- rm -f $tmp/out -- fi -+s|@configure_input@|$ac_sed_conf_input|;t t -+s&@top_builddir@&$ac_top_builddir_sub&;t t -+s&@top_build_prefix@&$ac_top_build_prefix&;t t -+s&@srcdir@&$ac_srcdir&;t t -+s&@abs_srcdir@&$ac_abs_srcdir&;t t -+s&@top_srcdir@&$ac_top_srcdir&;t t -+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -+s&@builddir@&$ac_builddir&;t t -+s&@abs_builddir@&$ac_abs_builddir&;t t -+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -+$ac_datarootdir_hack -+" -+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ -+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - --done --_ACEOF -+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && -+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && -+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ -+ "$ac_tmp/out"`; test -z "$ac_out"; } && -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined" >&5 -+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined" >&2;} - --cat >>$CONFIG_STATUS <<\_ACEOF -+ rm -f "$ac_tmp/stdin" -+ case $ac_file in -+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; -+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; -+ esac \ -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 -+ ;; - --{ (exit 0); exit 0; } -+ -+ -+ esac -+ -+done # for ac_tag -+ -+ -+as_fn_exit 0 - _ACEOF --chmod +x $CONFIG_STATUS - ac_clean_files=$ac_clean_files_save - -+test $ac_write_fail = 0 || -+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 -+ - - # configure is writing to config.log, and then calls config.status. - # config.status does its own redirection, appending to config.log. -@@ -7966,23 +7077,27 @@ if test "$no_create" != yes; then - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. -- $ac_cs_success || { (exit 1); exit 1; } -+ $ac_cs_success || as_fn_exit 1 -+fi -+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} - fi - - - if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then -- { echo "$as_me:$LINENO: " >&5 --echo "$as_me: " >&6;} -- { echo "$as_me:$LINENO: --------------------------------------------------" >&5 --echo "$as_me: --------------------------------------------------" >&6;} -- { echo "$as_me:$LINENO: Using erlang compiler: $ERLC" >&5 --echo "$as_me: Using erlang compiler: $ERLC" >&6;} -- { echo "$as_me:$LINENO: wxErlang Install in: $ERLANG_ROOT_DIR/lib/wx-$ERLWX_VSN" >&5 --echo "$as_me: wxErlang Install in: $ERLANG_ROOT_DIR/lib/wx-$ERLWX_VSN" >&6;} -- { echo "$as_me:$LINENO: Erlang driver in priv/$WXERL_SYS_TYPE/wxe_driver$SO_EXT" >&5 --echo "$as_me: Erlang driver in priv/$WXERL_SYS_TYPE/wxe_driver$SO_EXT" >&6;} -- { echo "$as_me:$LINENO: --------------------------------------------------" >&5 --echo "$as_me: --------------------------------------------------" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 -+$as_echo "$as_me: " >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: --------------------------------------------------" >&5 -+$as_echo "$as_me: --------------------------------------------------" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: Using erlang compiler: $ERLC" >&5 -+$as_echo "$as_me: Using erlang compiler: $ERLC" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: wxErlang Install in: $ERLANG_ROOT_DIR/lib/wx-$ERLWX_VSN" >&5 -+$as_echo "$as_me: wxErlang Install in: $ERLANG_ROOT_DIR/lib/wx-$ERLWX_VSN" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: Erlang driver in priv/$WXERL_SYS_TYPE/wxe_driver$SO_EXT" >&5 -+$as_echo "$as_me: Erlang driver in priv/$WXERL_SYS_TYPE/wxe_driver$SO_EXT" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: --------------------------------------------------" >&5 -+$as_echo "$as_me: --------------------------------------------------" >&6;} - fi - - if test X"$WX_BUILDING_INSIDE_ERLSRC" = X"true" ; then diff --git a/lang/erlang-runtime21/Makefile b/lang/erlang-runtime21/Makefile index 983ebb4228e..b348a4ae473 100644 --- a/lang/erlang-runtime21/Makefile +++ b/lang/erlang-runtime21/Makefile @@ -2,26 +2,12 @@ # $FreeBSD$ PORTNAME= erlang -PORTVERSION= 21.3 +DISTVERSIONPREFIX= OTP- +DISTVERSION= 21.3.3 # NB when bumping OTP versions also bump PORTREVISION in databases/couchdb2 CATEGORIES= lang parallel java -MASTER_SITES= http://www.erlang.org/download/:erlangorg \ - http://erlang.stacken.kth.se/download/:erlangorg \ - http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg \ - http://olgeni.olgeni.com/~olgeni/distfiles/:local \ - LOCAL/olgeni:local \ - LOCAL/dch:local PKGNAMESUFFIX= -runtime21 -DISTNAME= otp_src_${ERLANG_REL} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:erlangorg \ - preloaded-${PORTVERSION}${EXTRACT_SUFX}:local DIST_SUBDIR= erlang -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - -PATCH_SITES= http://olgeni.olgeni.com/~olgeni/distfiles/ \ - LOCAL/olgeni \ - LOCAL/dch -PATCHFILES= MAINTAINER= erlang@FreeBSD.org COMMENT= Functional programming language from Ericsson @@ -30,16 +16,18 @@ LICENSE= APACHE20 BROKEN_sparc64= Fails to build: error: fp_except undeclared -WRKSRC= ${WRKDIR}/otp_src_${ERLANG_REL} +USES= autoreconf:build gmake ncurses perl5 +USE_GITHUB= yes +GH_PROJECT= otp +USE_PERL5= build -ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//} -ERLANG_REL= 21.3 +GNU_CONFIGURE= yes +MAKE_JOBS_UNSAFE=yes -OPTIONS_SUB= yes SUB_FILES= pkg-message SUB_LIST= ERLANG_LIB=${ERLANG_LIB} -MAKE_JOBS_UNSAFE=yes +ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//} OPTIONS_DEFINE= DIRTY DTRACE GS HIPE JAVA KQUEUE NATIVE ODBC OPENSSL SCTP THREADS WX OPTIONS_DEFAULT=DIRTY DTRACE HIPE KQUEUE OPENSSL SCTP THREADS @@ -59,10 +47,6 @@ NATIVE_IMPLIES= HIPE OPTIONS_EXCLUDE+= DTRACE .endif -# If you run Erlang and get a message resembling "WARNING: number of -# probes fixed does not match the number of defined probes (54 != 132, -# respectively)" you probably misconfigured DTrace in some way. - OPTIONS_EXCLUDE_DragonFly= HIPE NATIVE SCTP # ld(1) fails to link probes: missing __dtrace_erlang___* symbols OPTIONS_EXCLUDE_aarch64= DTRACE @@ -72,10 +56,10 @@ OPTIONS_EXCLUDE_i386= DTRACE OPENSSL_VARS= BROKEN_SSL=openssl111 -GNU_CONFIGURE= yes -LDFLAGS+= -L${LOCALBASE}/lib -USES= gmake ncurses perl5 -USE_PERL5= build +# If you run Erlang and get a message resembling "WARNING: number of +# probes fixed does not match the number of defined probes (54 != 132, +# respectively)" you probably misconfigured DTrace in some way. + CONFIGURE_ENABLE= smp-support DIRTY_CONFIGURE_ENABLE= dirty-schedulers @@ -96,9 +80,10 @@ OPENSSL_USES= ssl SCTP_CONFIGURE_ENABLE= sctp THREADS_CONFIGURE_ENABLE= threads WX_CONFIGURE_WITH= wx-config=${WX_CONFIG} +WX_USES= gl WX_VARS= USE_WX=2.8+ WX_COMPS="wx contrib" USE_GL="gl glu" -.include +.include .if ${OPSYS} == FreeBSD CFLAGS+= -DMAP_NORESERVE=0 @@ -113,9 +98,12 @@ MAKE_ARGS+= ARCH=arm .endif pre-configure: - cd ${WRKSRC} && ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/preloaded-${PORTVERSION}${EXTRACT_SUFX} + @cd ${WRKSRC} && ./otp_build autoconf -pre-configure-MX-off: +pre-configure-WX-off: + echo "disabled by port options" > ${WRKSRC}/lib/debugger/SKIP + echo "disabled by port options" > ${WRKSRC}/lib/et/SKIP + echo "disabled by port options" > ${WRKSRC}/lib/observer/SKIP echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP post-configure-ODBC-on: @@ -146,4 +134,4 @@ post-stage: @cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type f -o -type l \ | ${SORT} >> ${TMPPLIST} -.include +.include diff --git a/lang/erlang-runtime21/distinfo b/lang/erlang-runtime21/distinfo index b70fe486ec6..7f58b70ed9d 100644 --- a/lang/erlang-runtime21/distinfo +++ b/lang/erlang-runtime21/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1552560312 -SHA256 (erlang/otp_src_21.3.tar.gz) = 69a743c4f23b2243e06170b1937558122142e47c8ebe652be143199bfafad6e4 -SIZE (erlang/otp_src_21.3.tar.gz) = 85547038 -SHA256 (erlang/preloaded-21.3.tar.gz) = f50f5b4bd2114eb9a3922257a5d2eddb064c51e80adf39d0c6a4f3d3e916afe4 -SIZE (erlang/preloaded-21.3.tar.gz) = 341616 +TIMESTAMP = 1554131181 +SHA256 (erlang/erlang-otp-OTP-21.3.3_GH0.tar.gz) = c56d6c736163e93ee3edab0b3ae59209cfd751f0d8078a7ca83d63942202b706 +SIZE (erlang/erlang-otp-OTP-21.3.3_GH0.tar.gz) = 54025876 diff --git a/lang/erlang-wx/Makefile b/lang/erlang-wx/Makefile index b57b15bebf4..6cc6f259b9b 100644 --- a/lang/erlang-wx/Makefile +++ b/lang/erlang-wx/Makefile @@ -1,73 +1,69 @@ # $FreeBSD$ PORTNAME= erlang -PORTVERSION= 19.3.6.12 +DISTVERSIONPREFIX= OTP- +DISTVERSION= 19.3.6.13 PORTEPOCH= 1 CATEGORIES= lang parallel -MASTER_SITES= http://www.erlang.org/download/:erlangorg \ - http://erlang.stacken.kth.se/download/:erlangorg \ - http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg PKGNAMESUFFIX= -wx -DISTNAME= otp_src_${ERL_RELEASE} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:erlangorg DIST_SUBDIR= erlang -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - -PATCH_SITES= http://olgeni.olgeni.com/~olgeni/distfiles/ \ - LOCAL/olgeni -PATCHFILES= patch-otp-19.3.1 patch-otp-19.3.2 patch-otp-19.3.3 \ - patch-otp-19.3.4 patch-otp-19.3.5 patch-otp-19.3.6 \ - patch-otp-19.3.6.1 patch-otp-19.3.6.2 patch-otp-19.3.6.3 \ - patch-otp-19.3.6.4 patch-otp-19.3.6.5 patch-otp-19.3.6.6 \ - patch-otp-19.3.6.7 patch-otp-19.3.6.8 patch-otp-19.3.6.9 \ - patch-otp-19.3.6.10 patch-otp-19.3.6.11 patch-otp-19.3.6.12 MAINTAINER= erlang@FreeBSD.org COMMENT= Erlang bindings for wxWindows LICENSE= APACHE20 -RUN_DEPENDS= ${LOCALBASE}/bin/erl:lang/erlang +BUILD_DEPENDS= erlc:lang/erlang +RUN_DEPENDS= erl:lang/erlang -WRKSRC= ${WRKDIR}/otp_src_${ERL_RELEASE} +USES= autoreconf:build gl gmake perl5 +USE_GITHUB= yes +GH_PROJECT= otp +USE_GL= gl glu +USE_PERL5= build +USE_WX= 2.8+ -PLIST_SUB= APP_VERSION=${APP_VERSION} \ - CONFIGURE_TARGET=${CONFIGURE_TARGET} +WX_COMPS= wx contrib +GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE=yes -OPTIONS_DEFINE= DOCS +PLIST_SUB= DEBUGGER_VERSION=${debugger_VSN} \ + ET_VERSION=${et_VSN} \ + OBSERVER_VERSION=${observer_VSN} \ + WX_VERSION=${wx_VSN} \ + CONFIGURE_TARGET=${CONFIGURE_TARGET} -ERL_RELEASE= 19.3 +debugger_VSN= 1.8 +et_VSN= 1.6 +observer_VSN= 4.2.1 +wx_VSN= 1.8 -USES= gmake perl5 -USE_PERL5= build -USE_GL= gl glu -GNU_CONFIGURE= yes -LDFLAGS+= -L${LOCALBASE}/lib - -APP_VERSION= 1.8 -APP_DIR= ${PREFIX}/lib/erlang/lib/wx-${APP_VERSION} - -.include +ERLANG_REL= 19.3 CONFIGURE_ARGS+=--enable-threads --without-odbc --without-javac --with-wx-config=${WX_CONFIG} -USE_WX= 2.8+ -WX_COMPS= wx contrib +pre-configure: + @cd ${WRKSRC} && ./otp_build autoconf do-build: - cd ${WRKSRC}/lib/wx && ${GMAKE} ERL_TOP=${WRKSRC} TARGET=${CONFIGURE_TARGET} +.for app in wx debugger et observer + cd ${WRKSRC}/lib/${app} && /usr/bin/env ERL_LIBS=${WRKSRC}/lib ${GMAKE} ERL_TOP=${WRKSRC} TARGET=${CONFIGURE_TARGET} +.endfor ${STRIP_CMD} ${WRKSRC}/lib/wx/priv/${CONFIGURE_TARGET}/erl_gl.so ${STRIP_CMD} ${WRKSRC}/lib/wx/priv/${CONFIGURE_TARGET}/wxe_driver.so ${MV} ${WRKSRC}/lib/wx/priv/${CONFIGURE_TARGET}/*.so ${WRKSRC}/lib/wx/priv ${RMDIR} ${WRKSRC}/lib/wx/priv/${CONFIGURE_TARGET} do-install: - @${MKDIR} ${STAGEDIR}${APP_DIR} - cd ${WRKSRC}/lib/wx && ${COPYTREE_SHARE} ebin ${STAGEDIR}${APP_DIR} - cd ${WRKSRC}/lib/wx && ${COPYTREE_SHARE} include ${STAGEDIR}${APP_DIR} - cd ${WRKSRC}/lib/wx && ${COPYTREE_SHARE} priv ${STAGEDIR}${APP_DIR} - cd ${WRKSRC}/lib/wx && ${COPYTREE_SHARE} src ${STAGEDIR}${APP_DIR} +.for app in wx debugger et observer + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${app}-${${app}_VSN} + ${FIND} ${WRKSRC}/lib/${app} -type d -empty -delete +.for dir in src include priv ebin + cd ${WRKSRC}/lib/${app} && if [ -d ${dir} ]; then \ + ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${app}-${${app}_VSN}; \ + fi +.endfor +.endfor .include diff --git a/lang/erlang-wx/distinfo b/lang/erlang-wx/distinfo index 2ae34bf99c6..c0ec51c6cef 100644 --- a/lang/erlang-wx/distinfo +++ b/lang/erlang-wx/distinfo @@ -1,39 +1,3 @@ -TIMESTAMP = 1540488279 -SHA256 (erlang/otp_src_19.3.tar.gz) = fe4a00651db39b8542b04530a48d24b2f2e7e0b77cbe93d728c9f05325bdfe83 -SIZE (erlang/otp_src_19.3.tar.gz) = 68510871 -SHA256 (erlang/patch-otp-19.3.1) = 2373f890516b58ae006812ba5f15e4af1f8820be98230011b8cd8b345f51dedd -SIZE (erlang/patch-otp-19.3.1) = 30225 -SHA256 (erlang/patch-otp-19.3.2) = 21c56ac188177985c9db11c7066dcee0f7370760da3e15a0d03c235bd2a2cb2a -SIZE (erlang/patch-otp-19.3.2) = 6290 -SHA256 (erlang/patch-otp-19.3.3) = dbe1cab750a3339c3755db27b800e53232519c84a304bd562263ffb060afab55 -SIZE (erlang/patch-otp-19.3.3) = 12525 -SHA256 (erlang/patch-otp-19.3.4) = 02437ac753932f913209102e8cb249a264b774833bfda8c1532b338af60ff8af -SIZE (erlang/patch-otp-19.3.4) = 13504 -SHA256 (erlang/patch-otp-19.3.5) = 5755da205004ae7e724390958db9ecc737d99ec14e0d14abcec8b8603ea6ece5 -SIZE (erlang/patch-otp-19.3.5) = 44563 -SHA256 (erlang/patch-otp-19.3.6) = ee1b5f0fd64db3322031c38722aee96a8ee35aaac454f430c829446a198f6534 -SIZE (erlang/patch-otp-19.3.6) = 13073 -SHA256 (erlang/patch-otp-19.3.6.1) = 65a6de8533ccaeec81bebcee1d6dde08713533e411a123d5ac27141967581600 -SIZE (erlang/patch-otp-19.3.6.1) = 28956 -SHA256 (erlang/patch-otp-19.3.6.2) = 3d12059e02ef31ae6e5dd97820b0d51c4ab0e7304cbaeddeb856fb2097da87fc -SIZE (erlang/patch-otp-19.3.6.2) = 14653 -SHA256 (erlang/patch-otp-19.3.6.3) = 77faeedb827c6793b183b33d161e5b3c4467c3ec9053840442d7fd187cfbfa78 -SIZE (erlang/patch-otp-19.3.6.3) = 24500 -SHA256 (erlang/patch-otp-19.3.6.4) = 662dab96ceed33b4b29c835d82bf6b4f8feaa8f75287f43f3ae7e64badb16255 -SIZE (erlang/patch-otp-19.3.6.4) = 10622 -SHA256 (erlang/patch-otp-19.3.6.5) = f830bd6328f2a9e8cb70750bb7e91a8db045b5fc13fe854710fdffce158788d1 -SIZE (erlang/patch-otp-19.3.6.5) = 13254 -SHA256 (erlang/patch-otp-19.3.6.6) = 6bb2da20ad241e86f847ba351dce23ecf5a82f0e6df8eceb83fe2ed4b05d8d2f -SIZE (erlang/patch-otp-19.3.6.6) = 12542 -SHA256 (erlang/patch-otp-19.3.6.7) = 34bed4599ff19c2bed944dff83e9b640fbf18b6b3a21b42d92c3697e4c50d810 -SIZE (erlang/patch-otp-19.3.6.7) = 11631 -SHA256 (erlang/patch-otp-19.3.6.8) = c3ea86434fe1a4d7baabe17d2e7134065bb19fef7d384a6e289e55a2288a6b61 -SIZE (erlang/patch-otp-19.3.6.8) = 4936 -SHA256 (erlang/patch-otp-19.3.6.9) = c0a243be5693752dc35b0fbe7622618903f130ad944bfa160248ea0e13a6148a -SIZE (erlang/patch-otp-19.3.6.9) = 6989 -SHA256 (erlang/patch-otp-19.3.6.10) = 98968885a53ab75a6abeeba584dc26297d01234866d2797d6c16f1bdd89d72c3 -SIZE (erlang/patch-otp-19.3.6.10) = 12767 -SHA256 (erlang/patch-otp-19.3.6.11) = a79f5a3fe737df191c9fa2eea3c9961b94be4d4d44620b1bed2266f1874f3669 -SIZE (erlang/patch-otp-19.3.6.11) = 4886 -SHA256 (erlang/patch-otp-19.3.6.12) = ea1ef7dba18d4a22d43008c7b9e7664c90887ae42fb87f31974c17b8520f3f0f -SIZE (erlang/patch-otp-19.3.6.12) = 5433 +TIMESTAMP = 1552751772 +SHA256 (erlang/erlang-otp-OTP-19.3.6.13_GH0.tar.gz) = 11a914176a33068226644f4e999ecc6e965ab1c60a324d90020f164641631fae +SIZE (erlang/erlang-otp-OTP-19.3.6.13_GH0.tar.gz) = 34006014 diff --git a/lang/erlang-wx/files/patch-lib_wx_configure b/lang/erlang-wx/files/patch-lib_wx_configure deleted file mode 100644 index b75764d23f6..00000000000 --- a/lang/erlang-wx/files/patch-lib_wx_configure +++ /dev/null @@ -1,10464 +0,0 @@ ---- lib/wx/configure.orig 2017-03-14 20:10:54 UTC -+++ lib/wx/configure -@@ -1,81 +1,459 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.59. -+# Generated by GNU Autoconf 2.69. -+# -+# -+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. -+# - # --# Copyright (C) 2003 Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. --## --------------------- ## --## M4sh Initialization. ## --## --------------------- ## -+## -------------------- ## -+## M4sh Initialization. ## -+## -------------------- ## - --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac - fi --DUALCASE=1; export DUALCASE # for MKS sh - --# Support unset when possible. --if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -- as_unset=unset -+ -+as_nl=' -+' -+export as_nl -+# Printing a long string crashes Solaris 7 /usr/bin/printf. -+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -+# Prefer a ksh shell builtin over an external printf program on Solaris, -+# but without wasting forks for bash or zsh. -+if test -z "$BASH_VERSION$ZSH_VERSION" \ -+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='print -r --' -+ as_echo_n='print -rn --' -+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='printf %s\n' -+ as_echo_n='printf %s' - else -- as_unset=false -+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -+ as_echo_n='/usr/ucb/echo -n' -+ else -+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -+ as_echo_n_body='eval -+ arg=$1; -+ case $arg in #( -+ *"$as_nl"*) -+ expr "X$arg" : "X\\(.*\\)$as_nl"; -+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -+ esac; -+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -+ ' -+ export as_echo_n_body -+ as_echo_n='sh -c $as_echo_n_body as_echo' -+ fi -+ export as_echo_body -+ as_echo='sh -c $as_echo_body as_echo' - fi - -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } -+fi - --# Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH -+ -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+as_myself= -+case $0 in #(( -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ exit 1 -+fi -+ -+# Unset variables that we do not need and which cause bugs (e.g. in -+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -+# suppresses any "Segmentation fault" message there. '((' could -+# trigger a bug in pdksh 5.2.14. -+for as_var in BASH_ENV ENV MAIL MAILPATH -+do eval test x\${$as_var+set} = xset \ -+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -+done - PS1='$ ' - PS2='> ' - PS4='+ ' - - # NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -- LC_TELEPHONE LC_TIME -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE -+ -+# CDPATH. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ -+# Use a proper internal environment variable to ensure we don't fall -+ # into an infinite loop, continuously re-executing ourselves. -+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then -+ _as_can_reexec=no; export _as_can_reexec; -+ # We cannot yet assume a decent shell, so we have to provide a -+# neutralization value for shells without unset; and this also -+# works around shells that cannot unset nonexistent variables. -+# Preserve -v and -x to the replacement shell. -+BASH_ENV=/dev/null -+ENV=/dev/null -+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -+case $- in # (((( -+ *v*x* | *x*v* ) as_opts=-vx ;; -+ *v* ) as_opts=-v ;; -+ *x* ) as_opts=-x ;; -+ * ) as_opts= ;; -+esac -+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -+# Admittedly, this is quite paranoid, since all the known shells bail -+# out after a failed `exec'. -+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -+as_fn_exit 255 -+ fi -+ # We don't want this to propagate to other subprocesses. -+ { _as_can_reexec=; unset _as_can_reexec;} -+if test "x$CONFIG_SHELL" = x; then -+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : -+ emulate sh -+ NULLCMD=: -+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '\${1+\"\$@\"}'='\"\$@\"' -+ setopt NO_GLOB_SUBST -+else -+ case \`(set -o) 2>/dev/null\` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac -+fi -+" -+ as_required="as_fn_return () { (exit \$1); } -+as_fn_success () { as_fn_return 0; } -+as_fn_failure () { as_fn_return 1; } -+as_fn_ret_success () { return 0; } -+as_fn_ret_failure () { return 1; } -+ -+exitcode=0 -+as_fn_success || { exitcode=1; echo as_fn_success failed.; } -+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } -+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } -+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : -+ -+else -+ exitcode=1; echo positional parameters were not saved. -+fi -+test x\$exitcode = x0 || exit 1 -+test -x / || exit 1" -+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO -+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO -+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && -+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -+test \$(( 1 + 1 )) = 2 || exit 1" -+ if (eval "$as_required") 2>/dev/null; then : -+ as_have_required=yes -+else -+ as_have_required=no -+fi -+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -+ -+else -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+as_found=false -+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH - do -- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -- eval $as_var=C; export $as_var -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ as_found=: -+ case $as_dir in #( -+ /*) -+ for as_base in sh bash ksh sh5; do -+ # Try only shells that exist, to save several forks. -+ as_shell=$as_dir/$as_base -+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && -+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : -+ CONFIG_SHELL=$as_shell as_have_required=yes -+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : -+ break 2 -+fi -+fi -+ done;; -+ esac -+ as_found=false -+done -+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && -+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : -+ CONFIG_SHELL=$SHELL as_have_required=yes -+fi; } -+IFS=$as_save_IFS -+ -+ -+ if test "x$CONFIG_SHELL" != x; then : -+ export CONFIG_SHELL -+ # We cannot yet assume a decent shell, so we have to provide a -+# neutralization value for shells without unset; and this also -+# works around shells that cannot unset nonexistent variables. -+# Preserve -v and -x to the replacement shell. -+BASH_ENV=/dev/null -+ENV=/dev/null -+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -+case $- in # (((( -+ *v*x* | *x*v* ) as_opts=-vx ;; -+ *v* ) as_opts=-v ;; -+ *x* ) as_opts=-x ;; -+ * ) as_opts= ;; -+esac -+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -+# Admittedly, this is quite paranoid, since all the known shells bail -+# out after a failed `exec'. -+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -+exit 255 -+fi -+ -+ if test x$as_have_required = xno; then : -+ $as_echo "$0: This script requires a shell more modern than all" -+ $as_echo "$0: the shells that I found on your system." -+ if test x${ZSH_VERSION+set} = xset ; then -+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" -+ $as_echo "$0: be upgraded to zsh 4.3.4 or later." - else -- $as_unset $as_var -+ $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, -+$0: including any error possibly output before this -+$0: message. Then install a modern shell, or manually run -+$0: the script under such a shell if you do have one." - fi --done -+ exit 1 -+fi -+fi -+fi -+SHELL=${CONFIG_SHELL-/bin/sh} -+export SHELL -+# Unset more variables known to interfere with behavior of common tools. -+CLICOLOR_FORCE= GREP_OPTIONS= -+unset CLICOLOR_FORCE GREP_OPTIONS - --# Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -+## --------------------- ## -+## M4sh Shell Functions. ## -+## --------------------- ## -+# as_fn_unset VAR -+# --------------- -+# Portably unset VAR. -+as_fn_unset () -+{ -+ { eval $1=; unset $1;} -+} -+as_unset=as_fn_unset -+ -+# as_fn_set_status STATUS -+# ----------------------- -+# Set $? to STATUS, without forking. -+as_fn_set_status () -+{ -+ return $1 -+} # as_fn_set_status -+ -+# as_fn_exit STATUS -+# ----------------- -+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -+as_fn_exit () -+{ -+ set +e -+ as_fn_set_status $1 -+ exit $1 -+} # as_fn_exit -+ -+# as_fn_mkdir_p -+# ------------- -+# Create "$as_dir" as a directory, including parents if necessary. -+as_fn_mkdir_p () -+{ -+ -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || eval $as_mkdir_p || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" -+ -+ -+} # as_fn_mkdir_p -+ -+# as_fn_executable_p FILE -+# ----------------------- -+# Test if FILE is an executable regular file. -+as_fn_executable_p () -+{ -+ test -f "$1" && test -x "$1" -+} # as_fn_executable_p -+# as_fn_append VAR VALUE -+# ---------------------- -+# Append the text in VALUE to the end of the definition contained in VAR. Take -+# advantage of any shell optimizations that allow amortized linear growth over -+# repeated appends, instead of the typical quadratic growth present in naive -+# implementations. -+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : -+ eval 'as_fn_append () -+ { -+ eval $1+=\$2 -+ }' -+else -+ as_fn_append () -+ { -+ eval $1=\$$1\$2 -+ } -+fi # as_fn_append -+ -+# as_fn_arith ARG... -+# ------------------ -+# Perform arithmetic evaluation on the ARGs, and store the result in the -+# global $as_val. Take advantage of shells that can avoid forks. The arguments -+# must be portable across $(()) and expr. -+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : -+ eval 'as_fn_arith () -+ { -+ as_val=$(( $* )) -+ }' -+else -+ as_fn_arith () -+ { -+ as_val=`expr "$@" || test $? -eq 1` -+ } -+fi # as_fn_arith -+ -+ -+# as_fn_error STATUS ERROR [LINENO LOG_FD] -+# ---------------------------------------- -+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -+# script with STATUS, using 1 if that was 0. -+as_fn_error () -+{ -+ as_status=$1; test $as_status -eq 0 && as_status=1 -+ if test "$4"; then -+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 -+ fi -+ $as_echo "$as_me: error: $2" >&2 -+ as_fn_exit $as_status -+} # as_fn_error -+ -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename - else - as_basename=false - fi - -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi - --# Name of the executable. --as_me=`$as_basename "$0" || -+as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || --echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -- /^X\/\(\/\/\)$/{ s//\1/; q; } -- /^X\/\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - --# PATH needs CR, and LINENO needs CR and PATH. - # Avoid depending upon Character Ranges. - as_cr_letters='abcdefghijklmnopqrstuvwxyz' - as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -@@ -83,146 +461,91 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE - as_cr_digits='0123456789' - as_cr_alnum=$as_cr_Letters$as_cr_digits - --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -- else -- PATH_SEPARATOR=: -- fi -- rm -f conf$$.sh --fi -- -- -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" || { -- # Find who we are. Look in the path if we contain no path at all -- # relative or not. -- case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -- -- ;; -- esac -- # We did not find ourselves, most probably we were run as `sh COMMAND' -- # in which case we are not to be found in the path. -- if test "x$as_myself" = x; then -- as_myself=$0 -- fi -- if test ! -f "$as_myself"; then -- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 -- { (exit 1); exit 1; }; } -- fi -- case $CONFIG_SHELL in -- '') -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for as_base in sh bash ksh sh5; do -- case $as_dir in -- /*) -- if ("$as_dir/$as_base" -c ' -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -- CONFIG_SHELL=$as_dir/$as_base -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" ${1+"$@"} -- fi;; -- esac -- done --done --;; -- esac - -- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -- # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line before each line; the second 'sed' does the real -- # work. The second script uses 'N' to pair each line-number line -- # with the numbered line, and appends trailing '-' during -- # substitution so that $LINENO is not a special case at line end. -- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -+ as_lineno_1=$LINENO as_lineno_1a=$LINENO -+ as_lineno_2=$LINENO as_lineno_2a=$LINENO -+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && -+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { -+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | - sed ' -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno - N -- s,$,-, -- : loop -- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -+ s/-\n.*// - ' >$as_me.lineno && -- chmod +x $as_me.lineno || -- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -- { (exit 1); exit 1; }; } -+ chmod +x "$as_me.lineno" || -+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - -+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have -+ # already done that, so ensure we don't try to do so again and fall -+ # in an infinite loop. This has already happened in practice. -+ _as_can_reexec=no; export _as_can_reexec - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensible to this). -- . ./$as_me.lineno -+ # original and so on. Autoconf is especially sensitive to this). -+ . "./$as_me.lineno" - # Exit status is that of the last command. - exit - } - -- --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in #((((( -+-n*) -+ case `echo 'xy\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ xy) ECHO_C='\c';; -+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null -+ ECHO_T=' ';; -+ esac;; -+*) -+ ECHO_N='-n';; - esac - --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr -+rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file - else -- as_expr=false -+ rm -f conf$$.dir -+ mkdir conf$$.dir 2>/dev/null - fi -- --rm -f conf$$ conf$$.exe conf$$.file --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -- as_ln_s='cp -p' -- else -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -pR'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -pR' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else -+ as_ln_s='cp -pR' - fi --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln - else -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - fi --rm -f conf$$ conf$$.exe conf$$.file -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null - - if mkdir -p . 2>/dev/null; then -- as_mkdir_p=: -+ as_mkdir_p='mkdir -p "$as_dir"' - else - test -d ./-p && rmdir ./-p - as_mkdir_p=false - fi - --as_executable_p="test -f" -+as_test_x='test -x' -+as_executable_p=as_fn_executable_p - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -231,38 +554,25 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P - as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH -- -+test -n "$DJDIR" || exec 7<&0 &1 - - # Name of the host. --# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, - # so uname gets run too. - ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - --exec 6>&1 -- - # - # Initializations. - # - ac_default_prefix=/usr/local -+ac_clean_files= - ac_config_libobj_dir=. -+LIBOBJS= - cross_compiling=no - subdirs= - MFLAGS= - MAKEFLAGS= --SHELL=${CONFIG_SHELL-/bin/sh} -- --# Maximum number of lines to put in a shell here document. --# This variable seems obsolete. It should probably be removed, and --# only ac_max_sed_lines should be used. --: ${ac_max_here_lines=38} - - # Identity of this package. - PACKAGE_NAME= -@@ -270,50 +580,175 @@ PACKAGE_TARNAME= - PACKAGE_VERSION= - PACKAGE_STRING= - PACKAGE_BUGREPORT= -+PACKAGE_URL= - - # Factoring default headers for most tests. - ac_includes_default="\ - #include --#if HAVE_SYS_TYPES_H -+#ifdef HAVE_SYS_TYPES_H - # include - #endif --#if HAVE_SYS_STAT_H -+#ifdef HAVE_SYS_STAT_H - # include - #endif --#if STDC_HEADERS -+#ifdef STDC_HEADERS - # include - # include - #else --# if HAVE_STDLIB_H -+# ifdef HAVE_STDLIB_H - # include - # endif - #endif --#if HAVE_STRING_H --# if !STDC_HEADERS && HAVE_MEMORY_H -+#ifdef HAVE_STRING_H -+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H - # include - # endif - # include - #endif --#if HAVE_STRINGS_H -+#ifdef HAVE_STRINGS_H - # include - #endif --#if HAVE_INTTYPES_H -+#ifdef HAVE_INTTYPES_H - # include --#else --# if HAVE_STDINT_H --# include --# endif - #endif --#if HAVE_UNISTD_H -+#ifdef HAVE_STDINT_H -+# include -+#endif -+#ifdef HAVE_UNISTD_H - # include - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os TARGET CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB CPP MIXED_CYGWIN_VC MIXED_MSYS_VC MIXED_VC MIXED_CYGWIN_MINGW MIXED_CYGWIN MIXED_MSYS EGREP OBJC_CC OBJC_CFLAGS GL_LIBS DEBUG_CFLAGS DEBUG_CXXFLAGS ERLC WX_BUILDING_INSIDE_ERLSRC ERLANG_ROOT_DIR WX_CONFIG_PATH WX_CPPFLAGS WX_CFLAGS WX_CXXFLAGS WX_CFLAGS_ONLY WX_CXXFLAGS_ONLY WX_LIBS WX_LIBS_STATIC WX_VERSION WX_RESCOMP WX_VERSION_MAJOR WX_VERSION_MINOR WX_VERSION_MICRO DEBUG_WX_CFLAGS DEBUG_WX_CXXFLAGS DEBUG_WX_LIBS DEBUG_WX_LIBS_STATIC FORCED_DEBUG_BUILD WX_HAVE_STATIC_LIBS RC_FILE_TYPE HAVE_GL_SUPPORT TESS_CB_TIGER_STYLE WXERL_CAN_BUILD_DRIVER SO_EXT RUN_ERL WXERL_SYS_TYPE LIBOBJS LTLIBOBJS' -+ac_subst_vars='LTLIBOBJS -+LIBOBJS -+WXERL_SYS_TYPE -+RUN_ERL -+SO_EXT -+WXERL_CAN_BUILD_DRIVER -+TESS_CB_TIGER_STYLE -+HAVE_GL_SUPPORT -+RC_FILE_TYPE -+WX_HAVE_STATIC_LIBS -+FORCED_DEBUG_BUILD -+DEBUG_WX_LIBS_STATIC -+DEBUG_WX_LIBS -+DEBUG_WX_CXXFLAGS -+DEBUG_WX_CFLAGS -+WX_VERSION_MICRO -+WX_VERSION_MINOR -+WX_VERSION_MAJOR -+WX_RESCOMP -+WX_VERSION -+WX_LIBS_STATIC -+WX_LIBS -+WX_CXXFLAGS_ONLY -+WX_CFLAGS_ONLY -+WX_CXXFLAGS -+WX_CFLAGS -+WX_CPPFLAGS -+WX_CONFIG_PATH -+ERLANG_ROOT_DIR -+WX_BUILDING_INSIDE_ERLSRC -+ERLC -+DEBUG_CXXFLAGS -+DEBUG_CFLAGS -+GL_LIBS -+OBJC_CFLAGS -+OBJC_CC -+EGREP -+GREP -+MIXED_MSYS -+MIXED_CYGWIN -+MIXED_CYGWIN_MINGW -+MIXED_VC -+MIXED_MSYS_VC -+MIXED_CYGWIN_VC -+CPP -+RANLIB -+ac_ct_CXX -+CXXFLAGS -+CXX -+OBJEXT -+EXEEXT -+ac_ct_CC -+CPPFLAGS -+LDFLAGS -+CFLAGS -+CC -+TARGET -+host_os -+host_vendor -+host_cpu -+host -+build_os -+build_vendor -+build_cpu -+build -+target_alias -+host_alias -+build_alias -+LIBS -+ECHO_T -+ECHO_N -+ECHO_C -+DEFS -+mandir -+localedir -+libdir -+psdir -+pdfdir -+dvidir -+htmldir -+infodir -+docdir -+oldincludedir -+includedir -+localstatedir -+sharedstatedir -+sysconfdir -+datadir -+datarootdir -+libexecdir -+sbindir -+bindir -+program_transform_name -+prefix -+exec_prefix -+PACKAGE_URL -+PACKAGE_BUGREPORT -+PACKAGE_STRING -+PACKAGE_VERSION -+PACKAGE_TARNAME -+PACKAGE_NAME -+PATH_SEPARATOR -+SHELL' - ac_subst_files='' -+ac_user_opts=' -+enable_option_checking -+with_wxdir -+with_wx_config -+with_wx_prefix -+with_wx_exec_prefix -+enable_sanitizers -+' -+ ac_precious_vars='build_alias -+host_alias -+target_alias -+CC -+CFLAGS -+LDFLAGS -+LIBS -+CPPFLAGS -+CXX -+CXXFLAGS -+CCC -+CPP' -+ - - # Initialize some variables set by options. - ac_init_help= - ac_init_version=false -+ac_unrecognized_opts= -+ac_unrecognized_sep= - # The variables have the same names as the options, with - # dashes changed to underlines. - cache_file=/dev/null -@@ -336,34 +771,49 @@ x_libraries=NONE - # and all the variables that are supposed to be based on exec_prefix - # by default will actually change. - # Use braces instead of parens because sh, perl, etc. also accept them. -+# (The list follows the same order as the GNU Coding Standards.) - bindir='${exec_prefix}/bin' - sbindir='${exec_prefix}/sbin' - libexecdir='${exec_prefix}/libexec' --datadir='${prefix}/share' -+datarootdir='${prefix}/share' -+datadir='${datarootdir}' - sysconfdir='${prefix}/etc' - sharedstatedir='${prefix}/com' - localstatedir='${prefix}/var' --libdir='${exec_prefix}/lib' - includedir='${prefix}/include' - oldincludedir='/usr/include' --infodir='${prefix}/info' --mandir='${prefix}/man' -+docdir='${datarootdir}/doc/${PACKAGE}' -+infodir='${datarootdir}/info' -+htmldir='${docdir}' -+dvidir='${docdir}' -+pdfdir='${docdir}' -+psdir='${docdir}' -+libdir='${exec_prefix}/lib' -+localedir='${datarootdir}/locale' -+mandir='${datarootdir}/man' - - ac_prev= -+ac_dashdash= - for ac_option - do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then -- eval "$ac_prev=\$ac_option" -+ eval $ac_prev=\$ac_option - ac_prev= - continue - fi - -- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` -+ case $ac_option in -+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; -+ *=) ac_optarg= ;; -+ *) ac_optarg=yes ;; -+ esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - -- case $ac_option in -+ case $ac_dashdash$ac_option in -+ --) -+ ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; -@@ -385,33 +835,59 @@ do - --config-cache | -C) - cache_file=config.cache ;; - -- -datadir | --datadir | --datadi | --datad | --data | --dat | --da) -+ -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; -- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ -- | --da=*) -+ -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - -+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ -+ | --dataroo | --dataro | --datar) -+ ac_prev=datarootdir ;; -+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ -+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) -+ datarootdir=$ac_optarg ;; -+ - -disable-* | --disable-*) -- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -- { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- eval "enable_$ac_feature=no" ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid feature name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval enable_$ac_useropt=no ;; -+ -+ -docdir | --docdir | --docdi | --doc | --do) -+ ac_prev=docdir ;; -+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) -+ docdir=$ac_optarg ;; -+ -+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) -+ ac_prev=dvidir ;; -+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) -+ dvidir=$ac_optarg ;; - - -enable-* | --enable-*) -- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -- { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -- *) ac_optarg=yes ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid feature name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; - esac -- eval "enable_$ac_feature='$ac_optarg'" ;; -+ eval enable_$ac_useropt=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -@@ -438,6 +914,12 @@ do - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - -+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) -+ ac_prev=htmldir ;; -+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ -+ | --ht=*) -+ htmldir=$ac_optarg ;; -+ - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; -@@ -462,13 +944,16 @@ do - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - -+ -localedir | --localedir | --localedi | --localed | --locale) -+ ac_prev=localedir ;; -+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) -+ localedir=$ac_optarg ;; -+ - -localstatedir | --localstatedir | --localstatedi | --localstated \ -- | --localstate | --localstat | --localsta | --localst \ -- | --locals | --local | --loca | --loc | --lo) -+ | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ -- | --localstate=* | --localstat=* | --localsta=* | --localst=* \ -- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) -+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) -@@ -533,6 +1018,16 @@ do - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - -+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) -+ ac_prev=pdfdir ;; -+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) -+ pdfdir=$ac_optarg ;; -+ -+ -psdir | --psdir | --psdi | --psd | --ps) -+ ac_prev=psdir ;; -+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) -+ psdir=$ac_optarg ;; -+ - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; -@@ -583,26 +1078,36 @@ do - ac_init_version=: ;; - - -with-* | --with-*) -- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -- { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package| sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -- *) ac_optarg=yes ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid package name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; - esac -- eval "with_$ac_package='$ac_optarg'" ;; -+ eval with_$ac_useropt=\$ac_optarg ;; - - -without-* | --without-*) -- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -- { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package | sed 's/-/_/g'` -- eval "with_$ac_package=no" ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid package name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval with_$ac_useropt=no ;; - - --x) - # Obsolete; use --with-x. -@@ -622,27 +1127,26 @@ do - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - -- -*) { echo "$as_me: error: unrecognized option: $ac_option --Try \`$0 --help' for more information." >&2 -- { (exit 1); exit 1; }; } -+ -*) as_fn_error $? "unrecognized option: \`$ac_option' -+Try \`$0 --help' for more information" - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. -- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 -- { (exit 1); exit 1; }; } -- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` -- eval "$ac_envvar='$ac_optarg'" -+ case $ac_envvar in #( -+ '' | [0-9]* | *[!_$as_cr_alnum]* ) -+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; -+ esac -+ eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. -- echo "$as_me: WARNING: you should use --build, --host, --target" >&2 -+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && -- echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} -+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" - ;; - - esac -@@ -650,31 +1154,36 @@ done - - if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` -- { echo "$as_me: error: missing argument to $ac_option" >&2 -- { (exit 1); exit 1; }; } -+ as_fn_error $? "missing argument to $ac_option" - fi - --# Be sure to have absolute paths. --for ac_var in exec_prefix prefix --do -- eval ac_val=$`echo $ac_var` -- case $ac_val in -- [\\/$]* | ?:[\\/]* | NONE | '' ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -+if test -n "$ac_unrecognized_opts"; then -+ case $enable_option_checking in -+ no) ;; -+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; -+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; - esac --done -+fi - --# Be sure to have absolute paths. --for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ -- localstatedir libdir includedir oldincludedir infodir mandir -+# Check all directory arguments for consistency. -+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ -+ datadir sysconfdir sharedstatedir localstatedir includedir \ -+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ -+ libdir localedir mandir - do -- eval ac_val=$`echo $ac_var` -+ eval ac_val=\$$ac_var -+ # Remove trailing slashes. - case $ac_val in -- [\\/$]* | ?:[\\/]* ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -+ */ ) -+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` -+ eval $ac_var=\$ac_val;; -+ esac -+ # Be sure to have absolute directory names. -+ case $ac_val in -+ [\\/$]* | ?:[\\/]* ) continue;; -+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac -+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" - done - - # There might be people who depend on the old broken behavior: `$host' -@@ -688,8 +1197,6 @@ target=$target_alias - if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe -- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. -- If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -@@ -701,82 +1208,72 @@ test -n "$host_alias" && ac_tool_prefix= - test "$silent" = yes && exec 6>/dev/null - - -+ac_pwd=`pwd` && test -n "$ac_pwd" && -+ac_ls_di=`ls -di .` && -+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -+ as_fn_error $? "working directory cannot be determined" -+test "X$ac_ls_di" = "X$ac_pwd_ls_di" || -+ as_fn_error $? "pwd does not report name of working directory" -+ -+ - # Find the source files, if location was not specified. - if test -z "$srcdir"; then - ac_srcdir_defaulted=yes -- # Try the directory containing this script, then its parent. -- ac_confdir=`(dirname "$0") 2>/dev/null || --$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$0" : 'X\(//\)[^/]' \| \ -- X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$0" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ # Try the directory containing this script, then the parent directory. -+ ac_confdir=`$as_dirname -- "$as_myself" || -+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_myself" : 'X\(//\)[^/]' \| \ -+ X"$as_myself" : 'X\(//\)$' \| \ -+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_myself" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - srcdir=$ac_confdir -- if test ! -r $srcdir/$ac_unique_file; then -+ if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. - fi - else - ac_srcdir_defaulted=no - fi --if test ! -r $srcdir/$ac_unique_file; then -- if test "$ac_srcdir_defaulted" = yes; then -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 -- { (exit 1); exit 1; }; } -- else -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -- { (exit 1); exit 1; }; } -- fi -+if test ! -r "$srcdir/$ac_unique_file"; then -+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." -+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" - fi --(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || -- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 -- { (exit 1); exit 1; }; } --srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` --ac_env_build_alias_set=${build_alias+set} --ac_env_build_alias_value=$build_alias --ac_cv_env_build_alias_set=${build_alias+set} --ac_cv_env_build_alias_value=$build_alias --ac_env_host_alias_set=${host_alias+set} --ac_env_host_alias_value=$host_alias --ac_cv_env_host_alias_set=${host_alias+set} --ac_cv_env_host_alias_value=$host_alias --ac_env_target_alias_set=${target_alias+set} --ac_env_target_alias_value=$target_alias --ac_cv_env_target_alias_set=${target_alias+set} --ac_cv_env_target_alias_value=$target_alias --ac_env_CC_set=${CC+set} --ac_env_CC_value=$CC --ac_cv_env_CC_set=${CC+set} --ac_cv_env_CC_value=$CC --ac_env_CFLAGS_set=${CFLAGS+set} --ac_env_CFLAGS_value=$CFLAGS --ac_cv_env_CFLAGS_set=${CFLAGS+set} --ac_cv_env_CFLAGS_value=$CFLAGS --ac_env_LDFLAGS_set=${LDFLAGS+set} --ac_env_LDFLAGS_value=$LDFLAGS --ac_cv_env_LDFLAGS_set=${LDFLAGS+set} --ac_cv_env_LDFLAGS_value=$LDFLAGS --ac_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_env_CPPFLAGS_value=$CPPFLAGS --ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_cv_env_CPPFLAGS_value=$CPPFLAGS --ac_env_CXX_set=${CXX+set} --ac_env_CXX_value=$CXX --ac_cv_env_CXX_set=${CXX+set} --ac_cv_env_CXX_value=$CXX --ac_env_CXXFLAGS_set=${CXXFLAGS+set} --ac_env_CXXFLAGS_value=$CXXFLAGS --ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} --ac_cv_env_CXXFLAGS_value=$CXXFLAGS --ac_env_CPP_set=${CPP+set} --ac_env_CPP_value=$CPP --ac_cv_env_CPP_set=${CPP+set} --ac_cv_env_CPP_value=$CPP -+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -+ac_abs_confdir=`( -+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" -+ pwd)` -+# When building in place, set srcdir=. -+if test "$ac_abs_confdir" = "$ac_pwd"; then -+ srcdir=. -+fi -+# Remove unnecessary trailing slashes from srcdir. -+# Double slashes in file names in object file debugging info -+# mess up M-x gdb in Emacs. -+case $srcdir in -+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -+esac -+for ac_var in $ac_precious_vars; do -+ eval ac_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_env_${ac_var}_value=\$${ac_var} -+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_cv_env_${ac_var}_value=\$${ac_var} -+done - - # - # Report the --help message. -@@ -799,20 +1296,17 @@ Configuration: - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit -- -q, --quiet, --silent do not print \`checking...' messages -+ -q, --quiet, --silent do not print \`checking ...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - --_ACEOF -- -- cat <<_ACEOF - Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX -- [$ac_default_prefix] -+ [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -- [PREFIX] -+ [PREFIX] - - By default, \`make install' will install all the files in - \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -@@ -822,18 +1316,25 @@ for instance \`--prefix=\$HOME'. - For better control, use the options below. - - Fine tuning of the installation directories: -- --bindir=DIR user executables [EPREFIX/bin] -- --sbindir=DIR system admin executables [EPREFIX/sbin] -- --libexecdir=DIR program executables [EPREFIX/libexec] -- --datadir=DIR read-only architecture-independent data [PREFIX/share] -- --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -- --localstatedir=DIR modifiable single-machine data [PREFIX/var] -- --libdir=DIR object code libraries [EPREFIX/lib] -- --includedir=DIR C header files [PREFIX/include] -- --oldincludedir=DIR C header files for non-gcc [/usr/include] -- --infodir=DIR info documentation [PREFIX/info] -- --mandir=DIR man documentation [PREFIX/man] -+ --bindir=DIR user executables [EPREFIX/bin] -+ --sbindir=DIR system admin executables [EPREFIX/sbin] -+ --libexecdir=DIR program executables [EPREFIX/libexec] -+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -+ --localstatedir=DIR modifiable single-machine data [PREFIX/var] -+ --libdir=DIR object code libraries [EPREFIX/lib] -+ --includedir=DIR C header files [PREFIX/include] -+ --oldincludedir=DIR C header files for non-gcc [/usr/include] -+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] -+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] -+ --infodir=DIR info documentation [DATAROOTDIR/info] -+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] -+ --mandir=DIR man documentation [DATAROOTDIR/man] -+ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] -+ --htmldir=DIR html documentation [DOCDIR] -+ --dvidir=DIR dvi documentation [DOCDIR] -+ --pdfdir=DIR pdf documentation [DOCDIR] -+ --psdir=DIR ps documentation [DOCDIR] - _ACEOF - - cat <<\_ACEOF -@@ -849,6 +1350,7 @@ if test -n "$ac_init_help"; then - cat <<\_ACEOF - - Optional Features: -+ --disable-option-checking ignore unrecognized --enable/--with options - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-sanitizers[=comma-separated list of sanitizers] -@@ -868,8 +1370,9 @@ Some influential environment variables: - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory -- CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have -- headers in a nonstandard directory -+ LIBS libraries to pass to the linker, e.g. -l -+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if -+ you have headers in a nonstandard directory - CXX C++ compiler command - CXXFLAGS C++ compiler flags - CPP C preprocessor -@@ -877,119 +1380,680 @@ Some influential environment variables: - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. - -+Report bugs to the package provider. - _ACEOF -+ac_status=$? - fi - - if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. -- ac_popdir=`pwd` - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue -- test -d $ac_dir || continue -+ test -d "$ac_dir" || -+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || -+ continue - ac_builddir=. - --if test "$ac_dir" != .; then -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix - - case $srcdir in -- .) # No --srcdir option. We are building in place. -+ .) # We are building in place. - ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; --esac -- --# Do not use `cd foo && pwd` to compute absolute paths, because --# the directories may not exist. --case `pwd` in --.) ac_abs_builddir="$ac_dir";; --*) -- case "$ac_dir" in -- .) ac_abs_builddir=`pwd`;; -- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -- *) ac_abs_builddir=`pwd`/"$ac_dir";; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_builddir=${ac_top_builddir}.;; --*) -- case ${ac_top_builddir}. in -- .) ac_abs_top_builddir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_srcdir=$ac_srcdir;; --*) -- case $ac_srcdir in -- .) ac_abs_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_srcdir=$ac_top_srcdir;; --*) -- case $ac_top_srcdir in -- .) ac_abs_top_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -- esac;; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; - esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - -- cd $ac_dir -- # Check for guested configure; otherwise get Cygnus style configure. -- if test -f $ac_srcdir/configure.gnu; then -- echo -- $SHELL $ac_srcdir/configure.gnu --help=recursive -- elif test -f $ac_srcdir/configure; then -- echo -- $SHELL $ac_srcdir/configure --help=recursive -- elif test -f $ac_srcdir/configure.ac || -- test -f $ac_srcdir/configure.in; then -- echo -- $ac_configure --help -+ cd "$ac_dir" || { ac_status=$?; continue; } -+ # Check for guested configure. -+ if test -f "$ac_srcdir/configure.gnu"; then -+ echo && -+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive -+ elif test -f "$ac_srcdir/configure"; then -+ echo && -+ $SHELL "$ac_srcdir/configure" --help=recursive - else -- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -- fi -- cd $ac_popdir -+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -+ fi || ac_status=$? -+ cd "$ac_pwd" || { ac_status=$?; break; } - done - fi - --test -n "$ac_init_help" && exit 0 -+test -n "$ac_init_help" && exit $ac_status - if $ac_init_version; then - cat <<\_ACEOF -+configure -+generated by GNU Autoconf 2.69 - --Copyright (C) 2003 Free Software Foundation, Inc. -+Copyright (C) 2012 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - _ACEOF -- exit 0 -+ exit - fi --exec 5>config.log --cat >&5 <<_ACEOF -+ -+## ------------------------ ## -+## Autoconf initialization. ## -+## ------------------------ ## -+ -+# ac_fn_c_try_compile LINENO -+# -------------------------- -+# Try to compile conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_compile () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ rm -f conftest.$ac_objext -+ if { { ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compile") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_c_try_compile -+ -+# ac_fn_cxx_try_compile LINENO -+# ---------------------------- -+# Try to compile conftest.$ac_ext, and return whether this succeeded. -+ac_fn_cxx_try_compile () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ rm -f conftest.$ac_objext -+ if { { ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compile") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_cxx_try_compile -+ -+# ac_fn_c_try_cpp LINENO -+# ---------------------- -+# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_cpp () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if { { ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } > conftest.i && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_c_try_cpp -+ -+# ac_fn_c_try_run LINENO -+# ---------------------- -+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -+# that executables *can* be run. -+ac_fn_c_try_run () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' -+ { { case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: program exited with status $ac_status" >&5 -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=$ac_status -+fi -+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_c_try_run -+ -+# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES -+# -------------------------------------------- -+# Tries to find the compile-time value of EXPR in a program that includes -+# INCLUDES, setting VAR accordingly. Returns whether the value could be -+# computed -+ac_fn_c_compute_int () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if test "$cross_compiling" = yes; then -+ # Depending upon the size, compute the lo and hi bounds. -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+static int test_array [1 - 2 * !(($2) >= 0)]; -+test_array [0] = 0; -+return test_array [0]; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_lo=0 ac_mid=0 -+ while :; do -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -+test_array [0] = 0; -+return test_array [0]; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_hi=$ac_mid; break -+else -+ as_fn_arith $ac_mid + 1 && ac_lo=$as_val -+ if test $ac_lo -le $ac_mid; then -+ ac_lo= ac_hi= -+ break -+ fi -+ as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ done -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+static int test_array [1 - 2 * !(($2) < 0)]; -+test_array [0] = 0; -+return test_array [0]; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_hi=-1 ac_mid=-1 -+ while :; do -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+static int test_array [1 - 2 * !(($2) >= $ac_mid)]; -+test_array [0] = 0; -+return test_array [0]; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_lo=$ac_mid; break -+else -+ as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val -+ if test $ac_mid -le $ac_hi; then -+ ac_lo= ac_hi= -+ break -+ fi -+ as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ done -+else -+ ac_lo= ac_hi= -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+# Binary search between lo and hi bounds. -+while test "x$ac_lo" != "x$ac_hi"; do -+ as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -+test_array [0] = 0; -+return test_array [0]; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_hi=$ac_mid -+else -+ as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+done -+case $ac_lo in #(( -+?*) eval "$3=\$ac_lo"; ac_retval=0 ;; -+'') ac_retval=1 ;; -+esac -+ else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+static long int longval () { return $2; } -+static unsigned long int ulongval () { return $2; } -+#include -+#include -+int -+main () -+{ -+ -+ FILE *f = fopen ("conftest.val", "w"); -+ if (! f) -+ return 1; -+ if (($2) < 0) -+ { -+ long int i = longval (); -+ if (i != ($2)) -+ return 1; -+ fprintf (f, "%ld", i); -+ } -+ else -+ { -+ unsigned long int i = ulongval (); -+ if (i != ($2)) -+ return 1; -+ fprintf (f, "%lu", i); -+ } -+ /* Do not output a trailing newline, as this causes \r\n confusion -+ on some platforms. */ -+ return ferror (f) || fclose (f) != 0; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_run "$LINENO"; then : -+ echo >>conftest.val; read $3 &5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+#include <$2> -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ eval "$3=yes" -+else -+ eval "$3=no" -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ -+} # ac_fn_c_check_header_compile -+ -+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -+# ------------------------------------------------------- -+# Tests whether HEADER exists, giving a warning if it cannot be compiled using -+# the include files in INCLUDES and setting the cache variable VAR -+# accordingly. -+ac_fn_c_check_header_mongrel () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if eval \${$3+:} false; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -+$as_echo_n "checking $2 usability... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+#include <$2> -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_header_compiler=yes -+else -+ ac_header_compiler=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -+$as_echo_n "checking $2 presence... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <$2> -+_ACEOF -+if ac_fn_c_try_cpp "$LINENO"; then : -+ ac_header_preproc=yes -+else -+ ac_header_preproc=no -+fi -+rm -f conftest.err conftest.i conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( -+ yes:no: ) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -+ ;; -+esac -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$3=\$ac_header_compiler" -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ -+} # ac_fn_c_check_header_mongrel -+ -+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES -+# ------------------------------------------- -+# Tests whether TYPE exists after having included INCLUDES, setting cache -+# variable VAR accordingly. -+ac_fn_c_check_type () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$3=no" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+if (sizeof ($2)) -+ return 0; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+if (sizeof (($2))) -+ return 0; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ -+else -+ eval "$3=yes" -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ -+} # ac_fn_c_check_type -+ -+# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES -+# --------------------------------------------------------- -+# Tests whether HEADER exists and can be compiled using the include files in -+# INCLUDES, setting the cache variable VAR accordingly. -+ac_fn_cxx_check_header_compile () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+#include <$2> -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO"; then : -+ eval "$3=yes" -+else -+ eval "$3=no" -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ -+} # ac_fn_cxx_check_header_compile -+ -+# ac_fn_cxx_try_link LINENO -+# ------------------------- -+# Try to link conftest.$ac_ext, and return whether this succeeded. -+ac_fn_cxx_try_link () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ rm -f conftest.$ac_objext conftest$ac_exeext -+ if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ test -x conftest$ac_exeext -+ }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 -+fi -+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information -+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would -+ # interfere with the next link command; also delete a directory that is -+ # left behind by Apple's compiler. We do this before executing the actions. -+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_cxx_try_link -+cat >config.log <<_ACEOF - This file contains any messages produced by compilers while - running configure, to aid debugging if configure makes a mistake. - - It was created by $as_me, which was --generated by GNU Autoconf 2.59. Invocation command line was -+generated by GNU Autoconf 2.69. Invocation command line was - - $ $0 $@ - - _ACEOF -+exec 5>>config.log - { - cat <<_ASUNAME - ## --------- ## -@@ -1008,7 +2072,7 @@ uname -v = `(uname -v) 2>/dev/null || ec - /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` - /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` - /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` --hostinfo = `(hostinfo) 2>/dev/null || echo unknown` -+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` - /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` - /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` - /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -@@ -1020,8 +2084,9 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- echo "PATH: $as_dir" --done -+ $as_echo "PATH: $as_dir" -+ done -+IFS=$as_save_IFS - - } >&5 - -@@ -1043,7 +2108,6 @@ _ACEOF - ac_configure_args= - ac_configure_args0= - ac_configure_args1= --ac_sep= - ac_must_keep_next=false - for ac_pass in 1 2 - do -@@ -1054,13 +2118,13 @@ do - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *\'*) -+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in -- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; - 2) -- ac_configure_args1="$ac_configure_args1 '$ac_arg'" -+ as_fn_append ac_configure_args1 " '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else -@@ -1076,104 +2140,115 @@ do - -* ) ac_must_keep_next=true ;; - esac - fi -- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" -- # Get rid of the leading space. -- ac_sep=" " -+ as_fn_append ac_configure_args " '$ac_arg'" - ;; - esac - done - done --$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } --$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } -+{ ac_configure_args0=; unset ac_configure_args0;} -+{ ac_configure_args1=; unset ac_configure_args1;} - - # When interrupted or exit'd, cleanup temporary files, and complete - # config.log. We remove comments because anyway the quotes in there - # would cause problems or look ugly. --# WARNING: Be sure not to use single quotes in there, as some shells, --# such as our DU 5.0 friend, will then `close' the trap. -+# WARNING: Use '\'' to represent an apostrophe within the trap. -+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. - trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo - -- cat <<\_ASBOX --## ---------------- ## -+ $as_echo "## ---------------- ## - ## Cache variables. ## --## ---------------- ## --_ASBOX -+## ---------------- ##" - echo - # The following way of writing the cache mishandles newlines in values, --{ -+( -+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -+ *) { eval $ac_var=; unset $ac_var;} ;; -+ esac ;; -+ esac -+ done - (set) 2>&1 | -- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) - sed -n \ -- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; -- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" -- ;; -+ "s/'\''/'\''\\\\'\'''\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" -+ ;; #( - *) -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; -- esac; --} -+ esac | -+ sort -+) - echo - -- cat <<\_ASBOX --## ----------------- ## -+ $as_echo "## ----------------- ## - ## Output variables. ## --## ----------------- ## --_ASBOX -+## ----------------- ##" - echo - for ac_var in $ac_subst_vars - do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - - if test -n "$ac_subst_files"; then -- cat <<\_ASBOX --## ------------- ## --## Output files. ## --## ------------- ## --_ASBOX -+ $as_echo "## ------------------- ## -+## File substitutions. ## -+## ------------------- ##" - echo - for ac_var in $ac_subst_files - do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi - - if test -s confdefs.h; then -- cat <<\_ASBOX --## ----------- ## -+ $as_echo "## ----------- ## - ## confdefs.h. ## --## ----------- ## --_ASBOX -+## ----------- ##" - echo -- sed "/^$/d" confdefs.h | sort -+ cat confdefs.h - echo - fi - test "$ac_signal" != 0 && -- echo "$as_me: caught signal $ac_signal" -- echo "$as_me: exit $exit_status" -+ $as_echo "$as_me: caught signal $ac_signal" -+ $as_echo "$as_me: exit $exit_status" - } >&5 -- rm -f core *.core && -- rm -rf conftest* confdefs* conf$$* $ac_clean_files && -+ rm -f core *.core core.conftest.* && -+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -- ' 0 -+' 0 - for ac_signal in 1 2 13 15; do -- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal - done - ac_signal=0 - - # confdefs.h avoids OS command line length limits that DEFS can exceed. --rm -rf conftest* confdefs.h --# AIX cpp loses on an empty file, so make sure it contains at least a newline. --echo >confdefs.h -+rm -f -r conftest* confdefs.h -+ -+$as_echo "/* confdefs.h */" > confdefs.h - - # Predefined preprocessor variables. - -@@ -1181,112 +2256,137 @@ cat >>confdefs.h <<_ACEOF - #define PACKAGE_NAME "$PACKAGE_NAME" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_TARNAME "$PACKAGE_TARNAME" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_VERSION "$PACKAGE_VERSION" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_STRING "$PACKAGE_STRING" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" - _ACEOF - -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_URL "$PACKAGE_URL" -+_ACEOF -+ - - # Let the site file select an alternate cache file if it wants to. --# Prefer explicitly selected file to automatically selected ones. --if test -z "$CONFIG_SITE"; then -- if test "x$prefix" != xNONE; then -- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" -- else -- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" -- fi -+# Prefer an explicitly selected file to automatically selected ones. -+ac_site_file1=NONE -+ac_site_file2=NONE -+if test -n "$CONFIG_SITE"; then -+ # We do not want a PATH search for config.site. -+ case $CONFIG_SITE in #(( -+ -*) ac_site_file1=./$CONFIG_SITE;; -+ */*) ac_site_file1=$CONFIG_SITE;; -+ *) ac_site_file1=./$CONFIG_SITE;; -+ esac -+elif test "x$prefix" != xNONE; then -+ ac_site_file1=$prefix/share/config.site -+ ac_site_file2=$prefix/etc/config.site -+else -+ ac_site_file1=$ac_default_prefix/share/config.site -+ ac_site_file2=$ac_default_prefix/etc/config.site - fi --for ac_site_file in $CONFIG_SITE; do -- if test -r "$ac_site_file"; then -- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 --echo "$as_me: loading site script $ac_site_file" >&6;} -+for ac_site_file in "$ac_site_file1" "$ac_site_file2" -+do -+ test "x$ac_site_file" = xNONE && continue -+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -+$as_echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 -- . "$ac_site_file" -+ . "$ac_site_file" \ -+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "failed to load site script $ac_site_file -+See \`config.log' for more details" "$LINENO" 5; } - fi - done - - if test -r "$cache_file"; then -- # Some versions of bash will fail to source /dev/null (special -- # files actually), so we avoid doing that. -- if test -f "$cache_file"; then -- { echo "$as_me:$LINENO: loading cache $cache_file" >&5 --echo "$as_me: loading cache $cache_file" >&6;} -+ # Some versions of bash will fail to source /dev/null (special files -+ # actually), so we avoid doing that. DJGPP emulates it as a regular file. -+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -+$as_echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in -- [\\/]* | ?:[\\/]* ) . $cache_file;; -- *) . ./$cache_file;; -+ [\\/]* | ?:[\\/]* ) . "$cache_file";; -+ *) . "./$cache_file";; - esac - fi - else -- { echo "$as_me:$LINENO: creating cache $cache_file" >&5 --echo "$as_me: creating cache $cache_file" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -+$as_echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file - fi - - # Check that the precious variables saved in the cache have kept the same - # value. - ac_cache_corrupted=false --for ac_var in `(set) 2>&1 | -- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do -+for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set -- eval ac_old_val="\$ac_cv_env_${ac_var}_value" -- eval ac_new_val="\$ac_env_${ac_var}_value" -+ eval ac_old_val=\$ac_cv_env_${ac_var}_value -+ eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) -- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) -- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then -- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 --echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 --echo "$as_me: former value: $ac_old_val" >&2;} -- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 --echo "$as_me: current value: $ac_new_val" >&2;} -- ac_cache_corrupted=: -+ # differences in whitespace do not lead to failure. -+ ac_old_val_w=`echo x $ac_old_val` -+ ac_new_val_w=`echo x $ac_new_val` -+ if test "$ac_old_val_w" != "$ac_new_val_w"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -+ ac_cache_corrupted=: -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} -+ eval $ac_var=\$ac_old_val -+ fi -+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. -- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; -+ *) as_fn_append ac_configure_args " '$ac_arg'" ;; - esac - fi - done - if $ac_cache_corrupted; then -- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 --echo "$as_me: error: changes in the environment can compromise the build" >&2;} -- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 --echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} -- { (exit 1); exit 1; }; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} -+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 - fi -+## -------------------- ## -+## Main body of script. ## -+## -------------------- ## - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' -@@ -1296,47 +2396,34 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - ac_aux_dir= - for ac_dir in $srcdir/autoconf; do -- if test -f $ac_dir/install-sh; then -+ if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break -- elif test -f $ac_dir/install.sh; then -+ elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break -- elif test -f $ac_dir/shtool; then -+ elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi - done - if test -z "$ac_aux_dir"; then -- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir/autoconf" >&5 --echo "$as_me: error: cannot find install-sh or install.sh in $srcdir/autoconf" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in $srcdir/autoconf" "$LINENO" 5 - fi --ac_config_guess="$SHELL $ac_aux_dir/config.guess" --ac_config_sub="$SHELL $ac_aux_dir/config.sub" --ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -+ -+# These three variables are undocumented and unsupported, -+# and are intended to be withdrawn in a future Autoconf release. -+# They can cause serious problems if a builder's source tree is in a directory -+# whose full name contains unusual characters. -+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -+ - - - -@@ -1349,28 +2436,32 @@ fi - if test -z "$ERL_TOP" || test ! -d $ERL_TOP ; then - ac_aux_dir= - for ac_dir in autoconf; do -- if test -f $ac_dir/install-sh; then -+ if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break -- elif test -f $ac_dir/install.sh; then -+ elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break -- elif test -f $ac_dir/shtool; then -+ elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi - done - if test -z "$ac_aux_dir"; then -- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in autoconf" >&5 --echo "$as_me: error: cannot find install-sh or install.sh in autoconf" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in autoconf" "$LINENO" 5 - fi --ac_config_guess="$SHELL $ac_aux_dir/config.guess" --ac_config_sub="$SHELL $ac_aux_dir/config.sub" --ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -+ -+# These three variables are undocumented and unsupported, -+# and are intended to be withdrawn in a future Autoconf release. -+# They can cause serious problems if a builder's source tree is in a directory -+# whose full name contains unusual characters. -+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -+ - - WX_BUILDING_INSIDE_ERLSRC=false - else -@@ -1378,55 +2469,63 @@ else - if test -d $erl_top/erts/autoconf; then - ac_aux_dir= - for ac_dir in $erl_top/erts/autoconf; do -- if test -f $ac_dir/install-sh; then -+ if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break -- elif test -f $ac_dir/install.sh; then -+ elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break -- elif test -f $ac_dir/shtool; then -+ elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi - done - if test -z "$ac_aux_dir"; then -- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $erl_top/erts/autoconf" >&5 --echo "$as_me: error: cannot find install-sh or install.sh in $erl_top/erts/autoconf" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in $erl_top/erts/autoconf" "$LINENO" 5 - fi --ac_config_guess="$SHELL $ac_aux_dir/config.guess" --ac_config_sub="$SHELL $ac_aux_dir/config.sub" --ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -+ -+# These three variables are undocumented and unsupported, -+# and are intended to be withdrawn in a future Autoconf release. -+# They can cause serious problems if a builder's source tree is in a directory -+# whose full name contains unusual characters. -+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -+ - - WX_BUILDING_INSIDE_ERLSRC=true - else - ac_aux_dir= - for ac_dir in autoconf; do -- if test -f $ac_dir/install-sh; then -+ if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break -- elif test -f $ac_dir/install.sh; then -+ elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break -- elif test -f $ac_dir/shtool; then -+ elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi - done - if test -z "$ac_aux_dir"; then -- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in autoconf" >&5 --echo "$as_me: error: cannot find install-sh or install.sh in autoconf" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in autoconf" "$LINENO" 5 - fi --ac_config_guess="$SHELL $ac_aux_dir/config.guess" --ac_config_sub="$SHELL $ac_aux_dir/config.sub" --ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -+ -+# These three variables are undocumented and unsupported, -+# and are intended to be withdrawn in a future Autoconf release. -+# They can cause serious problems if a builder's source tree is in a directory -+# whose full name contains unusual characters. -+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -+ - - WX_BUILDING_INSIDE_ERLSRC=false - fi -@@ -1434,57 +2533,74 @@ fi - - if test "X$host" != "Xfree_source" -a "X$host" != "Xwin32"; then - # Make sure we can run config.sub. --$ac_config_sub sun4 >/dev/null 2>&1 || -- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 --echo "$as_me: error: cannot run $ac_config_sub" >&2;} -- { (exit 1); exit 1; }; } -+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || -+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - --echo "$as_me:$LINENO: checking build system type" >&5 --echo $ECHO_N "checking build system type... $ECHO_C" >&6 --if test "${ac_cv_build+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -+$as_echo_n "checking build system type... " >&6; } -+if ${ac_cv_build+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- ac_cv_build_alias=$build_alias --test -z "$ac_cv_build_alias" && -- ac_cv_build_alias=`$ac_config_guess` --test -z "$ac_cv_build_alias" && -- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 --echo "$as_me: error: cannot guess build type; you must specify one" >&2;} -- { (exit 1); exit 1; }; } --ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} -- { (exit 1); exit 1; }; } -+ ac_build_alias=$build_alias -+test "x$ac_build_alias" = x && -+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -+test "x$ac_build_alias" = x && -+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || -+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 - - fi --echo "$as_me:$LINENO: result: $ac_cv_build" >&5 --echo "${ECHO_T}$ac_cv_build" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -+$as_echo "$ac_cv_build" >&6; } -+case $ac_cv_build in -+*-*-*) ;; -+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; -+esac - build=$ac_cv_build --build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_build -+shift -+build_cpu=$1 -+build_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+build_os=$* -+IFS=$ac_save_IFS -+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - --echo "$as_me:$LINENO: checking host system type" >&5 --echo $ECHO_N "checking host system type... $ECHO_C" >&6 --if test "${ac_cv_host+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -+$as_echo_n "checking host system type... " >&6; } -+if ${ac_cv_host+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- ac_cv_host_alias=$host_alias --test -z "$ac_cv_host_alias" && -- ac_cv_host_alias=$ac_cv_build_alias --ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} -- { (exit 1); exit 1; }; } -+ if test "x$host_alias" = x; then -+ ac_cv_host=$ac_cv_build -+else -+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || -+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 -+fi - - fi --echo "$as_me:$LINENO: result: $ac_cv_host" >&5 --echo "${ECHO_T}$ac_cv_host" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -+$as_echo "$ac_cv_host" >&6; } -+case $ac_cv_host in -+*-*-*) ;; -+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; -+esac - host=$ac_cv_host --host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_host -+shift -+host_cpu=$1 -+host_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+host_os=$* -+IFS=$ac_save_IFS -+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - - else -@@ -1512,10 +2628,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. - set dummy ${ac_tool_prefix}gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1525,35 +2641,37 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -1563,39 +2681,50 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -+$as_echo "$ac_ct_CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -- CC=$ac_ct_CC -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi - else - CC="$ac_cv_prog_CC" - fi - - if test -z "$CC"; then -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. - set dummy ${ac_tool_prefix}cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1605,77 +2734,37 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- --fi --if test -z "$ac_cv_prog_CC"; then -- ac_ct_CC=$CC -- # Extract the first word of "cc", so it can be a program name with args. --set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$ac_ct_CC"; then -- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- --fi --fi --ac_ct_CC=$ac_cv_prog_ac_ct_CC --if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -- CC=$ac_ct_CC --else -- CC="$ac_cv_prog_CC" --fi - -+ fi - fi - if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1686,18 +2775,19 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. -@@ -1715,24 +2805,25 @@ fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then -- for ac_prog in cl -+ for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1742,39 +2833,41 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - test -n "$CC" && break - done - fi - if test -z "$CC"; then - ac_ct_CC=$CC -- for ac_prog in cl -+ for ac_prog in cl.exe - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -1784,66 +2877,78 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -+$as_echo "$ac_ct_CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - test -n "$ac_ct_CC" && break - done - -- CC=$ac_ct_CC -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi - fi - - fi - - --test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH --See \`config.log' for more details." >&5 --echo "$as_me: error: no acceptable C compiler found in \$PATH --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "no acceptable C compiler found in \$PATH -+See \`config.log' for more details" "$LINENO" 5; } - - # Provide some information about the compiler. --echo "$as_me:$LINENO:" \ -- "checking for C compiler version" >&5 --ac_compiler=`set X $ac_compile; echo $2` --{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 -- (eval $ac_compiler --version &5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 -- (eval $ac_compiler -v &5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 -- (eval $ac_compiler -V &5) 2>&5 -+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -+set X $ac_compile -+ac_compiler=$2 -+for ac_option in --version -v -V -qversion; do -+ { { ac_try="$ac_compiler $ac_option >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } -+ if test -s conftest.err; then -+ sed '10a\ -+... rest of stderr output deleted ... -+ 10q' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ fi -+ rm -f conftest.er1 conftest.err -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+done - --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -1855,112 +2960,108 @@ main () - } - _ACEOF - ac_clean_files_save=$ac_clean_files --ac_clean_files="$ac_clean_files a.out a.exe b.out" -+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" - # Try to create an executable without -o first, disregard a.out. - # It will help us diagnose broken compilers, and finding out an intuition - # of exeext. --echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 --echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 --ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` --if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 -- (eval $ac_link_default) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- # Find the output, starting from the most likely. This scheme is --# not robust to junk in `.', hence go to wildcards (a.*) only as a last --# resort. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -+$as_echo_n "checking whether the C compiler works... " >&6; } -+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` - --# Be careful to initialize this variable, since it used to be cached. --# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. --ac_cv_exeext= --# b.out is created by i960 compilers. --for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out -+# The possible output files: -+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" -+ -+ac_rmfiles= -+for ac_file in $ac_files -+do -+ case $ac_file in -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; -+ * ) ac_rmfiles="$ac_rmfiles $ac_file";; -+ esac -+done -+rm -f $ac_rmfiles -+ -+if { { ac_try="$ac_link_default" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link_default") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : -+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -+# in a Makefile. We should not override ac_cv_exeext if it was cached, -+# so that the user can short-circuit this test for compilers unknown to -+# Autoconf. -+for ac_file in $ac_files '' - do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) -- ;; -- conftest.$ac_ext ) -- # This is the source file. -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) -- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- # FIXME: I believe we export ac_cv_exeext for Libtool, -- # but it would be cool to find out if it's true. Does anybody -- # maintain Libtool? --akim. -- export ac_cv_exeext -+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; -+ then :; else -+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -+ fi -+ # We set ac_cv_exeext here because the later test for it is not -+ # safe: cross compilers may not add the suffix if given an `-o' -+ # argument, so we may need to know it at that point already. -+ # Even if this section looks crufty: it has the advantage of -+ # actually working. - break;; - * ) - break;; - esac - done -+test "$ac_cv_exeext" = no && ac_cv_exeext= -+ - else -- echo "$as_me: failed program was:" >&5 -+ ac_file='' -+fi -+if test -z "$ac_file"; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+$as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { echo "$as_me:$LINENO: error: C compiler cannot create executables --See \`config.log' for more details." >&5 --echo "$as_me: error: C compiler cannot create executables --See \`config.log' for more details." >&2;} -- { (exit 77); exit 77; }; } -+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error 77 "C compiler cannot create executables -+See \`config.log' for more details" "$LINENO" 5; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - fi -- -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -+$as_echo_n "checking for C compiler default output file name... " >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -+$as_echo "$ac_file" >&6; } - ac_exeext=$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_file" >&5 --echo "${ECHO_T}$ac_file" >&6 - --# Check the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --echo "$as_me:$LINENO: checking whether the C compiler works" >&5 --echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 --# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 --# If not cross compiling, check that we can run a simple program. --if test "$cross_compiling" != yes; then -- if { ac_try='./$ac_file' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- cross_compiling=no -- else -- if test "$cross_compiling" = maybe; then -- cross_compiling=yes -- else -- { { echo "$as_me:$LINENO: error: cannot run C compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run C compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -- fi -- fi --fi --echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -- --rm -f a.out a.exe conftest$ac_cv_exeext b.out -+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out - ac_clean_files=$ac_clean_files_save --# Check the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 --echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 --echo "$as_me:$LINENO: result: $cross_compiling" >&5 --echo "${ECHO_T}$cross_compiling" >&6 -- --echo "$as_me:$LINENO: checking for suffix of executables" >&5 --echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -+$as_echo_n "checking for suffix of executables... " >&6; } -+if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) - # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will - # work properly (i.e., refer to `conftest.exe'), while it won't with -@@ -1968,38 +3069,90 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- export ac_cv_exeext - break;; - * ) break;; - esac - done - else -- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "cannot compute suffix of executables: cannot compile and link -+See \`config.log' for more details" "$LINENO" 5; } - fi -- --rm -f conftest$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 --echo "${ECHO_T}$ac_cv_exeext" >&6 -+rm -f conftest conftest$ac_cv_exeext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -+$as_echo "$ac_cv_exeext" >&6; } - - rm -f conftest.$ac_ext - EXEEXT=$ac_cv_exeext - ac_exeext=$EXEEXT --echo "$as_me:$LINENO: checking for suffix of object files" >&5 --echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 --if test "${ac_cv_objext+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main () -+{ -+FILE *f = fopen ("conftest.out", "w"); -+ return ferror (f) || fclose (f) != 0; -+ -+ ; -+ return 0; -+} - _ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ac_clean_files="$ac_clean_files conftest.out" -+# Check that the compiler produces executables we can run. If not, either -+# the compiler is broken, or we cross compile. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -+$as_echo_n "checking whether we are cross compiling... " >&6; } -+if test "$cross_compiling" != yes; then -+ { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if { ac_try='./conftest$ac_cv_exeext' -+ { { case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; }; then -+ cross_compiling=no -+ else -+ if test "$cross_compiling" = maybe; then -+ cross_compiling=yes -+ else -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "cannot run C compiled programs. -+If you meant to cross compile, use \`--host'. -+See \`config.log' for more details" "$LINENO" 5; } -+ fi -+ fi -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -+$as_echo "$cross_compiling" >&6; } -+ -+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out -+ac_clean_files=$ac_clean_files_save -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -+$as_echo_n "checking for suffix of object files... " >&6; } -+if ${ac_cv_objext+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2011,45 +3164,46 @@ main () - } - _ACEOF - rm -f conftest.o conftest.obj --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+if { { ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compile") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : -+ for ac_file in conftest.o conftest.obj conftest.*; do -+ test -f "$ac_file" || continue; - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac - done - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute suffix of object files: cannot compile --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "cannot compute suffix of object files: cannot compile -+See \`config.log' for more details" "$LINENO" 5; } - fi -- - rm -f conftest.$ac_cv_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 --echo "${ECHO_T}$ac_cv_objext" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -+$as_echo "$ac_cv_objext" >&6; } - OBJEXT=$ac_cv_objext - ac_objext=$OBJEXT --echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 --if test "${ac_cv_c_compiler_gnu+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -+if ${ac_cv_c_compiler_gnu+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2063,55 +3217,34 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - ac_compiler_gnu=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_compiler_gnu=no -+ ac_compiler_gnu=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_c_compiler_gnu=$ac_compiler_gnu - - fi --echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 --GCC=`test $ac_compiler_gnu = yes && echo yes` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -+$as_echo "$ac_cv_c_compiler_gnu" >&6; } -+if test $ac_compiler_gnu = yes; then -+ GCC=yes -+else -+ GCC= -+fi - ac_test_CFLAGS=${CFLAGS+set} - ac_save_CFLAGS=$CFLAGS --CFLAGS="-g" --echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 --echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 --if test "${ac_cv_prog_cc_g+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -+$as_echo_n "checking whether $CC accepts -g... " >&6; } -+if ${ac_cv_prog_cc_g+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ ac_save_c_werror_flag=$ac_c_werror_flag -+ ac_c_werror_flag=yes -+ ac_cv_prog_cc_g=no -+ CFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2122,39 +3255,49 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ CFLAGS="" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - --ac_cv_prog_cc_g=no -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ -+else -+ ac_c_werror_flag=$ac_save_c_werror_flag -+ CFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_prog_cc_g=yes - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_c_werror_flag=$ac_save_c_werror_flag -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -+$as_echo "$ac_cv_prog_cc_g" >&6; } - if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS - elif test $ac_cv_prog_cc_g = yes; then -@@ -2170,23 +3313,18 @@ else - CFLAGS= - fi - fi --echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 --echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 --if test "${ac_cv_prog_cc_stdc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -+if ${ac_cv_prog_cc_c89+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- ac_cv_prog_cc_stdc=no -+ ac_cv_prog_cc_c89=no - ac_save_CC=$CC --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - #include --#include --#include -+struct stat; - /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ - struct buf { int x; }; - FILE * (*rcsopen) (struct buf *, struct stat *, int); -@@ -2209,12 +3347,17 @@ static char *f (char * (*g) (char **, in - /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated -- as 'x'. The following induces an error, until -std1 is added to get -+ as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something -- that's true only with -std1. */ -+ that's true only with -std. */ - int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters -+ inside strings and character constants. */ -+#define FOO(x) 'x' -+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; -+ - int test (int i, double x); - struct s1 {int (*f) (int a);}; - struct s2 {int (*f) (double a);}; -@@ -2229,225 +3372,61 @@ return f (e, argv, 0) != argv[0] || f - return 0; - } - _ACEOF --# Don't try gcc -ansi; that turns off useful extensions and --# breaks some systems' header files. --# AIX -qlanglvl=ansi --# Ultrix and OSF/1 -std1 --# HP-UX 10.20 and later -Ae --# HP-UX older versions -Aa -D_HPUX_SOURCE --# SVR4 -Xc -D__EXTENSIONS__ --for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ -+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" - do - CC="$ac_save_CC $ac_arg" -- rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_prog_cc_stdc=$ac_arg --break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -+ if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_prog_cc_c89=$ac_arg - fi --rm -f conftest.err conftest.$ac_objext -+rm -f core conftest.err conftest.$ac_objext -+ test "x$ac_cv_prog_cc_c89" != "xno" && break - done --rm -f conftest.$ac_ext conftest.$ac_objext -+rm -f conftest.$ac_ext - CC=$ac_save_CC - - fi -- --case "x$ac_cv_prog_cc_stdc" in -- x|xno) -- echo "$as_me:$LINENO: result: none needed" >&5 --echo "${ECHO_T}none needed" >&6 ;; -+# AC_CACHE_VAL -+case "x$ac_cv_prog_cc_c89" in -+ x) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -+$as_echo "none needed" >&6; } ;; -+ xno) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -+$as_echo "unsupported" >&6; } ;; - *) -- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 -- CC="$CC $ac_cv_prog_cc_stdc" ;; -+ CC="$CC $ac_cv_prog_cc_c89" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; - esac -+if test "x$ac_cv_prog_cc_c89" != xno; then : - --# Some people use a C++ compiler to compile C. Since we use `exit', --# in C++ we need to declare it. In case someone uses the same compiler --# for both compiling C and C++ we need to have the C++ compiler decide --# the declaration of exit, since it's the most demanding environment. --cat >conftest.$ac_ext <<_ACEOF --#ifndef __cplusplus -- choke me --#endif --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- for ac_declaration in \ -- '' \ -- 'extern "C" void std::exit (int) throw (); using std::exit;' \ -- 'extern "C" void std::exit (int); using std::exit;' \ -- 'extern "C" void exit (int) throw ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_declaration --#include --int --main () --{ --exit (42); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --continue --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_declaration --int --main () --{ --exit (42); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --done --rm -f conftest* --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h - fi - --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - --ac_ext=cc -+ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test -n "$ac_tool_prefix"; then -- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC -+if test -z "$CXX"; then -+ if test -n "$CCC"; then -+ CXX=$CCC -+ else -+ if test -n "$ac_tool_prefix"; then -+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CXX+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_CXX+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -@@ -2457,39 +3436,41 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - CXX=$ac_cv_prog_CXX - if test -n "$CXX"; then -- echo "$as_me:$LINENO: result: $CXX" >&5 --echo "${ECHO_T}$CXX" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -+$as_echo "$CXX" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - test -n "$CXX" && break - done - fi - if test -z "$CXX"; then - ac_ct_CXX=$CXX -- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC -+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_CXX+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -@@ -2499,64 +3480,77 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CXX="$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CXX=$ac_cv_prog_ac_ct_CXX - if test -n "$ac_ct_CXX"; then -- echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 --echo "${ECHO_T}$ac_ct_CXX" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -+$as_echo "$ac_ct_CXX" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - test -n "$ac_ct_CXX" && break - done --test -n "$ac_ct_CXX" || ac_ct_CXX="g++" - -- CXX=$ac_ct_CXX -+ if test "x$ac_ct_CXX" = x; then -+ CXX="g++" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ CXX=$ac_ct_CXX -+ fi - fi - -- -+ fi -+fi - # Provide some information about the compiler. --echo "$as_me:$LINENO:" \ -- "checking for C++ compiler version" >&5 --ac_compiler=`set X $ac_compile; echo $2` --{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 -- (eval $ac_compiler --version &5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 -- (eval $ac_compiler -v &5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 -- (eval $ac_compiler -V &5) 2>&5 -+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 -+set X $ac_compile -+ac_compiler=$2 -+for ac_option in --version -v -V -qversion; do -+ { { ac_try="$ac_compiler $ac_option >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } -+ if test -s conftest.err; then -+ sed '10a\ -+... rest of stderr output deleted ... -+ 10q' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ fi -+ rm -f conftest.er1 conftest.err -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+done - --echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 --if test "${ac_cv_cxx_compiler_gnu+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 -+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -+if ${ac_cv_cxx_compiler_gnu+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2570,55 +3564,34 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_cxx_try_compile "$LINENO"; then : - ac_compiler_gnu=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_compiler_gnu=no -+ ac_compiler_gnu=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - - fi --echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 --GXX=`test $ac_compiler_gnu = yes && echo yes` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -+if test $ac_compiler_gnu = yes; then -+ GXX=yes -+else -+ GXX= -+fi - ac_test_CXXFLAGS=${CXXFLAGS+set} - ac_save_CXXFLAGS=$CXXFLAGS --CXXFLAGS="-g" --echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 --echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 --if test "${ac_cv_prog_cxx_g+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 -+$as_echo_n "checking whether $CXX accepts -g... " >&6; } -+if ${ac_cv_prog_cxx_g+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag -+ ac_cxx_werror_flag=yes -+ ac_cv_prog_cxx_g=no -+ CXXFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2629,160 +3602,64 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_prog_cxx_g=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_prog_cxx_g=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 --echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 --if test "$ac_test_CXXFLAGS" = set; then -- CXXFLAGS=$ac_save_CXXFLAGS --elif test $ac_cv_prog_cxx_g = yes; then -- if test "$GXX" = yes; then -- CXXFLAGS="-g -O2" -- else -- CXXFLAGS="-g" -- fi --else -- if test "$GXX" = yes; then -- CXXFLAGS="-O2" -- else -- CXXFLAGS= -- fi --fi --for ac_declaration in \ -- '' \ -- 'extern "C" void std::exit (int) throw (); using std::exit;' \ -- 'extern "C" void std::exit (int); using std::exit;' \ -- 'extern "C" void exit (int) throw ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ CXXFLAGS="" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --$ac_declaration --#include -+ - int - main () - { --exit (42); -+ - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_cxx_try_compile "$LINENO"; then : - --continue --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+else -+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag -+ CXXFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --$ac_declaration -+ - int - main () - { --exit (42); -+ - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -+if ac_fn_cxx_try_compile "$LINENO"; then : -+ ac_cv_prog_cxx_g=yes - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --done --rm -f conftest* --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -+$as_echo "$ac_cv_prog_cxx_g" >&6; } -+if test "$ac_test_CXXFLAGS" = set; then -+ CXXFLAGS=$ac_save_CXXFLAGS -+elif test $ac_cv_prog_cxx_g = yes; then -+ if test "$GXX" = yes; then -+ CXXFLAGS="-g -O2" -+ else -+ CXXFLAGS="-g" -+ fi -+else -+ if test "$GXX" = yes; then -+ CXXFLAGS="-O2" -+ else -+ CXXFLAGS= -+ fi - fi -- - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -2792,10 +3669,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. - set dummy ${ac_tool_prefix}ranlib; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_RANLIB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_RANLIB+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -@@ -2805,35 +3682,37 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - RANLIB=$ac_cv_prog_RANLIB - if test -n "$RANLIB"; then -- echo "$as_me:$LINENO: result: $RANLIB" >&5 --echo "${ECHO_T}$RANLIB" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -+$as_echo "$RANLIB" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -@@ -2843,28 +3722,38 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_RANLIB="ranlib" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - -- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" - fi - fi - ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB - if test -n "$ac_ct_RANLIB"; then -- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 --echo "${ECHO_T}$ac_ct_RANLIB" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -+$as_echo "$ac_ct_RANLIB" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -- RANLIB=$ac_ct_RANLIB -+ if test "x$ac_ct_RANLIB" = x; then -+ RANLIB=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ RANLIB=$ac_ct_RANLIB -+ fi - else - RANLIB="$ac_cv_prog_RANLIB" - fi -@@ -2874,15 +3763,15 @@ ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu --echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 --echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -+$as_echo_n "checking how to run the C preprocessor... " >&6; } - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= - fi - if test -z "$CPP"; then -- if test "${ac_cv_prog_CPP+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ if ${ac_cv_prog_CPP+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" -@@ -2896,11 +3785,7 @@ do - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #ifdef __STDC__ - # include -@@ -2909,78 +3794,34 @@ cat >>conftest.$ac_ext <<_ACEOF - #endif - Syntax error - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_cpp "$LINENO"; then : - -+else - # Broken: fails on valid input. - continue - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - -- # OK, works on sane cases. Now check whether non-existent headers -+ # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. - continue - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- - # Passes both tests. - ac_preproc_ok=: - break - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - - done - # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -+rm -f conftest.i conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then : - break - fi - -@@ -2992,8 +3833,8 @@ fi - else - ac_cv_prog_CPP=$CPP - fi --echo "$as_me:$LINENO: result: $CPP" >&5 --echo "${ECHO_T}$CPP" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -+$as_echo "$CPP" >&6; } - ac_preproc_ok=false - for ac_c_preproc_warn_flag in '' yes - do -@@ -3003,11 +3844,7 @@ do - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #ifdef __STDC__ - # include -@@ -3016,85 +3853,40 @@ cat >>conftest.$ac_ext <<_ACEOF - #endif - Syntax error - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_cpp "$LINENO"; then : - -+else - # Broken: fails on valid input. - continue - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - -- # OK, works on sane cases. Now check whether non-existent headers -+ # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. - continue - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- - # Passes both tests. - ac_preproc_ok=: - break - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - - done - # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -- : -+rm -f conftest.i conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then : -+ - else -- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check --See \`config.log' for more details." >&5 --echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -+See \`config.log' for more details" "$LINENO" 5; } - fi - - ac_ext=c -@@ -3104,41 +3896,39 @@ ac_link='$CC -o conftest$ac_exeext $CFLA - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - --{ echo "$as_me:$LINENO: Building for $host_os" >&5 --echo "$as_me: Building for $host_os" >&6;} -+{ $as_echo "$as_me:${as_lineno-$LINENO}: Building for $host_os" >&5 -+$as_echo "$as_me: Building for $host_os" >&6;} - WXERL_CAN_BUILD_DRIVER=true - - - MIXED_CYGWIN=no - MIXED_MSYS=no - --echo "$as_me:$LINENO: checking for mixed cygwin or msys and native VC++ environment" >&5 --echo $ECHO_N "checking for mixed cygwin or msys and native VC++ environment... $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mixed cygwin or msys and native VC++ environment" >&5 -+$as_echo_n "checking for mixed cygwin or msys and native VC++ environment... " >&6; } - if test "X$host" = "Xwin32" -a "x$GCC" != "xyes"; then - if test -x /usr/bin/msys-?.0.dll; then - CFLAGS="$CFLAGS -O2" - MIXED_MSYS=yes -- echo "$as_me:$LINENO: result: MSYS and VC" >&5 --echo "${ECHO_T}MSYS and VC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: MSYS and VC" >&5 -+$as_echo "MSYS and VC" >&6; } - MIXED_MSYS_VC=yes - CPPFLAGS="$CPPFLAGS -DERTS_MIXED_MSYS_VC" - elif test -x /usr/bin/cygpath; then - CFLAGS="$CFLAGS -O2" - MIXED_CYGWIN=yes -- echo "$as_me:$LINENO: result: Cygwin and VC" >&5 --echo "${ECHO_T}Cygwin and VC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Cygwin and VC" >&5 -+$as_echo "Cygwin and VC" >&6; } - MIXED_CYGWIN_VC=yes - CPPFLAGS="$CPPFLAGS -DERTS_MIXED_CYGWIN_VC" - else -- echo "$as_me:$LINENO: result: undeterminable" >&5 --echo "${ECHO_T}undeterminable" >&6 -- { { echo "$as_me:$LINENO: error: Seems to be mixed windows but not with cygwin" >&5 --echo "$as_me: error: Seems to be mixed windows but not with cygwin" >&2;} -- { (exit cannot handle this!); exit cannot handle this!; }; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: undeterminable" >&5 -+$as_echo "undeterminable" >&6; } -+ as_fn_error cannot handle this! "Seems to be mixed windows but not with cygwin" "$LINENO" 5 - fi - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - MIXED_CYGWIN_VC=no - MIXED_MSYS_VC=no - fi -@@ -3153,26 +3943,24 @@ fi - - - if test "x$MIXED_MSYS" != "xyes"; then -- echo "$as_me:$LINENO: checking for mixed cygwin and native MinGW environment" >&5 --echo $ECHO_N "checking for mixed cygwin and native MinGW environment... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mixed cygwin and native MinGW environment" >&5 -+$as_echo_n "checking for mixed cygwin and native MinGW environment... " >&6; } - if test "X$host" = "Xwin32" -a "x$GCC" = x"yes"; then - if test -x /usr/bin/cygpath; then - CFLAGS="$CFLAGS -O2" - MIXED_CYGWIN=yes -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - MIXED_CYGWIN_MINGW=yes - CPPFLAGS="$CPPFLAGS -DERTS_MIXED_CYGWIN_MINGW" - else -- echo "$as_me:$LINENO: result: undeterminable" >&5 --echo "${ECHO_T}undeterminable" >&6 -- { { echo "$as_me:$LINENO: error: Seems to be mixed windows but not with cygwin" >&5 --echo "$as_me: error: Seems to be mixed windows but not with cygwin" >&2;} -- { (exit cannot handle this!); exit cannot handle this!; }; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: undeterminable" >&5 -+$as_echo "undeterminable" >&6; } -+ as_fn_error cannot handle this! "Seems to be mixed windows but not with cygwin" "$LINENO" 5 - fi - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - MIXED_CYGWIN_MINGW=no - fi - else -@@ -3180,26 +3968,26 @@ else - fi - - --echo "$as_me:$LINENO: checking if we mix cygwin with any native compiler" >&5 --echo $ECHO_N "checking if we mix cygwin with any native compiler... $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we mix cygwin with any native compiler" >&5 -+$as_echo_n "checking if we mix cygwin with any native compiler... " >&6; } - if test "X$MIXED_CYGWIN" = "Xyes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - - - --echo "$as_me:$LINENO: checking if we mix msys with another native compiler" >&5 --echo $ECHO_N "checking if we mix msys with another native compiler... $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we mix msys with another native compiler" >&5 -+$as_echo_n "checking if we mix msys with another native compiler... " >&6; } - if test "X$MIXED_MSYS" = "Xyes" ; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -3213,31 +4001,142 @@ fi - - - --echo "$as_me:$LINENO: checking for egrep" >&5 --echo $ECHO_N "checking for egrep... $ECHO_C" >&6 --if test "${ac_cv_prog_egrep+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -+$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -+if ${ac_cv_path_GREP+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- if echo a | (grep -E '(a|b)') >/dev/null 2>&1 -- then ac_cv_prog_egrep='grep -E' -- else ac_cv_prog_egrep='egrep' -+ if test -z "$GREP"; then -+ ac_path_GREP_found=false -+ # Loop through the user's path and test for each of PROGNAME-LIST -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in grep ggrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" -+ as_fn_executable_p "$ac_path_GREP" || continue -+# Check for GNU ac_path_GREP and select it if it is found. -+ # Check for GNU $ac_path_GREP -+case `"$ac_path_GREP" --version 2>&1` in -+*GNU*) -+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -+*) -+ ac_count=0 -+ $as_echo_n 0123456789 >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ $as_echo 'GREP' >> "conftest.nl" -+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ as_fn_arith $ac_count + 1 && ac_count=$as_val -+ if test $ac_count -gt ${ac_path_GREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_GREP="$ac_path_GREP" -+ ac_path_GREP_max=$ac_count -+ fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+esac -+ -+ $ac_path_GREP_found && break 3 -+ done -+ done -+ done -+IFS=$as_save_IFS -+ if test -z "$ac_cv_path_GREP"; then -+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 -+ fi -+else -+ ac_cv_path_GREP=$GREP -+fi -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -+$as_echo "$ac_cv_path_GREP" >&6; } -+ GREP="$ac_cv_path_GREP" -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -+$as_echo_n "checking for egrep... " >&6; } -+if ${ac_cv_path_EGREP+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 -+ then ac_cv_path_EGREP="$GREP -E" -+ else -+ if test -z "$EGREP"; then -+ ac_path_EGREP_found=false -+ # Loop through the user's path and test for each of PROGNAME-LIST -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in egrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" -+ as_fn_executable_p "$ac_path_EGREP" || continue -+# Check for GNU ac_path_EGREP and select it if it is found. -+ # Check for GNU $ac_path_EGREP -+case `"$ac_path_EGREP" --version 2>&1` in -+*GNU*) -+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -+*) -+ ac_count=0 -+ $as_echo_n 0123456789 >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ $as_echo 'EGREP' >> "conftest.nl" -+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ as_fn_arith $ac_count + 1 && ac_count=$as_val -+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_EGREP="$ac_path_EGREP" -+ ac_path_EGREP_max=$ac_count - fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+esac -+ -+ $ac_path_EGREP_found && break 3 -+ done -+ done -+ done -+IFS=$as_save_IFS -+ if test -z "$ac_cv_path_EGREP"; then -+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 -+ fi -+else -+ ac_cv_path_EGREP=$EGREP - fi --echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 --echo "${ECHO_T}$ac_cv_prog_egrep" >&6 -- EGREP=$ac_cv_prog_egrep -+ -+ fi -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -+$as_echo "$ac_cv_path_EGREP" >&6; } -+ EGREP="$ac_cv_path_EGREP" - - --echo "$as_me:$LINENO: checking for ANSI C header files" >&5 --echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 --if test "${ac_cv_header_stdc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -+$as_echo_n "checking for ANSI C header files... " >&6; } -+if ${ac_cv_header_stdc+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - #include -@@ -3252,51 +4151,23 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_header_stdc=no -+ ac_cv_header_stdc=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "memchr" >/dev/null 2>&1; then -- : -+ $EGREP "memchr" >/dev/null 2>&1; then : -+ - else - ac_cv_header_stdc=no - fi -@@ -3306,18 +4177,14 @@ fi - - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "free" >/dev/null 2>&1; then -- : -+ $EGREP "free" >/dev/null 2>&1; then : -+ - else - ac_cv_header_stdc=no - fi -@@ -3327,16 +4194,13 @@ fi - - if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -- if test "$cross_compiling" = yes; then -+ if test "$cross_compiling" = yes; then : - : - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include -+#include - #if ((' ' & 0x0FF) == 0x020) - # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') - # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -@@ -3356,109 +4220,39 @@ main () - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) -- exit(2); -- exit (0); -+ return 2; -+ return 0; - } - _ACEOF --rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_run "$LINENO"; then : - --( exit $ac_status ) --ac_cv_header_stdc=no -+else -+ ac_cv_header_stdc=no - fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext - fi -+ - fi - fi --echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 --echo "${ECHO_T}$ac_cv_header_stdc" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -+$as_echo "$ac_cv_header_stdc" >&6; } - if test $ac_cv_header_stdc = yes; then - --cat >>confdefs.h <<\_ACEOF --#define STDC_HEADERS 1 --_ACEOF -+$as_echo "#define STDC_HEADERS 1" >>confdefs.h - - fi - - # On IRIX 5.3, sys/types and inttypes.h are conflicting. -- -- -- -- -- -- -- -- -- - for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default -- --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- eval "$as_ac_Header=yes" --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --eval "$as_ac_Header=no" --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -+" -+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -3466,415 +4260,34 @@ fi - done - - --echo "$as_me:$LINENO: checking for void *" >&5 --echo $ECHO_N "checking for void *... $ECHO_C" >&6 --if test "${ac_cv_type_void_p+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --int --main () --{ --if ((void * *) 0) -- return 0; --if (sizeof (void *)) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_void_p=yes -+# The cast to long int works around a bug in the HP C Compiler -+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+# This bug is HP SR number 8606223364. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5 -+$as_echo_n "checking size of void *... " >&6; } -+if ${ac_cv_sizeof_void_p+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_void_p=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&5 --echo "${ECHO_T}$ac_cv_type_void_p" >&6 -+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then : - --echo "$as_me:$LINENO: checking size of void *" >&5 --echo $ECHO_N "checking size of void *... $ECHO_C" >&6 --if test "${ac_cv_sizeof_void_p+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test "$ac_cv_type_void_p" = yes; then -- # The cast to unsigned long works around a bug in the HP C Compiler -- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -- # This bug is HP SR number 8606223364. -- if test "$cross_compiling" = yes; then -- # Depending upon the size, compute the lo and hi bounds. --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --int --main () --{ --static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= 0)]; --test_array [0] = 0 -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_lo=0 ac_mid=0 -- while :; do -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --int --main () --{ --static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)]; --test_array [0] = 0 -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_hi=$ac_mid; break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_lo=`expr $ac_mid + 1` -- if test $ac_lo -le $ac_mid; then -- ac_lo= ac_hi= -- break -- fi -- ac_mid=`expr 2 '*' $ac_mid + 1` --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- done --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --int --main () --{ --static int test_array [1 - 2 * !(((long) (sizeof (void *))) < 0)]; --test_array [0] = 0 -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_hi=-1 ac_mid=-1 -- while :; do -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --int --main () --{ --static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= $ac_mid)]; --test_array [0] = 0 -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_lo=$ac_mid; break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_hi=`expr '(' $ac_mid ')' - 1` -- if test $ac_mid -le $ac_hi; then -- ac_lo= ac_hi= -- break -- fi -- ac_mid=`expr 2 '*' $ac_mid` --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- done --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_lo= ac_hi= --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error 77 "cannot compute sizeof (void *) -+See \`config.log' for more details" "$LINENO" 5; } -+ else -+ ac_cv_sizeof_void_p=0 -+ fi - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --# Binary search between lo and hi bounds. --while test "x$ac_lo" != "x$ac_hi"; do -- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --int --main () --{ --static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)]; --test_array [0] = 0 - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_hi=$ac_mid --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_lo=`expr '(' $ac_mid ')' + 1` - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --done --case $ac_lo in --?*) ac_cv_sizeof_void_p=$ac_lo;; --'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77 --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute sizeof (void *), 77 --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } ;; --esac --else -- if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --long longval () { return (long) (sizeof (void *)); } --unsigned long ulongval () { return (long) (sizeof (void *)); } --#include --#include --int --main () --{ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5 -+$as_echo "$ac_cv_sizeof_void_p" >&6; } - -- FILE *f = fopen ("conftest.val", "w"); -- if (! f) -- exit (1); -- if (((long) (sizeof (void *))) < 0) -- { -- long i = longval (); -- if (i != ((long) (sizeof (void *)))) -- exit (1); -- fprintf (f, "%ld\n", i); -- } -- else -- { -- unsigned long i = ulongval (); -- if (i != ((long) (sizeof (void *)))) -- exit (1); -- fprintf (f, "%lu\n", i); -- } -- exit (ferror (f) || fclose (f) != 0); - -- ; -- return 0; --} --_ACEOF --rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_sizeof_void_p=`cat conftest.val` --else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - --( exit $ac_status ) --{ { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77 --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute sizeof (void *), 77 --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --fi --fi --rm -f conftest.val --else -- ac_cv_sizeof_void_p=0 --fi --fi --echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5 --echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6 - cat >>confdefs.h <<_ACEOF - #define SIZEOF_VOID_P $ac_cv_sizeof_void_p - _ACEOF -@@ -3888,21 +4301,17 @@ OBJC_CFLAGS="" - CXXFLAGS="" - case $host_os in - darwin*) -- echo "$as_me:$LINENO: checking Checking wxWidgets for min version:" >&5 --echo $ECHO_N "checking Checking wxWidgets for min version:... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Checking wxWidgets for min version:" >&5 -+$as_echo_n "checking Checking wxWidgets for min version:... " >&6; } - WX_CC=`wx-config --cc` - MAC_MIN=`echo "$WX_CC" | sed 's/^[^ ]*\ *//'` -- echo "$as_me:$LINENO: result: $MAC_MIN" >&5 --echo "${ECHO_T}$MAC_MIN" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAC_MIN" >&5 -+$as_echo "$MAC_MIN" >&6; } - -- echo "$as_me:$LINENO: checking if compiler accepts -ObjC" >&5 --echo $ECHO_N "checking if compiler accepts -ObjC... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -ObjC" >&5 -+$as_echo_n "checking if compiler accepts -ObjC... " >&6; } - CFLAGS="$CFLAGS -ObjC" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -3913,45 +4322,21 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - accept_objc_flag=true - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --accept_objc_flag=false -+ accept_objc_flag=false - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test "X$accept_objc_flag" = "Xtrue"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - C_ONLY_FLAGS="-ObjC" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -- echo "$as_me:$LINENO: checking for a Cocoa compliant Objective C compiler" >&5 --echo $ECHO_N "checking for a Cocoa compliant Objective C compiler... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Cocoa compliant Objective C compiler" >&5 -+$as_echo_n "checking for a Cocoa compliant Objective C compiler... " >&6; } - SEARCHFOR="" - SEARCHFORXX="" - save_IFS=$IFS -@@ -3980,22 +4365,20 @@ echo $ECHO_N "checking for a Cocoa compl - done - IFS=$save_IFS - if test X$APPLE_CC = X -o X$APPLE_CXX = X; then -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then -- { { echo "$as_me:$LINENO: error: Can not find compiler to compile Cocoa applications" >&5 --echo "$as_me: error: Can not find compiler to compile Cocoa applications" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "Can not find compiler to compile Cocoa applications" "$LINENO" 5 - else - echo "Can not find compiler to compile Cocoa applications" > ./CONF_INFO - WXERL_CAN_BUILD_DRIVER=false -- { echo "$as_me:$LINENO: WARNING: Can not find compiler to compile Cocoa applications" >&5 --echo "$as_me: WARNING: Can not find compiler to compile Cocoa applications" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can not find compiler to compile Cocoa applications" >&5 -+$as_echo "$as_me: WARNING: Can not find compiler to compile Cocoa applications" >&2;} - fi - WXERL_CAN_BUILD_DRIVER=false - else -- echo "$as_me:$LINENO: result: $APPLE_CC ($APPLE_CXX)" >&5 --echo "${ECHO_T}$APPLE_CC ($APPLE_CXX)" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $APPLE_CC ($APPLE_CXX)" >&5 -+$as_echo "$APPLE_CC ($APPLE_CXX)" >&6; } - CC=$APPLE_CC - CXX=$APPLE_CXX - #CXXFLAGS="-x c++ $CXXFLAGS" -@@ -4009,8 +4392,8 @@ echo "${ECHO_T}$APPLE_CC ($APPLE_CXX)" > - mingw32) - CFLAGS="$CFLAGS -DWIN32 -DWINVER=0x0600 -D_WINDOWS -D_UNICODE -DUNICODE" - CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0600" -- { echo "$as_me:$LINENO: WARNING: Reverting to 32-bit time_t" >&5 --echo "$as_me: WARNING: Reverting to 32-bit time_t" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Reverting to 32-bit time_t" >&5 -+$as_echo "$as_me: WARNING: Reverting to 32-bit time_t" >&2;} - CPPFLAGS="$CPPFLAGS -D_USE_32BIT_TIME_T" - ;; - win32) -@@ -4072,297 +4455,21 @@ esac - - - if test X"$host_os" != X"win32" ; then -- --for ac_header in GL/gl.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in GL/gl.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default" -+if test "x$ac_cv_header_GL_gl_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- --else -- --for ac_header in OpenGL/gl.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> -+#define HAVE_GL_GL_H 1 - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 - --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in OpenGL/gl.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "OpenGL/gl.h" "ac_cv_header_OpenGL_gl_h" "$ac_includes_default" -+if test "x$ac_cv_header_OpenGL_gl_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_OPENGL_GL_H 1 - _ACEOF - - fi -@@ -4377,154 +4484,16 @@ done - test X"$ac_cv_header_OpenGL_gl_h" != Xyes - then - saved_CPPFLAGS="$CPPFLAGS" -- { echo "$as_me:$LINENO: Checking for OpenGL headers in /usr/X11R6" >&5 --echo "$as_me: Checking for OpenGL headers in /usr/X11R6" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: Checking for OpenGL headers in /usr/X11R6" >&5 -+$as_echo "$as_me: Checking for OpenGL headers in /usr/X11R6" >&6;} - CPPFLAGS="-isystem /usr/X11R6/include $CPPFLAGS" - $as_unset ac_cv_header_GL_gl_h -- --for ac_header in GL/gl.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in GL/gl.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default" -+if test "x$ac_cv_header_GL_gl_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_GL_GL_H 1 - _ACEOF - - fi -@@ -4532,154 +4501,16 @@ fi - done - - if test X"$ac_cv_header_GL_gl_h" != Xyes ; then -- { echo "$as_me:$LINENO: Checking for OpenGL headers in /usr/local" >&5 --echo "$as_me: Checking for OpenGL headers in /usr/local" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: Checking for OpenGL headers in /usr/local" >&5 -+$as_echo "$as_me: Checking for OpenGL headers in /usr/local" >&6;} - CPPFLAGS="-isystem /usr/local/include $saved_CPPFLAGS" - $as_unset ac_cv_header_GL_gl_h -- --for ac_header in GL/gl.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in GL/gl.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default" -+if test "x$ac_cv_header_GL_gl_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_GL_GL_H 1 - _ACEOF - - fi -@@ -4687,8 +4518,8 @@ fi - done - - if test X"$ac_cv_header_GL_gl_h" != Xyes ; then -- { echo "$as_me:$LINENO: WARNING: No OpenGL headers found, wx will NOT be usable" >&5 --echo "$as_me: WARNING: No OpenGL headers found, wx will NOT be usable" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No OpenGL headers found, wx will NOT be usable" >&5 -+$as_echo "$as_me: WARNING: No OpenGL headers found, wx will NOT be usable" >&2;} - CPPFLAGS="$saved_CPPFLAGS" - else - GL_LIBS="-L/usr/local/lib $GL_LIBS" -@@ -4698,61 +4529,13 @@ echo "$as_me: WARNING: No OpenGL headers - fi - fi - else -- --for ac_header in gl/gl.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include -- --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- eval "$as_ac_Header=yes" --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --eval "$as_ac_Header=no" --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in gl/gl.h -+do : -+ ac_fn_c_check_header_compile "$LINENO" "gl/gl.h" "ac_cv_header_gl_gl_h" "#include -+" -+if test "x$ac_cv_header_gl_gl_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_GL_GL_H 1 - _ACEOF - - fi -@@ -4762,297 +4545,21 @@ done - fi - - if test X"$host_os" != X"win32" ; then -- --for ac_header in GL/glu.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in GL/glu.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "GL/glu.h" "ac_cv_header_GL_glu_h" "$ac_includes_default" -+if test "x$ac_cv_header_GL_glu_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_GL_GLU_H 1 - _ACEOF - - else -- --for ac_header in OpenGL/glu.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in OpenGL/glu.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "OpenGL/glu.h" "ac_cv_header_OpenGL_glu_h" "$ac_includes_default" -+if test "x$ac_cv_header_OpenGL_glu_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_OPENGL_GLU_H 1 - _ACEOF - - fi -@@ -5066,65 +4573,17 @@ done - if test X"$ac_cv_header_GL_glu_h" != Xyes && - test X"$ac_cv_header_OpenGL_glu_h" != Xyes - then -- { echo "$as_me:$LINENO: WARNING: No GLU headers found, wx will NOT be usable" >&5 --echo "$as_me: WARNING: No GLU headers found, wx will NOT be usable" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No GLU headers found, wx will NOT be usable" >&5 -+$as_echo "$as_me: WARNING: No GLU headers found, wx will NOT be usable" >&2;} - fi - else -- --for ac_header in gl/glu.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include -- --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- eval "$as_ac_Header=yes" --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --eval "$as_ac_Header=no" --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in gl/glu.h -+do : -+ ac_fn_c_check_header_compile "$LINENO" "gl/glu.h" "ac_cv_header_gl_glu_h" "#include -+" -+if test "x$ac_cv_header_gl_glu_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_GL_GLU_H 1 - _ACEOF - - fi -@@ -5146,43 +4605,39 @@ CFLAGS="$CFLAGS $CPPFLAGS $C_ONLY_FLAGS" - - - if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then -- echo "$as_me:$LINENO: checking for erl" >&5 --echo $ECHO_N "checking for erl... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for erl" >&5 -+$as_echo_n "checking for erl... " >&6; } - if test X$ERL != X; then -- echo "$as_me:$LINENO: result: yes; using $ERL" >&5 --echo "${ECHO_T}yes; using $ERL" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes; using $ERL" >&5 -+$as_echo "yes; using $ERL" >&6; } - else - type erl >/dev/null 2>&1 - if test $? -eq 0 ; then - ERL=erl -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - else -- { { echo "$as_me:$LINENO: error: Cannot find erl in path" >&5 --echo "$as_me: error: Cannot find erl in path" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "Cannot find erl in path" "$LINENO" 5 - fi - fi -- echo "$as_me:$LINENO: checking for erlc" >&5 --echo $ECHO_N "checking for erlc... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for erlc" >&5 -+$as_echo_n "checking for erlc... " >&6; } - if test X$ERLC != X; then -- echo "$as_me:$LINENO: result: yes; using $ERLC" >&5 --echo "${ECHO_T}yes; using $ERLC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes; using $ERLC" >&5 -+$as_echo "yes; using $ERLC" >&6; } - else - type erlc >/dev/null 2>&1 - if test $? -eq 0 ; then - ERLC=erlc -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - else -- { { echo "$as_me:$LINENO: error: Cannot find erlc in path" >&5 --echo "$as_me: error: Cannot find erlc in path" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "Cannot find erlc in path" "$LINENO" 5 - fi - fi - ERLANG_ROOT_DIR=`erl -noshell -eval 'io:format("~s~n",[code:root_dir()])' -s erlang halt` -- { echo "$as_me:$LINENO: ERL ROOT DIR: $ERLANG_ROOT_DIR" >&5 --echo "$as_me: ERL ROOT DIR: $ERLANG_ROOT_DIR" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: ERL ROOT DIR: $ERLANG_ROOT_DIR" >&5 -+$as_echo "$as_me: ERL ROOT DIR: $ERLANG_ROOT_DIR" >&6;} - ERLWX_VSN=`grep WX_VSN $srcdir/vsn.mk | sed 's/^.*= *//'` - else - ERLC=erlc -@@ -5272,41 +4727,41 @@ elif test X"$MIXED_CYGWIN_VC" = X"no" - - - - --# Check whether --with-wxdir or --without-wxdir was given. --if test "${with_wxdir+set}" = set; then -- withval="$with_wxdir" -- wx_config_name="$withval/wx-config" -+# Check whether --with-wxdir was given. -+if test "${with_wxdir+set}" = set; then : -+ withval=$with_wxdir; wx_config_name="$withval/wx-config" - wx_config_args="--inplace" --fi; -+fi - --# Check whether --with-wx-config or --without-wx-config was given. --if test "${with_wx_config+set}" = set; then -- withval="$with_wx_config" -- wx_config_name="$withval" --fi; - --# Check whether --with-wx-prefix or --without-wx-prefix was given. --if test "${with_wx_prefix+set}" = set; then -- withval="$with_wx_prefix" -- wx_config_prefix="$withval" -+# Check whether --with-wx-config was given. -+if test "${with_wx_config+set}" = set; then : -+ withval=$with_wx_config; wx_config_name="$withval" -+fi -+ -+ -+# Check whether --with-wx-prefix was given. -+if test "${with_wx_prefix+set}" = set; then : -+ withval=$with_wx_prefix; wx_config_prefix="$withval" - else - wx_config_prefix="" --fi; -+fi - --# Check whether --with-wx-exec-prefix or --without-wx-exec-prefix was given. --if test "${with_wx_exec_prefix+set}" = set; then -- withval="$with_wx_exec_prefix" -- wx_config_exec_prefix="$withval" -+ -+# Check whether --with-wx-exec-prefix was given. -+if test "${with_wx_exec_prefix+set}" = set; then : -+ withval=$with_wx_exec_prefix; wx_config_exec_prefix="$withval" - else - wx_config_exec_prefix="" --fi; -+fi -+ - - reqwx=2.8.4 - # Try to find debug libs first - # wxelibs=core,base,gl,aui,adv - -- echo "$as_me:$LINENO: checking for debug build of wxWidgets" >&5 --echo $ECHO_N "checking for debug build of wxWidgets... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for debug build of wxWidgets" >&5 -+$as_echo_n "checking for debug build of wxWidgets... " >&6; } - - - -@@ -5331,18 +4786,18 @@ echo $ECHO_N "checking for debug build o - fi - - if test -x "$WX_CONFIG_NAME" ; then -- echo "$as_me:$LINENO: checking for wx-config" >&5 --echo $ECHO_N "checking for wx-config... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wx-config" >&5 -+$as_echo_n "checking for wx-config... " >&6; } - WX_CONFIG_PATH="$WX_CONFIG_NAME" -- echo "$as_me:$LINENO: result: $WX_CONFIG_PATH" >&5 --echo "${ECHO_T}$WX_CONFIG_PATH" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WX_CONFIG_PATH" >&5 -+$as_echo "$WX_CONFIG_PATH" >&6; } - else - # Extract the first word of "$WX_CONFIG_NAME", so it can be a program name with args. - set dummy $WX_CONFIG_NAME; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_path_WX_CONFIG_PATH+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_path_WX_CONFIG_PATH+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - case $WX_CONFIG_PATH in - [\\/]* | ?:[\\/]*) -@@ -5355,29 +4810,30 @@ for as_dir in $as_dummy - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_WX_CONFIG_PATH="$as_dir/$ac_word$ac_exec_ext" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - test -z "$ac_cv_path_WX_CONFIG_PATH" && ac_cv_path_WX_CONFIG_PATH="no" - ;; - esac - fi - WX_CONFIG_PATH=$ac_cv_path_WX_CONFIG_PATH -- - if test -n "$WX_CONFIG_PATH"; then -- echo "$as_me:$LINENO: result: $WX_CONFIG_PATH" >&5 --echo "${ECHO_T}$WX_CONFIG_PATH" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WX_CONFIG_PATH" >&5 -+$as_echo "$WX_CONFIG_PATH" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - - if test "$WX_CONFIG_PATH" != "no" ; then -@@ -5385,11 +4841,11 @@ fi - - min_wx_version=$reqwx - if test -z "--unicode --debug=yes" ; then -- echo "$as_me:$LINENO: checking for wxWidgets version >= $min_wx_version" >&5 --echo $ECHO_N "checking for wxWidgets version >= $min_wx_version... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets version >= $min_wx_version" >&5 -+$as_echo_n "checking for wxWidgets version >= $min_wx_version... " >&6; } - else -- echo "$as_me:$LINENO: checking for wxWidgets version >= $min_wx_version (--unicode --debug=yes)" >&5 --echo $ECHO_N "checking for wxWidgets version >= $min_wx_version (--unicode --debug=yes)... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets version >= $min_wx_version (--unicode --debug=yes)" >&5 -+$as_echo_n "checking for wxWidgets version >= $min_wx_version (--unicode --debug=yes)... " >&6; } - fi - - WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args --unicode --debug=yes" -@@ -5431,19 +4887,19 @@ echo $ECHO_N "checking for wxWidgets ver - - - if test -n "$wx_ver_ok"; then -- echo "$as_me:$LINENO: result: yes (version $WX_VERSION)" >&5 --echo "${ECHO_T}yes (version $WX_VERSION)" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $WX_VERSION)" >&5 -+$as_echo "yes (version $WX_VERSION)" >&6; } - WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs stc,xrc,html,adv,xml,core,base,gl,aui` - -- echo "$as_me:$LINENO: checking for wxWidgets static library" >&5 --echo $ECHO_N "checking for wxWidgets static library... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets static library" >&5 -+$as_echo_n "checking for wxWidgets static library... " >&6; } - WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs stc,xrc,html,adv,xml,core,base,gl,aui 2>/dev/null` - if test "x$WX_LIBS_STATIC" = "x"; then -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - else -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - fi - - wx_has_cppflags="" -@@ -5500,11 +4956,11 @@ echo "${ECHO_T}yes" >&6 - else - - if test "x$WX_VERSION" = x; then -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - else -- echo "$as_me:$LINENO: result: no (version $WX_VERSION is not new enough)" >&5 --echo "${ECHO_T}no (version $WX_VERSION is not new enough)" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (version $WX_VERSION is not new enough)" >&5 -+$as_echo "no (version $WX_VERSION is not new enough)" >&6; } - fi - - WX_CFLAGS="" -@@ -5581,8 +5037,8 @@ echo "${ECHO_T}no (version $WX_VERSION i - - - -- echo "$as_me:$LINENO: checking for standard build of wxWidgets" >&5 --echo $ECHO_N "checking for standard build of wxWidgets... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for standard build of wxWidgets" >&5 -+$as_echo_n "checking for standard build of wxWidgets... " >&6; } - - - if test x${WX_CONFIG_NAME+set} != xset ; then -@@ -5606,18 +5062,18 @@ echo $ECHO_N "checking for standard buil - fi - - if test -x "$WX_CONFIG_NAME" ; then -- echo "$as_me:$LINENO: checking for wx-config" >&5 --echo $ECHO_N "checking for wx-config... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wx-config" >&5 -+$as_echo_n "checking for wx-config... " >&6; } - WX_CONFIG_PATH="$WX_CONFIG_NAME" -- echo "$as_me:$LINENO: result: $WX_CONFIG_PATH" >&5 --echo "${ECHO_T}$WX_CONFIG_PATH" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WX_CONFIG_PATH" >&5 -+$as_echo "$WX_CONFIG_PATH" >&6; } - else - # Extract the first word of "$WX_CONFIG_NAME", so it can be a program name with args. - set dummy $WX_CONFIG_NAME; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_path_WX_CONFIG_PATH+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_path_WX_CONFIG_PATH+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - case $WX_CONFIG_PATH in - [\\/]* | ?:[\\/]*) -@@ -5630,29 +5086,30 @@ for as_dir in $as_dummy - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_WX_CONFIG_PATH="$as_dir/$ac_word$ac_exec_ext" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - test -z "$ac_cv_path_WX_CONFIG_PATH" && ac_cv_path_WX_CONFIG_PATH="no" - ;; - esac - fi - WX_CONFIG_PATH=$ac_cv_path_WX_CONFIG_PATH -- - if test -n "$WX_CONFIG_PATH"; then -- echo "$as_me:$LINENO: result: $WX_CONFIG_PATH" >&5 --echo "${ECHO_T}$WX_CONFIG_PATH" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WX_CONFIG_PATH" >&5 -+$as_echo "$WX_CONFIG_PATH" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - - if test "$WX_CONFIG_PATH" != "no" ; then -@@ -5660,11 +5117,11 @@ fi - - min_wx_version=$reqwx - if test -z "--unicode --debug=no" ; then -- echo "$as_me:$LINENO: checking for wxWidgets version >= $min_wx_version" >&5 --echo $ECHO_N "checking for wxWidgets version >= $min_wx_version... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets version >= $min_wx_version" >&5 -+$as_echo_n "checking for wxWidgets version >= $min_wx_version... " >&6; } - else -- echo "$as_me:$LINENO: checking for wxWidgets version >= $min_wx_version (--unicode --debug=no)" >&5 --echo $ECHO_N "checking for wxWidgets version >= $min_wx_version (--unicode --debug=no)... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets version >= $min_wx_version (--unicode --debug=no)" >&5 -+$as_echo_n "checking for wxWidgets version >= $min_wx_version (--unicode --debug=no)... " >&6; } - fi - - WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args --unicode --debug=no" -@@ -5706,19 +5163,19 @@ echo $ECHO_N "checking for wxWidgets ver - - - if test -n "$wx_ver_ok"; then -- echo "$as_me:$LINENO: result: yes (version $WX_VERSION)" >&5 --echo "${ECHO_T}yes (version $WX_VERSION)" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $WX_VERSION)" >&5 -+$as_echo "yes (version $WX_VERSION)" >&6; } - WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs stc,xrc,html,adv,xml,core,base,gl,aui` - -- echo "$as_me:$LINENO: checking for wxWidgets static library" >&5 --echo $ECHO_N "checking for wxWidgets static library... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets static library" >&5 -+$as_echo_n "checking for wxWidgets static library... " >&6; } - WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs stc,xrc,html,adv,xml,core,base,gl,aui 2>/dev/null` - if test "x$WX_LIBS_STATIC" = "x"; then -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - else -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - fi - - wx_has_cppflags="" -@@ -5775,11 +5232,11 @@ echo "${ECHO_T}yes" >&6 - else - - if test "x$WX_VERSION" = x; then -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - else -- echo "$as_me:$LINENO: result: no (version $WX_VERSION is not new enough)" >&5 --echo "${ECHO_T}no (version $WX_VERSION is not new enough)" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (version $WX_VERSION is not new enough)" >&5 -+$as_echo "no (version $WX_VERSION is not new enough)" >&6; } - fi - - WX_CFLAGS="" -@@ -5878,27 +5335,18 @@ echo "${ECHO_T}no (version $WX_VERSION i - - if test "$wxWin" != 1; then - if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then -- { { echo "$as_me:$LINENO: error: -- wxWidgets must be installed on your system. -- -- Please check that wx-config is in path, the directory -- where wxWidgets libraries are installed (returned by -- 'wx-config --libs' or 'wx-config --static --libs' command) -- is in LD_LIBRARY_PATH or equivalent variable and -- wxWidgets version is $reqwx or above." >&5 --echo "$as_me: error: -+ as_fn_error $? " - wxWidgets must be installed on your system. - - Please check that wx-config is in path, the directory - where wxWidgets libraries are installed (returned by - 'wx-config --libs' or 'wx-config --static --libs' command) - is in LD_LIBRARY_PATH or equivalent variable and -- wxWidgets version is $reqwx or above." >&2;} -- { (exit 1); exit 1; }; } -+ wxWidgets version is $reqwx or above." "$LINENO" 5 - else - echo "wxWidgets not found, wx will NOT be usable" > ./CONF_INFO - WXERL_CAN_BUILD_DRIVER=false -- { echo "$as_me:$LINENO: WARNING: -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: - wxWidgets must be installed on your system. - - Please check that wx-config is in path, the directory -@@ -5906,7 +5354,7 @@ echo "$as_me: error: - 'wx-config --libs' or 'wx-config --static --libs' command) - is in LD_LIBRARY_PATH or equivalent variable and - wxWidgets version is $reqwx or above." >&5 --echo "$as_me: WARNING: -+$as_echo "$as_me: WARNING: - wxWidgets must be installed on your system. - - Please check that wx-config is in path, the directory -@@ -5917,12 +5365,12 @@ echo "$as_me: WARNING: - fi - fi - else -- echo "$as_me:$LINENO: checking for wxWidgets in standard locations" >&5 --echo $ECHO_N "checking for wxWidgets in standard locations... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets in standard locations" >&5 -+$as_echo_n "checking for wxWidgets in standard locations... " >&6; } - - # Check whether --with-wxdir was given. -- { echo "$as_me:$LINENO: OptionCheck: $with_wxdir $with_wx_prefix" >&5 --echo "$as_me: OptionCheck: $with_wxdir $with_wx_prefix" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: OptionCheck: $with_wxdir $with_wx_prefix" >&5 -+$as_echo "$as_me: OptionCheck: $with_wxdir $with_wx_prefix" >&6;} - - if test "${with_wxdir+set}" = set; then : - withval=$with_wxdir; CWXWIN0=$withval -@@ -5976,8 +5424,8 @@ echo "$as_me: OptionCheck: $with_wxdir $ - CWXPATH="$CWXWIN0 $CWXWIN1 $CWXWIN2 $CWX_DOCUMENTED $CWXWIN3 $CWXWIN4" - - for dir in $CWXPATH; do -- { echo "$as_me:$LINENO: Checking: $dir" >&5 --echo "$as_me: Checking: $dir" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: Checking: $dir" >&5 -+$as_echo "$as_me: Checking: $dir" >&6;} - if test -f $dir/include/wx/wx.h; then - WXINCLUDE_MSVC=$dir/include/msvc - WXINCLUDE_PLAIN=$dir/include -@@ -6007,25 +5455,23 @@ echo "$as_me: Checking: $dir" >&6;} - for lib in $WX_LIBS0 $WX_LIBS1 $WX_LIBS2 $WX_LIBS3 $WX_SYSLIBS; do - WX_LIBS_STATIC="$WX_LIBS_STATIC -l$lib" - done -- echo "$as_me:$LINENO: result: $dir" >&5 --echo "${ECHO_T}$dir" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dir" >&5 -+$as_echo "$dir" >&6; } - break - fi - fi - done - - if test -z "$WX_LIBS_STATIC"; then -- echo "$as_me:$LINENO: result: failed" >&5 --echo "${ECHO_T}failed" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 -+$as_echo "failed" >&6; } - if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then -- { { echo "$as_me:$LINENO: error: Cannot find core lib version for wxWidgets" >&5 --echo "$as_me: error: Cannot find core lib version for wxWidgets" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "Cannot find core lib version for wxWidgets" "$LINENO" 5 - else - echo "No usable wxWidgets not found, wx will not be useable" > ./CONF_INFO - WXERL_CAN_BUILD_DRIVER=false -- { echo "$as_me:$LINENO: WARNING: Cannot find core lib version for wxWidgets" >&5 --echo "$as_me: WARNING: Cannot find core lib version for wxWidgets" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find core lib version for wxWidgets" >&5 -+$as_echo "$as_me: WARNING: Cannot find core lib version for wxWidgets" >&2;} - fi - fi - WX_HAVE_STATIC_LIBS=true -@@ -6040,9 +5486,9 @@ if test "$WXERL_CAN_BUILD_DRIVER" != "fa - - - --echo "$as_me:$LINENO: checking if wxwidgets have opengl support" >&5 --echo $ECHO_N "checking if wxwidgets have opengl support... $ECHO_C" >&6 --ac_ext=cc -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if wxwidgets have opengl support" >&5 -+$as_echo_n "checking if wxwidgets have opengl support... " >&6; } -+ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -6052,11 +5498,7 @@ saved_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS" - - --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #ifdef WIN32 -@@ -6078,41 +5520,15 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_cxx_try_compile "$LINENO"; then : - HAVE_GL_SUPPORT=yes - --cat >>confdefs.h <<\_ACEOF --#define HAVE_GL_SUPPORT 1 --_ACEOF -+$as_echo "#define HAVE_GL_SUPPORT 1" >>confdefs.h - - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --HAVE_GL_SUPPORT=no -+ HAVE_GL_SUPPORT=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - CXXFLAGS=$saved_CXXFLAGS - ac_ext=c -@@ -6121,8 +5537,8 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - --echo "$as_me:$LINENO: result: $HAVE_GL_SUPPORT" >&5 --echo "${ECHO_T}$HAVE_GL_SUPPORT" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_GL_SUPPORT" >&5 -+$as_echo "$HAVE_GL_SUPPORT" >&6; } - - - if test X"$HAVE_GL_SUPPORT" != X"yes" ; then -@@ -6131,18 +5547,7 @@ if test X"$HAVE_GL_SUPPORT" != X"yes" ; - fi - - --echo "$as_me:$LINENO: checking for GLintptr" >&5 --echo $ECHO_N "checking for GLintptr... $ECHO_C" >&6 --if test "${ac_cv_type_GLintptr+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef WIN32 -+ac_fn_c_check_type "$LINENO" "GLintptr" "ac_cv_type_GLintptr" "#ifdef WIN32 - # include - # include - #elif defined(HAVE_GL_GL_H) -@@ -6151,52 +5556,8 @@ cat >>conftest.$ac_ext <<_ACEOF - # include - #endif - -- --int --main () --{ --if ((GLintptr *) 0) -- return 0; --if (sizeof (GLintptr)) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_GLintptr=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_GLintptr=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_type_GLintptr" >&5 --echo "${ECHO_T}$ac_cv_type_GLintptr" >&6 --if test $ac_cv_type_GLintptr = yes; then -+" -+if test "x$ac_cv_type_GLintptr" = xyes; then : - - cat >>confdefs.h <<_ACEOF - #define HAVE_GLINTPTR 1 -@@ -6204,18 +5565,7 @@ _ACEOF - - - fi --echo "$as_me:$LINENO: checking for GLintptrARB" >&5 --echo $ECHO_N "checking for GLintptrARB... $ECHO_C" >&6 --if test "${ac_cv_type_GLintptrARB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef WIN32 -+ac_fn_c_check_type "$LINENO" "GLintptrARB" "ac_cv_type_GLintptrARB" "#ifdef WIN32 - # include - # include - #elif defined(HAVE_GL_GL_H) -@@ -6224,52 +5574,8 @@ cat >>conftest.$ac_ext <<_ACEOF - # include - #endif - -- --int --main () --{ --if ((GLintptrARB *) 0) -- return 0; --if (sizeof (GLintptrARB)) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_GLintptrARB=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_GLintptrARB=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_type_GLintptrARB" >&5 --echo "${ECHO_T}$ac_cv_type_GLintptrARB" >&6 --if test $ac_cv_type_GLintptrARB = yes; then -+" -+if test "x$ac_cv_type_GLintptrARB" = xyes; then : - - cat >>confdefs.h <<_ACEOF - #define HAVE_GLINTPTRARB 1 -@@ -6277,18 +5583,7 @@ _ACEOF - - - fi --echo "$as_me:$LINENO: checking for GLchar" >&5 --echo $ECHO_N "checking for GLchar... $ECHO_C" >&6 --if test "${ac_cv_type_GLchar+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef WIN32 -+ac_fn_c_check_type "$LINENO" "GLchar" "ac_cv_type_GLchar" "#ifdef WIN32 - # include - # include - #elif defined(HAVE_GL_GL_H) -@@ -6297,52 +5592,8 @@ cat >>conftest.$ac_ext <<_ACEOF - # include - #endif - -- --int --main () --{ --if ((GLchar *) 0) -- return 0; --if (sizeof (GLchar)) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_GLchar=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_GLchar=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_type_GLchar" >&5 --echo "${ECHO_T}$ac_cv_type_GLchar" >&6 --if test $ac_cv_type_GLchar = yes; then -+" -+if test "x$ac_cv_type_GLchar" = xyes; then : - - cat >>confdefs.h <<_ACEOF - #define HAVE_GLCHAR 1 -@@ -6350,18 +5601,7 @@ _ACEOF - - - fi --echo "$as_me:$LINENO: checking for GLcharARB" >&5 --echo $ECHO_N "checking for GLcharARB... $ECHO_C" >&6 --if test "${ac_cv_type_GLcharARB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef WIN32 -+ac_fn_c_check_type "$LINENO" "GLcharARB" "ac_cv_type_GLcharARB" "#ifdef WIN32 - # include - # include - #elif defined(HAVE_GL_GL_H) -@@ -6370,52 +5610,8 @@ cat >>conftest.$ac_ext <<_ACEOF - # include - #endif - -- --int --main () --{ --if ((GLcharARB *) 0) -- return 0; --if (sizeof (GLcharARB)) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_GLcharARB=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_GLcharARB=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_type_GLcharARB" >&5 --echo "${ECHO_T}$ac_cv_type_GLcharARB" >&6 --if test $ac_cv_type_GLcharARB = yes; then -+" -+if test "x$ac_cv_type_GLcharARB" = xyes; then : - - cat >>confdefs.h <<_ACEOF - #define HAVE_GLCHARARB 1 -@@ -6423,18 +5619,7 @@ _ACEOF - - - fi --echo "$as_me:$LINENO: checking for GLhalfARB" >&5 --echo $ECHO_N "checking for GLhalfARB... $ECHO_C" >&6 --if test "${ac_cv_type_GLhalfARB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef WIN32 -+ac_fn_c_check_type "$LINENO" "GLhalfARB" "ac_cv_type_GLhalfARB" "#ifdef WIN32 - # include - # include - #elif defined(HAVE_GL_GL_H) -@@ -6443,52 +5628,8 @@ cat >>conftest.$ac_ext <<_ACEOF - # include - #endif - -- --int --main () --{ --if ((GLhalfARB *) 0) -- return 0; --if (sizeof (GLhalfARB)) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_GLhalfARB=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_GLhalfARB=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_type_GLhalfARB" >&5 --echo "${ECHO_T}$ac_cv_type_GLhalfARB" >&6 --if test $ac_cv_type_GLhalfARB = yes; then -+" -+if test "x$ac_cv_type_GLhalfARB" = xyes; then : - - cat >>confdefs.h <<_ACEOF - #define HAVE_GLHALFARB 1 -@@ -6496,18 +5637,7 @@ _ACEOF - - - fi --echo "$as_me:$LINENO: checking for GLint64EXT" >&5 --echo $ECHO_N "checking for GLint64EXT... $ECHO_C" >&6 --if test "${ac_cv_type_GLint64EXT+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef WIN32 -+ac_fn_c_check_type "$LINENO" "GLint64EXT" "ac_cv_type_GLint64EXT" "#ifdef WIN32 - # include - # include - #elif defined(HAVE_GL_GL_H) -@@ -6516,52 +5646,8 @@ cat >>conftest.$ac_ext <<_ACEOF - # include - #endif - -- --int --main () --{ --if ((GLint64EXT *) 0) -- return 0; --if (sizeof (GLint64EXT)) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_GLint64EXT=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_GLint64EXT=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_type_GLint64EXT" >&5 --echo "${ECHO_T}$ac_cv_type_GLint64EXT" >&6 --if test $ac_cv_type_GLint64EXT = yes; then -+" -+if test "x$ac_cv_type_GLint64EXT" = xyes; then : - - cat >>confdefs.h <<_ACEOF - #define HAVE_GLINT64EXT 1 -@@ -6572,9 +5658,9 @@ fi - - - --echo "$as_me:$LINENO: checking GLU Callbacks uses Tiger Style" >&5 --echo $ECHO_N "checking GLU Callbacks uses Tiger Style... $ECHO_C" >&6 --ac_ext=cc -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking GLU Callbacks uses Tiger Style" >&5 -+$as_echo_n "checking GLU Callbacks uses Tiger Style... " >&6; } -+ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -6583,11 +5669,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - saved_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS" - --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #ifdef WIN32 -@@ -6614,111 +5696,37 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_cxx_try_compile "$LINENO"; then : - TESS_CB_TIGER_STYLE=yes - --cat >>confdefs.h <<\_ACEOF --#define TESS_CB_TIGER_STYLE 1 --_ACEOF -+$as_echo "#define TESS_CB_TIGER_STYLE 1" >>confdefs.h - - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --TESS_CB_TIGER_STYLE=no -+ TESS_CB_TIGER_STYLE=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $TESS_CB_TIGER_STYLE" >&5 --echo "${ECHO_T}$TESS_CB_TIGER_STYLE" >&6 -- -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TESS_CB_TIGER_STYLE" >&5 -+$as_echo "$TESS_CB_TIGER_STYLE" >&6; } - - - - for ac_header in wx/stc/stc.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef WIN32 -+do : -+ ac_fn_cxx_check_header_compile "$LINENO" "wx/stc/stc.h" "ac_cv_header_wx_stc_stc_h" "#ifdef WIN32 - # include - #endif -- #include "wx/wx.h" -- --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- eval "$as_ac_Header=yes" --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --eval "$as_ac_Header=no" --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ #include \"wx/wx.h\" -+" -+if test "x$ac_cv_header_wx_stc_stc_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_WX_STC_STC_H 1 - _ACEOF - - else - WXERL_CAN_BUILD_DRIVER=false - echo "wxWidgets don't have wxStyledTextControl (stc.h), wx will NOT be useable" > ./CONF_INFO -- { echo "$as_me:$LINENO: WARNING: Can not find wx/stc/stc.h $CXXFLAGS" >&5 --echo "$as_me: WARNING: Can not find wx/stc/stc.h $CXXFLAGS" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can not find wx/stc/stc.h $CXXFLAGS" >&5 -+$as_echo "$as_me: WARNING: Can not find wx/stc/stc.h $CXXFLAGS" >&2;} - - fi - -@@ -6726,19 +5734,15 @@ done - - - --echo "$as_me:$LINENO: checking if we can link wxwidgets programs" >&5 --echo $ECHO_N "checking if we can link wxwidgets programs... $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can link wxwidgets programs" >&5 -+$as_echo_n "checking if we can link wxwidgets programs... " >&6; } - saved_LIBS=$LIBS - - if test X"$WX_HAVE_STATIC_LIBS" = X"true" ; then - LIBS=$WX_LIBS_STATIC - fi - --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #ifdef WIN32 -@@ -6769,41 +5773,17 @@ cat >>conftest.$ac_ext <<_ACEOF - IMPLEMENT_APP(MyApp) - - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_cxx_try_link "$LINENO"; then : - - CAN_LINK_WX=yes - - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- - - CAN_LINK_WX=no - - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - - CXXFLAGS=$saved_CXXFLAGS - LIBS=$saved_LIBS -@@ -6813,14 +5793,14 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - --echo "$as_me:$LINENO: result: $CAN_LINK_WX" >&5 --echo "${ECHO_T}$CAN_LINK_WX" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CAN_LINK_WX" >&5 -+$as_echo "$CAN_LINK_WX" >&6; } - - if test X"$CAN_LINK_WX" != X"yes" ; then - echo "Can not link the wx driver, wx will NOT be useable" > ./CONF_INFO - WXERL_CAN_BUILD_DRIVER=false -- { echo "$as_me:$LINENO: WARNING: Can not link wx program are all developer packages installed?" >&5 --echo "$as_me: WARNING: Can not link wx program are all developer packages installed?" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can not link wx program are all developer packages installed?" >&5 -+$as_echo "$as_me: WARNING: Can not link wx program are all developer packages installed?" >&2;} - fi - - fi -@@ -6829,15 +5809,11 @@ fi - if test "x$GCC" = xyes; then - # Treat certain GCC warnings as errors - -- echo "$as_me:$LINENO: checking if we can add -Werror=return-type to CFLAGS (via CFLAGS)" >&5 --echo $ECHO_N "checking if we can add -Werror=return-type to CFLAGS (via CFLAGS)... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can add -Werror=return-type to CFLAGS (via CFLAGS)" >&5 -+$as_echo_n "checking if we can add -Werror=return-type to CFLAGS (via CFLAGS)... " >&6; } - saved_CFLAGS=$CFLAGS; - CFLAGS="-Werror=return-type $CFLAGS"; -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -6848,56 +5824,28 @@ return 0; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - can_enable_flag=true - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --can_enable_flag=false -+ can_enable_flag=false - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS=$saved_CFLAGS; - if test "X$can_enable_flag" = "Xtrue"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - CFLAGS="-Werror=return-type $CFLAGS" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -- echo "$as_me:$LINENO: checking if we can add -Werror=return-type to CXXFLAGS (via CFLAGS)" >&5 --echo $ECHO_N "checking if we can add -Werror=return-type to CXXFLAGS (via CFLAGS)... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can add -Werror=return-type to CXXFLAGS (via CFLAGS)" >&5 -+$as_echo_n "checking if we can add -Werror=return-type to CXXFLAGS (via CFLAGS)... " >&6; } - saved_CFLAGS=$CFLAGS; - CFLAGS="-Werror=return-type $CXXFLAGS"; -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -6908,54 +5856,29 @@ return 0; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - can_enable_flag=true - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --can_enable_flag=false -+ can_enable_flag=false - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS=$saved_CFLAGS; - if test "X$can_enable_flag" = "Xtrue"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - CXXFLAGS="-Werror=return-type $CXXFLAGS" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - - fi - - - --# Check whether --enable-sanitizers or --disable-sanitizers was given. --if test "${enable_sanitizers+set}" = set; then -- enableval="$enable_sanitizers" -- -+# Check whether --enable-sanitizers was given. -+if test "${enable_sanitizers+set}" = set; then : -+ enableval=$enable_sanitizers; - case "$enableval" in - no) sanitizers= ;; - yes) sanitizers="-fsanitize=address,undefined" ;; -@@ -6965,7 +5888,8 @@ CFLAGS="$CFLAGS $sanitizers" - CXXFLAGS="$CXXFLAGS $sanitizers" - LDFLAGS="$LDFLAGS $sanitizers" - --fi; -+fi -+ - - ############################################################################# - -@@ -6997,13 +5921,11 @@ CONFIG_STATUS=$WXERL_SYS_TYPE/config.sta - - if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then - if test X"$WXERL_CAN_BUILD_DRIVER" != X"true" ; then -- { { echo "$as_me:$LINENO: error: Cannot build wxErlang driver, see ./CONF_INFO for information" >&5 --echo "$as_me: error: Cannot build wxErlang driver, see ./CONF_INFO for information" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "Cannot build wxErlang driver, see ./CONF_INFO for information" "$LINENO" 5 - fi - fi - -- ac_config_files="$ac_config_files config.mk c_src/Makefile" -+ac_config_files="$ac_config_files config.mk c_src/Makefile" - - - cat >confcache <<\_ACEOF -@@ -7024,39 +5946,70 @@ _ACEOF - - # The following way of writing the cache mishandles newlines in values, - # but we know of no workaround that is simple, portable, and efficient. --# So, don't put newlines in cache variables' values. -+# So, we kill variables containing newlines. - # Ultrix sh set writes to stderr and can't be redirected directly, - # and sets the high bit in the cache file unless we assign to the vars. --{ -+( -+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -+ *) { eval $ac_var=; unset $ac_var;} ;; -+ esac ;; -+ esac -+ done -+ - (set) 2>&1 | -- case `(ac_space=' '; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -- # `set' does not quote correctly, so add quotes (double-quote -- # substitution turns \\\\ into \\, and sed turns \\ into \). -+ case $as_nl`(ac_space=' '; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) -+ # `set' does not quote correctly, so add quotes: double-quote -+ # substitution turns \\\\ into \\, and sed turns \\ into \. - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -- ;; -+ ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; -- esac; --} | -+ esac | -+ sort -+) | - sed ' -+ /^ac_cv_env_/b end - t clear -- : clear -+ :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end -- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -- : end' >>confcache --if diff $cache_file confcache >/dev/null 2>&1; then :; else -- if test -w $cache_file; then -- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" -- cat confcache >$cache_file -+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -+ :end' >>confcache -+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else -+ if test -w "$cache_file"; then -+ if test "x$cache_file" != "x/dev/null"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -+$as_echo "$as_me: updating cache $cache_file" >&6;} -+ if test ! -f "$cache_file" || test -h "$cache_file"; then -+ cat confcache >"$cache_file" -+ else -+ case $cache_file in #( -+ */* | ?:*) -+ mv -f confcache "$cache_file"$$ && -+ mv -f "$cache_file"$$ "$cache_file" ;; #( -+ *) -+ mv -f confcache "$cache_file" ;; -+ esac -+ fi -+ fi - else -- echo "not updating unwritable cache $cache_file" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi - fi - rm -f confcache -@@ -7065,63 +6018,55 @@ test "x$prefix" = xNONE && prefix=$ac_de - # Let make expand exec_prefix. - test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - --# VPATH may cause trouble with some makes, so we remove $(srcdir), --# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and --# trailing colons and then remove the whole line if VPATH becomes empty --# (actually we leave an empty line to preserve line numbers). --if test "x$srcdir" = x.; then -- ac_vpsub='/^[ ]*VPATH[ ]*=/{ --s/:*\$(srcdir):*/:/; --s/:*\${srcdir}:*/:/; --s/:*@srcdir@:*/:/; --s/^\([^=]*=[ ]*\):*/\1/; --s/:*$//; --s/^[^=]*=[ ]*$//; --}' --fi -- - # Transform confdefs.h into DEFS. - # Protect against shell expansion while executing Makefile rules. - # Protect against Makefile macro expansion. - # - # If the first sed substitution is executed (which looks for macros that --# take arguments), then we branch to the quote section. Otherwise, -+# take arguments), then branch to the quote section. Otherwise, - # look for a macro that doesn't take arguments. --cat >confdef2opt.sed <<\_ACEOF -+ac_script=' -+:mline -+/\\$/{ -+ N -+ s,\\\n,, -+ b mline -+} - t clear --: clear --s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g -+:clear -+s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g - t quote --s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g -+s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g - t quote --d --: quote --s,[ `~#$^&*(){}\\|;'"<>?],\\&,g --s,\[,\\&,g --s,\],\\&,g --s,\$,$$,g --p --_ACEOF --# We use echo to avoid assuming a particular line-breaking character. --# The extra dot is to prevent the shell from consuming trailing --# line-breaks from the sub-command output. A line-break within --# single-quotes doesn't work because, if this script is created in a --# platform that uses two characters for line-breaks (e.g., DOS), tr --# would break. --ac_LF_and_DOT=`echo; echo .` --DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` --rm -f confdef2opt.sed -+b any -+:quote -+s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g -+s/\[/\\&/g -+s/\]/\\&/g -+s/\$/$$/g -+H -+:any -+${ -+ g -+ s/^\n// -+ s/\n/ /g -+ p -+} -+' -+DEFS=`sed -n "$ac_script" confdefs.h` - - - ac_libobjs= - ac_ltlibobjs= -+U= - for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. -- ac_i=`echo "$ac_i" | -- sed 's/\$U\././;s/\.o$//;s/\.obj$//'` -- # 2. Add them. -- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" -- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' -+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' -+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"` -+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR -+ # will be set to the directory where LIBOBJS objects are built. -+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" -+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' - done - LIBOBJS=$ac_libobjs - -@@ -7129,12 +6074,14 @@ LTLIBOBJS=$ac_ltlibobjs - - - --: ${CONFIG_STATUS=./config.status} -+: "${CONFIG_STATUS=./config.status}" -+ac_write_fail=0 - ac_clean_files_save=$ac_clean_files - ac_clean_files="$ac_clean_files $CONFIG_STATUS" --{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 --echo "$as_me: creating $CONFIG_STATUS" >&6;} --cat >$CONFIG_STATUS <<_ACEOF -+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -+as_write_fail=0 -+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 - #! $SHELL - # Generated by $as_me. - # Run this file to recreate the current configuration. -@@ -7144,81 +6091,253 @@ cat >$CONFIG_STATUS <<_ACEOF - debug=false - ac_cs_recheck=false - ac_cs_silent=false --SHELL=\${CONFIG_SHELL-$SHELL} --_ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF --## --------------------- ## --## M4sh Initialization. ## --## --------------------- ## -+SHELL=\${CONFIG_SHELL-$SHELL} -+export SHELL -+_ASEOF -+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 -+## -------------------- ## -+## M4sh Initialization. ## -+## -------------------- ## - --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac - fi --DUALCASE=1; export DUALCASE # for MKS sh - --# Support unset when possible. --if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -- as_unset=unset -+ -+as_nl=' -+' -+export as_nl -+# Printing a long string crashes Solaris 7 /usr/bin/printf. -+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -+# Prefer a ksh shell builtin over an external printf program on Solaris, -+# but without wasting forks for bash or zsh. -+if test -z "$BASH_VERSION$ZSH_VERSION" \ -+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='print -r --' -+ as_echo_n='print -rn --' -+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='printf %s\n' -+ as_echo_n='printf %s' - else -- as_unset=false -+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -+ as_echo_n='/usr/ucb/echo -n' -+ else -+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -+ as_echo_n_body='eval -+ arg=$1; -+ case $arg in #( -+ *"$as_nl"*) -+ expr "X$arg" : "X\\(.*\\)$as_nl"; -+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -+ esac; -+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -+ ' -+ export as_echo_n_body -+ as_echo_n='sh -c $as_echo_n_body as_echo' -+ fi -+ export as_echo_body -+ as_echo='sh -c $as_echo_body as_echo' -+fi -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } - fi - - --# Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+as_myself= -+case $0 in #(( -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ exit 1 -+fi -+ -+# Unset variables that we do not need and which cause bugs (e.g. in -+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -+# suppresses any "Segmentation fault" message there. '((' could -+# trigger a bug in pdksh 5.2.14. -+for as_var in BASH_ENV ENV MAIL MAILPATH -+do eval test x\${$as_var+set} = xset \ -+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -+done - PS1='$ ' - PS2='> ' - PS4='+ ' - - # NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -- LC_TELEPHONE LC_TIME --do -- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -- eval $as_var=C; export $as_var -- else -- $as_unset $as_var -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE -+ -+# CDPATH. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ -+ -+# as_fn_error STATUS ERROR [LINENO LOG_FD] -+# ---------------------------------------- -+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -+# script with STATUS, using 1 if that was 0. -+as_fn_error () -+{ -+ as_status=$1; test $as_status -eq 0 && as_status=1 -+ if test "$4"; then -+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 - fi --done -+ $as_echo "$as_me: error: $2" >&2 -+ as_fn_exit $as_status -+} # as_fn_error - --# Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -+ -+# as_fn_set_status STATUS -+# ----------------------- -+# Set $? to STATUS, without forking. -+as_fn_set_status () -+{ -+ return $1 -+} # as_fn_set_status -+ -+# as_fn_exit STATUS -+# ----------------- -+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -+as_fn_exit () -+{ -+ set +e -+ as_fn_set_status $1 -+ exit $1 -+} # as_fn_exit -+ -+# as_fn_unset VAR -+# --------------- -+# Portably unset VAR. -+as_fn_unset () -+{ -+ { eval $1=; unset $1;} -+} -+as_unset=as_fn_unset -+# as_fn_append VAR VALUE -+# ---------------------- -+# Append the text in VALUE to the end of the definition contained in VAR. Take -+# advantage of any shell optimizations that allow amortized linear growth over -+# repeated appends, instead of the typical quadratic growth present in naive -+# implementations. -+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : -+ eval 'as_fn_append () -+ { -+ eval $1+=\$2 -+ }' -+else -+ as_fn_append () -+ { -+ eval $1=\$$1\$2 -+ } -+fi # as_fn_append -+ -+# as_fn_arith ARG... -+# ------------------ -+# Perform arithmetic evaluation on the ARGs, and store the result in the -+# global $as_val. Take advantage of shells that can avoid forks. The arguments -+# must be portable across $(()) and expr. -+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : -+ eval 'as_fn_arith () -+ { -+ as_val=$(( $* )) -+ }' -+else -+ as_fn_arith () -+ { -+ as_val=`expr "$@" || test $? -eq 1` -+ } -+fi # as_fn_arith -+ -+ -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename - else - as_basename=false - fi - -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi - --# Name of the executable. --as_me=`$as_basename "$0" || -+as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || --echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -- /^X\/\(\/\/\)$/{ s//\1/; q; } -- /^X\/\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - --# PATH needs CR, and LINENO needs CR and PATH. - # Avoid depending upon Character Ranges. - as_cr_letters='abcdefghijklmnopqrstuvwxyz' - as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -@@ -7226,148 +6345,111 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE - as_cr_digits='0123456789' - as_cr_alnum=$as_cr_Letters$as_cr_digits - --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -- else -- PATH_SEPARATOR=: -- fi -- rm -f conf$$.sh --fi -- -- -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" || { -- # Find who we are. Look in the path if we contain no path at all -- # relative or not. -- case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -- -- ;; -- esac -- # We did not find ourselves, most probably we were run as `sh COMMAND' -- # in which case we are not to be found in the path. -- if test "x$as_myself" = x; then -- as_myself=$0 -- fi -- if test ! -f "$as_myself"; then -- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 --echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} -- { (exit 1); exit 1; }; } -- fi -- case $CONFIG_SHELL in -- '') -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for as_base in sh bash ksh sh5; do -- case $as_dir in -- /*) -- if ("$as_dir/$as_base" -c ' -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -- CONFIG_SHELL=$as_dir/$as_base -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" ${1+"$@"} -- fi;; -- esac -- done --done --;; -- esac -- -- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -- # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line before each line; the second 'sed' does the real -- # work. The second script uses 'N' to pair each line-number line -- # with the numbered line, and appends trailing '-' during -- # substitution so that $LINENO is not a special case at line end. -- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -- sed ' -- N -- s,$,-, -- : loop -- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -- t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -- ' >$as_me.lineno && -- chmod +x $as_me.lineno || -- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 --echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} -- { (exit 1); exit 1; }; } -- -- # Don't try to exec as it changes $[0], causing all sort of problems -- # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensible to this). -- . ./$as_me.lineno -- # Exit status is that of the last command. -- exit --} -- -- --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in #((((( -+-n*) -+ case `echo 'xy\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ xy) ECHO_C='\c';; -+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null -+ ECHO_T=' ';; -+ esac;; -+*) -+ ECHO_N='-n';; - esac - --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr -+rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file - else -- as_expr=false -+ rm -f conf$$.dir -+ mkdir conf$$.dir 2>/dev/null - fi -- --rm -f conf$$ conf$$.exe conf$$.file --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -- as_ln_s='cp -p' -- else -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -pR'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -pR' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else -+ as_ln_s='cp -pR' - fi --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln - else -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - fi --rm -f conf$$ conf$$.exe conf$$.file -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null -+ -+ -+# as_fn_mkdir_p -+# ------------- -+# Create "$as_dir" as a directory, including parents if necessary. -+as_fn_mkdir_p () -+{ - -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || eval $as_mkdir_p || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" -+ -+ -+} # as_fn_mkdir_p - if mkdir -p . 2>/dev/null; then -- as_mkdir_p=: -+ as_mkdir_p='mkdir -p "$as_dir"' - else - test -d ./-p && rmdir ./-p - as_mkdir_p=false - fi - --as_executable_p="test -f" -+ -+# as_fn_executable_p FILE -+# ----------------------- -+# Test if FILE is an executable regular file. -+as_fn_executable_p () -+{ -+ test -f "$1" && test -x "$1" -+} # as_fn_executable_p -+as_test_x='test -x' -+as_executable_p=as_fn_executable_p - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -7376,31 +6458,20 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P - as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH -- - exec 6>&1 -+## ----------------------------------- ## -+## Main body of $CONFIG_STATUS script. ## -+## ----------------------------------- ## -+_ASEOF -+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 - --# Open the log real soon, to keep \$[0] and so on meaningful, and to -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# Save the log message, to keep $0 and so on meaningful, and to - # report actual input values of CONFIG_FILES etc. instead of their --# values after options handling. Logging --version etc. is OK. --exec 5>>config.log --{ -- echo -- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX --## Running $as_me. ## --_ASBOX --} >&5 --cat >&5 <<_CSEOF -- -+# values after options handling. -+ac_log=" - This file was extended by $as_me, which was --generated by GNU Autoconf 2.59. Invocation command line was -+generated by GNU Autoconf 2.69. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -7408,124 +6479,116 @@ generated by GNU Autoconf 2.59. Invocat - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - --_CSEOF --echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 --echo >&5 -+on `(hostname || uname -n) 2>/dev/null | sed 1q` -+" -+ - _ACEOF - --# Files that config.status was made for. --if test -n "$ac_config_files"; then -- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS --fi -+case $ac_config_files in *" -+"*) set x $ac_config_files; shift; ac_config_files=$*;; -+esac - --if test -n "$ac_config_headers"; then -- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS --fi - --if test -n "$ac_config_links"; then -- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS --fi - --if test -n "$ac_config_commands"; then -- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS --fi -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+# Files that config.status was made for. -+config_files="$ac_config_files" - --cat >>$CONFIG_STATUS <<\_ACEOF -+_ACEOF - -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - ac_cs_usage="\ --\`$as_me' instantiates files from templates according to the --current configuration. -+\`$as_me' instantiates files and other configuration actions -+from templates according to the current configuration. Unless the files -+and actions are specified as TAGs, all are instantiated by default. - --Usage: $0 [OPTIONS] [FILE]... -+Usage: $0 [OPTION]... [TAG]... - - -h, --help print this help, then exit -- -V, --version print version number, then exit -- -q, --quiet do not print progress messages -+ -V, --version print version number and configuration settings, then exit -+ --config print configuration, then exit -+ -q, --quiet, --silent -+ do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions -- --file=FILE[:TEMPLATE] -- instantiate the configuration file FILE -+ --file=FILE[:TEMPLATE] -+ instantiate the configuration file FILE - - Configuration files: - $config_files - --Report bugs to ." --_ACEOF -+Report bugs to the package provider." - --cat >>$CONFIG_STATUS <<_ACEOF -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" - ac_cs_version="\\ - config.status --configured by $0, generated by GNU Autoconf 2.59, -- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -+configured by $0, generated by GNU Autoconf 2.69, -+ with options \\"\$ac_cs_config\\" - --Copyright (C) 2003 Free Software Foundation, Inc. -+Copyright (C) 2012 Free Software Foundation, Inc. - This config.status script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it." --srcdir=$srcdir -+ -+ac_pwd='$ac_pwd' -+srcdir='$srcdir' -+test -n "\$AWK" || AWK=awk - _ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF --# If no file are specified by the user, then we need to provide default --# value. By we need to know if files were specified by the user. -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# The default lists apply if the user does not specify any file. - ac_need_defaults=: - while test $# != 0 - do - case $1 in -- --*=*) -- ac_option=`expr "x$1" : 'x\([^=]*\)='` -- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` -+ --*=?*) -+ ac_option=`expr "X$1" : 'X\([^=]*\)='` -+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; -- -*) -+ --*=) -+ ac_option=`expr "X$1" : 'X\([^=]*\)='` -+ ac_optarg= -+ ac_shift=: -+ ;; -+ *) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; -- *) # This is not an option, so the user has probably given explicit -- # arguments. -- ac_option=$1 -- ac_need_defaults=false;; - esac - - case $ac_option in - # Handling of the options. --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; -- --version | --vers* | -V ) -- echo "$ac_cs_version"; exit 0 ;; -- --he | --h) -- # Conflict between --help and --header -- { { echo "$as_me:$LINENO: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; };; -- --help | --hel | -h ) -- echo "$ac_cs_usage"; exit 0 ;; -- --debug | --d* | -d ) -+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) -+ $as_echo "$ac_cs_version"; exit ;; -+ --config | --confi | --conf | --con | --co | --c ) -+ $as_echo "$ac_cs_config"; exit ;; -+ --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift -- CONFIG_FILES="$CONFIG_FILES $ac_optarg" -- ac_need_defaults=false;; -- --header | --heade | --head | --hea ) -- $ac_shift -- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" -+ case $ac_optarg in -+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ '') as_fn_error $? "missing file argument" ;; -+ esac -+ as_fn_append CONFIG_FILES " '$ac_optarg'" - ac_need_defaults=false;; -+ --he | --h | --help | --hel | -h ) -+ $as_echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. -- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; } ;; -+ -*) as_fn_error $? "unrecognized option: \`$1' -+Try \`$0 --help' for more information." ;; - -- *) ac_config_targets="$ac_config_targets $1" ;; -+ *) as_fn_append ac_config_targets " $1" -+ ac_need_defaults=false ;; - - esac - shift -@@ -7539,31 +6602,45 @@ if $ac_cs_silent; then - fi - - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - if \$ac_cs_recheck; then -- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 -- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ shift -+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 -+ CONFIG_SHELL='$SHELL' -+ export CONFIG_SHELL -+ exec "\$@" - fi - - _ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+exec 5>>config.log -+{ -+ echo -+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -+## Running $as_me. ## -+_ASBOX -+ $as_echo "$ac_log" -+} >&5 - -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+_ACEOF - -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - -- -- --cat >>$CONFIG_STATUS <<\_ACEOF -+# Handling of arguments. - for ac_config_target in $ac_config_targets - do -- case "$ac_config_target" in -- # Handling of arguments. -- "config.mk" ) CONFIG_FILES="$CONFIG_FILES config.mk" ;; -- "c_src/Makefile" ) CONFIG_FILES="$CONFIG_FILES c_src/Makefile" ;; -- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 --echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -- { (exit 1); exit 1; }; };; -+ case $ac_config_target in -+ "config.mk") CONFIG_FILES="$CONFIG_FILES config.mk" ;; -+ "c_src/Makefile") CONFIG_FILES="$CONFIG_FILES c_src/Makefile" ;; -+ -+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; - esac - done - -+ - # If the user did not use the arguments to specify the items to instantiate, - # then the envvar interface is used. Set only those that are not. - # We use the long form for the default assignment because of an extremely -@@ -7573,380 +6650,414 @@ if $ac_need_defaults; then - fi - - # Have a temporary directory for convenience. Make it in the build tree --# simply because there is no reason to put it here, and in addition, -+# simply because there is no reason against having it here, and in addition, - # creating and moving files from /tmp can sometimes cause problems. --# Create a temporary directory, and hook for its removal unless debugging. -+# Hook for its removal unless debugging. -+# Note that there is a small window in which the directory will not be cleaned: -+# after its creation but before its name has been assigned to `$tmp'. - $debug || - { -- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 -- trap '{ (exit 1); exit 1; }' 1 2 13 15 -+ tmp= ac_tmp= -+ trap 'exit_status=$? -+ : "${ac_tmp:=$tmp}" -+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status -+' 0 -+ trap 'as_fn_exit 1' 1 2 13 15 - } -- - # Create a (secure) tmp directory for tmp files. - - { -- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && -- test -n "$tmp" && test -d "$tmp" -+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && -+ test -d "$tmp" - } || - { -- tmp=./confstat$$-$RANDOM -- (umask 077 && mkdir $tmp) --} || -+ tmp=./conf$$-$RANDOM -+ (umask 077 && mkdir "$tmp") -+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 -+ac_tmp=$tmp -+ -+# Set up the scripts for CONFIG_FILES section. -+# No need to generate them if there are no CONFIG_FILES. -+# This happens for instance with `./config.status config.h'. -+if test -n "$CONFIG_FILES"; then -+ -+ -+ac_cr=`echo X | tr X '\015'` -+# On cygwin, bash can eat \r inside `` if the user requested igncr. -+# But we know of no other shell where ac_cr would be empty at this -+# point, so we can use a bashism as a fallback. -+if test "x$ac_cr" = x; then -+ eval ac_cr=\$\'\\r\' -+fi -+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` -+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then -+ ac_cs_awk_cr='\\r' -+else -+ ac_cs_awk_cr=$ac_cr -+fi -+ -+echo 'BEGIN {' >"$ac_tmp/subs1.awk" && -+_ACEOF -+ -+ - { -- echo "$me: cannot create a temporary directory in ." >&2 -- { (exit 1); exit 1; } -+ echo "cat >conf$$subs.awk <<_ACEOF" && -+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && -+ echo "_ACEOF" -+} >conf$$subs.sh || -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` -+ac_delim='%!_!# ' -+for ac_last_try in false false false false false :; do -+ . ./conf$$subs.sh || -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -+ -+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` -+ if test $ac_delim_n = $ac_delim_num; then -+ break -+ elif $ac_last_try; then -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -+ else -+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " -+ fi -+done -+rm -f conf$$subs.sh -+ -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && -+_ACEOF -+sed -n ' -+h -+s/^/S["/; s/!.*/"]=/ -+p -+g -+s/^[^!]*!// -+:repl -+t repl -+s/'"$ac_delim"'$// -+t delim -+:nl -+h -+s/\(.\{148\}\)..*/\1/ -+t more1 -+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ -+p -+n -+b repl -+:more1 -+s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -+p -+g -+s/.\{148\}// -+t nl -+:delim -+h -+s/\(.\{148\}\)..*/\1/ -+t more2 -+s/["\\]/\\&/g; s/^/"/; s/$/"/ -+p -+b -+:more2 -+s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -+p -+g -+s/.\{148\}// -+t delim -+' >$CONFIG_STATUS || ac_write_fail=1 -+rm -f conf$$subs.awk -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+_ACAWK -+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && -+ for (key in S) S_is_set[key] = 1 -+ FS = "" - -+} -+{ -+ line = $ 0 -+ nfields = split(line, field, "@") -+ substed = 0 -+ len = length(field[1]) -+ for (i = 2; i < nfields; i++) { -+ key = field[i] -+ keylen = length(key) -+ if (S_is_set[key]) { -+ value = S[key] -+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) -+ len += length(value) + length(field[++i]) -+ substed = 1 -+ } else -+ len += 1 + keylen -+ } -+ -+ print line -+} -+ -+_ACAWK -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then -+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" -+else -+ cat -+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ -+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 - _ACEOF - --cat >>$CONFIG_STATUS <<_ACEOF -+# VPATH may cause trouble with some makes, so we remove sole $(srcdir), -+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and -+# trailing colons and then remove the whole line if VPATH becomes empty -+# (actually we leave an empty line to preserve line numbers). -+if test "x$srcdir" = x.; then -+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ -+h -+s/// -+s/^/:/ -+s/[ ]*$/:/ -+s/:\$(srcdir):/:/g -+s/:\${srcdir}:/:/g -+s/:@srcdir@:/:/g -+s/^:*// -+s/:*$// -+x -+s/\(=[ ]*\).*/\1/ -+G -+s/\n// -+s/^[^=]*=[ ]*$// -+}' -+fi - --# --# CONFIG_FILES section. --# -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+fi # test -n "$CONFIG_FILES" - --# No need to generate the scripts if there are no CONFIG_FILES. --# This happens for instance when ./config.status config.h --if test -n "\$CONFIG_FILES"; then -- # Protect against being on the right side of a sed subst in config.status. -- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; -- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF --s,@SHELL@,$SHELL,;t t --s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t --s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t --s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t --s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t --s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t --s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t --s,@exec_prefix@,$exec_prefix,;t t --s,@prefix@,$prefix,;t t --s,@program_transform_name@,$program_transform_name,;t t --s,@bindir@,$bindir,;t t --s,@sbindir@,$sbindir,;t t --s,@libexecdir@,$libexecdir,;t t --s,@datadir@,$datadir,;t t --s,@sysconfdir@,$sysconfdir,;t t --s,@sharedstatedir@,$sharedstatedir,;t t --s,@localstatedir@,$localstatedir,;t t --s,@libdir@,$libdir,;t t --s,@includedir@,$includedir,;t t --s,@oldincludedir@,$oldincludedir,;t t --s,@infodir@,$infodir,;t t --s,@mandir@,$mandir,;t t --s,@build_alias@,$build_alias,;t t --s,@host_alias@,$host_alias,;t t --s,@target_alias@,$target_alias,;t t --s,@DEFS@,$DEFS,;t t --s,@ECHO_C@,$ECHO_C,;t t --s,@ECHO_N@,$ECHO_N,;t t --s,@ECHO_T@,$ECHO_T,;t t --s,@LIBS@,$LIBS,;t t --s,@build@,$build,;t t --s,@build_cpu@,$build_cpu,;t t --s,@build_vendor@,$build_vendor,;t t --s,@build_os@,$build_os,;t t --s,@host@,$host,;t t --s,@host_cpu@,$host_cpu,;t t --s,@host_vendor@,$host_vendor,;t t --s,@host_os@,$host_os,;t t --s,@TARGET@,$TARGET,;t t --s,@CC@,$CC,;t t --s,@CFLAGS@,$CFLAGS,;t t --s,@LDFLAGS@,$LDFLAGS,;t t --s,@CPPFLAGS@,$CPPFLAGS,;t t --s,@ac_ct_CC@,$ac_ct_CC,;t t --s,@EXEEXT@,$EXEEXT,;t t --s,@OBJEXT@,$OBJEXT,;t t --s,@CXX@,$CXX,;t t --s,@CXXFLAGS@,$CXXFLAGS,;t t --s,@ac_ct_CXX@,$ac_ct_CXX,;t t --s,@RANLIB@,$RANLIB,;t t --s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t --s,@CPP@,$CPP,;t t --s,@MIXED_CYGWIN_VC@,$MIXED_CYGWIN_VC,;t t --s,@MIXED_MSYS_VC@,$MIXED_MSYS_VC,;t t --s,@MIXED_VC@,$MIXED_VC,;t t --s,@MIXED_CYGWIN_MINGW@,$MIXED_CYGWIN_MINGW,;t t --s,@MIXED_CYGWIN@,$MIXED_CYGWIN,;t t --s,@MIXED_MSYS@,$MIXED_MSYS,;t t --s,@EGREP@,$EGREP,;t t --s,@OBJC_CC@,$OBJC_CC,;t t --s,@OBJC_CFLAGS@,$OBJC_CFLAGS,;t t --s,@GL_LIBS@,$GL_LIBS,;t t --s,@DEBUG_CFLAGS@,$DEBUG_CFLAGS,;t t --s,@DEBUG_CXXFLAGS@,$DEBUG_CXXFLAGS,;t t --s,@ERLC@,$ERLC,;t t --s,@WX_BUILDING_INSIDE_ERLSRC@,$WX_BUILDING_INSIDE_ERLSRC,;t t --s,@ERLANG_ROOT_DIR@,$ERLANG_ROOT_DIR,;t t --s,@WX_CONFIG_PATH@,$WX_CONFIG_PATH,;t t --s,@WX_CPPFLAGS@,$WX_CPPFLAGS,;t t --s,@WX_CFLAGS@,$WX_CFLAGS,;t t --s,@WX_CXXFLAGS@,$WX_CXXFLAGS,;t t --s,@WX_CFLAGS_ONLY@,$WX_CFLAGS_ONLY,;t t --s,@WX_CXXFLAGS_ONLY@,$WX_CXXFLAGS_ONLY,;t t --s,@WX_LIBS@,$WX_LIBS,;t t --s,@WX_LIBS_STATIC@,$WX_LIBS_STATIC,;t t --s,@WX_VERSION@,$WX_VERSION,;t t --s,@WX_RESCOMP@,$WX_RESCOMP,;t t --s,@WX_VERSION_MAJOR@,$WX_VERSION_MAJOR,;t t --s,@WX_VERSION_MINOR@,$WX_VERSION_MINOR,;t t --s,@WX_VERSION_MICRO@,$WX_VERSION_MICRO,;t t --s,@DEBUG_WX_CFLAGS@,$DEBUG_WX_CFLAGS,;t t --s,@DEBUG_WX_CXXFLAGS@,$DEBUG_WX_CXXFLAGS,;t t --s,@DEBUG_WX_LIBS@,$DEBUG_WX_LIBS,;t t --s,@DEBUG_WX_LIBS_STATIC@,$DEBUG_WX_LIBS_STATIC,;t t --s,@FORCED_DEBUG_BUILD@,$FORCED_DEBUG_BUILD,;t t --s,@WX_HAVE_STATIC_LIBS@,$WX_HAVE_STATIC_LIBS,;t t --s,@RC_FILE_TYPE@,$RC_FILE_TYPE,;t t --s,@HAVE_GL_SUPPORT@,$HAVE_GL_SUPPORT,;t t --s,@TESS_CB_TIGER_STYLE@,$TESS_CB_TIGER_STYLE,;t t --s,@WXERL_CAN_BUILD_DRIVER@,$WXERL_CAN_BUILD_DRIVER,;t t --s,@SO_EXT@,$SO_EXT,;t t --s,@RUN_ERL@,$RUN_ERL,;t t --s,@WXERL_SYS_TYPE@,$WXERL_SYS_TYPE,;t t --s,@LIBOBJS@,$LIBOBJS,;t t --s,@LTLIBOBJS@,$LTLIBOBJS,;t t --CEOF - --_ACEOF -+eval set X " :F $CONFIG_FILES " -+shift -+for ac_tag -+do -+ case $ac_tag in -+ :[FHLC]) ac_mode=$ac_tag; continue;; -+ esac -+ case $ac_mode$ac_tag in -+ :[FHL]*:*);; -+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; -+ :[FH]-) ac_tag=-:-;; -+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; -+ esac -+ ac_save_IFS=$IFS -+ IFS=: -+ set x $ac_tag -+ IFS=$ac_save_IFS -+ shift -+ ac_file=$1 -+ shift - -- cat >>$CONFIG_STATUS <<\_ACEOF -- # Split the substitutions into bite-sized pieces for seds with -- # small command number limits, like on Digital OSF/1 and HP-UX. -- ac_max_sed_lines=48 -- ac_sed_frag=1 # Number of current file. -- ac_beg=1 # First line for current file. -- ac_end=$ac_max_sed_lines # Line after last line for current file. -- ac_more_lines=: -- ac_sed_cmds= -- while $ac_more_lines; do -- if test $ac_beg -gt 1; then -- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- else -- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- fi -- if test ! -s $tmp/subs.frag; then -- ac_more_lines=false -- else -- # The purpose of the label and of the branching condition is to -- # speed up the sed processing (if there are no `@' at all, there -- # is no need to browse any of the substitutions). -- # These are the two extra sed commands mentioned above. -- (echo ':t -- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" -- else -- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" -- fi -- ac_sed_frag=`expr $ac_sed_frag + 1` -- ac_beg=$ac_end -- ac_end=`expr $ac_end + $ac_max_sed_lines` -+ case $ac_mode in -+ :L) ac_source=$1;; -+ :[FH]) -+ ac_file_inputs= -+ for ac_f -+ do -+ case $ac_f in -+ -) ac_f="$ac_tmp/stdin";; -+ *) # Look for the file first in the build tree, then in the source tree -+ # (if the path is not absolute). The absolute path cannot be DOS-style, -+ # because $ac_f cannot contain `:'. -+ test -f "$ac_f" || -+ case $ac_f in -+ [\\/$]*) false;; -+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; -+ esac || -+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; -+ esac -+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac -+ as_fn_append ac_file_inputs " '$ac_f'" -+ done -+ -+ # Let's still pretend it is `configure' which instantiates (i.e., don't -+ # use $as_me), people would be surprised to read: -+ # /* config.h. Generated by config.status. */ -+ configure_input='Generated from '` -+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' -+ `' by configure.' -+ if test x"$ac_file" != x-; then -+ configure_input="$ac_file. $configure_input" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -+$as_echo "$as_me: creating $ac_file" >&6;} - fi -- done -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds=cat -- fi --fi # test -n "$CONFIG_FILES" -+ # Neutralize special characters interpreted by sed in replacement strings. -+ case $configure_input in #( -+ *\&* | *\|* | *\\* ) -+ ac_sed_conf_input=`$as_echo "$configure_input" | -+ sed 's/[\\\\&|]/\\\\&/g'`;; #( -+ *) ac_sed_conf_input=$configure_input;; -+ esac - --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF --for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue -- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". -- case $ac_file in -- - | *:- | *:-:* ) # input from stdin -- cat >$tmp/stdin -- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- * ) ac_file_in=$ac_file.in ;; -+ case $ac_tag in -+ *:-:* | *:-) cat >"$ac_tmp/stdin" \ -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; -+ esac -+ ;; - esac - -- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. -- ac_dir=`(dirname "$ac_file") 2>/dev/null || -+ ac_dir=`$as_dirname -- "$ac_file" || - $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ -- X"$ac_file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$ac_file" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- { if $as_mkdir_p; then -- mkdir -p "$ac_dir" -- else -- as_dir="$ac_dir" -- as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- done -- test ! -n "$as_dirs" || mkdir $as_dirs -- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 --echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -- { (exit 1); exit 1; }; }; } -- -+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$ac_file" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ as_dir="$ac_dir"; as_fn_mkdir_p - ac_builddir=. - --if test "$ac_dir" != .; then -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix - - case $srcdir in -- .) # No --srcdir option. We are building in place. -+ .) # We are building in place. - ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; --esac -- --# Do not use `cd foo && pwd` to compute absolute paths, because --# the directories may not exist. --case `pwd` in --.) ac_abs_builddir="$ac_dir";; --*) -- case "$ac_dir" in -- .) ac_abs_builddir=`pwd`;; -- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -- *) ac_abs_builddir=`pwd`/"$ac_dir";; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_builddir=${ac_top_builddir}.;; --*) -- case ${ac_top_builddir}. in -- .) ac_abs_top_builddir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_srcdir=$ac_srcdir;; --*) -- case $ac_srcdir in -- .) ac_abs_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_srcdir=$ac_top_srcdir;; --*) -- case $ac_top_srcdir in -- .) ac_abs_top_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -- esac;; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; - esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - -+ case $ac_mode in -+ :F) -+ # -+ # CONFIG_FILE -+ # - -- if test x"$ac_file" != x-; then -- { echo "$as_me:$LINENO: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -- rm -f "$ac_file" -- fi -- # Let's still pretend it is `configure' which instantiates (i.e., don't -- # use $as_me), people would be surprised to read: -- # /* config.h. Generated by config.status. */ -- if test x"$ac_file" = x-; then -- configure_input= -- else -- configure_input="$ac_file. " -- fi -- configure_input=$configure_input"Generated from `echo $ac_file_in | -- sed 's,.*/,,'` by configure." -+_ACEOF - -- # First look for the input files in the build tree, otherwise in the -- # src tree. -- ac_file_inputs=`IFS=: -- for f in $ac_file_in; do -- case $f in -- -) echo $tmp/stdin ;; -- [\\/$]*) -- # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- echo "$f";; -- *) # Relative -- if test -f "$f"; then -- # Build tree -- echo "$f" -- elif test -f "$srcdir/$f"; then -- # Source tree -- echo "$srcdir/$f" -- else -- # /dev/null tree -- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- fi;; -- esac -- done` || { (exit 1); exit 1; } -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# If the template does not know about datarootdir, expand it. -+# FIXME: This hack should be removed a few years after 2.60. -+ac_datarootdir_hack=; ac_datarootdir_seen= -+ac_sed_dataroot=' -+/datarootdir/ { -+ p -+ q -+} -+/@datadir@/p -+/@docdir@/p -+/@infodir@/p -+/@localedir@/p -+/@mandir@/p' -+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in -+*datarootdir*) ac_datarootdir_seen=yes;; -+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -- sed "$ac_vpsub -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ ac_datarootdir_hack=' -+ s&@datadir@&$datadir&g -+ s&@docdir@&$docdir&g -+ s&@infodir@&$infodir&g -+ s&@localedir@&$localedir&g -+ s&@mandir@&$mandir&g -+ s&\\\${datarootdir}&$datarootdir&g' ;; -+esac -+_ACEOF -+ -+# Neutralize VPATH when `$srcdir' = `.'. -+# Shell code in configure.ac might set extrasub. -+# FIXME: do we really want to maintain this feature? -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ac_sed_extra="$ac_vpsub - $extrasub - _ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - :t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b --s,@configure_input@,$configure_input,;t t --s,@srcdir@,$ac_srcdir,;t t --s,@abs_srcdir@,$ac_abs_srcdir,;t t --s,@top_srcdir@,$ac_top_srcdir,;t t --s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t --s,@builddir@,$ac_builddir,;t t --s,@abs_builddir@,$ac_abs_builddir,;t t --s,@top_builddir@,$ac_top_builddir,;t t --s,@abs_top_builddir@,$ac_abs_top_builddir,;t t --" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out -- rm -f $tmp/stdin -- if test x"$ac_file" != x-; then -- mv $tmp/out $ac_file -- else -- cat $tmp/out -- rm -f $tmp/out -- fi -+s|@configure_input@|$ac_sed_conf_input|;t t -+s&@top_builddir@&$ac_top_builddir_sub&;t t -+s&@top_build_prefix@&$ac_top_build_prefix&;t t -+s&@srcdir@&$ac_srcdir&;t t -+s&@abs_srcdir@&$ac_abs_srcdir&;t t -+s&@top_srcdir@&$ac_top_srcdir&;t t -+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -+s&@builddir@&$ac_builddir&;t t -+s&@abs_builddir@&$ac_abs_builddir&;t t -+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -+$ac_datarootdir_hack -+" -+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ -+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - --done --_ACEOF -+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && -+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && -+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ -+ "$ac_tmp/out"`; test -z "$ac_out"; } && -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined" >&5 -+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined" >&2;} - --cat >>$CONFIG_STATUS <<\_ACEOF -+ rm -f "$ac_tmp/stdin" -+ case $ac_file in -+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; -+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; -+ esac \ -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 -+ ;; - --{ (exit 0); exit 0; } -+ -+ -+ esac -+ -+done # for ac_tag -+ -+ -+as_fn_exit 0 - _ACEOF --chmod +x $CONFIG_STATUS - ac_clean_files=$ac_clean_files_save - -+test $ac_write_fail = 0 || -+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 -+ - - # configure is writing to config.log, and then calls config.status. - # config.status does its own redirection, appending to config.log. -@@ -7966,23 +7077,27 @@ if test "$no_create" != yes; then - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. -- $ac_cs_success || { (exit 1); exit 1; } -+ $ac_cs_success || as_fn_exit 1 -+fi -+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} - fi - - - if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then -- { echo "$as_me:$LINENO: " >&5 --echo "$as_me: " >&6;} -- { echo "$as_me:$LINENO: --------------------------------------------------" >&5 --echo "$as_me: --------------------------------------------------" >&6;} -- { echo "$as_me:$LINENO: Using erlang compiler: $ERLC" >&5 --echo "$as_me: Using erlang compiler: $ERLC" >&6;} -- { echo "$as_me:$LINENO: wxErlang Install in: $ERLANG_ROOT_DIR/lib/wx-$ERLWX_VSN" >&5 --echo "$as_me: wxErlang Install in: $ERLANG_ROOT_DIR/lib/wx-$ERLWX_VSN" >&6;} -- { echo "$as_me:$LINENO: Erlang driver in priv/$WXERL_SYS_TYPE/wxe_driver$SO_EXT" >&5 --echo "$as_me: Erlang driver in priv/$WXERL_SYS_TYPE/wxe_driver$SO_EXT" >&6;} -- { echo "$as_me:$LINENO: --------------------------------------------------" >&5 --echo "$as_me: --------------------------------------------------" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 -+$as_echo "$as_me: " >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: --------------------------------------------------" >&5 -+$as_echo "$as_me: --------------------------------------------------" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: Using erlang compiler: $ERLC" >&5 -+$as_echo "$as_me: Using erlang compiler: $ERLC" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: wxErlang Install in: $ERLANG_ROOT_DIR/lib/wx-$ERLWX_VSN" >&5 -+$as_echo "$as_me: wxErlang Install in: $ERLANG_ROOT_DIR/lib/wx-$ERLWX_VSN" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: Erlang driver in priv/$WXERL_SYS_TYPE/wxe_driver$SO_EXT" >&5 -+$as_echo "$as_me: Erlang driver in priv/$WXERL_SYS_TYPE/wxe_driver$SO_EXT" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: --------------------------------------------------" >&5 -+$as_echo "$as_me: --------------------------------------------------" >&6;} - fi - - if test X"$WX_BUILDING_INSIDE_ERLSRC" = X"true" ; then diff --git a/lang/erlang-wx/pkg-plist b/lang/erlang-wx/pkg-plist index 4258c848860..ce9e13947cc 100644 --- a/lang/erlang-wx/pkg-plist +++ b/lang/erlang-wx/pkg-plist @@ -1,482 +1,661 @@ -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/gl.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/glu.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wx.app -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wx.appup -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wx.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxAcceleratorEntry.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxAcceleratorTable.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxActivateEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxArtProvider.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxAuiDockArt.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxAuiManager.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxAuiManagerEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxAuiNotebook.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxAuiNotebookEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxAuiPaneInfo.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxAuiSimpleTabArt.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxAuiTabArt.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxBitmap.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxBitmapButton.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxBitmapDataObject.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxBoxSizer.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxBrush.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxBufferedDC.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxBufferedPaintDC.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxButton.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxCalendarCtrl.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxCalendarDateAttr.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxCalendarEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxCaret.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxCheckBox.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxCheckListBox.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxChildFocusEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxChoice.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxChoicebook.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxClientDC.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxClipboard.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxClipboardTextEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxCloseEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxColourData.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxColourDialog.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxColourPickerCtrl.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxColourPickerEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxComboBox.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxCommandEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxContextMenuEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxControl.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxControlWithItems.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxCursor.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxDC.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxDCOverlay.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxDataObject.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxDateEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxDatePickerCtrl.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxDialog.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxDirDialog.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxDirPickerCtrl.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxDisplayChangedEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxDropFilesEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxEraseEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxEvtHandler.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxFileDataObject.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxFileDialog.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxFileDirPickerEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxFilePickerCtrl.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxFindReplaceData.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxFindReplaceDialog.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxFlexGridSizer.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxFocusEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxFont.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxFontData.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxFontDialog.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxFontPickerCtrl.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxFontPickerEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxFrame.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxGBSizerItem.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxGLCanvas.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxGauge.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxGenericDirCtrl.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxGraphicsBrush.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxGraphicsContext.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxGraphicsFont.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxGraphicsMatrix.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxGraphicsObject.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxGraphicsPath.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxGraphicsPen.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxGraphicsRenderer.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxGrid.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxGridBagSizer.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxGridCellAttr.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxGridCellBoolEditor.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxGridCellBoolRenderer.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxGridCellChoiceEditor.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxGridCellEditor.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxGridCellFloatEditor.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxGridCellFloatRenderer.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxGridCellNumberEditor.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxGridCellNumberRenderer.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxGridCellRenderer.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxGridCellStringRenderer.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxGridCellTextEditor.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxGridEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxGridSizer.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxHelpEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxHtmlEasyPrinting.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxHtmlLinkEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxHtmlWindow.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxIcon.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxIconBundle.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxIconizeEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxIdleEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxImage.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxImageList.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxInitDialogEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxJoystickEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxKeyEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxLayoutAlgorithm.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxListBox.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxListCtrl.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxListEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxListItem.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxListItemAttr.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxListView.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxListbook.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxLocale.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxLogNull.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxMDIChildFrame.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxMDIClientWindow.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxMDIParentFrame.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxMask.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxMaximizeEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxMemoryDC.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxMenu.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxMenuBar.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxMenuEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxMenuItem.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxMessageDialog.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxMiniFrame.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxMirrorDC.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxMouseCaptureChangedEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxMouseCaptureLostEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxMouseEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxMoveEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxMultiChoiceDialog.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxNavigationKeyEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxNotebook.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxNotebookEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxNotifyEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxOverlay.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxPageSetupDialog.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxPageSetupDialogData.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxPaintDC.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxPaintEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxPalette.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxPaletteChangedEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxPanel.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxPasswordEntryDialog.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxPen.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxPickerBase.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxPopupTransientWindow.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxPopupWindow.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxPostScriptDC.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxPreviewCanvas.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxPreviewControlBar.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxPreviewFrame.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxPrintData.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxPrintDialog.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxPrintDialogData.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxPrintPreview.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxPrinter.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxPrintout.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxProgressDialog.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxQueryNewPaletteEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxRadioBox.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxRadioButton.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxRegion.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxSashEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxSashLayoutWindow.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxSashWindow.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxScreenDC.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxScrollBar.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxScrollEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxScrollWinEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxScrolledWindow.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxSetCursorEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxShowEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxSingleChoiceDialog.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxSizeEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxSizer.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxSizerFlags.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxSizerItem.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxSlider.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxSpinButton.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxSpinCtrl.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxSpinEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxSplashScreen.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxSplitterEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxSplitterWindow.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxStaticBitmap.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxStaticBox.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxStaticBoxSizer.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxStaticLine.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxStaticText.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxStatusBar.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxStdDialogButtonSizer.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxStyledTextCtrl.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxStyledTextEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxSysColourChangedEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxSystemOptions.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxSystemSettings.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxTaskBarIcon.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxTaskBarIconEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxTextAttr.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxTextCtrl.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxTextDataObject.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxTextEntryDialog.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxToggleButton.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxToolBar.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxToolTip.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxToolbook.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxTopLevelWindow.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxTreeCtrl.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxTreeEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxTreebook.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxUpdateUIEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxWindow.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxWindowCreateEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxWindowDC.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxWindowDestroyEvent.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxXmlResource.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wx_misc.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wx_object.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxe_master.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxe_server.beam -lib/erlang/lib/wx-%%APP_VERSION%%/ebin/wxe_util.beam -lib/erlang/lib/wx-%%APP_VERSION%%/include/gl.hrl -lib/erlang/lib/wx-%%APP_VERSION%%/include/glu.hrl -lib/erlang/lib/wx-%%APP_VERSION%%/include/wx.hrl -lib/erlang/lib/wx-%%APP_VERSION%%/priv/erl_gl.so -lib/erlang/lib/wx-%%APP_VERSION%%/priv/erlang-logo128.png -lib/erlang/lib/wx-%%APP_VERSION%%/priv/erlang-logo32.png -lib/erlang/lib/wx-%%APP_VERSION%%/priv/erlang-logo64.png -lib/erlang/lib/wx-%%APP_VERSION%%/priv/wxe_driver.so -lib/erlang/lib/wx-%%APP_VERSION%%/src/Makefile -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/gl.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/glu.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxAcceleratorEntry.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxAcceleratorTable.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxActivateEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxArtProvider.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxAuiDockArt.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxAuiManager.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxAuiManagerEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxAuiNotebook.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxAuiNotebookEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxAuiPaneInfo.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxAuiSimpleTabArt.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxAuiTabArt.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxBitmap.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxBitmapButton.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxBitmapDataObject.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxBoxSizer.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxBrush.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxBufferedDC.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxBufferedPaintDC.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxButton.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxCalendarCtrl.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxCalendarDateAttr.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxCalendarEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxCaret.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxCheckBox.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxCheckListBox.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxChildFocusEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxChoice.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxChoicebook.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxClientDC.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxClipboard.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxClipboardTextEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxCloseEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxColourData.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxColourDialog.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxColourPickerCtrl.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxColourPickerEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxComboBox.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxCommandEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxContextMenuEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxControl.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxControlWithItems.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxCursor.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxDC.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxDCOverlay.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxDataObject.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxDateEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxDatePickerCtrl.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxDialog.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxDirDialog.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxDirPickerCtrl.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxDisplayChangedEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxDropFilesEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxEraseEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxEvtHandler.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxFileDataObject.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxFileDialog.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxFileDirPickerEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxFilePickerCtrl.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxFindReplaceData.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxFindReplaceDialog.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxFlexGridSizer.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxFocusEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxFont.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxFontData.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxFontDialog.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxFontPickerCtrl.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxFontPickerEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxFrame.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxGBSizerItem.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxGLCanvas.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxGauge.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxGenericDirCtrl.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxGraphicsBrush.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxGraphicsContext.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxGraphicsFont.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxGraphicsMatrix.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxGraphicsObject.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxGraphicsPath.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxGraphicsPen.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxGraphicsRenderer.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxGrid.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxGridBagSizer.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxGridCellAttr.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxGridCellBoolEditor.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxGridCellBoolRenderer.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxGridCellChoiceEditor.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxGridCellEditor.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxGridCellFloatEditor.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxGridCellFloatRenderer.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxGridCellNumberEditor.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxGridCellNumberRenderer.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxGridCellRenderer.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxGridCellStringRenderer.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxGridCellTextEditor.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxGridEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxGridSizer.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxHelpEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxHtmlEasyPrinting.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxHtmlLinkEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxHtmlWindow.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxIcon.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxIconBundle.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxIconizeEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxIdleEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxImage.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxImageList.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxInitDialogEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxJoystickEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxKeyEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxLayoutAlgorithm.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxListBox.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxListCtrl.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxListEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxListItem.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxListItemAttr.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxListView.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxListbook.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxLocale.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxLogNull.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxMDIChildFrame.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxMDIClientWindow.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxMDIParentFrame.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxMask.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxMaximizeEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxMemoryDC.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxMenu.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxMenuBar.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxMenuEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxMenuItem.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxMessageDialog.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxMiniFrame.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxMirrorDC.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxMouseCaptureChangedEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxMouseCaptureLostEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxMouseEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxMoveEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxMultiChoiceDialog.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxNavigationKeyEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxNotebook.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxNotebookEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxNotifyEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxOverlay.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxPageSetupDialog.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxPageSetupDialogData.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxPaintDC.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxPaintEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxPalette.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxPaletteChangedEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxPanel.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxPasswordEntryDialog.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxPen.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxPickerBase.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxPopupTransientWindow.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxPopupWindow.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxPostScriptDC.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxPreviewCanvas.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxPreviewControlBar.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxPreviewFrame.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxPrintData.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxPrintDialog.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxPrintDialogData.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxPrintPreview.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxPrinter.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxPrintout.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxProgressDialog.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxQueryNewPaletteEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxRadioBox.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxRadioButton.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxRegion.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxSashEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxSashLayoutWindow.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxSashWindow.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxScreenDC.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxScrollBar.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxScrollEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxScrollWinEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxScrolledWindow.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxSetCursorEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxShowEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxSingleChoiceDialog.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxSizeEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxSizer.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxSizerFlags.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxSizerItem.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxSlider.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxSpinButton.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxSpinCtrl.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxSpinEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxSplashScreen.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxSplitterEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxSplitterWindow.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxStaticBitmap.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxStaticBox.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxStaticBoxSizer.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxStaticLine.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxStaticText.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxStatusBar.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxStdDialogButtonSizer.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxStyledTextCtrl.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxStyledTextEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxSysColourChangedEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxSystemOptions.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxSystemSettings.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxTaskBarIcon.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxTaskBarIconEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxTextAttr.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxTextCtrl.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxTextDataObject.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxTextEntryDialog.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxToggleButton.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxToolBar.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxToolTip.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxToolbook.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxTopLevelWindow.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxTreeCtrl.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxTreeEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxTreebook.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxUpdateUIEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxWindow.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxWindowCreateEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxWindowDC.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxWindowDestroyEvent.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxXmlResource.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wx_misc.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxe_debug.hrl -lib/erlang/lib/wx-%%APP_VERSION%%/src/gen/wxe_funcs.hrl -lib/erlang/lib/wx-%%APP_VERSION%%/src/wx.app.src -lib/erlang/lib/wx-%%APP_VERSION%%/src/wx.appup.src -lib/erlang/lib/wx-%%APP_VERSION%%/src/wx.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/wx_object.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/wxe.hrl -lib/erlang/lib/wx-%%APP_VERSION%%/src/wxe_master.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/wxe_server.erl -lib/erlang/lib/wx-%%APP_VERSION%%/src/wxe_util.erl +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/gl.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/glu.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wx.app +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wx.appup +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wx.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxAcceleratorEntry.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxAcceleratorTable.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxActivateEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxArtProvider.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxAuiDockArt.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxAuiManager.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxAuiManagerEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxAuiNotebook.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxAuiNotebookEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxAuiPaneInfo.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxAuiSimpleTabArt.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxAuiTabArt.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxBitmap.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxBitmapButton.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxBitmapDataObject.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxBoxSizer.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxBrush.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxBufferedDC.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxBufferedPaintDC.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxButton.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxCalendarCtrl.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxCalendarDateAttr.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxCalendarEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxCaret.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxCheckBox.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxCheckListBox.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxChildFocusEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxChoice.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxChoicebook.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxClientDC.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxClipboard.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxClipboardTextEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxCloseEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxColourData.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxColourDialog.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxColourPickerCtrl.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxColourPickerEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxComboBox.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxCommandEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxContextMenuEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxControl.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxControlWithItems.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxCursor.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxDC.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxDCOverlay.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxDataObject.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxDateEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxDatePickerCtrl.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxDialog.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxDirDialog.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxDirPickerCtrl.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxDisplayChangedEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxDropFilesEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxEraseEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxEvtHandler.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxFileDataObject.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxFileDialog.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxFileDirPickerEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxFilePickerCtrl.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxFindReplaceData.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxFindReplaceDialog.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxFlexGridSizer.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxFocusEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxFont.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxFontData.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxFontDialog.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxFontPickerCtrl.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxFontPickerEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxFrame.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxGBSizerItem.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxGLCanvas.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxGauge.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxGenericDirCtrl.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxGraphicsBrush.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxGraphicsContext.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxGraphicsFont.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxGraphicsMatrix.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxGraphicsObject.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxGraphicsPath.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxGraphicsPen.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxGraphicsRenderer.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxGrid.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxGridBagSizer.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxGridCellAttr.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxGridCellBoolEditor.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxGridCellBoolRenderer.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxGridCellChoiceEditor.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxGridCellEditor.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxGridCellFloatEditor.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxGridCellFloatRenderer.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxGridCellNumberEditor.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxGridCellNumberRenderer.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxGridCellRenderer.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxGridCellStringRenderer.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxGridCellTextEditor.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxGridEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxGridSizer.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxHelpEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxHtmlEasyPrinting.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxHtmlLinkEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxHtmlWindow.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxIcon.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxIconBundle.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxIconizeEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxIdleEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxImage.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxImageList.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxInitDialogEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxJoystickEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxKeyEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxLayoutAlgorithm.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxListBox.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxListCtrl.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxListEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxListItem.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxListItemAttr.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxListView.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxListbook.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxLocale.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxLogNull.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxMDIChildFrame.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxMDIClientWindow.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxMDIParentFrame.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxMask.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxMaximizeEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxMemoryDC.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxMenu.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxMenuBar.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxMenuEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxMenuItem.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxMessageDialog.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxMiniFrame.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxMirrorDC.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxMouseCaptureChangedEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxMouseCaptureLostEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxMouseEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxMoveEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxMultiChoiceDialog.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxNavigationKeyEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxNotebook.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxNotebookEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxNotifyEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxOverlay.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxPageSetupDialog.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxPageSetupDialogData.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxPaintDC.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxPaintEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxPalette.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxPaletteChangedEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxPanel.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxPasswordEntryDialog.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxPen.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxPickerBase.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxPopupTransientWindow.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxPopupWindow.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxPostScriptDC.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxPreviewCanvas.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxPreviewControlBar.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxPreviewFrame.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxPrintData.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxPrintDialog.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxPrintDialogData.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxPrintPreview.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxPrinter.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxPrintout.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxProgressDialog.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxQueryNewPaletteEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxRadioBox.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxRadioButton.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxRegion.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxSashEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxSashLayoutWindow.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxSashWindow.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxScreenDC.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxScrollBar.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxScrollEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxScrollWinEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxScrolledWindow.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxSetCursorEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxShowEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxSingleChoiceDialog.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxSizeEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxSizer.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxSizerFlags.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxSizerItem.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxSlider.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxSpinButton.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxSpinCtrl.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxSpinEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxSplashScreen.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxSplitterEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxSplitterWindow.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxStaticBitmap.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxStaticBox.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxStaticBoxSizer.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxStaticLine.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxStaticText.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxStatusBar.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxStdDialogButtonSizer.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxStyledTextCtrl.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxStyledTextEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxSysColourChangedEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxSystemOptions.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxSystemSettings.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxTaskBarIcon.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxTaskBarIconEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxTextAttr.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxTextCtrl.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxTextDataObject.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxTextEntryDialog.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxToggleButton.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxToolBar.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxToolTip.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxToolbook.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxTopLevelWindow.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxTreeCtrl.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxTreeEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxTreebook.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxUpdateUIEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxWindow.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxWindowCreateEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxWindowDC.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxWindowDestroyEvent.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxXmlResource.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wx_misc.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wx_object.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxe_master.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxe_server.beam +lib/erlang/lib/wx-%%WX_VERSION%%/ebin/wxe_util.beam +lib/erlang/lib/wx-%%WX_VERSION%%/include/gl.hrl +lib/erlang/lib/wx-%%WX_VERSION%%/include/glu.hrl +lib/erlang/lib/wx-%%WX_VERSION%%/include/wx.hrl +lib/erlang/lib/wx-%%WX_VERSION%%/priv/erl_gl.so +lib/erlang/lib/wx-%%WX_VERSION%%/priv/erlang-logo128.png +lib/erlang/lib/wx-%%WX_VERSION%%/priv/erlang-logo32.png +lib/erlang/lib/wx-%%WX_VERSION%%/priv/erlang-logo64.png +lib/erlang/lib/wx-%%WX_VERSION%%/priv/wxe_driver.so +lib/erlang/lib/wx-%%WX_VERSION%%/src/Makefile +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/gl.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/glu.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxAcceleratorEntry.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxAcceleratorTable.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxActivateEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxArtProvider.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxAuiDockArt.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxAuiManager.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxAuiManagerEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxAuiNotebook.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxAuiNotebookEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxAuiPaneInfo.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxAuiSimpleTabArt.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxAuiTabArt.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxBitmap.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxBitmapButton.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxBitmapDataObject.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxBoxSizer.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxBrush.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxBufferedDC.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxBufferedPaintDC.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxButton.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxCalendarCtrl.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxCalendarDateAttr.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxCalendarEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxCaret.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxCheckBox.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxCheckListBox.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxChildFocusEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxChoice.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxChoicebook.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxClientDC.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxClipboard.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxClipboardTextEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxCloseEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxColourData.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxColourDialog.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxColourPickerCtrl.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxColourPickerEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxComboBox.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxCommandEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxContextMenuEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxControl.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxControlWithItems.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxCursor.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxDC.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxDCOverlay.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxDataObject.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxDateEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxDatePickerCtrl.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxDialog.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxDirDialog.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxDirPickerCtrl.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxDisplayChangedEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxDropFilesEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxEraseEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxEvtHandler.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxFileDataObject.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxFileDialog.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxFileDirPickerEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxFilePickerCtrl.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxFindReplaceData.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxFindReplaceDialog.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxFlexGridSizer.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxFocusEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxFont.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxFontData.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxFontDialog.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxFontPickerCtrl.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxFontPickerEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxFrame.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxGBSizerItem.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxGLCanvas.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxGauge.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxGenericDirCtrl.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxGraphicsBrush.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxGraphicsContext.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxGraphicsFont.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxGraphicsMatrix.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxGraphicsObject.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxGraphicsPath.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxGraphicsPen.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxGraphicsRenderer.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxGrid.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxGridBagSizer.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxGridCellAttr.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxGridCellBoolEditor.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxGridCellBoolRenderer.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxGridCellChoiceEditor.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxGridCellEditor.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxGridCellFloatEditor.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxGridCellFloatRenderer.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxGridCellNumberEditor.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxGridCellNumberRenderer.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxGridCellRenderer.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxGridCellStringRenderer.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxGridCellTextEditor.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxGridEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxGridSizer.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxHelpEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxHtmlEasyPrinting.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxHtmlLinkEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxHtmlWindow.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxIcon.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxIconBundle.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxIconizeEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxIdleEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxImage.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxImageList.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxInitDialogEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxJoystickEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxKeyEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxLayoutAlgorithm.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxListBox.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxListCtrl.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxListEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxListItem.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxListItemAttr.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxListView.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxListbook.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxLocale.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxLogNull.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxMDIChildFrame.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxMDIClientWindow.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxMDIParentFrame.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxMask.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxMaximizeEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxMemoryDC.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxMenu.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxMenuBar.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxMenuEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxMenuItem.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxMessageDialog.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxMiniFrame.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxMirrorDC.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxMouseCaptureChangedEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxMouseCaptureLostEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxMouseEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxMoveEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxMultiChoiceDialog.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxNavigationKeyEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxNotebook.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxNotebookEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxNotifyEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxOverlay.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxPageSetupDialog.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxPageSetupDialogData.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxPaintDC.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxPaintEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxPalette.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxPaletteChangedEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxPanel.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxPasswordEntryDialog.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxPen.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxPickerBase.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxPopupTransientWindow.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxPopupWindow.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxPostScriptDC.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxPreviewCanvas.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxPreviewControlBar.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxPreviewFrame.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxPrintData.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxPrintDialog.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxPrintDialogData.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxPrintPreview.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxPrinter.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxPrintout.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxProgressDialog.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxQueryNewPaletteEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxRadioBox.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxRadioButton.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxRegion.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxSashEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxSashLayoutWindow.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxSashWindow.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxScreenDC.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxScrollBar.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxScrollEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxScrollWinEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxScrolledWindow.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxSetCursorEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxShowEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxSingleChoiceDialog.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxSizeEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxSizer.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxSizerFlags.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxSizerItem.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxSlider.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxSpinButton.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxSpinCtrl.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxSpinEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxSplashScreen.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxSplitterEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxSplitterWindow.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxStaticBitmap.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxStaticBox.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxStaticBoxSizer.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxStaticLine.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxStaticText.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxStatusBar.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxStdDialogButtonSizer.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxStyledTextCtrl.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxStyledTextEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxSysColourChangedEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxSystemOptions.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxSystemSettings.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxTaskBarIcon.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxTaskBarIconEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxTextAttr.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxTextCtrl.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxTextDataObject.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxTextEntryDialog.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxToggleButton.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxToolBar.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxToolTip.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxToolbook.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxTopLevelWindow.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxTreeCtrl.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxTreeEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxTreebook.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxUpdateUIEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxWindow.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxWindowCreateEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxWindowDC.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxWindowDestroyEvent.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxXmlResource.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wx_misc.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxe_debug.hrl +lib/erlang/lib/wx-%%WX_VERSION%%/src/gen/wxe_funcs.hrl +lib/erlang/lib/wx-%%WX_VERSION%%/src/wx.app.src +lib/erlang/lib/wx-%%WX_VERSION%%/src/wx.appup.src +lib/erlang/lib/wx-%%WX_VERSION%%/src/wx.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/wx_object.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/wxe.hrl +lib/erlang/lib/wx-%%WX_VERSION%%/src/wxe_master.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/wxe_server.erl +lib/erlang/lib/wx-%%WX_VERSION%%/src/wxe_util.erl +lib/erlang/lib/debugger-%%WX_VERSION%%/ebin/dbg_debugged.beam +lib/erlang/lib/debugger-%%WX_VERSION%%/ebin/dbg_icmd.beam +lib/erlang/lib/debugger-%%WX_VERSION%%/ebin/dbg_idb.beam +lib/erlang/lib/debugger-%%WX_VERSION%%/ebin/dbg_ieval.beam +lib/erlang/lib/debugger-%%WX_VERSION%%/ebin/dbg_iload.beam +lib/erlang/lib/debugger-%%WX_VERSION%%/ebin/dbg_iserver.beam +lib/erlang/lib/debugger-%%WX_VERSION%%/ebin/dbg_istk.beam +lib/erlang/lib/debugger-%%WX_VERSION%%/ebin/dbg_wx_break.beam +lib/erlang/lib/debugger-%%WX_VERSION%%/ebin/dbg_wx_break_win.beam +lib/erlang/lib/debugger-%%WX_VERSION%%/ebin/dbg_wx_code.beam +lib/erlang/lib/debugger-%%WX_VERSION%%/ebin/dbg_wx_filedialog_win.beam +lib/erlang/lib/debugger-%%WX_VERSION%%/ebin/dbg_wx_interpret.beam +lib/erlang/lib/debugger-%%WX_VERSION%%/ebin/dbg_wx_mon.beam +lib/erlang/lib/debugger-%%WX_VERSION%%/ebin/dbg_wx_mon_win.beam +lib/erlang/lib/debugger-%%WX_VERSION%%/ebin/dbg_wx_settings.beam +lib/erlang/lib/debugger-%%WX_VERSION%%/ebin/dbg_wx_src_view.beam +lib/erlang/lib/debugger-%%WX_VERSION%%/ebin/dbg_wx_trace.beam +lib/erlang/lib/debugger-%%WX_VERSION%%/ebin/dbg_wx_trace_win.beam +lib/erlang/lib/debugger-%%WX_VERSION%%/ebin/dbg_wx_view.beam +lib/erlang/lib/debugger-%%WX_VERSION%%/ebin/dbg_wx_win.beam +lib/erlang/lib/debugger-%%WX_VERSION%%/ebin/dbg_wx_winman.beam +lib/erlang/lib/debugger-%%WX_VERSION%%/ebin/debugger.app +lib/erlang/lib/debugger-%%WX_VERSION%%/ebin/debugger.appup +lib/erlang/lib/debugger-%%WX_VERSION%%/ebin/debugger.beam +lib/erlang/lib/debugger-%%WX_VERSION%%/ebin/i.beam +lib/erlang/lib/debugger-%%WX_VERSION%%/ebin/int.beam +lib/erlang/lib/debugger-%%WX_VERSION%%/priv/Makefile +lib/erlang/lib/debugger-%%WX_VERSION%%/priv/debugger.gif +lib/erlang/lib/debugger-%%WX_VERSION%%/priv/debugger.tool +lib/erlang/lib/debugger-%%WX_VERSION%%/priv/erlang_bug.png +lib/erlang/lib/debugger-%%WX_VERSION%%/src/Makefile +lib/erlang/lib/debugger-%%WX_VERSION%%/src/dbg_debugged.erl +lib/erlang/lib/debugger-%%WX_VERSION%%/src/dbg_icmd.erl +lib/erlang/lib/debugger-%%WX_VERSION%%/src/dbg_idb.erl +lib/erlang/lib/debugger-%%WX_VERSION%%/src/dbg_ieval.erl +lib/erlang/lib/debugger-%%WX_VERSION%%/src/dbg_ieval.hrl +lib/erlang/lib/debugger-%%WX_VERSION%%/src/dbg_iload.erl +lib/erlang/lib/debugger-%%WX_VERSION%%/src/dbg_iserver.erl +lib/erlang/lib/debugger-%%WX_VERSION%%/src/dbg_istk.erl +lib/erlang/lib/debugger-%%WX_VERSION%%/src/dbg_wx_break.erl +lib/erlang/lib/debugger-%%WX_VERSION%%/src/dbg_wx_break_win.erl +lib/erlang/lib/debugger-%%WX_VERSION%%/src/dbg_wx_code.erl +lib/erlang/lib/debugger-%%WX_VERSION%%/src/dbg_wx_filedialog_win.erl +lib/erlang/lib/debugger-%%WX_VERSION%%/src/dbg_wx_filedialog_win.hrl +lib/erlang/lib/debugger-%%WX_VERSION%%/src/dbg_wx_interpret.erl +lib/erlang/lib/debugger-%%WX_VERSION%%/src/dbg_wx_mon.erl +lib/erlang/lib/debugger-%%WX_VERSION%%/src/dbg_wx_mon_win.erl +lib/erlang/lib/debugger-%%WX_VERSION%%/src/dbg_wx_settings.erl +lib/erlang/lib/debugger-%%WX_VERSION%%/src/dbg_wx_src_view.erl +lib/erlang/lib/debugger-%%WX_VERSION%%/src/dbg_wx_trace.erl +lib/erlang/lib/debugger-%%WX_VERSION%%/src/dbg_wx_trace_win.erl +lib/erlang/lib/debugger-%%WX_VERSION%%/src/dbg_wx_view.erl +lib/erlang/lib/debugger-%%WX_VERSION%%/src/dbg_wx_win.erl +lib/erlang/lib/debugger-%%WX_VERSION%%/src/dbg_wx_winman.erl +lib/erlang/lib/debugger-%%WX_VERSION%%/src/debugger.app.src +lib/erlang/lib/debugger-%%WX_VERSION%%/src/debugger.appup.src +lib/erlang/lib/debugger-%%WX_VERSION%%/src/debugger.erl +lib/erlang/lib/debugger-%%WX_VERSION%%/src/i.erl +lib/erlang/lib/debugger-%%WX_VERSION%%/src/int.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/cdv_atom_cb.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/cdv_bin_cb.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/cdv_detail_wx.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/cdv_dist_cb.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/cdv_ets_cb.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/cdv_fun_cb.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/cdv_gen_cb.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/cdv_html_wx.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/cdv_info_wx.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/cdv_int_tab_cb.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/cdv_mem_cb.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/cdv_mod_cb.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/cdv_multi_wx.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/cdv_port_cb.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/cdv_proc_cb.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/cdv_sched_cb.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/cdv_table_wx.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/cdv_term_cb.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/cdv_timer_cb.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/cdv_virtual_list_wx.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/cdv_wx.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/crashdump_viewer.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/etop.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/etop_tr.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/etop_txt.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/observer.app +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/observer.appup +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/observer.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/observer_alloc_wx.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/observer_app_wx.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/observer_html_lib.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/observer_lib.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/observer_perf_wx.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/observer_port_wx.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/observer_pro_wx.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/observer_procinfo.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/observer_sys_wx.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/observer_trace_wx.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/observer_traceoptions_wx.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/observer_tv_table.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/observer_tv_wx.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/observer_wx.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/ttb.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/ebin/ttb_et.beam +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/include/etop.hrl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/priv/bin/cdv +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/priv/bin/cdv.bat +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/priv/bin/etop +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/priv/bin/etop.bat +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/priv/erlang_observer.png +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/Makefile +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/cdv_atom_cb.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/cdv_bin_cb.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/cdv_detail_wx.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/cdv_dist_cb.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/cdv_ets_cb.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/cdv_fun_cb.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/cdv_gen_cb.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/cdv_html_wx.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/cdv_info_wx.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/cdv_int_tab_cb.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/cdv_mem_cb.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/cdv_mod_cb.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/cdv_multi_wx.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/cdv_port_cb.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/cdv_proc_cb.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/cdv_sched_cb.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/cdv_table_wx.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/cdv_term_cb.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/cdv_timer_cb.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/cdv_virtual_list_wx.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/cdv_wx.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/crashdump_viewer.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/crashdump_viewer.hrl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/etop.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/etop_defs.hrl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/etop_tr.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/etop_txt.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/multitrace.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/observer.app.src +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/observer.appup.src +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/observer.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/observer_alloc_wx.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/observer_app_wx.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/observer_defs.hrl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/observer_html_lib.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/observer_lib.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/observer_perf_wx.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/observer_port_wx.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/observer_pro_wx.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/observer_procinfo.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/observer_sys_wx.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/observer_trace_wx.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/observer_traceoptions_wx.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/observer_tv.hrl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/observer_tv_table.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/observer_tv_wx.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/observer_wx.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/ttb.erl +lib/erlang/lib/observer-%%OBSERVER_VERSION%%/src/ttb_et.erl +lib/erlang/lib/et-%%ET_VERSION%%/ebin/et.app +lib/erlang/lib/et-%%ET_VERSION%%/ebin/et.appup +lib/erlang/lib/et-%%ET_VERSION%%/ebin/et.beam +lib/erlang/lib/et-%%ET_VERSION%%/ebin/et_collector.beam +lib/erlang/lib/et-%%ET_VERSION%%/ebin/et_selector.beam +lib/erlang/lib/et-%%ET_VERSION%%/ebin/et_viewer.beam +lib/erlang/lib/et-%%ET_VERSION%%/ebin/et_wx_contents_viewer.beam +lib/erlang/lib/et-%%ET_VERSION%%/ebin/et_wx_viewer.beam +lib/erlang/lib/et-%%ET_VERSION%%/include/et.hrl +lib/erlang/lib/et-%%ET_VERSION%%/src/Makefile +lib/erlang/lib/et-%%ET_VERSION%%/src/et.app.src +lib/erlang/lib/et-%%ET_VERSION%%/src/et.appup.src +lib/erlang/lib/et-%%ET_VERSION%%/src/et.erl +lib/erlang/lib/et-%%ET_VERSION%%/src/et_collector.erl +lib/erlang/lib/et-%%ET_VERSION%%/src/et_internal.hrl +lib/erlang/lib/et-%%ET_VERSION%%/src/et_selector.erl +lib/erlang/lib/et-%%ET_VERSION%%/src/et_viewer.erl +lib/erlang/lib/et-%%ET_VERSION%%/src/et_wx_contents_viewer.erl +lib/erlang/lib/et-%%ET_VERSION%%/src/et_wx_viewer.erl +lib/erlang/lib/et-%%ET_VERSION%%/src/modules.mk diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index 0effe286506..9e95a2e689d 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -2,29 +2,12 @@ # $FreeBSD$ PORTNAME= erlang -PORTVERSION= 19.3.6.12 -PORTREVISION= 1 +DISTVERSIONPREFIX= OTP- +DISTVERSION= 19.3.6.13 PORTEPOCH= 4 CATEGORIES= lang parallel java -MASTER_SITES= http://www.erlang.org/download/:erlangorg \ - http://erlang.stacken.kth.se/download/:erlangorg \ - http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg \ - http://olgeni.olgeni.com/~olgeni/distfiles/:local \ - LOCAL/olgeni:local -DISTNAME= otp_src_${ERLANG_REL} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:erlangorg \ - preloaded-${PORTVERSION}${EXTRACT_SUFX}:local +MASTER_SITES= http://www.erlang.org/download/:erlangorg DIST_SUBDIR= erlang -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - -PATCH_SITES= http://olgeni.olgeni.com/~olgeni/distfiles/ \ - LOCAL/olgeni -PATCHFILES= patch-otp-19.3.1 patch-otp-19.3.2 patch-otp-19.3.3 \ - patch-otp-19.3.4 patch-otp-19.3.5 patch-otp-19.3.6 \ - patch-otp-19.3.6.1 patch-otp-19.3.6.2 patch-otp-19.3.6.3 \ - patch-otp-19.3.6.4 patch-otp-19.3.6.5 patch-otp-19.3.6.6 \ - patch-otp-19.3.6.7 patch-otp-19.3.6.8 patch-otp-19.3.6.9 \ - patch-otp-19.3.6.10 patch-otp-19.3.6.11 patch-otp-19.3.6.12 MAINTAINER= erlang@FreeBSD.org COMMENT= Functional programming language from Ericsson @@ -33,16 +16,30 @@ LICENSE= APACHE20 BROKEN_sparc64= Fails to build: error: fp_except undeclared -WRKSRC= ${WRKDIR}/otp_src_${ERLANG_REL} +USES= autoreconf:build gmake ncurses perl5 +USE_GITHUB= yes +GH_PROJECT= otp +USE_PERL5= build +USE_RC_SUBR= epmd -ERLANG_LIB= ${PORTNAME} -ERLANG_REL= 19.3 +GNU_CONFIGURE= yes +MAKE_JOBS_UNSAFE=yes OPTIONS_SUB= yes SUB_FILES= pkg-message SUB_LIST= TOOLS_VSN=${TOOLS_VSN} -MAKE_JOBS_UNSAFE=yes +ERLANG_LIB= ${PORTNAME} +ERLANG_REL= 19.3 +EI_VSN= 3.9.3 +SNMP_VSN= 5.2.5 +TOOLS_VSN= 2.9.1 +ERLANG_MAN= otp_doc_man_${ERLANG_REL}.tar.gz + +# On Erlang 22, native code generation does not currently work for all modules +# due to new BEAM instructions not supported by HiPE the native compiler. +# Remove HIPE from OPTIONS_DEFAULT if this is still the case when the port is +# upgraded to such version. OPTIONS_DEFINE= DIRTY DTRACE GS HIPE JAVA KQUEUE MANPAGES NATIVE ODBC OPENSSL SCTP SMP THREADS WX OPTIONS_DEFAULT=DTRACE HIPE KQUEUE MANPAGES OPENSSL SCTP SMP THREADS @@ -69,12 +66,6 @@ OPTIONS_EXCLUDE_armv6= DTRACE OPTIONS_EXCLUDE_armv7= DTRACE OPTIONS_EXCLUDE_i386= DTRACE -GNU_CONFIGURE= yes -LDFLAGS+= -L${LOCALBASE}/lib -USES= gmake ncurses perl5 -USE_PERL5= build -USE_RC_SUBR= epmd - # If you run Erlang and get a message resembling "WARNING: number of # probes fixed does not match the number of defined probes (54 != 132, # respectively)" you probably misconfigured DTrace in some way. @@ -98,17 +89,11 @@ SCTP_CONFIGURE_ENABLE= sctp SMP_CONFIGURE_ENABLE= smp-support THREADS_CONFIGURE_ENABLE= threads WX_CONFIGURE_WITH= wx-config=${WX_CONFIG} +WX_USES= gl WX_VARS= USE_WX=2.8+ WX_COMPS="wx contrib" USE_GL="gl glu" - -EI_VSN= 3.9.3 -SNMP_VSN= 5.2.5 -TOOLS_VSN= 2.9.1 - -ERLANG_MAN= otp_doc_man_${ERLANG_REL}.tar.gz - MANPAGES_DISTFILES= ${ERLANG_MAN}:erlangorg -.include +.include .if ${OPSYS} == FreeBSD CFLAGS+= -DMAP_NORESERVE=0 @@ -123,9 +108,12 @@ MAKE_ARGS+= ARCH=arm .endif pre-configure: - cd ${WRKSRC} && ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/preloaded-${PORTVERSION}${EXTRACT_SUFX} + @cd ${WRKSRC} && ./otp_build autoconf -pre-configure-MX-off: +pre-configure-WX-off: + echo "disabled by port options" > ${WRKSRC}/lib/debugger/SKIP + echo "disabled by port options" > ${WRKSRC}/lib/et/SKIP + echo "disabled by port options" > ${WRKSRC}/lib/observer/SKIP echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP post-configure-ODBC-on: @@ -168,6 +156,9 @@ post-install-OPENSSL-off: ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssl-* post-install-WX-off: + ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/debugger-* + ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/et-* + ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/observer-* ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-* post-stage: @@ -175,4 +166,4 @@ post-stage: @cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type f -o -type l \ | ${SORT} >> ${TMPPLIST} -.include +.include diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo index bc1738e79ac..882f5aa548c 100644 --- a/lang/erlang/distinfo +++ b/lang/erlang/distinfo @@ -1,43 +1,5 @@ -TIMESTAMP = 1540477142 -SHA256 (erlang/otp_src_19.3.tar.gz) = fe4a00651db39b8542b04530a48d24b2f2e7e0b77cbe93d728c9f05325bdfe83 -SIZE (erlang/otp_src_19.3.tar.gz) = 68510871 -SHA256 (erlang/preloaded-19.3.6.12.tar.gz) = 5046641cea7c9f56ca46674342cde1bf7bc9959d9ed5cef3b55fb725d4d6a4d6 -SIZE (erlang/preloaded-19.3.6.12.tar.gz) = 330073 +TIMESTAMP = 1552748153 SHA256 (erlang/otp_doc_man_19.3.tar.gz) = f8192ffdd7367083c055695eeddf198155da43dcc221aed1d870d1e3871dd95c SIZE (erlang/otp_doc_man_19.3.tar.gz) = 1410781 -SHA256 (erlang/patch-otp-19.3.1) = 2373f890516b58ae006812ba5f15e4af1f8820be98230011b8cd8b345f51dedd -SIZE (erlang/patch-otp-19.3.1) = 30225 -SHA256 (erlang/patch-otp-19.3.2) = 21c56ac188177985c9db11c7066dcee0f7370760da3e15a0d03c235bd2a2cb2a -SIZE (erlang/patch-otp-19.3.2) = 6290 -SHA256 (erlang/patch-otp-19.3.3) = dbe1cab750a3339c3755db27b800e53232519c84a304bd562263ffb060afab55 -SIZE (erlang/patch-otp-19.3.3) = 12525 -SHA256 (erlang/patch-otp-19.3.4) = 02437ac753932f913209102e8cb249a264b774833bfda8c1532b338af60ff8af -SIZE (erlang/patch-otp-19.3.4) = 13504 -SHA256 (erlang/patch-otp-19.3.5) = 5755da205004ae7e724390958db9ecc737d99ec14e0d14abcec8b8603ea6ece5 -SIZE (erlang/patch-otp-19.3.5) = 44563 -SHA256 (erlang/patch-otp-19.3.6) = ee1b5f0fd64db3322031c38722aee96a8ee35aaac454f430c829446a198f6534 -SIZE (erlang/patch-otp-19.3.6) = 13073 -SHA256 (erlang/patch-otp-19.3.6.1) = 65a6de8533ccaeec81bebcee1d6dde08713533e411a123d5ac27141967581600 -SIZE (erlang/patch-otp-19.3.6.1) = 28956 -SHA256 (erlang/patch-otp-19.3.6.2) = 3d12059e02ef31ae6e5dd97820b0d51c4ab0e7304cbaeddeb856fb2097da87fc -SIZE (erlang/patch-otp-19.3.6.2) = 14653 -SHA256 (erlang/patch-otp-19.3.6.3) = 77faeedb827c6793b183b33d161e5b3c4467c3ec9053840442d7fd187cfbfa78 -SIZE (erlang/patch-otp-19.3.6.3) = 24500 -SHA256 (erlang/patch-otp-19.3.6.4) = 662dab96ceed33b4b29c835d82bf6b4f8feaa8f75287f43f3ae7e64badb16255 -SIZE (erlang/patch-otp-19.3.6.4) = 10622 -SHA256 (erlang/patch-otp-19.3.6.5) = f830bd6328f2a9e8cb70750bb7e91a8db045b5fc13fe854710fdffce158788d1 -SIZE (erlang/patch-otp-19.3.6.5) = 13254 -SHA256 (erlang/patch-otp-19.3.6.6) = 6bb2da20ad241e86f847ba351dce23ecf5a82f0e6df8eceb83fe2ed4b05d8d2f -SIZE (erlang/patch-otp-19.3.6.6) = 12542 -SHA256 (erlang/patch-otp-19.3.6.7) = 34bed4599ff19c2bed944dff83e9b640fbf18b6b3a21b42d92c3697e4c50d810 -SIZE (erlang/patch-otp-19.3.6.7) = 11631 -SHA256 (erlang/patch-otp-19.3.6.8) = c3ea86434fe1a4d7baabe17d2e7134065bb19fef7d384a6e289e55a2288a6b61 -SIZE (erlang/patch-otp-19.3.6.8) = 4936 -SHA256 (erlang/patch-otp-19.3.6.9) = c0a243be5693752dc35b0fbe7622618903f130ad944bfa160248ea0e13a6148a -SIZE (erlang/patch-otp-19.3.6.9) = 6989 -SHA256 (erlang/patch-otp-19.3.6.10) = 98968885a53ab75a6abeeba584dc26297d01234866d2797d6c16f1bdd89d72c3 -SIZE (erlang/patch-otp-19.3.6.10) = 12767 -SHA256 (erlang/patch-otp-19.3.6.11) = a79f5a3fe737df191c9fa2eea3c9961b94be4d4d44620b1bed2266f1874f3669 -SIZE (erlang/patch-otp-19.3.6.11) = 4886 -SHA256 (erlang/patch-otp-19.3.6.12) = ea1ef7dba18d4a22d43008c7b9e7664c90887ae42fb87f31974c17b8520f3f0f -SIZE (erlang/patch-otp-19.3.6.12) = 5433 +SHA256 (erlang/erlang-otp-OTP-19.3.6.13_GH0.tar.gz) = 11a914176a33068226644f4e999ecc6e965ab1c60a324d90020f164641631fae +SIZE (erlang/erlang-otp-OTP-19.3.6.13_GH0.tar.gz) = 34006014 diff --git a/lang/erlang/files/patch-lib_wx_configure b/lang/erlang/files/patch-lib_wx_configure deleted file mode 100644 index b75764d23f6..00000000000 --- a/lang/erlang/files/patch-lib_wx_configure +++ /dev/null @@ -1,10464 +0,0 @@ ---- lib/wx/configure.orig 2017-03-14 20:10:54 UTC -+++ lib/wx/configure -@@ -1,81 +1,459 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.59. -+# Generated by GNU Autoconf 2.69. -+# -+# -+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. -+# - # --# Copyright (C) 2003 Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. --## --------------------- ## --## M4sh Initialization. ## --## --------------------- ## -+## -------------------- ## -+## M4sh Initialization. ## -+## -------------------- ## - --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac - fi --DUALCASE=1; export DUALCASE # for MKS sh - --# Support unset when possible. --if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -- as_unset=unset -+ -+as_nl=' -+' -+export as_nl -+# Printing a long string crashes Solaris 7 /usr/bin/printf. -+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -+# Prefer a ksh shell builtin over an external printf program on Solaris, -+# but without wasting forks for bash or zsh. -+if test -z "$BASH_VERSION$ZSH_VERSION" \ -+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='print -r --' -+ as_echo_n='print -rn --' -+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='printf %s\n' -+ as_echo_n='printf %s' - else -- as_unset=false -+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -+ as_echo_n='/usr/ucb/echo -n' -+ else -+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -+ as_echo_n_body='eval -+ arg=$1; -+ case $arg in #( -+ *"$as_nl"*) -+ expr "X$arg" : "X\\(.*\\)$as_nl"; -+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -+ esac; -+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -+ ' -+ export as_echo_n_body -+ as_echo_n='sh -c $as_echo_n_body as_echo' -+ fi -+ export as_echo_body -+ as_echo='sh -c $as_echo_body as_echo' - fi - -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } -+fi - --# Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH -+ -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+as_myself= -+case $0 in #(( -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ exit 1 -+fi -+ -+# Unset variables that we do not need and which cause bugs (e.g. in -+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -+# suppresses any "Segmentation fault" message there. '((' could -+# trigger a bug in pdksh 5.2.14. -+for as_var in BASH_ENV ENV MAIL MAILPATH -+do eval test x\${$as_var+set} = xset \ -+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -+done - PS1='$ ' - PS2='> ' - PS4='+ ' - - # NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -- LC_TELEPHONE LC_TIME -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE -+ -+# CDPATH. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ -+# Use a proper internal environment variable to ensure we don't fall -+ # into an infinite loop, continuously re-executing ourselves. -+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then -+ _as_can_reexec=no; export _as_can_reexec; -+ # We cannot yet assume a decent shell, so we have to provide a -+# neutralization value for shells without unset; and this also -+# works around shells that cannot unset nonexistent variables. -+# Preserve -v and -x to the replacement shell. -+BASH_ENV=/dev/null -+ENV=/dev/null -+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -+case $- in # (((( -+ *v*x* | *x*v* ) as_opts=-vx ;; -+ *v* ) as_opts=-v ;; -+ *x* ) as_opts=-x ;; -+ * ) as_opts= ;; -+esac -+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -+# Admittedly, this is quite paranoid, since all the known shells bail -+# out after a failed `exec'. -+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -+as_fn_exit 255 -+ fi -+ # We don't want this to propagate to other subprocesses. -+ { _as_can_reexec=; unset _as_can_reexec;} -+if test "x$CONFIG_SHELL" = x; then -+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : -+ emulate sh -+ NULLCMD=: -+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '\${1+\"\$@\"}'='\"\$@\"' -+ setopt NO_GLOB_SUBST -+else -+ case \`(set -o) 2>/dev/null\` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac -+fi -+" -+ as_required="as_fn_return () { (exit \$1); } -+as_fn_success () { as_fn_return 0; } -+as_fn_failure () { as_fn_return 1; } -+as_fn_ret_success () { return 0; } -+as_fn_ret_failure () { return 1; } -+ -+exitcode=0 -+as_fn_success || { exitcode=1; echo as_fn_success failed.; } -+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } -+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } -+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : -+ -+else -+ exitcode=1; echo positional parameters were not saved. -+fi -+test x\$exitcode = x0 || exit 1 -+test -x / || exit 1" -+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO -+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO -+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && -+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -+test \$(( 1 + 1 )) = 2 || exit 1" -+ if (eval "$as_required") 2>/dev/null; then : -+ as_have_required=yes -+else -+ as_have_required=no -+fi -+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -+ -+else -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+as_found=false -+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH - do -- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -- eval $as_var=C; export $as_var -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ as_found=: -+ case $as_dir in #( -+ /*) -+ for as_base in sh bash ksh sh5; do -+ # Try only shells that exist, to save several forks. -+ as_shell=$as_dir/$as_base -+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && -+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : -+ CONFIG_SHELL=$as_shell as_have_required=yes -+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : -+ break 2 -+fi -+fi -+ done;; -+ esac -+ as_found=false -+done -+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && -+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : -+ CONFIG_SHELL=$SHELL as_have_required=yes -+fi; } -+IFS=$as_save_IFS -+ -+ -+ if test "x$CONFIG_SHELL" != x; then : -+ export CONFIG_SHELL -+ # We cannot yet assume a decent shell, so we have to provide a -+# neutralization value for shells without unset; and this also -+# works around shells that cannot unset nonexistent variables. -+# Preserve -v and -x to the replacement shell. -+BASH_ENV=/dev/null -+ENV=/dev/null -+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -+case $- in # (((( -+ *v*x* | *x*v* ) as_opts=-vx ;; -+ *v* ) as_opts=-v ;; -+ *x* ) as_opts=-x ;; -+ * ) as_opts= ;; -+esac -+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -+# Admittedly, this is quite paranoid, since all the known shells bail -+# out after a failed `exec'. -+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -+exit 255 -+fi -+ -+ if test x$as_have_required = xno; then : -+ $as_echo "$0: This script requires a shell more modern than all" -+ $as_echo "$0: the shells that I found on your system." -+ if test x${ZSH_VERSION+set} = xset ; then -+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" -+ $as_echo "$0: be upgraded to zsh 4.3.4 or later." - else -- $as_unset $as_var -+ $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, -+$0: including any error possibly output before this -+$0: message. Then install a modern shell, or manually run -+$0: the script under such a shell if you do have one." - fi --done -+ exit 1 -+fi -+fi -+fi -+SHELL=${CONFIG_SHELL-/bin/sh} -+export SHELL -+# Unset more variables known to interfere with behavior of common tools. -+CLICOLOR_FORCE= GREP_OPTIONS= -+unset CLICOLOR_FORCE GREP_OPTIONS - --# Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -+## --------------------- ## -+## M4sh Shell Functions. ## -+## --------------------- ## -+# as_fn_unset VAR -+# --------------- -+# Portably unset VAR. -+as_fn_unset () -+{ -+ { eval $1=; unset $1;} -+} -+as_unset=as_fn_unset -+ -+# as_fn_set_status STATUS -+# ----------------------- -+# Set $? to STATUS, without forking. -+as_fn_set_status () -+{ -+ return $1 -+} # as_fn_set_status -+ -+# as_fn_exit STATUS -+# ----------------- -+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -+as_fn_exit () -+{ -+ set +e -+ as_fn_set_status $1 -+ exit $1 -+} # as_fn_exit -+ -+# as_fn_mkdir_p -+# ------------- -+# Create "$as_dir" as a directory, including parents if necessary. -+as_fn_mkdir_p () -+{ -+ -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || eval $as_mkdir_p || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" -+ -+ -+} # as_fn_mkdir_p -+ -+# as_fn_executable_p FILE -+# ----------------------- -+# Test if FILE is an executable regular file. -+as_fn_executable_p () -+{ -+ test -f "$1" && test -x "$1" -+} # as_fn_executable_p -+# as_fn_append VAR VALUE -+# ---------------------- -+# Append the text in VALUE to the end of the definition contained in VAR. Take -+# advantage of any shell optimizations that allow amortized linear growth over -+# repeated appends, instead of the typical quadratic growth present in naive -+# implementations. -+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : -+ eval 'as_fn_append () -+ { -+ eval $1+=\$2 -+ }' -+else -+ as_fn_append () -+ { -+ eval $1=\$$1\$2 -+ } -+fi # as_fn_append -+ -+# as_fn_arith ARG... -+# ------------------ -+# Perform arithmetic evaluation on the ARGs, and store the result in the -+# global $as_val. Take advantage of shells that can avoid forks. The arguments -+# must be portable across $(()) and expr. -+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : -+ eval 'as_fn_arith () -+ { -+ as_val=$(( $* )) -+ }' -+else -+ as_fn_arith () -+ { -+ as_val=`expr "$@" || test $? -eq 1` -+ } -+fi # as_fn_arith -+ -+ -+# as_fn_error STATUS ERROR [LINENO LOG_FD] -+# ---------------------------------------- -+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -+# script with STATUS, using 1 if that was 0. -+as_fn_error () -+{ -+ as_status=$1; test $as_status -eq 0 && as_status=1 -+ if test "$4"; then -+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 -+ fi -+ $as_echo "$as_me: error: $2" >&2 -+ as_fn_exit $as_status -+} # as_fn_error -+ -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename - else - as_basename=false - fi - -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi - --# Name of the executable. --as_me=`$as_basename "$0" || -+as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || --echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -- /^X\/\(\/\/\)$/{ s//\1/; q; } -- /^X\/\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - --# PATH needs CR, and LINENO needs CR and PATH. - # Avoid depending upon Character Ranges. - as_cr_letters='abcdefghijklmnopqrstuvwxyz' - as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -@@ -83,146 +461,91 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE - as_cr_digits='0123456789' - as_cr_alnum=$as_cr_Letters$as_cr_digits - --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -- else -- PATH_SEPARATOR=: -- fi -- rm -f conf$$.sh --fi -- -- -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" || { -- # Find who we are. Look in the path if we contain no path at all -- # relative or not. -- case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -- -- ;; -- esac -- # We did not find ourselves, most probably we were run as `sh COMMAND' -- # in which case we are not to be found in the path. -- if test "x$as_myself" = x; then -- as_myself=$0 -- fi -- if test ! -f "$as_myself"; then -- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 -- { (exit 1); exit 1; }; } -- fi -- case $CONFIG_SHELL in -- '') -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for as_base in sh bash ksh sh5; do -- case $as_dir in -- /*) -- if ("$as_dir/$as_base" -c ' -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -- CONFIG_SHELL=$as_dir/$as_base -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" ${1+"$@"} -- fi;; -- esac -- done --done --;; -- esac - -- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -- # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line before each line; the second 'sed' does the real -- # work. The second script uses 'N' to pair each line-number line -- # with the numbered line, and appends trailing '-' during -- # substitution so that $LINENO is not a special case at line end. -- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -+ as_lineno_1=$LINENO as_lineno_1a=$LINENO -+ as_lineno_2=$LINENO as_lineno_2a=$LINENO -+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && -+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { -+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | - sed ' -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno - N -- s,$,-, -- : loop -- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -+ s/-\n.*// - ' >$as_me.lineno && -- chmod +x $as_me.lineno || -- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -- { (exit 1); exit 1; }; } -+ chmod +x "$as_me.lineno" || -+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - -+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have -+ # already done that, so ensure we don't try to do so again and fall -+ # in an infinite loop. This has already happened in practice. -+ _as_can_reexec=no; export _as_can_reexec - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensible to this). -- . ./$as_me.lineno -+ # original and so on. Autoconf is especially sensitive to this). -+ . "./$as_me.lineno" - # Exit status is that of the last command. - exit - } - -- --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in #((((( -+-n*) -+ case `echo 'xy\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ xy) ECHO_C='\c';; -+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null -+ ECHO_T=' ';; -+ esac;; -+*) -+ ECHO_N='-n';; - esac - --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr -+rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file - else -- as_expr=false -+ rm -f conf$$.dir -+ mkdir conf$$.dir 2>/dev/null - fi -- --rm -f conf$$ conf$$.exe conf$$.file --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -- as_ln_s='cp -p' -- else -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -pR'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -pR' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else -+ as_ln_s='cp -pR' - fi --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln - else -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - fi --rm -f conf$$ conf$$.exe conf$$.file -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null - - if mkdir -p . 2>/dev/null; then -- as_mkdir_p=: -+ as_mkdir_p='mkdir -p "$as_dir"' - else - test -d ./-p && rmdir ./-p - as_mkdir_p=false - fi - --as_executable_p="test -f" -+as_test_x='test -x' -+as_executable_p=as_fn_executable_p - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -231,38 +554,25 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P - as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH -- -+test -n "$DJDIR" || exec 7<&0 &1 - - # Name of the host. --# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, - # so uname gets run too. - ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - --exec 6>&1 -- - # - # Initializations. - # - ac_default_prefix=/usr/local -+ac_clean_files= - ac_config_libobj_dir=. -+LIBOBJS= - cross_compiling=no - subdirs= - MFLAGS= - MAKEFLAGS= --SHELL=${CONFIG_SHELL-/bin/sh} -- --# Maximum number of lines to put in a shell here document. --# This variable seems obsolete. It should probably be removed, and --# only ac_max_sed_lines should be used. --: ${ac_max_here_lines=38} - - # Identity of this package. - PACKAGE_NAME= -@@ -270,50 +580,175 @@ PACKAGE_TARNAME= - PACKAGE_VERSION= - PACKAGE_STRING= - PACKAGE_BUGREPORT= -+PACKAGE_URL= - - # Factoring default headers for most tests. - ac_includes_default="\ - #include --#if HAVE_SYS_TYPES_H -+#ifdef HAVE_SYS_TYPES_H - # include - #endif --#if HAVE_SYS_STAT_H -+#ifdef HAVE_SYS_STAT_H - # include - #endif --#if STDC_HEADERS -+#ifdef STDC_HEADERS - # include - # include - #else --# if HAVE_STDLIB_H -+# ifdef HAVE_STDLIB_H - # include - # endif - #endif --#if HAVE_STRING_H --# if !STDC_HEADERS && HAVE_MEMORY_H -+#ifdef HAVE_STRING_H -+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H - # include - # endif - # include - #endif --#if HAVE_STRINGS_H -+#ifdef HAVE_STRINGS_H - # include - #endif --#if HAVE_INTTYPES_H -+#ifdef HAVE_INTTYPES_H - # include --#else --# if HAVE_STDINT_H --# include --# endif - #endif --#if HAVE_UNISTD_H -+#ifdef HAVE_STDINT_H -+# include -+#endif -+#ifdef HAVE_UNISTD_H - # include - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os TARGET CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB CPP MIXED_CYGWIN_VC MIXED_MSYS_VC MIXED_VC MIXED_CYGWIN_MINGW MIXED_CYGWIN MIXED_MSYS EGREP OBJC_CC OBJC_CFLAGS GL_LIBS DEBUG_CFLAGS DEBUG_CXXFLAGS ERLC WX_BUILDING_INSIDE_ERLSRC ERLANG_ROOT_DIR WX_CONFIG_PATH WX_CPPFLAGS WX_CFLAGS WX_CXXFLAGS WX_CFLAGS_ONLY WX_CXXFLAGS_ONLY WX_LIBS WX_LIBS_STATIC WX_VERSION WX_RESCOMP WX_VERSION_MAJOR WX_VERSION_MINOR WX_VERSION_MICRO DEBUG_WX_CFLAGS DEBUG_WX_CXXFLAGS DEBUG_WX_LIBS DEBUG_WX_LIBS_STATIC FORCED_DEBUG_BUILD WX_HAVE_STATIC_LIBS RC_FILE_TYPE HAVE_GL_SUPPORT TESS_CB_TIGER_STYLE WXERL_CAN_BUILD_DRIVER SO_EXT RUN_ERL WXERL_SYS_TYPE LIBOBJS LTLIBOBJS' -+ac_subst_vars='LTLIBOBJS -+LIBOBJS -+WXERL_SYS_TYPE -+RUN_ERL -+SO_EXT -+WXERL_CAN_BUILD_DRIVER -+TESS_CB_TIGER_STYLE -+HAVE_GL_SUPPORT -+RC_FILE_TYPE -+WX_HAVE_STATIC_LIBS -+FORCED_DEBUG_BUILD -+DEBUG_WX_LIBS_STATIC -+DEBUG_WX_LIBS -+DEBUG_WX_CXXFLAGS -+DEBUG_WX_CFLAGS -+WX_VERSION_MICRO -+WX_VERSION_MINOR -+WX_VERSION_MAJOR -+WX_RESCOMP -+WX_VERSION -+WX_LIBS_STATIC -+WX_LIBS -+WX_CXXFLAGS_ONLY -+WX_CFLAGS_ONLY -+WX_CXXFLAGS -+WX_CFLAGS -+WX_CPPFLAGS -+WX_CONFIG_PATH -+ERLANG_ROOT_DIR -+WX_BUILDING_INSIDE_ERLSRC -+ERLC -+DEBUG_CXXFLAGS -+DEBUG_CFLAGS -+GL_LIBS -+OBJC_CFLAGS -+OBJC_CC -+EGREP -+GREP -+MIXED_MSYS -+MIXED_CYGWIN -+MIXED_CYGWIN_MINGW -+MIXED_VC -+MIXED_MSYS_VC -+MIXED_CYGWIN_VC -+CPP -+RANLIB -+ac_ct_CXX -+CXXFLAGS -+CXX -+OBJEXT -+EXEEXT -+ac_ct_CC -+CPPFLAGS -+LDFLAGS -+CFLAGS -+CC -+TARGET -+host_os -+host_vendor -+host_cpu -+host -+build_os -+build_vendor -+build_cpu -+build -+target_alias -+host_alias -+build_alias -+LIBS -+ECHO_T -+ECHO_N -+ECHO_C -+DEFS -+mandir -+localedir -+libdir -+psdir -+pdfdir -+dvidir -+htmldir -+infodir -+docdir -+oldincludedir -+includedir -+localstatedir -+sharedstatedir -+sysconfdir -+datadir -+datarootdir -+libexecdir -+sbindir -+bindir -+program_transform_name -+prefix -+exec_prefix -+PACKAGE_URL -+PACKAGE_BUGREPORT -+PACKAGE_STRING -+PACKAGE_VERSION -+PACKAGE_TARNAME -+PACKAGE_NAME -+PATH_SEPARATOR -+SHELL' - ac_subst_files='' -+ac_user_opts=' -+enable_option_checking -+with_wxdir -+with_wx_config -+with_wx_prefix -+with_wx_exec_prefix -+enable_sanitizers -+' -+ ac_precious_vars='build_alias -+host_alias -+target_alias -+CC -+CFLAGS -+LDFLAGS -+LIBS -+CPPFLAGS -+CXX -+CXXFLAGS -+CCC -+CPP' -+ - - # Initialize some variables set by options. - ac_init_help= - ac_init_version=false -+ac_unrecognized_opts= -+ac_unrecognized_sep= - # The variables have the same names as the options, with - # dashes changed to underlines. - cache_file=/dev/null -@@ -336,34 +771,49 @@ x_libraries=NONE - # and all the variables that are supposed to be based on exec_prefix - # by default will actually change. - # Use braces instead of parens because sh, perl, etc. also accept them. -+# (The list follows the same order as the GNU Coding Standards.) - bindir='${exec_prefix}/bin' - sbindir='${exec_prefix}/sbin' - libexecdir='${exec_prefix}/libexec' --datadir='${prefix}/share' -+datarootdir='${prefix}/share' -+datadir='${datarootdir}' - sysconfdir='${prefix}/etc' - sharedstatedir='${prefix}/com' - localstatedir='${prefix}/var' --libdir='${exec_prefix}/lib' - includedir='${prefix}/include' - oldincludedir='/usr/include' --infodir='${prefix}/info' --mandir='${prefix}/man' -+docdir='${datarootdir}/doc/${PACKAGE}' -+infodir='${datarootdir}/info' -+htmldir='${docdir}' -+dvidir='${docdir}' -+pdfdir='${docdir}' -+psdir='${docdir}' -+libdir='${exec_prefix}/lib' -+localedir='${datarootdir}/locale' -+mandir='${datarootdir}/man' - - ac_prev= -+ac_dashdash= - for ac_option - do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then -- eval "$ac_prev=\$ac_option" -+ eval $ac_prev=\$ac_option - ac_prev= - continue - fi - -- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` -+ case $ac_option in -+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; -+ *=) ac_optarg= ;; -+ *) ac_optarg=yes ;; -+ esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - -- case $ac_option in -+ case $ac_dashdash$ac_option in -+ --) -+ ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; -@@ -385,33 +835,59 @@ do - --config-cache | -C) - cache_file=config.cache ;; - -- -datadir | --datadir | --datadi | --datad | --data | --dat | --da) -+ -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; -- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ -- | --da=*) -+ -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - -+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ -+ | --dataroo | --dataro | --datar) -+ ac_prev=datarootdir ;; -+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ -+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) -+ datarootdir=$ac_optarg ;; -+ - -disable-* | --disable-*) -- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -- { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- eval "enable_$ac_feature=no" ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid feature name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval enable_$ac_useropt=no ;; -+ -+ -docdir | --docdir | --docdi | --doc | --do) -+ ac_prev=docdir ;; -+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) -+ docdir=$ac_optarg ;; -+ -+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) -+ ac_prev=dvidir ;; -+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) -+ dvidir=$ac_optarg ;; - - -enable-* | --enable-*) -- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -- { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -- *) ac_optarg=yes ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid feature name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; - esac -- eval "enable_$ac_feature='$ac_optarg'" ;; -+ eval enable_$ac_useropt=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -@@ -438,6 +914,12 @@ do - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - -+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) -+ ac_prev=htmldir ;; -+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ -+ | --ht=*) -+ htmldir=$ac_optarg ;; -+ - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; -@@ -462,13 +944,16 @@ do - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - -+ -localedir | --localedir | --localedi | --localed | --locale) -+ ac_prev=localedir ;; -+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) -+ localedir=$ac_optarg ;; -+ - -localstatedir | --localstatedir | --localstatedi | --localstated \ -- | --localstate | --localstat | --localsta | --localst \ -- | --locals | --local | --loca | --loc | --lo) -+ | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ -- | --localstate=* | --localstat=* | --localsta=* | --localst=* \ -- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) -+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) -@@ -533,6 +1018,16 @@ do - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - -+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) -+ ac_prev=pdfdir ;; -+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) -+ pdfdir=$ac_optarg ;; -+ -+ -psdir | --psdir | --psdi | --psd | --ps) -+ ac_prev=psdir ;; -+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) -+ psdir=$ac_optarg ;; -+ - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; -@@ -583,26 +1078,36 @@ do - ac_init_version=: ;; - - -with-* | --with-*) -- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -- { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package| sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -- *) ac_optarg=yes ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid package name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; - esac -- eval "with_$ac_package='$ac_optarg'" ;; -+ eval with_$ac_useropt=\$ac_optarg ;; - - -without-* | --without-*) -- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -- { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package | sed 's/-/_/g'` -- eval "with_$ac_package=no" ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid package name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval with_$ac_useropt=no ;; - - --x) - # Obsolete; use --with-x. -@@ -622,27 +1127,26 @@ do - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - -- -*) { echo "$as_me: error: unrecognized option: $ac_option --Try \`$0 --help' for more information." >&2 -- { (exit 1); exit 1; }; } -+ -*) as_fn_error $? "unrecognized option: \`$ac_option' -+Try \`$0 --help' for more information" - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. -- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 -- { (exit 1); exit 1; }; } -- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` -- eval "$ac_envvar='$ac_optarg'" -+ case $ac_envvar in #( -+ '' | [0-9]* | *[!_$as_cr_alnum]* ) -+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; -+ esac -+ eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. -- echo "$as_me: WARNING: you should use --build, --host, --target" >&2 -+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && -- echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} -+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" - ;; - - esac -@@ -650,31 +1154,36 @@ done - - if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` -- { echo "$as_me: error: missing argument to $ac_option" >&2 -- { (exit 1); exit 1; }; } -+ as_fn_error $? "missing argument to $ac_option" - fi - --# Be sure to have absolute paths. --for ac_var in exec_prefix prefix --do -- eval ac_val=$`echo $ac_var` -- case $ac_val in -- [\\/$]* | ?:[\\/]* | NONE | '' ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -+if test -n "$ac_unrecognized_opts"; then -+ case $enable_option_checking in -+ no) ;; -+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; -+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; - esac --done -+fi - --# Be sure to have absolute paths. --for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ -- localstatedir libdir includedir oldincludedir infodir mandir -+# Check all directory arguments for consistency. -+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ -+ datadir sysconfdir sharedstatedir localstatedir includedir \ -+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ -+ libdir localedir mandir - do -- eval ac_val=$`echo $ac_var` -+ eval ac_val=\$$ac_var -+ # Remove trailing slashes. - case $ac_val in -- [\\/$]* | ?:[\\/]* ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -+ */ ) -+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` -+ eval $ac_var=\$ac_val;; -+ esac -+ # Be sure to have absolute directory names. -+ case $ac_val in -+ [\\/$]* | ?:[\\/]* ) continue;; -+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac -+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" - done - - # There might be people who depend on the old broken behavior: `$host' -@@ -688,8 +1197,6 @@ target=$target_alias - if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe -- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. -- If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -@@ -701,82 +1208,72 @@ test -n "$host_alias" && ac_tool_prefix= - test "$silent" = yes && exec 6>/dev/null - - -+ac_pwd=`pwd` && test -n "$ac_pwd" && -+ac_ls_di=`ls -di .` && -+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -+ as_fn_error $? "working directory cannot be determined" -+test "X$ac_ls_di" = "X$ac_pwd_ls_di" || -+ as_fn_error $? "pwd does not report name of working directory" -+ -+ - # Find the source files, if location was not specified. - if test -z "$srcdir"; then - ac_srcdir_defaulted=yes -- # Try the directory containing this script, then its parent. -- ac_confdir=`(dirname "$0") 2>/dev/null || --$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$0" : 'X\(//\)[^/]' \| \ -- X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$0" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ # Try the directory containing this script, then the parent directory. -+ ac_confdir=`$as_dirname -- "$as_myself" || -+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_myself" : 'X\(//\)[^/]' \| \ -+ X"$as_myself" : 'X\(//\)$' \| \ -+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_myself" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - srcdir=$ac_confdir -- if test ! -r $srcdir/$ac_unique_file; then -+ if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. - fi - else - ac_srcdir_defaulted=no - fi --if test ! -r $srcdir/$ac_unique_file; then -- if test "$ac_srcdir_defaulted" = yes; then -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 -- { (exit 1); exit 1; }; } -- else -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -- { (exit 1); exit 1; }; } -- fi -+if test ! -r "$srcdir/$ac_unique_file"; then -+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." -+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" - fi --(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || -- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 -- { (exit 1); exit 1; }; } --srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` --ac_env_build_alias_set=${build_alias+set} --ac_env_build_alias_value=$build_alias --ac_cv_env_build_alias_set=${build_alias+set} --ac_cv_env_build_alias_value=$build_alias --ac_env_host_alias_set=${host_alias+set} --ac_env_host_alias_value=$host_alias --ac_cv_env_host_alias_set=${host_alias+set} --ac_cv_env_host_alias_value=$host_alias --ac_env_target_alias_set=${target_alias+set} --ac_env_target_alias_value=$target_alias --ac_cv_env_target_alias_set=${target_alias+set} --ac_cv_env_target_alias_value=$target_alias --ac_env_CC_set=${CC+set} --ac_env_CC_value=$CC --ac_cv_env_CC_set=${CC+set} --ac_cv_env_CC_value=$CC --ac_env_CFLAGS_set=${CFLAGS+set} --ac_env_CFLAGS_value=$CFLAGS --ac_cv_env_CFLAGS_set=${CFLAGS+set} --ac_cv_env_CFLAGS_value=$CFLAGS --ac_env_LDFLAGS_set=${LDFLAGS+set} --ac_env_LDFLAGS_value=$LDFLAGS --ac_cv_env_LDFLAGS_set=${LDFLAGS+set} --ac_cv_env_LDFLAGS_value=$LDFLAGS --ac_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_env_CPPFLAGS_value=$CPPFLAGS --ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_cv_env_CPPFLAGS_value=$CPPFLAGS --ac_env_CXX_set=${CXX+set} --ac_env_CXX_value=$CXX --ac_cv_env_CXX_set=${CXX+set} --ac_cv_env_CXX_value=$CXX --ac_env_CXXFLAGS_set=${CXXFLAGS+set} --ac_env_CXXFLAGS_value=$CXXFLAGS --ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} --ac_cv_env_CXXFLAGS_value=$CXXFLAGS --ac_env_CPP_set=${CPP+set} --ac_env_CPP_value=$CPP --ac_cv_env_CPP_set=${CPP+set} --ac_cv_env_CPP_value=$CPP -+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -+ac_abs_confdir=`( -+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" -+ pwd)` -+# When building in place, set srcdir=. -+if test "$ac_abs_confdir" = "$ac_pwd"; then -+ srcdir=. -+fi -+# Remove unnecessary trailing slashes from srcdir. -+# Double slashes in file names in object file debugging info -+# mess up M-x gdb in Emacs. -+case $srcdir in -+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -+esac -+for ac_var in $ac_precious_vars; do -+ eval ac_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_env_${ac_var}_value=\$${ac_var} -+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_cv_env_${ac_var}_value=\$${ac_var} -+done - - # - # Report the --help message. -@@ -799,20 +1296,17 @@ Configuration: - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit -- -q, --quiet, --silent do not print \`checking...' messages -+ -q, --quiet, --silent do not print \`checking ...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - --_ACEOF -- -- cat <<_ACEOF - Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX -- [$ac_default_prefix] -+ [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -- [PREFIX] -+ [PREFIX] - - By default, \`make install' will install all the files in - \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -@@ -822,18 +1316,25 @@ for instance \`--prefix=\$HOME'. - For better control, use the options below. - - Fine tuning of the installation directories: -- --bindir=DIR user executables [EPREFIX/bin] -- --sbindir=DIR system admin executables [EPREFIX/sbin] -- --libexecdir=DIR program executables [EPREFIX/libexec] -- --datadir=DIR read-only architecture-independent data [PREFIX/share] -- --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -- --localstatedir=DIR modifiable single-machine data [PREFIX/var] -- --libdir=DIR object code libraries [EPREFIX/lib] -- --includedir=DIR C header files [PREFIX/include] -- --oldincludedir=DIR C header files for non-gcc [/usr/include] -- --infodir=DIR info documentation [PREFIX/info] -- --mandir=DIR man documentation [PREFIX/man] -+ --bindir=DIR user executables [EPREFIX/bin] -+ --sbindir=DIR system admin executables [EPREFIX/sbin] -+ --libexecdir=DIR program executables [EPREFIX/libexec] -+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -+ --localstatedir=DIR modifiable single-machine data [PREFIX/var] -+ --libdir=DIR object code libraries [EPREFIX/lib] -+ --includedir=DIR C header files [PREFIX/include] -+ --oldincludedir=DIR C header files for non-gcc [/usr/include] -+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] -+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] -+ --infodir=DIR info documentation [DATAROOTDIR/info] -+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] -+ --mandir=DIR man documentation [DATAROOTDIR/man] -+ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] -+ --htmldir=DIR html documentation [DOCDIR] -+ --dvidir=DIR dvi documentation [DOCDIR] -+ --pdfdir=DIR pdf documentation [DOCDIR] -+ --psdir=DIR ps documentation [DOCDIR] - _ACEOF - - cat <<\_ACEOF -@@ -849,6 +1350,7 @@ if test -n "$ac_init_help"; then - cat <<\_ACEOF - - Optional Features: -+ --disable-option-checking ignore unrecognized --enable/--with options - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-sanitizers[=comma-separated list of sanitizers] -@@ -868,8 +1370,9 @@ Some influential environment variables: - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory -- CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have -- headers in a nonstandard directory -+ LIBS libraries to pass to the linker, e.g. -l -+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if -+ you have headers in a nonstandard directory - CXX C++ compiler command - CXXFLAGS C++ compiler flags - CPP C preprocessor -@@ -877,119 +1380,680 @@ Some influential environment variables: - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. - -+Report bugs to the package provider. - _ACEOF -+ac_status=$? - fi - - if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. -- ac_popdir=`pwd` - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue -- test -d $ac_dir || continue -+ test -d "$ac_dir" || -+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || -+ continue - ac_builddir=. - --if test "$ac_dir" != .; then -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix - - case $srcdir in -- .) # No --srcdir option. We are building in place. -+ .) # We are building in place. - ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; --esac -- --# Do not use `cd foo && pwd` to compute absolute paths, because --# the directories may not exist. --case `pwd` in --.) ac_abs_builddir="$ac_dir";; --*) -- case "$ac_dir" in -- .) ac_abs_builddir=`pwd`;; -- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -- *) ac_abs_builddir=`pwd`/"$ac_dir";; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_builddir=${ac_top_builddir}.;; --*) -- case ${ac_top_builddir}. in -- .) ac_abs_top_builddir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_srcdir=$ac_srcdir;; --*) -- case $ac_srcdir in -- .) ac_abs_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_srcdir=$ac_top_srcdir;; --*) -- case $ac_top_srcdir in -- .) ac_abs_top_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -- esac;; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; - esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - -- cd $ac_dir -- # Check for guested configure; otherwise get Cygnus style configure. -- if test -f $ac_srcdir/configure.gnu; then -- echo -- $SHELL $ac_srcdir/configure.gnu --help=recursive -- elif test -f $ac_srcdir/configure; then -- echo -- $SHELL $ac_srcdir/configure --help=recursive -- elif test -f $ac_srcdir/configure.ac || -- test -f $ac_srcdir/configure.in; then -- echo -- $ac_configure --help -+ cd "$ac_dir" || { ac_status=$?; continue; } -+ # Check for guested configure. -+ if test -f "$ac_srcdir/configure.gnu"; then -+ echo && -+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive -+ elif test -f "$ac_srcdir/configure"; then -+ echo && -+ $SHELL "$ac_srcdir/configure" --help=recursive - else -- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -- fi -- cd $ac_popdir -+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -+ fi || ac_status=$? -+ cd "$ac_pwd" || { ac_status=$?; break; } - done - fi - --test -n "$ac_init_help" && exit 0 -+test -n "$ac_init_help" && exit $ac_status - if $ac_init_version; then - cat <<\_ACEOF -+configure -+generated by GNU Autoconf 2.69 - --Copyright (C) 2003 Free Software Foundation, Inc. -+Copyright (C) 2012 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - _ACEOF -- exit 0 -+ exit - fi --exec 5>config.log --cat >&5 <<_ACEOF -+ -+## ------------------------ ## -+## Autoconf initialization. ## -+## ------------------------ ## -+ -+# ac_fn_c_try_compile LINENO -+# -------------------------- -+# Try to compile conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_compile () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ rm -f conftest.$ac_objext -+ if { { ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compile") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_c_try_compile -+ -+# ac_fn_cxx_try_compile LINENO -+# ---------------------------- -+# Try to compile conftest.$ac_ext, and return whether this succeeded. -+ac_fn_cxx_try_compile () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ rm -f conftest.$ac_objext -+ if { { ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compile") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_cxx_try_compile -+ -+# ac_fn_c_try_cpp LINENO -+# ---------------------- -+# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_cpp () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if { { ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } > conftest.i && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_c_try_cpp -+ -+# ac_fn_c_try_run LINENO -+# ---------------------- -+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -+# that executables *can* be run. -+ac_fn_c_try_run () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' -+ { { case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: program exited with status $ac_status" >&5 -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=$ac_status -+fi -+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_c_try_run -+ -+# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES -+# -------------------------------------------- -+# Tries to find the compile-time value of EXPR in a program that includes -+# INCLUDES, setting VAR accordingly. Returns whether the value could be -+# computed -+ac_fn_c_compute_int () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if test "$cross_compiling" = yes; then -+ # Depending upon the size, compute the lo and hi bounds. -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+static int test_array [1 - 2 * !(($2) >= 0)]; -+test_array [0] = 0; -+return test_array [0]; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_lo=0 ac_mid=0 -+ while :; do -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -+test_array [0] = 0; -+return test_array [0]; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_hi=$ac_mid; break -+else -+ as_fn_arith $ac_mid + 1 && ac_lo=$as_val -+ if test $ac_lo -le $ac_mid; then -+ ac_lo= ac_hi= -+ break -+ fi -+ as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ done -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+static int test_array [1 - 2 * !(($2) < 0)]; -+test_array [0] = 0; -+return test_array [0]; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_hi=-1 ac_mid=-1 -+ while :; do -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+static int test_array [1 - 2 * !(($2) >= $ac_mid)]; -+test_array [0] = 0; -+return test_array [0]; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_lo=$ac_mid; break -+else -+ as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val -+ if test $ac_mid -le $ac_hi; then -+ ac_lo= ac_hi= -+ break -+ fi -+ as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ done -+else -+ ac_lo= ac_hi= -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+# Binary search between lo and hi bounds. -+while test "x$ac_lo" != "x$ac_hi"; do -+ as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -+test_array [0] = 0; -+return test_array [0]; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_hi=$ac_mid -+else -+ as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+done -+case $ac_lo in #(( -+?*) eval "$3=\$ac_lo"; ac_retval=0 ;; -+'') ac_retval=1 ;; -+esac -+ else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+static long int longval () { return $2; } -+static unsigned long int ulongval () { return $2; } -+#include -+#include -+int -+main () -+{ -+ -+ FILE *f = fopen ("conftest.val", "w"); -+ if (! f) -+ return 1; -+ if (($2) < 0) -+ { -+ long int i = longval (); -+ if (i != ($2)) -+ return 1; -+ fprintf (f, "%ld", i); -+ } -+ else -+ { -+ unsigned long int i = ulongval (); -+ if (i != ($2)) -+ return 1; -+ fprintf (f, "%lu", i); -+ } -+ /* Do not output a trailing newline, as this causes \r\n confusion -+ on some platforms. */ -+ return ferror (f) || fclose (f) != 0; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_run "$LINENO"; then : -+ echo >>conftest.val; read $3 &5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+#include <$2> -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ eval "$3=yes" -+else -+ eval "$3=no" -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ -+} # ac_fn_c_check_header_compile -+ -+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -+# ------------------------------------------------------- -+# Tests whether HEADER exists, giving a warning if it cannot be compiled using -+# the include files in INCLUDES and setting the cache variable VAR -+# accordingly. -+ac_fn_c_check_header_mongrel () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if eval \${$3+:} false; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -+$as_echo_n "checking $2 usability... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+#include <$2> -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_header_compiler=yes -+else -+ ac_header_compiler=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -+$as_echo_n "checking $2 presence... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <$2> -+_ACEOF -+if ac_fn_c_try_cpp "$LINENO"; then : -+ ac_header_preproc=yes -+else -+ ac_header_preproc=no -+fi -+rm -f conftest.err conftest.i conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( -+ yes:no: ) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -+ ;; -+esac -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$3=\$ac_header_compiler" -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ -+} # ac_fn_c_check_header_mongrel -+ -+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES -+# ------------------------------------------- -+# Tests whether TYPE exists after having included INCLUDES, setting cache -+# variable VAR accordingly. -+ac_fn_c_check_type () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$3=no" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+if (sizeof ($2)) -+ return 0; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+if (sizeof (($2))) -+ return 0; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ -+else -+ eval "$3=yes" -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ -+} # ac_fn_c_check_type -+ -+# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES -+# --------------------------------------------------------- -+# Tests whether HEADER exists and can be compiled using the include files in -+# INCLUDES, setting the cache variable VAR accordingly. -+ac_fn_cxx_check_header_compile () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+#include <$2> -+_ACEOF -+if ac_fn_cxx_try_compile "$LINENO"; then : -+ eval "$3=yes" -+else -+ eval "$3=no" -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ -+} # ac_fn_cxx_check_header_compile -+ -+# ac_fn_cxx_try_link LINENO -+# ------------------------- -+# Try to link conftest.$ac_ext, and return whether this succeeded. -+ac_fn_cxx_try_link () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ rm -f conftest.$ac_objext conftest$ac_exeext -+ if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ test -x conftest$ac_exeext -+ }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 -+fi -+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information -+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would -+ # interfere with the next link command; also delete a directory that is -+ # left behind by Apple's compiler. We do this before executing the actions. -+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_cxx_try_link -+cat >config.log <<_ACEOF - This file contains any messages produced by compilers while - running configure, to aid debugging if configure makes a mistake. - - It was created by $as_me, which was --generated by GNU Autoconf 2.59. Invocation command line was -+generated by GNU Autoconf 2.69. Invocation command line was - - $ $0 $@ - - _ACEOF -+exec 5>>config.log - { - cat <<_ASUNAME - ## --------- ## -@@ -1008,7 +2072,7 @@ uname -v = `(uname -v) 2>/dev/null || ec - /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` - /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` - /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` --hostinfo = `(hostinfo) 2>/dev/null || echo unknown` -+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` - /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` - /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` - /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -@@ -1020,8 +2084,9 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- echo "PATH: $as_dir" --done -+ $as_echo "PATH: $as_dir" -+ done -+IFS=$as_save_IFS - - } >&5 - -@@ -1043,7 +2108,6 @@ _ACEOF - ac_configure_args= - ac_configure_args0= - ac_configure_args1= --ac_sep= - ac_must_keep_next=false - for ac_pass in 1 2 - do -@@ -1054,13 +2118,13 @@ do - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *\'*) -+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in -- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; - 2) -- ac_configure_args1="$ac_configure_args1 '$ac_arg'" -+ as_fn_append ac_configure_args1 " '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else -@@ -1076,104 +2140,115 @@ do - -* ) ac_must_keep_next=true ;; - esac - fi -- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" -- # Get rid of the leading space. -- ac_sep=" " -+ as_fn_append ac_configure_args " '$ac_arg'" - ;; - esac - done - done --$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } --$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } -+{ ac_configure_args0=; unset ac_configure_args0;} -+{ ac_configure_args1=; unset ac_configure_args1;} - - # When interrupted or exit'd, cleanup temporary files, and complete - # config.log. We remove comments because anyway the quotes in there - # would cause problems or look ugly. --# WARNING: Be sure not to use single quotes in there, as some shells, --# such as our DU 5.0 friend, will then `close' the trap. -+# WARNING: Use '\'' to represent an apostrophe within the trap. -+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. - trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo - -- cat <<\_ASBOX --## ---------------- ## -+ $as_echo "## ---------------- ## - ## Cache variables. ## --## ---------------- ## --_ASBOX -+## ---------------- ##" - echo - # The following way of writing the cache mishandles newlines in values, --{ -+( -+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -+ *) { eval $ac_var=; unset $ac_var;} ;; -+ esac ;; -+ esac -+ done - (set) 2>&1 | -- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) - sed -n \ -- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; -- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" -- ;; -+ "s/'\''/'\''\\\\'\'''\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" -+ ;; #( - *) -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; -- esac; --} -+ esac | -+ sort -+) - echo - -- cat <<\_ASBOX --## ----------------- ## -+ $as_echo "## ----------------- ## - ## Output variables. ## --## ----------------- ## --_ASBOX -+## ----------------- ##" - echo - for ac_var in $ac_subst_vars - do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - - if test -n "$ac_subst_files"; then -- cat <<\_ASBOX --## ------------- ## --## Output files. ## --## ------------- ## --_ASBOX -+ $as_echo "## ------------------- ## -+## File substitutions. ## -+## ------------------- ##" - echo - for ac_var in $ac_subst_files - do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi - - if test -s confdefs.h; then -- cat <<\_ASBOX --## ----------- ## -+ $as_echo "## ----------- ## - ## confdefs.h. ## --## ----------- ## --_ASBOX -+## ----------- ##" - echo -- sed "/^$/d" confdefs.h | sort -+ cat confdefs.h - echo - fi - test "$ac_signal" != 0 && -- echo "$as_me: caught signal $ac_signal" -- echo "$as_me: exit $exit_status" -+ $as_echo "$as_me: caught signal $ac_signal" -+ $as_echo "$as_me: exit $exit_status" - } >&5 -- rm -f core *.core && -- rm -rf conftest* confdefs* conf$$* $ac_clean_files && -+ rm -f core *.core core.conftest.* && -+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -- ' 0 -+' 0 - for ac_signal in 1 2 13 15; do -- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal - done - ac_signal=0 - - # confdefs.h avoids OS command line length limits that DEFS can exceed. --rm -rf conftest* confdefs.h --# AIX cpp loses on an empty file, so make sure it contains at least a newline. --echo >confdefs.h -+rm -f -r conftest* confdefs.h -+ -+$as_echo "/* confdefs.h */" > confdefs.h - - # Predefined preprocessor variables. - -@@ -1181,112 +2256,137 @@ cat >>confdefs.h <<_ACEOF - #define PACKAGE_NAME "$PACKAGE_NAME" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_TARNAME "$PACKAGE_TARNAME" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_VERSION "$PACKAGE_VERSION" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_STRING "$PACKAGE_STRING" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" - _ACEOF - -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_URL "$PACKAGE_URL" -+_ACEOF -+ - - # Let the site file select an alternate cache file if it wants to. --# Prefer explicitly selected file to automatically selected ones. --if test -z "$CONFIG_SITE"; then -- if test "x$prefix" != xNONE; then -- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" -- else -- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" -- fi -+# Prefer an explicitly selected file to automatically selected ones. -+ac_site_file1=NONE -+ac_site_file2=NONE -+if test -n "$CONFIG_SITE"; then -+ # We do not want a PATH search for config.site. -+ case $CONFIG_SITE in #(( -+ -*) ac_site_file1=./$CONFIG_SITE;; -+ */*) ac_site_file1=$CONFIG_SITE;; -+ *) ac_site_file1=./$CONFIG_SITE;; -+ esac -+elif test "x$prefix" != xNONE; then -+ ac_site_file1=$prefix/share/config.site -+ ac_site_file2=$prefix/etc/config.site -+else -+ ac_site_file1=$ac_default_prefix/share/config.site -+ ac_site_file2=$ac_default_prefix/etc/config.site - fi --for ac_site_file in $CONFIG_SITE; do -- if test -r "$ac_site_file"; then -- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 --echo "$as_me: loading site script $ac_site_file" >&6;} -+for ac_site_file in "$ac_site_file1" "$ac_site_file2" -+do -+ test "x$ac_site_file" = xNONE && continue -+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -+$as_echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 -- . "$ac_site_file" -+ . "$ac_site_file" \ -+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "failed to load site script $ac_site_file -+See \`config.log' for more details" "$LINENO" 5; } - fi - done - - if test -r "$cache_file"; then -- # Some versions of bash will fail to source /dev/null (special -- # files actually), so we avoid doing that. -- if test -f "$cache_file"; then -- { echo "$as_me:$LINENO: loading cache $cache_file" >&5 --echo "$as_me: loading cache $cache_file" >&6;} -+ # Some versions of bash will fail to source /dev/null (special files -+ # actually), so we avoid doing that. DJGPP emulates it as a regular file. -+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -+$as_echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in -- [\\/]* | ?:[\\/]* ) . $cache_file;; -- *) . ./$cache_file;; -+ [\\/]* | ?:[\\/]* ) . "$cache_file";; -+ *) . "./$cache_file";; - esac - fi - else -- { echo "$as_me:$LINENO: creating cache $cache_file" >&5 --echo "$as_me: creating cache $cache_file" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -+$as_echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file - fi - - # Check that the precious variables saved in the cache have kept the same - # value. - ac_cache_corrupted=false --for ac_var in `(set) 2>&1 | -- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do -+for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set -- eval ac_old_val="\$ac_cv_env_${ac_var}_value" -- eval ac_new_val="\$ac_env_${ac_var}_value" -+ eval ac_old_val=\$ac_cv_env_${ac_var}_value -+ eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) -- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) -- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then -- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 --echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 --echo "$as_me: former value: $ac_old_val" >&2;} -- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 --echo "$as_me: current value: $ac_new_val" >&2;} -- ac_cache_corrupted=: -+ # differences in whitespace do not lead to failure. -+ ac_old_val_w=`echo x $ac_old_val` -+ ac_new_val_w=`echo x $ac_new_val` -+ if test "$ac_old_val_w" != "$ac_new_val_w"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -+ ac_cache_corrupted=: -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} -+ eval $ac_var=\$ac_old_val -+ fi -+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. -- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; -+ *) as_fn_append ac_configure_args " '$ac_arg'" ;; - esac - fi - done - if $ac_cache_corrupted; then -- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 --echo "$as_me: error: changes in the environment can compromise the build" >&2;} -- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 --echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} -- { (exit 1); exit 1; }; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} -+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 - fi -+## -------------------- ## -+## Main body of script. ## -+## -------------------- ## - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' -@@ -1296,47 +2396,34 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - ac_aux_dir= - for ac_dir in $srcdir/autoconf; do -- if test -f $ac_dir/install-sh; then -+ if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break -- elif test -f $ac_dir/install.sh; then -+ elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break -- elif test -f $ac_dir/shtool; then -+ elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi - done - if test -z "$ac_aux_dir"; then -- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir/autoconf" >&5 --echo "$as_me: error: cannot find install-sh or install.sh in $srcdir/autoconf" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in $srcdir/autoconf" "$LINENO" 5 - fi --ac_config_guess="$SHELL $ac_aux_dir/config.guess" --ac_config_sub="$SHELL $ac_aux_dir/config.sub" --ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -+ -+# These three variables are undocumented and unsupported, -+# and are intended to be withdrawn in a future Autoconf release. -+# They can cause serious problems if a builder's source tree is in a directory -+# whose full name contains unusual characters. -+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -+ - - - -@@ -1349,28 +2436,32 @@ fi - if test -z "$ERL_TOP" || test ! -d $ERL_TOP ; then - ac_aux_dir= - for ac_dir in autoconf; do -- if test -f $ac_dir/install-sh; then -+ if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break -- elif test -f $ac_dir/install.sh; then -+ elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break -- elif test -f $ac_dir/shtool; then -+ elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi - done - if test -z "$ac_aux_dir"; then -- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in autoconf" >&5 --echo "$as_me: error: cannot find install-sh or install.sh in autoconf" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in autoconf" "$LINENO" 5 - fi --ac_config_guess="$SHELL $ac_aux_dir/config.guess" --ac_config_sub="$SHELL $ac_aux_dir/config.sub" --ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -+ -+# These three variables are undocumented and unsupported, -+# and are intended to be withdrawn in a future Autoconf release. -+# They can cause serious problems if a builder's source tree is in a directory -+# whose full name contains unusual characters. -+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -+ - - WX_BUILDING_INSIDE_ERLSRC=false - else -@@ -1378,55 +2469,63 @@ else - if test -d $erl_top/erts/autoconf; then - ac_aux_dir= - for ac_dir in $erl_top/erts/autoconf; do -- if test -f $ac_dir/install-sh; then -+ if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break -- elif test -f $ac_dir/install.sh; then -+ elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break -- elif test -f $ac_dir/shtool; then -+ elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi - done - if test -z "$ac_aux_dir"; then -- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $erl_top/erts/autoconf" >&5 --echo "$as_me: error: cannot find install-sh or install.sh in $erl_top/erts/autoconf" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in $erl_top/erts/autoconf" "$LINENO" 5 - fi --ac_config_guess="$SHELL $ac_aux_dir/config.guess" --ac_config_sub="$SHELL $ac_aux_dir/config.sub" --ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -+ -+# These three variables are undocumented and unsupported, -+# and are intended to be withdrawn in a future Autoconf release. -+# They can cause serious problems if a builder's source tree is in a directory -+# whose full name contains unusual characters. -+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -+ - - WX_BUILDING_INSIDE_ERLSRC=true - else - ac_aux_dir= - for ac_dir in autoconf; do -- if test -f $ac_dir/install-sh; then -+ if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break -- elif test -f $ac_dir/install.sh; then -+ elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break -- elif test -f $ac_dir/shtool; then -+ elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi - done - if test -z "$ac_aux_dir"; then -- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in autoconf" >&5 --echo "$as_me: error: cannot find install-sh or install.sh in autoconf" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in autoconf" "$LINENO" 5 - fi --ac_config_guess="$SHELL $ac_aux_dir/config.guess" --ac_config_sub="$SHELL $ac_aux_dir/config.sub" --ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -+ -+# These three variables are undocumented and unsupported, -+# and are intended to be withdrawn in a future Autoconf release. -+# They can cause serious problems if a builder's source tree is in a directory -+# whose full name contains unusual characters. -+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -+ - - WX_BUILDING_INSIDE_ERLSRC=false - fi -@@ -1434,57 +2533,74 @@ fi - - if test "X$host" != "Xfree_source" -a "X$host" != "Xwin32"; then - # Make sure we can run config.sub. --$ac_config_sub sun4 >/dev/null 2>&1 || -- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 --echo "$as_me: error: cannot run $ac_config_sub" >&2;} -- { (exit 1); exit 1; }; } -+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || -+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - --echo "$as_me:$LINENO: checking build system type" >&5 --echo $ECHO_N "checking build system type... $ECHO_C" >&6 --if test "${ac_cv_build+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -+$as_echo_n "checking build system type... " >&6; } -+if ${ac_cv_build+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- ac_cv_build_alias=$build_alias --test -z "$ac_cv_build_alias" && -- ac_cv_build_alias=`$ac_config_guess` --test -z "$ac_cv_build_alias" && -- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 --echo "$as_me: error: cannot guess build type; you must specify one" >&2;} -- { (exit 1); exit 1; }; } --ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} -- { (exit 1); exit 1; }; } -+ ac_build_alias=$build_alias -+test "x$ac_build_alias" = x && -+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -+test "x$ac_build_alias" = x && -+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || -+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 - - fi --echo "$as_me:$LINENO: result: $ac_cv_build" >&5 --echo "${ECHO_T}$ac_cv_build" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -+$as_echo "$ac_cv_build" >&6; } -+case $ac_cv_build in -+*-*-*) ;; -+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; -+esac - build=$ac_cv_build --build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_build -+shift -+build_cpu=$1 -+build_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+build_os=$* -+IFS=$ac_save_IFS -+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - --echo "$as_me:$LINENO: checking host system type" >&5 --echo $ECHO_N "checking host system type... $ECHO_C" >&6 --if test "${ac_cv_host+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -+$as_echo_n "checking host system type... " >&6; } -+if ${ac_cv_host+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- ac_cv_host_alias=$host_alias --test -z "$ac_cv_host_alias" && -- ac_cv_host_alias=$ac_cv_build_alias --ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} -- { (exit 1); exit 1; }; } -+ if test "x$host_alias" = x; then -+ ac_cv_host=$ac_cv_build -+else -+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || -+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 -+fi - - fi --echo "$as_me:$LINENO: result: $ac_cv_host" >&5 --echo "${ECHO_T}$ac_cv_host" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -+$as_echo "$ac_cv_host" >&6; } -+case $ac_cv_host in -+*-*-*) ;; -+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; -+esac - host=$ac_cv_host --host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_host -+shift -+host_cpu=$1 -+host_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+host_os=$* -+IFS=$ac_save_IFS -+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - - else -@@ -1512,10 +2628,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. - set dummy ${ac_tool_prefix}gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1525,35 +2641,37 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -1563,39 +2681,50 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -+$as_echo "$ac_ct_CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -- CC=$ac_ct_CC -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi - else - CC="$ac_cv_prog_CC" - fi - - if test -z "$CC"; then -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. - set dummy ${ac_tool_prefix}cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1605,77 +2734,37 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- --fi --if test -z "$ac_cv_prog_CC"; then -- ac_ct_CC=$CC -- # Extract the first word of "cc", so it can be a program name with args. --set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$ac_ct_CC"; then -- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- --fi --fi --ac_ct_CC=$ac_cv_prog_ac_ct_CC --if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -- CC=$ac_ct_CC --else -- CC="$ac_cv_prog_CC" --fi - -+ fi - fi - if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1686,18 +2775,19 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. -@@ -1715,24 +2805,25 @@ fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then -- for ac_prog in cl -+ for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1742,39 +2833,41 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - test -n "$CC" && break - done - fi - if test -z "$CC"; then - ac_ct_CC=$CC -- for ac_prog in cl -+ for ac_prog in cl.exe - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -1784,66 +2877,78 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -+$as_echo "$ac_ct_CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - test -n "$ac_ct_CC" && break - done - -- CC=$ac_ct_CC -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi - fi - - fi - - --test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH --See \`config.log' for more details." >&5 --echo "$as_me: error: no acceptable C compiler found in \$PATH --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "no acceptable C compiler found in \$PATH -+See \`config.log' for more details" "$LINENO" 5; } - - # Provide some information about the compiler. --echo "$as_me:$LINENO:" \ -- "checking for C compiler version" >&5 --ac_compiler=`set X $ac_compile; echo $2` --{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 -- (eval $ac_compiler --version &5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 -- (eval $ac_compiler -v &5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 -- (eval $ac_compiler -V &5) 2>&5 -+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -+set X $ac_compile -+ac_compiler=$2 -+for ac_option in --version -v -V -qversion; do -+ { { ac_try="$ac_compiler $ac_option >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } -+ if test -s conftest.err; then -+ sed '10a\ -+... rest of stderr output deleted ... -+ 10q' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ fi -+ rm -f conftest.er1 conftest.err -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+done - --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -1855,112 +2960,108 @@ main () - } - _ACEOF - ac_clean_files_save=$ac_clean_files --ac_clean_files="$ac_clean_files a.out a.exe b.out" -+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" - # Try to create an executable without -o first, disregard a.out. - # It will help us diagnose broken compilers, and finding out an intuition - # of exeext. --echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 --echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 --ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` --if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 -- (eval $ac_link_default) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- # Find the output, starting from the most likely. This scheme is --# not robust to junk in `.', hence go to wildcards (a.*) only as a last --# resort. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -+$as_echo_n "checking whether the C compiler works... " >&6; } -+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` - --# Be careful to initialize this variable, since it used to be cached. --# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. --ac_cv_exeext= --# b.out is created by i960 compilers. --for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out -+# The possible output files: -+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" -+ -+ac_rmfiles= -+for ac_file in $ac_files -+do -+ case $ac_file in -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; -+ * ) ac_rmfiles="$ac_rmfiles $ac_file";; -+ esac -+done -+rm -f $ac_rmfiles -+ -+if { { ac_try="$ac_link_default" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link_default") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : -+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -+# in a Makefile. We should not override ac_cv_exeext if it was cached, -+# so that the user can short-circuit this test for compilers unknown to -+# Autoconf. -+for ac_file in $ac_files '' - do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) -- ;; -- conftest.$ac_ext ) -- # This is the source file. -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) -- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- # FIXME: I believe we export ac_cv_exeext for Libtool, -- # but it would be cool to find out if it's true. Does anybody -- # maintain Libtool? --akim. -- export ac_cv_exeext -+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; -+ then :; else -+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -+ fi -+ # We set ac_cv_exeext here because the later test for it is not -+ # safe: cross compilers may not add the suffix if given an `-o' -+ # argument, so we may need to know it at that point already. -+ # Even if this section looks crufty: it has the advantage of -+ # actually working. - break;; - * ) - break;; - esac - done -+test "$ac_cv_exeext" = no && ac_cv_exeext= -+ - else -- echo "$as_me: failed program was:" >&5 -+ ac_file='' -+fi -+if test -z "$ac_file"; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+$as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { echo "$as_me:$LINENO: error: C compiler cannot create executables --See \`config.log' for more details." >&5 --echo "$as_me: error: C compiler cannot create executables --See \`config.log' for more details." >&2;} -- { (exit 77); exit 77; }; } -+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error 77 "C compiler cannot create executables -+See \`config.log' for more details" "$LINENO" 5; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - fi -- -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -+$as_echo_n "checking for C compiler default output file name... " >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -+$as_echo "$ac_file" >&6; } - ac_exeext=$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_file" >&5 --echo "${ECHO_T}$ac_file" >&6 - --# Check the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --echo "$as_me:$LINENO: checking whether the C compiler works" >&5 --echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 --# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 --# If not cross compiling, check that we can run a simple program. --if test "$cross_compiling" != yes; then -- if { ac_try='./$ac_file' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- cross_compiling=no -- else -- if test "$cross_compiling" = maybe; then -- cross_compiling=yes -- else -- { { echo "$as_me:$LINENO: error: cannot run C compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run C compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -- fi -- fi --fi --echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -- --rm -f a.out a.exe conftest$ac_cv_exeext b.out -+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out - ac_clean_files=$ac_clean_files_save --# Check the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 --echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 --echo "$as_me:$LINENO: result: $cross_compiling" >&5 --echo "${ECHO_T}$cross_compiling" >&6 -- --echo "$as_me:$LINENO: checking for suffix of executables" >&5 --echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -+$as_echo_n "checking for suffix of executables... " >&6; } -+if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) - # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will - # work properly (i.e., refer to `conftest.exe'), while it won't with -@@ -1968,38 +3069,90 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- export ac_cv_exeext - break;; - * ) break;; - esac - done - else -- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "cannot compute suffix of executables: cannot compile and link -+See \`config.log' for more details" "$LINENO" 5; } - fi -- --rm -f conftest$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 --echo "${ECHO_T}$ac_cv_exeext" >&6 -+rm -f conftest conftest$ac_cv_exeext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -+$as_echo "$ac_cv_exeext" >&6; } - - rm -f conftest.$ac_ext - EXEEXT=$ac_cv_exeext - ac_exeext=$EXEEXT --echo "$as_me:$LINENO: checking for suffix of object files" >&5 --echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 --if test "${ac_cv_objext+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main () -+{ -+FILE *f = fopen ("conftest.out", "w"); -+ return ferror (f) || fclose (f) != 0; -+ -+ ; -+ return 0; -+} - _ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ac_clean_files="$ac_clean_files conftest.out" -+# Check that the compiler produces executables we can run. If not, either -+# the compiler is broken, or we cross compile. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -+$as_echo_n "checking whether we are cross compiling... " >&6; } -+if test "$cross_compiling" != yes; then -+ { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if { ac_try='./conftest$ac_cv_exeext' -+ { { case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; }; then -+ cross_compiling=no -+ else -+ if test "$cross_compiling" = maybe; then -+ cross_compiling=yes -+ else -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "cannot run C compiled programs. -+If you meant to cross compile, use \`--host'. -+See \`config.log' for more details" "$LINENO" 5; } -+ fi -+ fi -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -+$as_echo "$cross_compiling" >&6; } -+ -+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out -+ac_clean_files=$ac_clean_files_save -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -+$as_echo_n "checking for suffix of object files... " >&6; } -+if ${ac_cv_objext+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2011,45 +3164,46 @@ main () - } - _ACEOF - rm -f conftest.o conftest.obj --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+if { { ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compile") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : -+ for ac_file in conftest.o conftest.obj conftest.*; do -+ test -f "$ac_file" || continue; - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac - done - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute suffix of object files: cannot compile --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "cannot compute suffix of object files: cannot compile -+See \`config.log' for more details" "$LINENO" 5; } - fi -- - rm -f conftest.$ac_cv_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 --echo "${ECHO_T}$ac_cv_objext" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -+$as_echo "$ac_cv_objext" >&6; } - OBJEXT=$ac_cv_objext - ac_objext=$OBJEXT --echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 --if test "${ac_cv_c_compiler_gnu+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -+if ${ac_cv_c_compiler_gnu+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2063,55 +3217,34 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - ac_compiler_gnu=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_compiler_gnu=no -+ ac_compiler_gnu=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_c_compiler_gnu=$ac_compiler_gnu - - fi --echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 --GCC=`test $ac_compiler_gnu = yes && echo yes` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -+$as_echo "$ac_cv_c_compiler_gnu" >&6; } -+if test $ac_compiler_gnu = yes; then -+ GCC=yes -+else -+ GCC= -+fi - ac_test_CFLAGS=${CFLAGS+set} - ac_save_CFLAGS=$CFLAGS --CFLAGS="-g" --echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 --echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 --if test "${ac_cv_prog_cc_g+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -+$as_echo_n "checking whether $CC accepts -g... " >&6; } -+if ${ac_cv_prog_cc_g+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ ac_save_c_werror_flag=$ac_c_werror_flag -+ ac_c_werror_flag=yes -+ ac_cv_prog_cc_g=no -+ CFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2122,39 +3255,49 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ CFLAGS="" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - --ac_cv_prog_cc_g=no -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ -+else -+ ac_c_werror_flag=$ac_save_c_werror_flag -+ CFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_prog_cc_g=yes - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_c_werror_flag=$ac_save_c_werror_flag -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -+$as_echo "$ac_cv_prog_cc_g" >&6; } - if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS - elif test $ac_cv_prog_cc_g = yes; then -@@ -2170,23 +3313,18 @@ else - CFLAGS= - fi - fi --echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 --echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 --if test "${ac_cv_prog_cc_stdc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -+if ${ac_cv_prog_cc_c89+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- ac_cv_prog_cc_stdc=no -+ ac_cv_prog_cc_c89=no - ac_save_CC=$CC --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - #include --#include --#include -+struct stat; - /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ - struct buf { int x; }; - FILE * (*rcsopen) (struct buf *, struct stat *, int); -@@ -2209,12 +3347,17 @@ static char *f (char * (*g) (char **, in - /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated -- as 'x'. The following induces an error, until -std1 is added to get -+ as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something -- that's true only with -std1. */ -+ that's true only with -std. */ - int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters -+ inside strings and character constants. */ -+#define FOO(x) 'x' -+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; -+ - int test (int i, double x); - struct s1 {int (*f) (int a);}; - struct s2 {int (*f) (double a);}; -@@ -2229,225 +3372,61 @@ return f (e, argv, 0) != argv[0] || f - return 0; - } - _ACEOF --# Don't try gcc -ansi; that turns off useful extensions and --# breaks some systems' header files. --# AIX -qlanglvl=ansi --# Ultrix and OSF/1 -std1 --# HP-UX 10.20 and later -Ae --# HP-UX older versions -Aa -D_HPUX_SOURCE --# SVR4 -Xc -D__EXTENSIONS__ --for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ -+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" - do - CC="$ac_save_CC $ac_arg" -- rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_prog_cc_stdc=$ac_arg --break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -+ if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_prog_cc_c89=$ac_arg - fi --rm -f conftest.err conftest.$ac_objext -+rm -f core conftest.err conftest.$ac_objext -+ test "x$ac_cv_prog_cc_c89" != "xno" && break - done --rm -f conftest.$ac_ext conftest.$ac_objext -+rm -f conftest.$ac_ext - CC=$ac_save_CC - - fi -- --case "x$ac_cv_prog_cc_stdc" in -- x|xno) -- echo "$as_me:$LINENO: result: none needed" >&5 --echo "${ECHO_T}none needed" >&6 ;; -+# AC_CACHE_VAL -+case "x$ac_cv_prog_cc_c89" in -+ x) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -+$as_echo "none needed" >&6; } ;; -+ xno) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -+$as_echo "unsupported" >&6; } ;; - *) -- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 -- CC="$CC $ac_cv_prog_cc_stdc" ;; -+ CC="$CC $ac_cv_prog_cc_c89" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; - esac -+if test "x$ac_cv_prog_cc_c89" != xno; then : - --# Some people use a C++ compiler to compile C. Since we use `exit', --# in C++ we need to declare it. In case someone uses the same compiler --# for both compiling C and C++ we need to have the C++ compiler decide --# the declaration of exit, since it's the most demanding environment. --cat >conftest.$ac_ext <<_ACEOF --#ifndef __cplusplus -- choke me --#endif --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- for ac_declaration in \ -- '' \ -- 'extern "C" void std::exit (int) throw (); using std::exit;' \ -- 'extern "C" void std::exit (int); using std::exit;' \ -- 'extern "C" void exit (int) throw ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_declaration --#include --int --main () --{ --exit (42); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --continue --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_declaration --int --main () --{ --exit (42); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --done --rm -f conftest* --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h - fi - --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - --ac_ext=cc -+ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test -n "$ac_tool_prefix"; then -- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC -+if test -z "$CXX"; then -+ if test -n "$CCC"; then -+ CXX=$CCC -+ else -+ if test -n "$ac_tool_prefix"; then -+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CXX+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_CXX+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -@@ -2457,39 +3436,41 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - CXX=$ac_cv_prog_CXX - if test -n "$CXX"; then -- echo "$as_me:$LINENO: result: $CXX" >&5 --echo "${ECHO_T}$CXX" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -+$as_echo "$CXX" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - test -n "$CXX" && break - done - fi - if test -z "$CXX"; then - ac_ct_CXX=$CXX -- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC -+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_CXX+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -@@ -2499,64 +3480,77 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CXX="$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CXX=$ac_cv_prog_ac_ct_CXX - if test -n "$ac_ct_CXX"; then -- echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 --echo "${ECHO_T}$ac_ct_CXX" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -+$as_echo "$ac_ct_CXX" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - test -n "$ac_ct_CXX" && break - done --test -n "$ac_ct_CXX" || ac_ct_CXX="g++" - -- CXX=$ac_ct_CXX -+ if test "x$ac_ct_CXX" = x; then -+ CXX="g++" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ CXX=$ac_ct_CXX -+ fi - fi - -- -+ fi -+fi - # Provide some information about the compiler. --echo "$as_me:$LINENO:" \ -- "checking for C++ compiler version" >&5 --ac_compiler=`set X $ac_compile; echo $2` --{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 -- (eval $ac_compiler --version &5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 -- (eval $ac_compiler -v &5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 -- (eval $ac_compiler -V &5) 2>&5 -+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 -+set X $ac_compile -+ac_compiler=$2 -+for ac_option in --version -v -V -qversion; do -+ { { ac_try="$ac_compiler $ac_option >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } -+ if test -s conftest.err; then -+ sed '10a\ -+... rest of stderr output deleted ... -+ 10q' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ fi -+ rm -f conftest.er1 conftest.err -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+done - --echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 --if test "${ac_cv_cxx_compiler_gnu+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 -+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -+if ${ac_cv_cxx_compiler_gnu+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2570,55 +3564,34 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_cxx_try_compile "$LINENO"; then : - ac_compiler_gnu=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_compiler_gnu=no -+ ac_compiler_gnu=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - - fi --echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 --GXX=`test $ac_compiler_gnu = yes && echo yes` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -+if test $ac_compiler_gnu = yes; then -+ GXX=yes -+else -+ GXX= -+fi - ac_test_CXXFLAGS=${CXXFLAGS+set} - ac_save_CXXFLAGS=$CXXFLAGS --CXXFLAGS="-g" --echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 --echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 --if test "${ac_cv_prog_cxx_g+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 -+$as_echo_n "checking whether $CXX accepts -g... " >&6; } -+if ${ac_cv_prog_cxx_g+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag -+ ac_cxx_werror_flag=yes -+ ac_cv_prog_cxx_g=no -+ CXXFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2629,160 +3602,64 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_prog_cxx_g=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_prog_cxx_g=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 --echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 --if test "$ac_test_CXXFLAGS" = set; then -- CXXFLAGS=$ac_save_CXXFLAGS --elif test $ac_cv_prog_cxx_g = yes; then -- if test "$GXX" = yes; then -- CXXFLAGS="-g -O2" -- else -- CXXFLAGS="-g" -- fi --else -- if test "$GXX" = yes; then -- CXXFLAGS="-O2" -- else -- CXXFLAGS= -- fi --fi --for ac_declaration in \ -- '' \ -- 'extern "C" void std::exit (int) throw (); using std::exit;' \ -- 'extern "C" void std::exit (int); using std::exit;' \ -- 'extern "C" void exit (int) throw ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ CXXFLAGS="" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --$ac_declaration --#include -+ - int - main () - { --exit (42); -+ - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_cxx_try_compile "$LINENO"; then : - --continue --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+else -+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag -+ CXXFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --$ac_declaration -+ - int - main () - { --exit (42); -+ - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -+if ac_fn_cxx_try_compile "$LINENO"; then : -+ ac_cv_prog_cxx_g=yes - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --done --rm -f conftest* --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -+$as_echo "$ac_cv_prog_cxx_g" >&6; } -+if test "$ac_test_CXXFLAGS" = set; then -+ CXXFLAGS=$ac_save_CXXFLAGS -+elif test $ac_cv_prog_cxx_g = yes; then -+ if test "$GXX" = yes; then -+ CXXFLAGS="-g -O2" -+ else -+ CXXFLAGS="-g" -+ fi -+else -+ if test "$GXX" = yes; then -+ CXXFLAGS="-O2" -+ else -+ CXXFLAGS= -+ fi - fi -- - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -2792,10 +3669,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. - set dummy ${ac_tool_prefix}ranlib; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_RANLIB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_RANLIB+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -@@ -2805,35 +3682,37 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - RANLIB=$ac_cv_prog_RANLIB - if test -n "$RANLIB"; then -- echo "$as_me:$LINENO: result: $RANLIB" >&5 --echo "${ECHO_T}$RANLIB" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -+$as_echo "$RANLIB" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -@@ -2843,28 +3722,38 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_RANLIB="ranlib" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - -- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" - fi - fi - ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB - if test -n "$ac_ct_RANLIB"; then -- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 --echo "${ECHO_T}$ac_ct_RANLIB" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -+$as_echo "$ac_ct_RANLIB" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -- RANLIB=$ac_ct_RANLIB -+ if test "x$ac_ct_RANLIB" = x; then -+ RANLIB=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ RANLIB=$ac_ct_RANLIB -+ fi - else - RANLIB="$ac_cv_prog_RANLIB" - fi -@@ -2874,15 +3763,15 @@ ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu --echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 --echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -+$as_echo_n "checking how to run the C preprocessor... " >&6; } - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= - fi - if test -z "$CPP"; then -- if test "${ac_cv_prog_CPP+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ if ${ac_cv_prog_CPP+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" -@@ -2896,11 +3785,7 @@ do - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #ifdef __STDC__ - # include -@@ -2909,78 +3794,34 @@ cat >>conftest.$ac_ext <<_ACEOF - #endif - Syntax error - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_cpp "$LINENO"; then : - -+else - # Broken: fails on valid input. - continue - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - -- # OK, works on sane cases. Now check whether non-existent headers -+ # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. - continue - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- - # Passes both tests. - ac_preproc_ok=: - break - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - - done - # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -+rm -f conftest.i conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then : - break - fi - -@@ -2992,8 +3833,8 @@ fi - else - ac_cv_prog_CPP=$CPP - fi --echo "$as_me:$LINENO: result: $CPP" >&5 --echo "${ECHO_T}$CPP" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -+$as_echo "$CPP" >&6; } - ac_preproc_ok=false - for ac_c_preproc_warn_flag in '' yes - do -@@ -3003,11 +3844,7 @@ do - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #ifdef __STDC__ - # include -@@ -3016,85 +3853,40 @@ cat >>conftest.$ac_ext <<_ACEOF - #endif - Syntax error - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_cpp "$LINENO"; then : - -+else - # Broken: fails on valid input. - continue - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - -- # OK, works on sane cases. Now check whether non-existent headers -+ # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. - continue - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- - # Passes both tests. - ac_preproc_ok=: - break - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - - done - # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -- : -+rm -f conftest.i conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then : -+ - else -- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check --See \`config.log' for more details." >&5 --echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -+See \`config.log' for more details" "$LINENO" 5; } - fi - - ac_ext=c -@@ -3104,41 +3896,39 @@ ac_link='$CC -o conftest$ac_exeext $CFLA - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - --{ echo "$as_me:$LINENO: Building for $host_os" >&5 --echo "$as_me: Building for $host_os" >&6;} -+{ $as_echo "$as_me:${as_lineno-$LINENO}: Building for $host_os" >&5 -+$as_echo "$as_me: Building for $host_os" >&6;} - WXERL_CAN_BUILD_DRIVER=true - - - MIXED_CYGWIN=no - MIXED_MSYS=no - --echo "$as_me:$LINENO: checking for mixed cygwin or msys and native VC++ environment" >&5 --echo $ECHO_N "checking for mixed cygwin or msys and native VC++ environment... $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mixed cygwin or msys and native VC++ environment" >&5 -+$as_echo_n "checking for mixed cygwin or msys and native VC++ environment... " >&6; } - if test "X$host" = "Xwin32" -a "x$GCC" != "xyes"; then - if test -x /usr/bin/msys-?.0.dll; then - CFLAGS="$CFLAGS -O2" - MIXED_MSYS=yes -- echo "$as_me:$LINENO: result: MSYS and VC" >&5 --echo "${ECHO_T}MSYS and VC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: MSYS and VC" >&5 -+$as_echo "MSYS and VC" >&6; } - MIXED_MSYS_VC=yes - CPPFLAGS="$CPPFLAGS -DERTS_MIXED_MSYS_VC" - elif test -x /usr/bin/cygpath; then - CFLAGS="$CFLAGS -O2" - MIXED_CYGWIN=yes -- echo "$as_me:$LINENO: result: Cygwin and VC" >&5 --echo "${ECHO_T}Cygwin and VC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Cygwin and VC" >&5 -+$as_echo "Cygwin and VC" >&6; } - MIXED_CYGWIN_VC=yes - CPPFLAGS="$CPPFLAGS -DERTS_MIXED_CYGWIN_VC" - else -- echo "$as_me:$LINENO: result: undeterminable" >&5 --echo "${ECHO_T}undeterminable" >&6 -- { { echo "$as_me:$LINENO: error: Seems to be mixed windows but not with cygwin" >&5 --echo "$as_me: error: Seems to be mixed windows but not with cygwin" >&2;} -- { (exit cannot handle this!); exit cannot handle this!; }; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: undeterminable" >&5 -+$as_echo "undeterminable" >&6; } -+ as_fn_error cannot handle this! "Seems to be mixed windows but not with cygwin" "$LINENO" 5 - fi - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - MIXED_CYGWIN_VC=no - MIXED_MSYS_VC=no - fi -@@ -3153,26 +3943,24 @@ fi - - - if test "x$MIXED_MSYS" != "xyes"; then -- echo "$as_me:$LINENO: checking for mixed cygwin and native MinGW environment" >&5 --echo $ECHO_N "checking for mixed cygwin and native MinGW environment... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mixed cygwin and native MinGW environment" >&5 -+$as_echo_n "checking for mixed cygwin and native MinGW environment... " >&6; } - if test "X$host" = "Xwin32" -a "x$GCC" = x"yes"; then - if test -x /usr/bin/cygpath; then - CFLAGS="$CFLAGS -O2" - MIXED_CYGWIN=yes -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - MIXED_CYGWIN_MINGW=yes - CPPFLAGS="$CPPFLAGS -DERTS_MIXED_CYGWIN_MINGW" - else -- echo "$as_me:$LINENO: result: undeterminable" >&5 --echo "${ECHO_T}undeterminable" >&6 -- { { echo "$as_me:$LINENO: error: Seems to be mixed windows but not with cygwin" >&5 --echo "$as_me: error: Seems to be mixed windows but not with cygwin" >&2;} -- { (exit cannot handle this!); exit cannot handle this!; }; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: undeterminable" >&5 -+$as_echo "undeterminable" >&6; } -+ as_fn_error cannot handle this! "Seems to be mixed windows but not with cygwin" "$LINENO" 5 - fi - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - MIXED_CYGWIN_MINGW=no - fi - else -@@ -3180,26 +3968,26 @@ else - fi - - --echo "$as_me:$LINENO: checking if we mix cygwin with any native compiler" >&5 --echo $ECHO_N "checking if we mix cygwin with any native compiler... $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we mix cygwin with any native compiler" >&5 -+$as_echo_n "checking if we mix cygwin with any native compiler... " >&6; } - if test "X$MIXED_CYGWIN" = "Xyes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - - - --echo "$as_me:$LINENO: checking if we mix msys with another native compiler" >&5 --echo $ECHO_N "checking if we mix msys with another native compiler... $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we mix msys with another native compiler" >&5 -+$as_echo_n "checking if we mix msys with another native compiler... " >&6; } - if test "X$MIXED_MSYS" = "Xyes" ; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -3213,31 +4001,142 @@ fi - - - --echo "$as_me:$LINENO: checking for egrep" >&5 --echo $ECHO_N "checking for egrep... $ECHO_C" >&6 --if test "${ac_cv_prog_egrep+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -+$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -+if ${ac_cv_path_GREP+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- if echo a | (grep -E '(a|b)') >/dev/null 2>&1 -- then ac_cv_prog_egrep='grep -E' -- else ac_cv_prog_egrep='egrep' -+ if test -z "$GREP"; then -+ ac_path_GREP_found=false -+ # Loop through the user's path and test for each of PROGNAME-LIST -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in grep ggrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" -+ as_fn_executable_p "$ac_path_GREP" || continue -+# Check for GNU ac_path_GREP and select it if it is found. -+ # Check for GNU $ac_path_GREP -+case `"$ac_path_GREP" --version 2>&1` in -+*GNU*) -+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -+*) -+ ac_count=0 -+ $as_echo_n 0123456789 >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ $as_echo 'GREP' >> "conftest.nl" -+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ as_fn_arith $ac_count + 1 && ac_count=$as_val -+ if test $ac_count -gt ${ac_path_GREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_GREP="$ac_path_GREP" -+ ac_path_GREP_max=$ac_count -+ fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+esac -+ -+ $ac_path_GREP_found && break 3 -+ done -+ done -+ done -+IFS=$as_save_IFS -+ if test -z "$ac_cv_path_GREP"; then -+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 -+ fi -+else -+ ac_cv_path_GREP=$GREP -+fi -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -+$as_echo "$ac_cv_path_GREP" >&6; } -+ GREP="$ac_cv_path_GREP" -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -+$as_echo_n "checking for egrep... " >&6; } -+if ${ac_cv_path_EGREP+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 -+ then ac_cv_path_EGREP="$GREP -E" -+ else -+ if test -z "$EGREP"; then -+ ac_path_EGREP_found=false -+ # Loop through the user's path and test for each of PROGNAME-LIST -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in egrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" -+ as_fn_executable_p "$ac_path_EGREP" || continue -+# Check for GNU ac_path_EGREP and select it if it is found. -+ # Check for GNU $ac_path_EGREP -+case `"$ac_path_EGREP" --version 2>&1` in -+*GNU*) -+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -+*) -+ ac_count=0 -+ $as_echo_n 0123456789 >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ $as_echo 'EGREP' >> "conftest.nl" -+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ as_fn_arith $ac_count + 1 && ac_count=$as_val -+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_EGREP="$ac_path_EGREP" -+ ac_path_EGREP_max=$ac_count - fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+esac -+ -+ $ac_path_EGREP_found && break 3 -+ done -+ done -+ done -+IFS=$as_save_IFS -+ if test -z "$ac_cv_path_EGREP"; then -+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 -+ fi -+else -+ ac_cv_path_EGREP=$EGREP - fi --echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 --echo "${ECHO_T}$ac_cv_prog_egrep" >&6 -- EGREP=$ac_cv_prog_egrep -+ -+ fi -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -+$as_echo "$ac_cv_path_EGREP" >&6; } -+ EGREP="$ac_cv_path_EGREP" - - --echo "$as_me:$LINENO: checking for ANSI C header files" >&5 --echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 --if test "${ac_cv_header_stdc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -+$as_echo_n "checking for ANSI C header files... " >&6; } -+if ${ac_cv_header_stdc+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - #include -@@ -3252,51 +4151,23 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_header_stdc=no -+ ac_cv_header_stdc=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "memchr" >/dev/null 2>&1; then -- : -+ $EGREP "memchr" >/dev/null 2>&1; then : -+ - else - ac_cv_header_stdc=no - fi -@@ -3306,18 +4177,14 @@ fi - - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "free" >/dev/null 2>&1; then -- : -+ $EGREP "free" >/dev/null 2>&1; then : -+ - else - ac_cv_header_stdc=no - fi -@@ -3327,16 +4194,13 @@ fi - - if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -- if test "$cross_compiling" = yes; then -+ if test "$cross_compiling" = yes; then : - : - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include -+#include - #if ((' ' & 0x0FF) == 0x020) - # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') - # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -@@ -3356,109 +4220,39 @@ main () - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) -- exit(2); -- exit (0); -+ return 2; -+ return 0; - } - _ACEOF --rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_run "$LINENO"; then : - --( exit $ac_status ) --ac_cv_header_stdc=no -+else -+ ac_cv_header_stdc=no - fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext - fi -+ - fi - fi --echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 --echo "${ECHO_T}$ac_cv_header_stdc" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -+$as_echo "$ac_cv_header_stdc" >&6; } - if test $ac_cv_header_stdc = yes; then - --cat >>confdefs.h <<\_ACEOF --#define STDC_HEADERS 1 --_ACEOF -+$as_echo "#define STDC_HEADERS 1" >>confdefs.h - - fi - - # On IRIX 5.3, sys/types and inttypes.h are conflicting. -- -- -- -- -- -- -- -- -- - for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default -- --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- eval "$as_ac_Header=yes" --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --eval "$as_ac_Header=no" --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -+" -+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -3466,415 +4260,34 @@ fi - done - - --echo "$as_me:$LINENO: checking for void *" >&5 --echo $ECHO_N "checking for void *... $ECHO_C" >&6 --if test "${ac_cv_type_void_p+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --int --main () --{ --if ((void * *) 0) -- return 0; --if (sizeof (void *)) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_void_p=yes -+# The cast to long int works around a bug in the HP C Compiler -+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+# This bug is HP SR number 8606223364. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5 -+$as_echo_n "checking size of void *... " >&6; } -+if ${ac_cv_sizeof_void_p+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_void_p=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&5 --echo "${ECHO_T}$ac_cv_type_void_p" >&6 -+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then : - --echo "$as_me:$LINENO: checking size of void *" >&5 --echo $ECHO_N "checking size of void *... $ECHO_C" >&6 --if test "${ac_cv_sizeof_void_p+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test "$ac_cv_type_void_p" = yes; then -- # The cast to unsigned long works around a bug in the HP C Compiler -- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -- # This bug is HP SR number 8606223364. -- if test "$cross_compiling" = yes; then -- # Depending upon the size, compute the lo and hi bounds. --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --int --main () --{ --static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= 0)]; --test_array [0] = 0 -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_lo=0 ac_mid=0 -- while :; do -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --int --main () --{ --static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)]; --test_array [0] = 0 -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_hi=$ac_mid; break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_lo=`expr $ac_mid + 1` -- if test $ac_lo -le $ac_mid; then -- ac_lo= ac_hi= -- break -- fi -- ac_mid=`expr 2 '*' $ac_mid + 1` --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- done --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --int --main () --{ --static int test_array [1 - 2 * !(((long) (sizeof (void *))) < 0)]; --test_array [0] = 0 -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_hi=-1 ac_mid=-1 -- while :; do -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --int --main () --{ --static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= $ac_mid)]; --test_array [0] = 0 -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_lo=$ac_mid; break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_hi=`expr '(' $ac_mid ')' - 1` -- if test $ac_mid -le $ac_hi; then -- ac_lo= ac_hi= -- break -- fi -- ac_mid=`expr 2 '*' $ac_mid` --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- done --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_lo= ac_hi= --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error 77 "cannot compute sizeof (void *) -+See \`config.log' for more details" "$LINENO" 5; } -+ else -+ ac_cv_sizeof_void_p=0 -+ fi - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --# Binary search between lo and hi bounds. --while test "x$ac_lo" != "x$ac_hi"; do -- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --int --main () --{ --static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)]; --test_array [0] = 0 - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_hi=$ac_mid --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_lo=`expr '(' $ac_mid ')' + 1` - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --done --case $ac_lo in --?*) ac_cv_sizeof_void_p=$ac_lo;; --'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77 --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute sizeof (void *), 77 --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } ;; --esac --else -- if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --long longval () { return (long) (sizeof (void *)); } --unsigned long ulongval () { return (long) (sizeof (void *)); } --#include --#include --int --main () --{ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5 -+$as_echo "$ac_cv_sizeof_void_p" >&6; } - -- FILE *f = fopen ("conftest.val", "w"); -- if (! f) -- exit (1); -- if (((long) (sizeof (void *))) < 0) -- { -- long i = longval (); -- if (i != ((long) (sizeof (void *)))) -- exit (1); -- fprintf (f, "%ld\n", i); -- } -- else -- { -- unsigned long i = ulongval (); -- if (i != ((long) (sizeof (void *)))) -- exit (1); -- fprintf (f, "%lu\n", i); -- } -- exit (ferror (f) || fclose (f) != 0); - -- ; -- return 0; --} --_ACEOF --rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_sizeof_void_p=`cat conftest.val` --else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - --( exit $ac_status ) --{ { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77 --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute sizeof (void *), 77 --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --fi --fi --rm -f conftest.val --else -- ac_cv_sizeof_void_p=0 --fi --fi --echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5 --echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6 - cat >>confdefs.h <<_ACEOF - #define SIZEOF_VOID_P $ac_cv_sizeof_void_p - _ACEOF -@@ -3888,21 +4301,17 @@ OBJC_CFLAGS="" - CXXFLAGS="" - case $host_os in - darwin*) -- echo "$as_me:$LINENO: checking Checking wxWidgets for min version:" >&5 --echo $ECHO_N "checking Checking wxWidgets for min version:... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Checking wxWidgets for min version:" >&5 -+$as_echo_n "checking Checking wxWidgets for min version:... " >&6; } - WX_CC=`wx-config --cc` - MAC_MIN=`echo "$WX_CC" | sed 's/^[^ ]*\ *//'` -- echo "$as_me:$LINENO: result: $MAC_MIN" >&5 --echo "${ECHO_T}$MAC_MIN" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAC_MIN" >&5 -+$as_echo "$MAC_MIN" >&6; } - -- echo "$as_me:$LINENO: checking if compiler accepts -ObjC" >&5 --echo $ECHO_N "checking if compiler accepts -ObjC... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -ObjC" >&5 -+$as_echo_n "checking if compiler accepts -ObjC... " >&6; } - CFLAGS="$CFLAGS -ObjC" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -3913,45 +4322,21 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - accept_objc_flag=true - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --accept_objc_flag=false -+ accept_objc_flag=false - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test "X$accept_objc_flag" = "Xtrue"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - C_ONLY_FLAGS="-ObjC" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -- echo "$as_me:$LINENO: checking for a Cocoa compliant Objective C compiler" >&5 --echo $ECHO_N "checking for a Cocoa compliant Objective C compiler... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Cocoa compliant Objective C compiler" >&5 -+$as_echo_n "checking for a Cocoa compliant Objective C compiler... " >&6; } - SEARCHFOR="" - SEARCHFORXX="" - save_IFS=$IFS -@@ -3980,22 +4365,20 @@ echo $ECHO_N "checking for a Cocoa compl - done - IFS=$save_IFS - if test X$APPLE_CC = X -o X$APPLE_CXX = X; then -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then -- { { echo "$as_me:$LINENO: error: Can not find compiler to compile Cocoa applications" >&5 --echo "$as_me: error: Can not find compiler to compile Cocoa applications" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "Can not find compiler to compile Cocoa applications" "$LINENO" 5 - else - echo "Can not find compiler to compile Cocoa applications" > ./CONF_INFO - WXERL_CAN_BUILD_DRIVER=false -- { echo "$as_me:$LINENO: WARNING: Can not find compiler to compile Cocoa applications" >&5 --echo "$as_me: WARNING: Can not find compiler to compile Cocoa applications" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can not find compiler to compile Cocoa applications" >&5 -+$as_echo "$as_me: WARNING: Can not find compiler to compile Cocoa applications" >&2;} - fi - WXERL_CAN_BUILD_DRIVER=false - else -- echo "$as_me:$LINENO: result: $APPLE_CC ($APPLE_CXX)" >&5 --echo "${ECHO_T}$APPLE_CC ($APPLE_CXX)" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $APPLE_CC ($APPLE_CXX)" >&5 -+$as_echo "$APPLE_CC ($APPLE_CXX)" >&6; } - CC=$APPLE_CC - CXX=$APPLE_CXX - #CXXFLAGS="-x c++ $CXXFLAGS" -@@ -4009,8 +4392,8 @@ echo "${ECHO_T}$APPLE_CC ($APPLE_CXX)" > - mingw32) - CFLAGS="$CFLAGS -DWIN32 -DWINVER=0x0600 -D_WINDOWS -D_UNICODE -DUNICODE" - CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0600" -- { echo "$as_me:$LINENO: WARNING: Reverting to 32-bit time_t" >&5 --echo "$as_me: WARNING: Reverting to 32-bit time_t" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Reverting to 32-bit time_t" >&5 -+$as_echo "$as_me: WARNING: Reverting to 32-bit time_t" >&2;} - CPPFLAGS="$CPPFLAGS -D_USE_32BIT_TIME_T" - ;; - win32) -@@ -4072,297 +4455,21 @@ esac - - - if test X"$host_os" != X"win32" ; then -- --for ac_header in GL/gl.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in GL/gl.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default" -+if test "x$ac_cv_header_GL_gl_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- --else -- --for ac_header in OpenGL/gl.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> -+#define HAVE_GL_GL_H 1 - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 - --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in OpenGL/gl.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "OpenGL/gl.h" "ac_cv_header_OpenGL_gl_h" "$ac_includes_default" -+if test "x$ac_cv_header_OpenGL_gl_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_OPENGL_GL_H 1 - _ACEOF - - fi -@@ -4377,154 +4484,16 @@ done - test X"$ac_cv_header_OpenGL_gl_h" != Xyes - then - saved_CPPFLAGS="$CPPFLAGS" -- { echo "$as_me:$LINENO: Checking for OpenGL headers in /usr/X11R6" >&5 --echo "$as_me: Checking for OpenGL headers in /usr/X11R6" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: Checking for OpenGL headers in /usr/X11R6" >&5 -+$as_echo "$as_me: Checking for OpenGL headers in /usr/X11R6" >&6;} - CPPFLAGS="-isystem /usr/X11R6/include $CPPFLAGS" - $as_unset ac_cv_header_GL_gl_h -- --for ac_header in GL/gl.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in GL/gl.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default" -+if test "x$ac_cv_header_GL_gl_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_GL_GL_H 1 - _ACEOF - - fi -@@ -4532,154 +4501,16 @@ fi - done - - if test X"$ac_cv_header_GL_gl_h" != Xyes ; then -- { echo "$as_me:$LINENO: Checking for OpenGL headers in /usr/local" >&5 --echo "$as_me: Checking for OpenGL headers in /usr/local" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: Checking for OpenGL headers in /usr/local" >&5 -+$as_echo "$as_me: Checking for OpenGL headers in /usr/local" >&6;} - CPPFLAGS="-isystem /usr/local/include $saved_CPPFLAGS" - $as_unset ac_cv_header_GL_gl_h -- --for ac_header in GL/gl.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in GL/gl.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default" -+if test "x$ac_cv_header_GL_gl_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_GL_GL_H 1 - _ACEOF - - fi -@@ -4687,8 +4518,8 @@ fi - done - - if test X"$ac_cv_header_GL_gl_h" != Xyes ; then -- { echo "$as_me:$LINENO: WARNING: No OpenGL headers found, wx will NOT be usable" >&5 --echo "$as_me: WARNING: No OpenGL headers found, wx will NOT be usable" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No OpenGL headers found, wx will NOT be usable" >&5 -+$as_echo "$as_me: WARNING: No OpenGL headers found, wx will NOT be usable" >&2;} - CPPFLAGS="$saved_CPPFLAGS" - else - GL_LIBS="-L/usr/local/lib $GL_LIBS" -@@ -4698,61 +4529,13 @@ echo "$as_me: WARNING: No OpenGL headers - fi - fi - else -- --for ac_header in gl/gl.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include -- --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- eval "$as_ac_Header=yes" --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --eval "$as_ac_Header=no" --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in gl/gl.h -+do : -+ ac_fn_c_check_header_compile "$LINENO" "gl/gl.h" "ac_cv_header_gl_gl_h" "#include -+" -+if test "x$ac_cv_header_gl_gl_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_GL_GL_H 1 - _ACEOF - - fi -@@ -4762,297 +4545,21 @@ done - fi - - if test X"$host_os" != X"win32" ; then -- --for ac_header in GL/glu.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in GL/glu.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "GL/glu.h" "ac_cv_header_GL_glu_h" "$ac_includes_default" -+if test "x$ac_cv_header_GL_glu_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_GL_GLU_H 1 - _ACEOF - - else -- --for ac_header in OpenGL/glu.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in OpenGL/glu.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "OpenGL/glu.h" "ac_cv_header_OpenGL_glu_h" "$ac_includes_default" -+if test "x$ac_cv_header_OpenGL_glu_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_OPENGL_GLU_H 1 - _ACEOF - - fi -@@ -5066,65 +4573,17 @@ done - if test X"$ac_cv_header_GL_glu_h" != Xyes && - test X"$ac_cv_header_OpenGL_glu_h" != Xyes - then -- { echo "$as_me:$LINENO: WARNING: No GLU headers found, wx will NOT be usable" >&5 --echo "$as_me: WARNING: No GLU headers found, wx will NOT be usable" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No GLU headers found, wx will NOT be usable" >&5 -+$as_echo "$as_me: WARNING: No GLU headers found, wx will NOT be usable" >&2;} - fi - else -- --for ac_header in gl/glu.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include -- --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- eval "$as_ac_Header=yes" --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --eval "$as_ac_Header=no" --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in gl/glu.h -+do : -+ ac_fn_c_check_header_compile "$LINENO" "gl/glu.h" "ac_cv_header_gl_glu_h" "#include -+" -+if test "x$ac_cv_header_gl_glu_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_GL_GLU_H 1 - _ACEOF - - fi -@@ -5146,43 +4605,39 @@ CFLAGS="$CFLAGS $CPPFLAGS $C_ONLY_FLAGS" - - - if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then -- echo "$as_me:$LINENO: checking for erl" >&5 --echo $ECHO_N "checking for erl... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for erl" >&5 -+$as_echo_n "checking for erl... " >&6; } - if test X$ERL != X; then -- echo "$as_me:$LINENO: result: yes; using $ERL" >&5 --echo "${ECHO_T}yes; using $ERL" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes; using $ERL" >&5 -+$as_echo "yes; using $ERL" >&6; } - else - type erl >/dev/null 2>&1 - if test $? -eq 0 ; then - ERL=erl -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - else -- { { echo "$as_me:$LINENO: error: Cannot find erl in path" >&5 --echo "$as_me: error: Cannot find erl in path" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "Cannot find erl in path" "$LINENO" 5 - fi - fi -- echo "$as_me:$LINENO: checking for erlc" >&5 --echo $ECHO_N "checking for erlc... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for erlc" >&5 -+$as_echo_n "checking for erlc... " >&6; } - if test X$ERLC != X; then -- echo "$as_me:$LINENO: result: yes; using $ERLC" >&5 --echo "${ECHO_T}yes; using $ERLC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes; using $ERLC" >&5 -+$as_echo "yes; using $ERLC" >&6; } - else - type erlc >/dev/null 2>&1 - if test $? -eq 0 ; then - ERLC=erlc -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - else -- { { echo "$as_me:$LINENO: error: Cannot find erlc in path" >&5 --echo "$as_me: error: Cannot find erlc in path" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "Cannot find erlc in path" "$LINENO" 5 - fi - fi - ERLANG_ROOT_DIR=`erl -noshell -eval 'io:format("~s~n",[code:root_dir()])' -s erlang halt` -- { echo "$as_me:$LINENO: ERL ROOT DIR: $ERLANG_ROOT_DIR" >&5 --echo "$as_me: ERL ROOT DIR: $ERLANG_ROOT_DIR" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: ERL ROOT DIR: $ERLANG_ROOT_DIR" >&5 -+$as_echo "$as_me: ERL ROOT DIR: $ERLANG_ROOT_DIR" >&6;} - ERLWX_VSN=`grep WX_VSN $srcdir/vsn.mk | sed 's/^.*= *//'` - else - ERLC=erlc -@@ -5272,41 +4727,41 @@ elif test X"$MIXED_CYGWIN_VC" = X"no" - - - - --# Check whether --with-wxdir or --without-wxdir was given. --if test "${with_wxdir+set}" = set; then -- withval="$with_wxdir" -- wx_config_name="$withval/wx-config" -+# Check whether --with-wxdir was given. -+if test "${with_wxdir+set}" = set; then : -+ withval=$with_wxdir; wx_config_name="$withval/wx-config" - wx_config_args="--inplace" --fi; -+fi - --# Check whether --with-wx-config or --without-wx-config was given. --if test "${with_wx_config+set}" = set; then -- withval="$with_wx_config" -- wx_config_name="$withval" --fi; - --# Check whether --with-wx-prefix or --without-wx-prefix was given. --if test "${with_wx_prefix+set}" = set; then -- withval="$with_wx_prefix" -- wx_config_prefix="$withval" -+# Check whether --with-wx-config was given. -+if test "${with_wx_config+set}" = set; then : -+ withval=$with_wx_config; wx_config_name="$withval" -+fi -+ -+ -+# Check whether --with-wx-prefix was given. -+if test "${with_wx_prefix+set}" = set; then : -+ withval=$with_wx_prefix; wx_config_prefix="$withval" - else - wx_config_prefix="" --fi; -+fi - --# Check whether --with-wx-exec-prefix or --without-wx-exec-prefix was given. --if test "${with_wx_exec_prefix+set}" = set; then -- withval="$with_wx_exec_prefix" -- wx_config_exec_prefix="$withval" -+ -+# Check whether --with-wx-exec-prefix was given. -+if test "${with_wx_exec_prefix+set}" = set; then : -+ withval=$with_wx_exec_prefix; wx_config_exec_prefix="$withval" - else - wx_config_exec_prefix="" --fi; -+fi -+ - - reqwx=2.8.4 - # Try to find debug libs first - # wxelibs=core,base,gl,aui,adv - -- echo "$as_me:$LINENO: checking for debug build of wxWidgets" >&5 --echo $ECHO_N "checking for debug build of wxWidgets... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for debug build of wxWidgets" >&5 -+$as_echo_n "checking for debug build of wxWidgets... " >&6; } - - - -@@ -5331,18 +4786,18 @@ echo $ECHO_N "checking for debug build o - fi - - if test -x "$WX_CONFIG_NAME" ; then -- echo "$as_me:$LINENO: checking for wx-config" >&5 --echo $ECHO_N "checking for wx-config... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wx-config" >&5 -+$as_echo_n "checking for wx-config... " >&6; } - WX_CONFIG_PATH="$WX_CONFIG_NAME" -- echo "$as_me:$LINENO: result: $WX_CONFIG_PATH" >&5 --echo "${ECHO_T}$WX_CONFIG_PATH" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WX_CONFIG_PATH" >&5 -+$as_echo "$WX_CONFIG_PATH" >&6; } - else - # Extract the first word of "$WX_CONFIG_NAME", so it can be a program name with args. - set dummy $WX_CONFIG_NAME; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_path_WX_CONFIG_PATH+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_path_WX_CONFIG_PATH+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - case $WX_CONFIG_PATH in - [\\/]* | ?:[\\/]*) -@@ -5355,29 +4810,30 @@ for as_dir in $as_dummy - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_WX_CONFIG_PATH="$as_dir/$ac_word$ac_exec_ext" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - test -z "$ac_cv_path_WX_CONFIG_PATH" && ac_cv_path_WX_CONFIG_PATH="no" - ;; - esac - fi - WX_CONFIG_PATH=$ac_cv_path_WX_CONFIG_PATH -- - if test -n "$WX_CONFIG_PATH"; then -- echo "$as_me:$LINENO: result: $WX_CONFIG_PATH" >&5 --echo "${ECHO_T}$WX_CONFIG_PATH" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WX_CONFIG_PATH" >&5 -+$as_echo "$WX_CONFIG_PATH" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - - if test "$WX_CONFIG_PATH" != "no" ; then -@@ -5385,11 +4841,11 @@ fi - - min_wx_version=$reqwx - if test -z "--unicode --debug=yes" ; then -- echo "$as_me:$LINENO: checking for wxWidgets version >= $min_wx_version" >&5 --echo $ECHO_N "checking for wxWidgets version >= $min_wx_version... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets version >= $min_wx_version" >&5 -+$as_echo_n "checking for wxWidgets version >= $min_wx_version... " >&6; } - else -- echo "$as_me:$LINENO: checking for wxWidgets version >= $min_wx_version (--unicode --debug=yes)" >&5 --echo $ECHO_N "checking for wxWidgets version >= $min_wx_version (--unicode --debug=yes)... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets version >= $min_wx_version (--unicode --debug=yes)" >&5 -+$as_echo_n "checking for wxWidgets version >= $min_wx_version (--unicode --debug=yes)... " >&6; } - fi - - WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args --unicode --debug=yes" -@@ -5431,19 +4887,19 @@ echo $ECHO_N "checking for wxWidgets ver - - - if test -n "$wx_ver_ok"; then -- echo "$as_me:$LINENO: result: yes (version $WX_VERSION)" >&5 --echo "${ECHO_T}yes (version $WX_VERSION)" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $WX_VERSION)" >&5 -+$as_echo "yes (version $WX_VERSION)" >&6; } - WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs stc,xrc,html,adv,xml,core,base,gl,aui` - -- echo "$as_me:$LINENO: checking for wxWidgets static library" >&5 --echo $ECHO_N "checking for wxWidgets static library... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets static library" >&5 -+$as_echo_n "checking for wxWidgets static library... " >&6; } - WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs stc,xrc,html,adv,xml,core,base,gl,aui 2>/dev/null` - if test "x$WX_LIBS_STATIC" = "x"; then -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - else -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - fi - - wx_has_cppflags="" -@@ -5500,11 +4956,11 @@ echo "${ECHO_T}yes" >&6 - else - - if test "x$WX_VERSION" = x; then -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - else -- echo "$as_me:$LINENO: result: no (version $WX_VERSION is not new enough)" >&5 --echo "${ECHO_T}no (version $WX_VERSION is not new enough)" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (version $WX_VERSION is not new enough)" >&5 -+$as_echo "no (version $WX_VERSION is not new enough)" >&6; } - fi - - WX_CFLAGS="" -@@ -5581,8 +5037,8 @@ echo "${ECHO_T}no (version $WX_VERSION i - - - -- echo "$as_me:$LINENO: checking for standard build of wxWidgets" >&5 --echo $ECHO_N "checking for standard build of wxWidgets... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for standard build of wxWidgets" >&5 -+$as_echo_n "checking for standard build of wxWidgets... " >&6; } - - - if test x${WX_CONFIG_NAME+set} != xset ; then -@@ -5606,18 +5062,18 @@ echo $ECHO_N "checking for standard buil - fi - - if test -x "$WX_CONFIG_NAME" ; then -- echo "$as_me:$LINENO: checking for wx-config" >&5 --echo $ECHO_N "checking for wx-config... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wx-config" >&5 -+$as_echo_n "checking for wx-config... " >&6; } - WX_CONFIG_PATH="$WX_CONFIG_NAME" -- echo "$as_me:$LINENO: result: $WX_CONFIG_PATH" >&5 --echo "${ECHO_T}$WX_CONFIG_PATH" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WX_CONFIG_PATH" >&5 -+$as_echo "$WX_CONFIG_PATH" >&6; } - else - # Extract the first word of "$WX_CONFIG_NAME", so it can be a program name with args. - set dummy $WX_CONFIG_NAME; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_path_WX_CONFIG_PATH+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_path_WX_CONFIG_PATH+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - case $WX_CONFIG_PATH in - [\\/]* | ?:[\\/]*) -@@ -5630,29 +5086,30 @@ for as_dir in $as_dummy - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_WX_CONFIG_PATH="$as_dir/$ac_word$ac_exec_ext" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - test -z "$ac_cv_path_WX_CONFIG_PATH" && ac_cv_path_WX_CONFIG_PATH="no" - ;; - esac - fi - WX_CONFIG_PATH=$ac_cv_path_WX_CONFIG_PATH -- - if test -n "$WX_CONFIG_PATH"; then -- echo "$as_me:$LINENO: result: $WX_CONFIG_PATH" >&5 --echo "${ECHO_T}$WX_CONFIG_PATH" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WX_CONFIG_PATH" >&5 -+$as_echo "$WX_CONFIG_PATH" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - - if test "$WX_CONFIG_PATH" != "no" ; then -@@ -5660,11 +5117,11 @@ fi - - min_wx_version=$reqwx - if test -z "--unicode --debug=no" ; then -- echo "$as_me:$LINENO: checking for wxWidgets version >= $min_wx_version" >&5 --echo $ECHO_N "checking for wxWidgets version >= $min_wx_version... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets version >= $min_wx_version" >&5 -+$as_echo_n "checking for wxWidgets version >= $min_wx_version... " >&6; } - else -- echo "$as_me:$LINENO: checking for wxWidgets version >= $min_wx_version (--unicode --debug=no)" >&5 --echo $ECHO_N "checking for wxWidgets version >= $min_wx_version (--unicode --debug=no)... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets version >= $min_wx_version (--unicode --debug=no)" >&5 -+$as_echo_n "checking for wxWidgets version >= $min_wx_version (--unicode --debug=no)... " >&6; } - fi - - WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args --unicode --debug=no" -@@ -5706,19 +5163,19 @@ echo $ECHO_N "checking for wxWidgets ver - - - if test -n "$wx_ver_ok"; then -- echo "$as_me:$LINENO: result: yes (version $WX_VERSION)" >&5 --echo "${ECHO_T}yes (version $WX_VERSION)" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $WX_VERSION)" >&5 -+$as_echo "yes (version $WX_VERSION)" >&6; } - WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs stc,xrc,html,adv,xml,core,base,gl,aui` - -- echo "$as_me:$LINENO: checking for wxWidgets static library" >&5 --echo $ECHO_N "checking for wxWidgets static library... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets static library" >&5 -+$as_echo_n "checking for wxWidgets static library... " >&6; } - WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs stc,xrc,html,adv,xml,core,base,gl,aui 2>/dev/null` - if test "x$WX_LIBS_STATIC" = "x"; then -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - else -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - fi - - wx_has_cppflags="" -@@ -5775,11 +5232,11 @@ echo "${ECHO_T}yes" >&6 - else - - if test "x$WX_VERSION" = x; then -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - else -- echo "$as_me:$LINENO: result: no (version $WX_VERSION is not new enough)" >&5 --echo "${ECHO_T}no (version $WX_VERSION is not new enough)" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (version $WX_VERSION is not new enough)" >&5 -+$as_echo "no (version $WX_VERSION is not new enough)" >&6; } - fi - - WX_CFLAGS="" -@@ -5878,27 +5335,18 @@ echo "${ECHO_T}no (version $WX_VERSION i - - if test "$wxWin" != 1; then - if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then -- { { echo "$as_me:$LINENO: error: -- wxWidgets must be installed on your system. -- -- Please check that wx-config is in path, the directory -- where wxWidgets libraries are installed (returned by -- 'wx-config --libs' or 'wx-config --static --libs' command) -- is in LD_LIBRARY_PATH or equivalent variable and -- wxWidgets version is $reqwx or above." >&5 --echo "$as_me: error: -+ as_fn_error $? " - wxWidgets must be installed on your system. - - Please check that wx-config is in path, the directory - where wxWidgets libraries are installed (returned by - 'wx-config --libs' or 'wx-config --static --libs' command) - is in LD_LIBRARY_PATH or equivalent variable and -- wxWidgets version is $reqwx or above." >&2;} -- { (exit 1); exit 1; }; } -+ wxWidgets version is $reqwx or above." "$LINENO" 5 - else - echo "wxWidgets not found, wx will NOT be usable" > ./CONF_INFO - WXERL_CAN_BUILD_DRIVER=false -- { echo "$as_me:$LINENO: WARNING: -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: - wxWidgets must be installed on your system. - - Please check that wx-config is in path, the directory -@@ -5906,7 +5354,7 @@ echo "$as_me: error: - 'wx-config --libs' or 'wx-config --static --libs' command) - is in LD_LIBRARY_PATH or equivalent variable and - wxWidgets version is $reqwx or above." >&5 --echo "$as_me: WARNING: -+$as_echo "$as_me: WARNING: - wxWidgets must be installed on your system. - - Please check that wx-config is in path, the directory -@@ -5917,12 +5365,12 @@ echo "$as_me: WARNING: - fi - fi - else -- echo "$as_me:$LINENO: checking for wxWidgets in standard locations" >&5 --echo $ECHO_N "checking for wxWidgets in standard locations... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets in standard locations" >&5 -+$as_echo_n "checking for wxWidgets in standard locations... " >&6; } - - # Check whether --with-wxdir was given. -- { echo "$as_me:$LINENO: OptionCheck: $with_wxdir $with_wx_prefix" >&5 --echo "$as_me: OptionCheck: $with_wxdir $with_wx_prefix" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: OptionCheck: $with_wxdir $with_wx_prefix" >&5 -+$as_echo "$as_me: OptionCheck: $with_wxdir $with_wx_prefix" >&6;} - - if test "${with_wxdir+set}" = set; then : - withval=$with_wxdir; CWXWIN0=$withval -@@ -5976,8 +5424,8 @@ echo "$as_me: OptionCheck: $with_wxdir $ - CWXPATH="$CWXWIN0 $CWXWIN1 $CWXWIN2 $CWX_DOCUMENTED $CWXWIN3 $CWXWIN4" - - for dir in $CWXPATH; do -- { echo "$as_me:$LINENO: Checking: $dir" >&5 --echo "$as_me: Checking: $dir" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: Checking: $dir" >&5 -+$as_echo "$as_me: Checking: $dir" >&6;} - if test -f $dir/include/wx/wx.h; then - WXINCLUDE_MSVC=$dir/include/msvc - WXINCLUDE_PLAIN=$dir/include -@@ -6007,25 +5455,23 @@ echo "$as_me: Checking: $dir" >&6;} - for lib in $WX_LIBS0 $WX_LIBS1 $WX_LIBS2 $WX_LIBS3 $WX_SYSLIBS; do - WX_LIBS_STATIC="$WX_LIBS_STATIC -l$lib" - done -- echo "$as_me:$LINENO: result: $dir" >&5 --echo "${ECHO_T}$dir" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dir" >&5 -+$as_echo "$dir" >&6; } - break - fi - fi - done - - if test -z "$WX_LIBS_STATIC"; then -- echo "$as_me:$LINENO: result: failed" >&5 --echo "${ECHO_T}failed" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 -+$as_echo "failed" >&6; } - if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then -- { { echo "$as_me:$LINENO: error: Cannot find core lib version for wxWidgets" >&5 --echo "$as_me: error: Cannot find core lib version for wxWidgets" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "Cannot find core lib version for wxWidgets" "$LINENO" 5 - else - echo "No usable wxWidgets not found, wx will not be useable" > ./CONF_INFO - WXERL_CAN_BUILD_DRIVER=false -- { echo "$as_me:$LINENO: WARNING: Cannot find core lib version for wxWidgets" >&5 --echo "$as_me: WARNING: Cannot find core lib version for wxWidgets" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find core lib version for wxWidgets" >&5 -+$as_echo "$as_me: WARNING: Cannot find core lib version for wxWidgets" >&2;} - fi - fi - WX_HAVE_STATIC_LIBS=true -@@ -6040,9 +5486,9 @@ if test "$WXERL_CAN_BUILD_DRIVER" != "fa - - - --echo "$as_me:$LINENO: checking if wxwidgets have opengl support" >&5 --echo $ECHO_N "checking if wxwidgets have opengl support... $ECHO_C" >&6 --ac_ext=cc -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if wxwidgets have opengl support" >&5 -+$as_echo_n "checking if wxwidgets have opengl support... " >&6; } -+ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -6052,11 +5498,7 @@ saved_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS" - - --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #ifdef WIN32 -@@ -6078,41 +5520,15 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_cxx_try_compile "$LINENO"; then : - HAVE_GL_SUPPORT=yes - --cat >>confdefs.h <<\_ACEOF --#define HAVE_GL_SUPPORT 1 --_ACEOF -+$as_echo "#define HAVE_GL_SUPPORT 1" >>confdefs.h - - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --HAVE_GL_SUPPORT=no -+ HAVE_GL_SUPPORT=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - CXXFLAGS=$saved_CXXFLAGS - ac_ext=c -@@ -6121,8 +5537,8 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - --echo "$as_me:$LINENO: result: $HAVE_GL_SUPPORT" >&5 --echo "${ECHO_T}$HAVE_GL_SUPPORT" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_GL_SUPPORT" >&5 -+$as_echo "$HAVE_GL_SUPPORT" >&6; } - - - if test X"$HAVE_GL_SUPPORT" != X"yes" ; then -@@ -6131,18 +5547,7 @@ if test X"$HAVE_GL_SUPPORT" != X"yes" ; - fi - - --echo "$as_me:$LINENO: checking for GLintptr" >&5 --echo $ECHO_N "checking for GLintptr... $ECHO_C" >&6 --if test "${ac_cv_type_GLintptr+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef WIN32 -+ac_fn_c_check_type "$LINENO" "GLintptr" "ac_cv_type_GLintptr" "#ifdef WIN32 - # include - # include - #elif defined(HAVE_GL_GL_H) -@@ -6151,52 +5556,8 @@ cat >>conftest.$ac_ext <<_ACEOF - # include - #endif - -- --int --main () --{ --if ((GLintptr *) 0) -- return 0; --if (sizeof (GLintptr)) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_GLintptr=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_GLintptr=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_type_GLintptr" >&5 --echo "${ECHO_T}$ac_cv_type_GLintptr" >&6 --if test $ac_cv_type_GLintptr = yes; then -+" -+if test "x$ac_cv_type_GLintptr" = xyes; then : - - cat >>confdefs.h <<_ACEOF - #define HAVE_GLINTPTR 1 -@@ -6204,18 +5565,7 @@ _ACEOF - - - fi --echo "$as_me:$LINENO: checking for GLintptrARB" >&5 --echo $ECHO_N "checking for GLintptrARB... $ECHO_C" >&6 --if test "${ac_cv_type_GLintptrARB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef WIN32 -+ac_fn_c_check_type "$LINENO" "GLintptrARB" "ac_cv_type_GLintptrARB" "#ifdef WIN32 - # include - # include - #elif defined(HAVE_GL_GL_H) -@@ -6224,52 +5574,8 @@ cat >>conftest.$ac_ext <<_ACEOF - # include - #endif - -- --int --main () --{ --if ((GLintptrARB *) 0) -- return 0; --if (sizeof (GLintptrARB)) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_GLintptrARB=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_GLintptrARB=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_type_GLintptrARB" >&5 --echo "${ECHO_T}$ac_cv_type_GLintptrARB" >&6 --if test $ac_cv_type_GLintptrARB = yes; then -+" -+if test "x$ac_cv_type_GLintptrARB" = xyes; then : - - cat >>confdefs.h <<_ACEOF - #define HAVE_GLINTPTRARB 1 -@@ -6277,18 +5583,7 @@ _ACEOF - - - fi --echo "$as_me:$LINENO: checking for GLchar" >&5 --echo $ECHO_N "checking for GLchar... $ECHO_C" >&6 --if test "${ac_cv_type_GLchar+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef WIN32 -+ac_fn_c_check_type "$LINENO" "GLchar" "ac_cv_type_GLchar" "#ifdef WIN32 - # include - # include - #elif defined(HAVE_GL_GL_H) -@@ -6297,52 +5592,8 @@ cat >>conftest.$ac_ext <<_ACEOF - # include - #endif - -- --int --main () --{ --if ((GLchar *) 0) -- return 0; --if (sizeof (GLchar)) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_GLchar=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_GLchar=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_type_GLchar" >&5 --echo "${ECHO_T}$ac_cv_type_GLchar" >&6 --if test $ac_cv_type_GLchar = yes; then -+" -+if test "x$ac_cv_type_GLchar" = xyes; then : - - cat >>confdefs.h <<_ACEOF - #define HAVE_GLCHAR 1 -@@ -6350,18 +5601,7 @@ _ACEOF - - - fi --echo "$as_me:$LINENO: checking for GLcharARB" >&5 --echo $ECHO_N "checking for GLcharARB... $ECHO_C" >&6 --if test "${ac_cv_type_GLcharARB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef WIN32 -+ac_fn_c_check_type "$LINENO" "GLcharARB" "ac_cv_type_GLcharARB" "#ifdef WIN32 - # include - # include - #elif defined(HAVE_GL_GL_H) -@@ -6370,52 +5610,8 @@ cat >>conftest.$ac_ext <<_ACEOF - # include - #endif - -- --int --main () --{ --if ((GLcharARB *) 0) -- return 0; --if (sizeof (GLcharARB)) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_GLcharARB=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_GLcharARB=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_type_GLcharARB" >&5 --echo "${ECHO_T}$ac_cv_type_GLcharARB" >&6 --if test $ac_cv_type_GLcharARB = yes; then -+" -+if test "x$ac_cv_type_GLcharARB" = xyes; then : - - cat >>confdefs.h <<_ACEOF - #define HAVE_GLCHARARB 1 -@@ -6423,18 +5619,7 @@ _ACEOF - - - fi --echo "$as_me:$LINENO: checking for GLhalfARB" >&5 --echo $ECHO_N "checking for GLhalfARB... $ECHO_C" >&6 --if test "${ac_cv_type_GLhalfARB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef WIN32 -+ac_fn_c_check_type "$LINENO" "GLhalfARB" "ac_cv_type_GLhalfARB" "#ifdef WIN32 - # include - # include - #elif defined(HAVE_GL_GL_H) -@@ -6443,52 +5628,8 @@ cat >>conftest.$ac_ext <<_ACEOF - # include - #endif - -- --int --main () --{ --if ((GLhalfARB *) 0) -- return 0; --if (sizeof (GLhalfARB)) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_GLhalfARB=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_GLhalfARB=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_type_GLhalfARB" >&5 --echo "${ECHO_T}$ac_cv_type_GLhalfARB" >&6 --if test $ac_cv_type_GLhalfARB = yes; then -+" -+if test "x$ac_cv_type_GLhalfARB" = xyes; then : - - cat >>confdefs.h <<_ACEOF - #define HAVE_GLHALFARB 1 -@@ -6496,18 +5637,7 @@ _ACEOF - - - fi --echo "$as_me:$LINENO: checking for GLint64EXT" >&5 --echo $ECHO_N "checking for GLint64EXT... $ECHO_C" >&6 --if test "${ac_cv_type_GLint64EXT+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef WIN32 -+ac_fn_c_check_type "$LINENO" "GLint64EXT" "ac_cv_type_GLint64EXT" "#ifdef WIN32 - # include - # include - #elif defined(HAVE_GL_GL_H) -@@ -6516,52 +5646,8 @@ cat >>conftest.$ac_ext <<_ACEOF - # include - #endif - -- --int --main () --{ --if ((GLint64EXT *) 0) -- return 0; --if (sizeof (GLint64EXT)) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_GLint64EXT=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_GLint64EXT=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_type_GLint64EXT" >&5 --echo "${ECHO_T}$ac_cv_type_GLint64EXT" >&6 --if test $ac_cv_type_GLint64EXT = yes; then -+" -+if test "x$ac_cv_type_GLint64EXT" = xyes; then : - - cat >>confdefs.h <<_ACEOF - #define HAVE_GLINT64EXT 1 -@@ -6572,9 +5658,9 @@ fi - - - --echo "$as_me:$LINENO: checking GLU Callbacks uses Tiger Style" >&5 --echo $ECHO_N "checking GLU Callbacks uses Tiger Style... $ECHO_C" >&6 --ac_ext=cc -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking GLU Callbacks uses Tiger Style" >&5 -+$as_echo_n "checking GLU Callbacks uses Tiger Style... " >&6; } -+ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -6583,11 +5669,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - saved_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS" - --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #ifdef WIN32 -@@ -6614,111 +5696,37 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_cxx_try_compile "$LINENO"; then : - TESS_CB_TIGER_STYLE=yes - --cat >>confdefs.h <<\_ACEOF --#define TESS_CB_TIGER_STYLE 1 --_ACEOF -+$as_echo "#define TESS_CB_TIGER_STYLE 1" >>confdefs.h - - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --TESS_CB_TIGER_STYLE=no -+ TESS_CB_TIGER_STYLE=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $TESS_CB_TIGER_STYLE" >&5 --echo "${ECHO_T}$TESS_CB_TIGER_STYLE" >&6 -- -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TESS_CB_TIGER_STYLE" >&5 -+$as_echo "$TESS_CB_TIGER_STYLE" >&6; } - - - - for ac_header in wx/stc/stc.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef WIN32 -+do : -+ ac_fn_cxx_check_header_compile "$LINENO" "wx/stc/stc.h" "ac_cv_header_wx_stc_stc_h" "#ifdef WIN32 - # include - #endif -- #include "wx/wx.h" -- --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- eval "$as_ac_Header=yes" --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --eval "$as_ac_Header=no" --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ #include \"wx/wx.h\" -+" -+if test "x$ac_cv_header_wx_stc_stc_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_WX_STC_STC_H 1 - _ACEOF - - else - WXERL_CAN_BUILD_DRIVER=false - echo "wxWidgets don't have wxStyledTextControl (stc.h), wx will NOT be useable" > ./CONF_INFO -- { echo "$as_me:$LINENO: WARNING: Can not find wx/stc/stc.h $CXXFLAGS" >&5 --echo "$as_me: WARNING: Can not find wx/stc/stc.h $CXXFLAGS" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can not find wx/stc/stc.h $CXXFLAGS" >&5 -+$as_echo "$as_me: WARNING: Can not find wx/stc/stc.h $CXXFLAGS" >&2;} - - fi - -@@ -6726,19 +5734,15 @@ done - - - --echo "$as_me:$LINENO: checking if we can link wxwidgets programs" >&5 --echo $ECHO_N "checking if we can link wxwidgets programs... $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can link wxwidgets programs" >&5 -+$as_echo_n "checking if we can link wxwidgets programs... " >&6; } - saved_LIBS=$LIBS - - if test X"$WX_HAVE_STATIC_LIBS" = X"true" ; then - LIBS=$WX_LIBS_STATIC - fi - --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #ifdef WIN32 -@@ -6769,41 +5773,17 @@ cat >>conftest.$ac_ext <<_ACEOF - IMPLEMENT_APP(MyApp) - - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_cxx_try_link "$LINENO"; then : - - CAN_LINK_WX=yes - - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- - - CAN_LINK_WX=no - - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - - CXXFLAGS=$saved_CXXFLAGS - LIBS=$saved_LIBS -@@ -6813,14 +5793,14 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - --echo "$as_me:$LINENO: result: $CAN_LINK_WX" >&5 --echo "${ECHO_T}$CAN_LINK_WX" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CAN_LINK_WX" >&5 -+$as_echo "$CAN_LINK_WX" >&6; } - - if test X"$CAN_LINK_WX" != X"yes" ; then - echo "Can not link the wx driver, wx will NOT be useable" > ./CONF_INFO - WXERL_CAN_BUILD_DRIVER=false -- { echo "$as_me:$LINENO: WARNING: Can not link wx program are all developer packages installed?" >&5 --echo "$as_me: WARNING: Can not link wx program are all developer packages installed?" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can not link wx program are all developer packages installed?" >&5 -+$as_echo "$as_me: WARNING: Can not link wx program are all developer packages installed?" >&2;} - fi - - fi -@@ -6829,15 +5809,11 @@ fi - if test "x$GCC" = xyes; then - # Treat certain GCC warnings as errors - -- echo "$as_me:$LINENO: checking if we can add -Werror=return-type to CFLAGS (via CFLAGS)" >&5 --echo $ECHO_N "checking if we can add -Werror=return-type to CFLAGS (via CFLAGS)... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can add -Werror=return-type to CFLAGS (via CFLAGS)" >&5 -+$as_echo_n "checking if we can add -Werror=return-type to CFLAGS (via CFLAGS)... " >&6; } - saved_CFLAGS=$CFLAGS; - CFLAGS="-Werror=return-type $CFLAGS"; -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -6848,56 +5824,28 @@ return 0; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - can_enable_flag=true - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --can_enable_flag=false -+ can_enable_flag=false - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS=$saved_CFLAGS; - if test "X$can_enable_flag" = "Xtrue"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - CFLAGS="-Werror=return-type $CFLAGS" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -- echo "$as_me:$LINENO: checking if we can add -Werror=return-type to CXXFLAGS (via CFLAGS)" >&5 --echo $ECHO_N "checking if we can add -Werror=return-type to CXXFLAGS (via CFLAGS)... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can add -Werror=return-type to CXXFLAGS (via CFLAGS)" >&5 -+$as_echo_n "checking if we can add -Werror=return-type to CXXFLAGS (via CFLAGS)... " >&6; } - saved_CFLAGS=$CFLAGS; - CFLAGS="-Werror=return-type $CXXFLAGS"; -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -6908,54 +5856,29 @@ return 0; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - can_enable_flag=true - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --can_enable_flag=false -+ can_enable_flag=false - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS=$saved_CFLAGS; - if test "X$can_enable_flag" = "Xtrue"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - CXXFLAGS="-Werror=return-type $CXXFLAGS" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - - fi - - - --# Check whether --enable-sanitizers or --disable-sanitizers was given. --if test "${enable_sanitizers+set}" = set; then -- enableval="$enable_sanitizers" -- -+# Check whether --enable-sanitizers was given. -+if test "${enable_sanitizers+set}" = set; then : -+ enableval=$enable_sanitizers; - case "$enableval" in - no) sanitizers= ;; - yes) sanitizers="-fsanitize=address,undefined" ;; -@@ -6965,7 +5888,8 @@ CFLAGS="$CFLAGS $sanitizers" - CXXFLAGS="$CXXFLAGS $sanitizers" - LDFLAGS="$LDFLAGS $sanitizers" - --fi; -+fi -+ - - ############################################################################# - -@@ -6997,13 +5921,11 @@ CONFIG_STATUS=$WXERL_SYS_TYPE/config.sta - - if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then - if test X"$WXERL_CAN_BUILD_DRIVER" != X"true" ; then -- { { echo "$as_me:$LINENO: error: Cannot build wxErlang driver, see ./CONF_INFO for information" >&5 --echo "$as_me: error: Cannot build wxErlang driver, see ./CONF_INFO for information" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "Cannot build wxErlang driver, see ./CONF_INFO for information" "$LINENO" 5 - fi - fi - -- ac_config_files="$ac_config_files config.mk c_src/Makefile" -+ac_config_files="$ac_config_files config.mk c_src/Makefile" - - - cat >confcache <<\_ACEOF -@@ -7024,39 +5946,70 @@ _ACEOF - - # The following way of writing the cache mishandles newlines in values, - # but we know of no workaround that is simple, portable, and efficient. --# So, don't put newlines in cache variables' values. -+# So, we kill variables containing newlines. - # Ultrix sh set writes to stderr and can't be redirected directly, - # and sets the high bit in the cache file unless we assign to the vars. --{ -+( -+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -+ *) { eval $ac_var=; unset $ac_var;} ;; -+ esac ;; -+ esac -+ done -+ - (set) 2>&1 | -- case `(ac_space=' '; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -- # `set' does not quote correctly, so add quotes (double-quote -- # substitution turns \\\\ into \\, and sed turns \\ into \). -+ case $as_nl`(ac_space=' '; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) -+ # `set' does not quote correctly, so add quotes: double-quote -+ # substitution turns \\\\ into \\, and sed turns \\ into \. - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -- ;; -+ ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; -- esac; --} | -+ esac | -+ sort -+) | - sed ' -+ /^ac_cv_env_/b end - t clear -- : clear -+ :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end -- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -- : end' >>confcache --if diff $cache_file confcache >/dev/null 2>&1; then :; else -- if test -w $cache_file; then -- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" -- cat confcache >$cache_file -+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -+ :end' >>confcache -+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else -+ if test -w "$cache_file"; then -+ if test "x$cache_file" != "x/dev/null"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -+$as_echo "$as_me: updating cache $cache_file" >&6;} -+ if test ! -f "$cache_file" || test -h "$cache_file"; then -+ cat confcache >"$cache_file" -+ else -+ case $cache_file in #( -+ */* | ?:*) -+ mv -f confcache "$cache_file"$$ && -+ mv -f "$cache_file"$$ "$cache_file" ;; #( -+ *) -+ mv -f confcache "$cache_file" ;; -+ esac -+ fi -+ fi - else -- echo "not updating unwritable cache $cache_file" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi - fi - rm -f confcache -@@ -7065,63 +6018,55 @@ test "x$prefix" = xNONE && prefix=$ac_de - # Let make expand exec_prefix. - test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - --# VPATH may cause trouble with some makes, so we remove $(srcdir), --# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and --# trailing colons and then remove the whole line if VPATH becomes empty --# (actually we leave an empty line to preserve line numbers). --if test "x$srcdir" = x.; then -- ac_vpsub='/^[ ]*VPATH[ ]*=/{ --s/:*\$(srcdir):*/:/; --s/:*\${srcdir}:*/:/; --s/:*@srcdir@:*/:/; --s/^\([^=]*=[ ]*\):*/\1/; --s/:*$//; --s/^[^=]*=[ ]*$//; --}' --fi -- - # Transform confdefs.h into DEFS. - # Protect against shell expansion while executing Makefile rules. - # Protect against Makefile macro expansion. - # - # If the first sed substitution is executed (which looks for macros that --# take arguments), then we branch to the quote section. Otherwise, -+# take arguments), then branch to the quote section. Otherwise, - # look for a macro that doesn't take arguments. --cat >confdef2opt.sed <<\_ACEOF -+ac_script=' -+:mline -+/\\$/{ -+ N -+ s,\\\n,, -+ b mline -+} - t clear --: clear --s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g -+:clear -+s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g - t quote --s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g -+s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g - t quote --d --: quote --s,[ `~#$^&*(){}\\|;'"<>?],\\&,g --s,\[,\\&,g --s,\],\\&,g --s,\$,$$,g --p --_ACEOF --# We use echo to avoid assuming a particular line-breaking character. --# The extra dot is to prevent the shell from consuming trailing --# line-breaks from the sub-command output. A line-break within --# single-quotes doesn't work because, if this script is created in a --# platform that uses two characters for line-breaks (e.g., DOS), tr --# would break. --ac_LF_and_DOT=`echo; echo .` --DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` --rm -f confdef2opt.sed -+b any -+:quote -+s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g -+s/\[/\\&/g -+s/\]/\\&/g -+s/\$/$$/g -+H -+:any -+${ -+ g -+ s/^\n// -+ s/\n/ /g -+ p -+} -+' -+DEFS=`sed -n "$ac_script" confdefs.h` - - - ac_libobjs= - ac_ltlibobjs= -+U= - for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. -- ac_i=`echo "$ac_i" | -- sed 's/\$U\././;s/\.o$//;s/\.obj$//'` -- # 2. Add them. -- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" -- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' -+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' -+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"` -+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR -+ # will be set to the directory where LIBOBJS objects are built. -+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" -+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' - done - LIBOBJS=$ac_libobjs - -@@ -7129,12 +6074,14 @@ LTLIBOBJS=$ac_ltlibobjs - - - --: ${CONFIG_STATUS=./config.status} -+: "${CONFIG_STATUS=./config.status}" -+ac_write_fail=0 - ac_clean_files_save=$ac_clean_files - ac_clean_files="$ac_clean_files $CONFIG_STATUS" --{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 --echo "$as_me: creating $CONFIG_STATUS" >&6;} --cat >$CONFIG_STATUS <<_ACEOF -+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -+as_write_fail=0 -+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 - #! $SHELL - # Generated by $as_me. - # Run this file to recreate the current configuration. -@@ -7144,81 +6091,253 @@ cat >$CONFIG_STATUS <<_ACEOF - debug=false - ac_cs_recheck=false - ac_cs_silent=false --SHELL=\${CONFIG_SHELL-$SHELL} --_ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF --## --------------------- ## --## M4sh Initialization. ## --## --------------------- ## -+SHELL=\${CONFIG_SHELL-$SHELL} -+export SHELL -+_ASEOF -+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 -+## -------------------- ## -+## M4sh Initialization. ## -+## -------------------- ## - --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac - fi --DUALCASE=1; export DUALCASE # for MKS sh - --# Support unset when possible. --if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -- as_unset=unset -+ -+as_nl=' -+' -+export as_nl -+# Printing a long string crashes Solaris 7 /usr/bin/printf. -+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -+# Prefer a ksh shell builtin over an external printf program on Solaris, -+# but without wasting forks for bash or zsh. -+if test -z "$BASH_VERSION$ZSH_VERSION" \ -+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='print -r --' -+ as_echo_n='print -rn --' -+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='printf %s\n' -+ as_echo_n='printf %s' - else -- as_unset=false -+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -+ as_echo_n='/usr/ucb/echo -n' -+ else -+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -+ as_echo_n_body='eval -+ arg=$1; -+ case $arg in #( -+ *"$as_nl"*) -+ expr "X$arg" : "X\\(.*\\)$as_nl"; -+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -+ esac; -+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -+ ' -+ export as_echo_n_body -+ as_echo_n='sh -c $as_echo_n_body as_echo' -+ fi -+ export as_echo_body -+ as_echo='sh -c $as_echo_body as_echo' -+fi -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } - fi - - --# Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+as_myself= -+case $0 in #(( -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ exit 1 -+fi -+ -+# Unset variables that we do not need and which cause bugs (e.g. in -+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -+# suppresses any "Segmentation fault" message there. '((' could -+# trigger a bug in pdksh 5.2.14. -+for as_var in BASH_ENV ENV MAIL MAILPATH -+do eval test x\${$as_var+set} = xset \ -+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -+done - PS1='$ ' - PS2='> ' - PS4='+ ' - - # NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -- LC_TELEPHONE LC_TIME --do -- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -- eval $as_var=C; export $as_var -- else -- $as_unset $as_var -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE -+ -+# CDPATH. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ -+ -+# as_fn_error STATUS ERROR [LINENO LOG_FD] -+# ---------------------------------------- -+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -+# script with STATUS, using 1 if that was 0. -+as_fn_error () -+{ -+ as_status=$1; test $as_status -eq 0 && as_status=1 -+ if test "$4"; then -+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 - fi --done -+ $as_echo "$as_me: error: $2" >&2 -+ as_fn_exit $as_status -+} # as_fn_error - --# Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -+ -+# as_fn_set_status STATUS -+# ----------------------- -+# Set $? to STATUS, without forking. -+as_fn_set_status () -+{ -+ return $1 -+} # as_fn_set_status -+ -+# as_fn_exit STATUS -+# ----------------- -+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -+as_fn_exit () -+{ -+ set +e -+ as_fn_set_status $1 -+ exit $1 -+} # as_fn_exit -+ -+# as_fn_unset VAR -+# --------------- -+# Portably unset VAR. -+as_fn_unset () -+{ -+ { eval $1=; unset $1;} -+} -+as_unset=as_fn_unset -+# as_fn_append VAR VALUE -+# ---------------------- -+# Append the text in VALUE to the end of the definition contained in VAR. Take -+# advantage of any shell optimizations that allow amortized linear growth over -+# repeated appends, instead of the typical quadratic growth present in naive -+# implementations. -+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : -+ eval 'as_fn_append () -+ { -+ eval $1+=\$2 -+ }' -+else -+ as_fn_append () -+ { -+ eval $1=\$$1\$2 -+ } -+fi # as_fn_append -+ -+# as_fn_arith ARG... -+# ------------------ -+# Perform arithmetic evaluation on the ARGs, and store the result in the -+# global $as_val. Take advantage of shells that can avoid forks. The arguments -+# must be portable across $(()) and expr. -+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : -+ eval 'as_fn_arith () -+ { -+ as_val=$(( $* )) -+ }' -+else -+ as_fn_arith () -+ { -+ as_val=`expr "$@" || test $? -eq 1` -+ } -+fi # as_fn_arith -+ -+ -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename - else - as_basename=false - fi - -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi - --# Name of the executable. --as_me=`$as_basename "$0" || -+as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || --echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -- /^X\/\(\/\/\)$/{ s//\1/; q; } -- /^X\/\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - --# PATH needs CR, and LINENO needs CR and PATH. - # Avoid depending upon Character Ranges. - as_cr_letters='abcdefghijklmnopqrstuvwxyz' - as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -@@ -7226,148 +6345,111 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE - as_cr_digits='0123456789' - as_cr_alnum=$as_cr_Letters$as_cr_digits - --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -- else -- PATH_SEPARATOR=: -- fi -- rm -f conf$$.sh --fi -- -- -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" || { -- # Find who we are. Look in the path if we contain no path at all -- # relative or not. -- case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -- -- ;; -- esac -- # We did not find ourselves, most probably we were run as `sh COMMAND' -- # in which case we are not to be found in the path. -- if test "x$as_myself" = x; then -- as_myself=$0 -- fi -- if test ! -f "$as_myself"; then -- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 --echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} -- { (exit 1); exit 1; }; } -- fi -- case $CONFIG_SHELL in -- '') -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for as_base in sh bash ksh sh5; do -- case $as_dir in -- /*) -- if ("$as_dir/$as_base" -c ' -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -- CONFIG_SHELL=$as_dir/$as_base -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" ${1+"$@"} -- fi;; -- esac -- done --done --;; -- esac -- -- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -- # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line before each line; the second 'sed' does the real -- # work. The second script uses 'N' to pair each line-number line -- # with the numbered line, and appends trailing '-' during -- # substitution so that $LINENO is not a special case at line end. -- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -- sed ' -- N -- s,$,-, -- : loop -- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -- t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -- ' >$as_me.lineno && -- chmod +x $as_me.lineno || -- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 --echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} -- { (exit 1); exit 1; }; } -- -- # Don't try to exec as it changes $[0], causing all sort of problems -- # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensible to this). -- . ./$as_me.lineno -- # Exit status is that of the last command. -- exit --} -- -- --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in #((((( -+-n*) -+ case `echo 'xy\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ xy) ECHO_C='\c';; -+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null -+ ECHO_T=' ';; -+ esac;; -+*) -+ ECHO_N='-n';; - esac - --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr -+rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file - else -- as_expr=false -+ rm -f conf$$.dir -+ mkdir conf$$.dir 2>/dev/null - fi -- --rm -f conf$$ conf$$.exe conf$$.file --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -- as_ln_s='cp -p' -- else -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -pR'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -pR' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else -+ as_ln_s='cp -pR' - fi --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln - else -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - fi --rm -f conf$$ conf$$.exe conf$$.file -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null -+ -+ -+# as_fn_mkdir_p -+# ------------- -+# Create "$as_dir" as a directory, including parents if necessary. -+as_fn_mkdir_p () -+{ - -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || eval $as_mkdir_p || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" -+ -+ -+} # as_fn_mkdir_p - if mkdir -p . 2>/dev/null; then -- as_mkdir_p=: -+ as_mkdir_p='mkdir -p "$as_dir"' - else - test -d ./-p && rmdir ./-p - as_mkdir_p=false - fi - --as_executable_p="test -f" -+ -+# as_fn_executable_p FILE -+# ----------------------- -+# Test if FILE is an executable regular file. -+as_fn_executable_p () -+{ -+ test -f "$1" && test -x "$1" -+} # as_fn_executable_p -+as_test_x='test -x' -+as_executable_p=as_fn_executable_p - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -7376,31 +6458,20 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P - as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH -- - exec 6>&1 -+## ----------------------------------- ## -+## Main body of $CONFIG_STATUS script. ## -+## ----------------------------------- ## -+_ASEOF -+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 - --# Open the log real soon, to keep \$[0] and so on meaningful, and to -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# Save the log message, to keep $0 and so on meaningful, and to - # report actual input values of CONFIG_FILES etc. instead of their --# values after options handling. Logging --version etc. is OK. --exec 5>>config.log --{ -- echo -- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX --## Running $as_me. ## --_ASBOX --} >&5 --cat >&5 <<_CSEOF -- -+# values after options handling. -+ac_log=" - This file was extended by $as_me, which was --generated by GNU Autoconf 2.59. Invocation command line was -+generated by GNU Autoconf 2.69. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -7408,124 +6479,116 @@ generated by GNU Autoconf 2.59. Invocat - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - --_CSEOF --echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 --echo >&5 -+on `(hostname || uname -n) 2>/dev/null | sed 1q` -+" -+ - _ACEOF - --# Files that config.status was made for. --if test -n "$ac_config_files"; then -- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS --fi -+case $ac_config_files in *" -+"*) set x $ac_config_files; shift; ac_config_files=$*;; -+esac - --if test -n "$ac_config_headers"; then -- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS --fi - --if test -n "$ac_config_links"; then -- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS --fi - --if test -n "$ac_config_commands"; then -- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS --fi -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+# Files that config.status was made for. -+config_files="$ac_config_files" - --cat >>$CONFIG_STATUS <<\_ACEOF -+_ACEOF - -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - ac_cs_usage="\ --\`$as_me' instantiates files from templates according to the --current configuration. -+\`$as_me' instantiates files and other configuration actions -+from templates according to the current configuration. Unless the files -+and actions are specified as TAGs, all are instantiated by default. - --Usage: $0 [OPTIONS] [FILE]... -+Usage: $0 [OPTION]... [TAG]... - - -h, --help print this help, then exit -- -V, --version print version number, then exit -- -q, --quiet do not print progress messages -+ -V, --version print version number and configuration settings, then exit -+ --config print configuration, then exit -+ -q, --quiet, --silent -+ do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions -- --file=FILE[:TEMPLATE] -- instantiate the configuration file FILE -+ --file=FILE[:TEMPLATE] -+ instantiate the configuration file FILE - - Configuration files: - $config_files - --Report bugs to ." --_ACEOF -+Report bugs to the package provider." - --cat >>$CONFIG_STATUS <<_ACEOF -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" - ac_cs_version="\\ - config.status --configured by $0, generated by GNU Autoconf 2.59, -- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -+configured by $0, generated by GNU Autoconf 2.69, -+ with options \\"\$ac_cs_config\\" - --Copyright (C) 2003 Free Software Foundation, Inc. -+Copyright (C) 2012 Free Software Foundation, Inc. - This config.status script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it." --srcdir=$srcdir -+ -+ac_pwd='$ac_pwd' -+srcdir='$srcdir' -+test -n "\$AWK" || AWK=awk - _ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF --# If no file are specified by the user, then we need to provide default --# value. By we need to know if files were specified by the user. -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# The default lists apply if the user does not specify any file. - ac_need_defaults=: - while test $# != 0 - do - case $1 in -- --*=*) -- ac_option=`expr "x$1" : 'x\([^=]*\)='` -- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` -+ --*=?*) -+ ac_option=`expr "X$1" : 'X\([^=]*\)='` -+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; -- -*) -+ --*=) -+ ac_option=`expr "X$1" : 'X\([^=]*\)='` -+ ac_optarg= -+ ac_shift=: -+ ;; -+ *) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; -- *) # This is not an option, so the user has probably given explicit -- # arguments. -- ac_option=$1 -- ac_need_defaults=false;; - esac - - case $ac_option in - # Handling of the options. --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; -- --version | --vers* | -V ) -- echo "$ac_cs_version"; exit 0 ;; -- --he | --h) -- # Conflict between --help and --header -- { { echo "$as_me:$LINENO: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; };; -- --help | --hel | -h ) -- echo "$ac_cs_usage"; exit 0 ;; -- --debug | --d* | -d ) -+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) -+ $as_echo "$ac_cs_version"; exit ;; -+ --config | --confi | --conf | --con | --co | --c ) -+ $as_echo "$ac_cs_config"; exit ;; -+ --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift -- CONFIG_FILES="$CONFIG_FILES $ac_optarg" -- ac_need_defaults=false;; -- --header | --heade | --head | --hea ) -- $ac_shift -- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" -+ case $ac_optarg in -+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ '') as_fn_error $? "missing file argument" ;; -+ esac -+ as_fn_append CONFIG_FILES " '$ac_optarg'" - ac_need_defaults=false;; -+ --he | --h | --help | --hel | -h ) -+ $as_echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. -- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; } ;; -+ -*) as_fn_error $? "unrecognized option: \`$1' -+Try \`$0 --help' for more information." ;; - -- *) ac_config_targets="$ac_config_targets $1" ;; -+ *) as_fn_append ac_config_targets " $1" -+ ac_need_defaults=false ;; - - esac - shift -@@ -7539,31 +6602,45 @@ if $ac_cs_silent; then - fi - - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - if \$ac_cs_recheck; then -- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 -- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ shift -+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 -+ CONFIG_SHELL='$SHELL' -+ export CONFIG_SHELL -+ exec "\$@" - fi - - _ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+exec 5>>config.log -+{ -+ echo -+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -+## Running $as_me. ## -+_ASBOX -+ $as_echo "$ac_log" -+} >&5 - -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+_ACEOF - -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - -- -- --cat >>$CONFIG_STATUS <<\_ACEOF -+# Handling of arguments. - for ac_config_target in $ac_config_targets - do -- case "$ac_config_target" in -- # Handling of arguments. -- "config.mk" ) CONFIG_FILES="$CONFIG_FILES config.mk" ;; -- "c_src/Makefile" ) CONFIG_FILES="$CONFIG_FILES c_src/Makefile" ;; -- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 --echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -- { (exit 1); exit 1; }; };; -+ case $ac_config_target in -+ "config.mk") CONFIG_FILES="$CONFIG_FILES config.mk" ;; -+ "c_src/Makefile") CONFIG_FILES="$CONFIG_FILES c_src/Makefile" ;; -+ -+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; - esac - done - -+ - # If the user did not use the arguments to specify the items to instantiate, - # then the envvar interface is used. Set only those that are not. - # We use the long form for the default assignment because of an extremely -@@ -7573,380 +6650,414 @@ if $ac_need_defaults; then - fi - - # Have a temporary directory for convenience. Make it in the build tree --# simply because there is no reason to put it here, and in addition, -+# simply because there is no reason against having it here, and in addition, - # creating and moving files from /tmp can sometimes cause problems. --# Create a temporary directory, and hook for its removal unless debugging. -+# Hook for its removal unless debugging. -+# Note that there is a small window in which the directory will not be cleaned: -+# after its creation but before its name has been assigned to `$tmp'. - $debug || - { -- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 -- trap '{ (exit 1); exit 1; }' 1 2 13 15 -+ tmp= ac_tmp= -+ trap 'exit_status=$? -+ : "${ac_tmp:=$tmp}" -+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status -+' 0 -+ trap 'as_fn_exit 1' 1 2 13 15 - } -- - # Create a (secure) tmp directory for tmp files. - - { -- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && -- test -n "$tmp" && test -d "$tmp" -+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && -+ test -d "$tmp" - } || - { -- tmp=./confstat$$-$RANDOM -- (umask 077 && mkdir $tmp) --} || -+ tmp=./conf$$-$RANDOM -+ (umask 077 && mkdir "$tmp") -+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 -+ac_tmp=$tmp -+ -+# Set up the scripts for CONFIG_FILES section. -+# No need to generate them if there are no CONFIG_FILES. -+# This happens for instance with `./config.status config.h'. -+if test -n "$CONFIG_FILES"; then -+ -+ -+ac_cr=`echo X | tr X '\015'` -+# On cygwin, bash can eat \r inside `` if the user requested igncr. -+# But we know of no other shell where ac_cr would be empty at this -+# point, so we can use a bashism as a fallback. -+if test "x$ac_cr" = x; then -+ eval ac_cr=\$\'\\r\' -+fi -+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` -+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then -+ ac_cs_awk_cr='\\r' -+else -+ ac_cs_awk_cr=$ac_cr -+fi -+ -+echo 'BEGIN {' >"$ac_tmp/subs1.awk" && -+_ACEOF -+ -+ - { -- echo "$me: cannot create a temporary directory in ." >&2 -- { (exit 1); exit 1; } -+ echo "cat >conf$$subs.awk <<_ACEOF" && -+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && -+ echo "_ACEOF" -+} >conf$$subs.sh || -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` -+ac_delim='%!_!# ' -+for ac_last_try in false false false false false :; do -+ . ./conf$$subs.sh || -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -+ -+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` -+ if test $ac_delim_n = $ac_delim_num; then -+ break -+ elif $ac_last_try; then -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -+ else -+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " -+ fi -+done -+rm -f conf$$subs.sh -+ -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && -+_ACEOF -+sed -n ' -+h -+s/^/S["/; s/!.*/"]=/ -+p -+g -+s/^[^!]*!// -+:repl -+t repl -+s/'"$ac_delim"'$// -+t delim -+:nl -+h -+s/\(.\{148\}\)..*/\1/ -+t more1 -+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ -+p -+n -+b repl -+:more1 -+s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -+p -+g -+s/.\{148\}// -+t nl -+:delim -+h -+s/\(.\{148\}\)..*/\1/ -+t more2 -+s/["\\]/\\&/g; s/^/"/; s/$/"/ -+p -+b -+:more2 -+s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -+p -+g -+s/.\{148\}// -+t delim -+' >$CONFIG_STATUS || ac_write_fail=1 -+rm -f conf$$subs.awk -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+_ACAWK -+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && -+ for (key in S) S_is_set[key] = 1 -+ FS = "" - -+} -+{ -+ line = $ 0 -+ nfields = split(line, field, "@") -+ substed = 0 -+ len = length(field[1]) -+ for (i = 2; i < nfields; i++) { -+ key = field[i] -+ keylen = length(key) -+ if (S_is_set[key]) { -+ value = S[key] -+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) -+ len += length(value) + length(field[++i]) -+ substed = 1 -+ } else -+ len += 1 + keylen -+ } -+ -+ print line -+} -+ -+_ACAWK -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then -+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" -+else -+ cat -+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ -+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 - _ACEOF - --cat >>$CONFIG_STATUS <<_ACEOF -+# VPATH may cause trouble with some makes, so we remove sole $(srcdir), -+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and -+# trailing colons and then remove the whole line if VPATH becomes empty -+# (actually we leave an empty line to preserve line numbers). -+if test "x$srcdir" = x.; then -+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ -+h -+s/// -+s/^/:/ -+s/[ ]*$/:/ -+s/:\$(srcdir):/:/g -+s/:\${srcdir}:/:/g -+s/:@srcdir@:/:/g -+s/^:*// -+s/:*$// -+x -+s/\(=[ ]*\).*/\1/ -+G -+s/\n// -+s/^[^=]*=[ ]*$// -+}' -+fi - --# --# CONFIG_FILES section. --# -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+fi # test -n "$CONFIG_FILES" - --# No need to generate the scripts if there are no CONFIG_FILES. --# This happens for instance when ./config.status config.h --if test -n "\$CONFIG_FILES"; then -- # Protect against being on the right side of a sed subst in config.status. -- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; -- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF --s,@SHELL@,$SHELL,;t t --s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t --s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t --s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t --s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t --s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t --s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t --s,@exec_prefix@,$exec_prefix,;t t --s,@prefix@,$prefix,;t t --s,@program_transform_name@,$program_transform_name,;t t --s,@bindir@,$bindir,;t t --s,@sbindir@,$sbindir,;t t --s,@libexecdir@,$libexecdir,;t t --s,@datadir@,$datadir,;t t --s,@sysconfdir@,$sysconfdir,;t t --s,@sharedstatedir@,$sharedstatedir,;t t --s,@localstatedir@,$localstatedir,;t t --s,@libdir@,$libdir,;t t --s,@includedir@,$includedir,;t t --s,@oldincludedir@,$oldincludedir,;t t --s,@infodir@,$infodir,;t t --s,@mandir@,$mandir,;t t --s,@build_alias@,$build_alias,;t t --s,@host_alias@,$host_alias,;t t --s,@target_alias@,$target_alias,;t t --s,@DEFS@,$DEFS,;t t --s,@ECHO_C@,$ECHO_C,;t t --s,@ECHO_N@,$ECHO_N,;t t --s,@ECHO_T@,$ECHO_T,;t t --s,@LIBS@,$LIBS,;t t --s,@build@,$build,;t t --s,@build_cpu@,$build_cpu,;t t --s,@build_vendor@,$build_vendor,;t t --s,@build_os@,$build_os,;t t --s,@host@,$host,;t t --s,@host_cpu@,$host_cpu,;t t --s,@host_vendor@,$host_vendor,;t t --s,@host_os@,$host_os,;t t --s,@TARGET@,$TARGET,;t t --s,@CC@,$CC,;t t --s,@CFLAGS@,$CFLAGS,;t t --s,@LDFLAGS@,$LDFLAGS,;t t --s,@CPPFLAGS@,$CPPFLAGS,;t t --s,@ac_ct_CC@,$ac_ct_CC,;t t --s,@EXEEXT@,$EXEEXT,;t t --s,@OBJEXT@,$OBJEXT,;t t --s,@CXX@,$CXX,;t t --s,@CXXFLAGS@,$CXXFLAGS,;t t --s,@ac_ct_CXX@,$ac_ct_CXX,;t t --s,@RANLIB@,$RANLIB,;t t --s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t --s,@CPP@,$CPP,;t t --s,@MIXED_CYGWIN_VC@,$MIXED_CYGWIN_VC,;t t --s,@MIXED_MSYS_VC@,$MIXED_MSYS_VC,;t t --s,@MIXED_VC@,$MIXED_VC,;t t --s,@MIXED_CYGWIN_MINGW@,$MIXED_CYGWIN_MINGW,;t t --s,@MIXED_CYGWIN@,$MIXED_CYGWIN,;t t --s,@MIXED_MSYS@,$MIXED_MSYS,;t t --s,@EGREP@,$EGREP,;t t --s,@OBJC_CC@,$OBJC_CC,;t t --s,@OBJC_CFLAGS@,$OBJC_CFLAGS,;t t --s,@GL_LIBS@,$GL_LIBS,;t t --s,@DEBUG_CFLAGS@,$DEBUG_CFLAGS,;t t --s,@DEBUG_CXXFLAGS@,$DEBUG_CXXFLAGS,;t t --s,@ERLC@,$ERLC,;t t --s,@WX_BUILDING_INSIDE_ERLSRC@,$WX_BUILDING_INSIDE_ERLSRC,;t t --s,@ERLANG_ROOT_DIR@,$ERLANG_ROOT_DIR,;t t --s,@WX_CONFIG_PATH@,$WX_CONFIG_PATH,;t t --s,@WX_CPPFLAGS@,$WX_CPPFLAGS,;t t --s,@WX_CFLAGS@,$WX_CFLAGS,;t t --s,@WX_CXXFLAGS@,$WX_CXXFLAGS,;t t --s,@WX_CFLAGS_ONLY@,$WX_CFLAGS_ONLY,;t t --s,@WX_CXXFLAGS_ONLY@,$WX_CXXFLAGS_ONLY,;t t --s,@WX_LIBS@,$WX_LIBS,;t t --s,@WX_LIBS_STATIC@,$WX_LIBS_STATIC,;t t --s,@WX_VERSION@,$WX_VERSION,;t t --s,@WX_RESCOMP@,$WX_RESCOMP,;t t --s,@WX_VERSION_MAJOR@,$WX_VERSION_MAJOR,;t t --s,@WX_VERSION_MINOR@,$WX_VERSION_MINOR,;t t --s,@WX_VERSION_MICRO@,$WX_VERSION_MICRO,;t t --s,@DEBUG_WX_CFLAGS@,$DEBUG_WX_CFLAGS,;t t --s,@DEBUG_WX_CXXFLAGS@,$DEBUG_WX_CXXFLAGS,;t t --s,@DEBUG_WX_LIBS@,$DEBUG_WX_LIBS,;t t --s,@DEBUG_WX_LIBS_STATIC@,$DEBUG_WX_LIBS_STATIC,;t t --s,@FORCED_DEBUG_BUILD@,$FORCED_DEBUG_BUILD,;t t --s,@WX_HAVE_STATIC_LIBS@,$WX_HAVE_STATIC_LIBS,;t t --s,@RC_FILE_TYPE@,$RC_FILE_TYPE,;t t --s,@HAVE_GL_SUPPORT@,$HAVE_GL_SUPPORT,;t t --s,@TESS_CB_TIGER_STYLE@,$TESS_CB_TIGER_STYLE,;t t --s,@WXERL_CAN_BUILD_DRIVER@,$WXERL_CAN_BUILD_DRIVER,;t t --s,@SO_EXT@,$SO_EXT,;t t --s,@RUN_ERL@,$RUN_ERL,;t t --s,@WXERL_SYS_TYPE@,$WXERL_SYS_TYPE,;t t --s,@LIBOBJS@,$LIBOBJS,;t t --s,@LTLIBOBJS@,$LTLIBOBJS,;t t --CEOF - --_ACEOF -+eval set X " :F $CONFIG_FILES " -+shift -+for ac_tag -+do -+ case $ac_tag in -+ :[FHLC]) ac_mode=$ac_tag; continue;; -+ esac -+ case $ac_mode$ac_tag in -+ :[FHL]*:*);; -+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; -+ :[FH]-) ac_tag=-:-;; -+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; -+ esac -+ ac_save_IFS=$IFS -+ IFS=: -+ set x $ac_tag -+ IFS=$ac_save_IFS -+ shift -+ ac_file=$1 -+ shift - -- cat >>$CONFIG_STATUS <<\_ACEOF -- # Split the substitutions into bite-sized pieces for seds with -- # small command number limits, like on Digital OSF/1 and HP-UX. -- ac_max_sed_lines=48 -- ac_sed_frag=1 # Number of current file. -- ac_beg=1 # First line for current file. -- ac_end=$ac_max_sed_lines # Line after last line for current file. -- ac_more_lines=: -- ac_sed_cmds= -- while $ac_more_lines; do -- if test $ac_beg -gt 1; then -- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- else -- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- fi -- if test ! -s $tmp/subs.frag; then -- ac_more_lines=false -- else -- # The purpose of the label and of the branching condition is to -- # speed up the sed processing (if there are no `@' at all, there -- # is no need to browse any of the substitutions). -- # These are the two extra sed commands mentioned above. -- (echo ':t -- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" -- else -- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" -- fi -- ac_sed_frag=`expr $ac_sed_frag + 1` -- ac_beg=$ac_end -- ac_end=`expr $ac_end + $ac_max_sed_lines` -+ case $ac_mode in -+ :L) ac_source=$1;; -+ :[FH]) -+ ac_file_inputs= -+ for ac_f -+ do -+ case $ac_f in -+ -) ac_f="$ac_tmp/stdin";; -+ *) # Look for the file first in the build tree, then in the source tree -+ # (if the path is not absolute). The absolute path cannot be DOS-style, -+ # because $ac_f cannot contain `:'. -+ test -f "$ac_f" || -+ case $ac_f in -+ [\\/$]*) false;; -+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; -+ esac || -+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; -+ esac -+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac -+ as_fn_append ac_file_inputs " '$ac_f'" -+ done -+ -+ # Let's still pretend it is `configure' which instantiates (i.e., don't -+ # use $as_me), people would be surprised to read: -+ # /* config.h. Generated by config.status. */ -+ configure_input='Generated from '` -+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' -+ `' by configure.' -+ if test x"$ac_file" != x-; then -+ configure_input="$ac_file. $configure_input" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -+$as_echo "$as_me: creating $ac_file" >&6;} - fi -- done -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds=cat -- fi --fi # test -n "$CONFIG_FILES" -+ # Neutralize special characters interpreted by sed in replacement strings. -+ case $configure_input in #( -+ *\&* | *\|* | *\\* ) -+ ac_sed_conf_input=`$as_echo "$configure_input" | -+ sed 's/[\\\\&|]/\\\\&/g'`;; #( -+ *) ac_sed_conf_input=$configure_input;; -+ esac - --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF --for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue -- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". -- case $ac_file in -- - | *:- | *:-:* ) # input from stdin -- cat >$tmp/stdin -- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- * ) ac_file_in=$ac_file.in ;; -+ case $ac_tag in -+ *:-:* | *:-) cat >"$ac_tmp/stdin" \ -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; -+ esac -+ ;; - esac - -- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. -- ac_dir=`(dirname "$ac_file") 2>/dev/null || -+ ac_dir=`$as_dirname -- "$ac_file" || - $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ -- X"$ac_file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$ac_file" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- { if $as_mkdir_p; then -- mkdir -p "$ac_dir" -- else -- as_dir="$ac_dir" -- as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- done -- test ! -n "$as_dirs" || mkdir $as_dirs -- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 --echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -- { (exit 1); exit 1; }; }; } -- -+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$ac_file" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ as_dir="$ac_dir"; as_fn_mkdir_p - ac_builddir=. - --if test "$ac_dir" != .; then -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix - - case $srcdir in -- .) # No --srcdir option. We are building in place. -+ .) # We are building in place. - ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; --esac -- --# Do not use `cd foo && pwd` to compute absolute paths, because --# the directories may not exist. --case `pwd` in --.) ac_abs_builddir="$ac_dir";; --*) -- case "$ac_dir" in -- .) ac_abs_builddir=`pwd`;; -- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -- *) ac_abs_builddir=`pwd`/"$ac_dir";; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_builddir=${ac_top_builddir}.;; --*) -- case ${ac_top_builddir}. in -- .) ac_abs_top_builddir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_srcdir=$ac_srcdir;; --*) -- case $ac_srcdir in -- .) ac_abs_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_srcdir=$ac_top_srcdir;; --*) -- case $ac_top_srcdir in -- .) ac_abs_top_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -- esac;; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; - esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - -+ case $ac_mode in -+ :F) -+ # -+ # CONFIG_FILE -+ # - -- if test x"$ac_file" != x-; then -- { echo "$as_me:$LINENO: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -- rm -f "$ac_file" -- fi -- # Let's still pretend it is `configure' which instantiates (i.e., don't -- # use $as_me), people would be surprised to read: -- # /* config.h. Generated by config.status. */ -- if test x"$ac_file" = x-; then -- configure_input= -- else -- configure_input="$ac_file. " -- fi -- configure_input=$configure_input"Generated from `echo $ac_file_in | -- sed 's,.*/,,'` by configure." -+_ACEOF - -- # First look for the input files in the build tree, otherwise in the -- # src tree. -- ac_file_inputs=`IFS=: -- for f in $ac_file_in; do -- case $f in -- -) echo $tmp/stdin ;; -- [\\/$]*) -- # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- echo "$f";; -- *) # Relative -- if test -f "$f"; then -- # Build tree -- echo "$f" -- elif test -f "$srcdir/$f"; then -- # Source tree -- echo "$srcdir/$f" -- else -- # /dev/null tree -- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- fi;; -- esac -- done` || { (exit 1); exit 1; } -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# If the template does not know about datarootdir, expand it. -+# FIXME: This hack should be removed a few years after 2.60. -+ac_datarootdir_hack=; ac_datarootdir_seen= -+ac_sed_dataroot=' -+/datarootdir/ { -+ p -+ q -+} -+/@datadir@/p -+/@docdir@/p -+/@infodir@/p -+/@localedir@/p -+/@mandir@/p' -+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in -+*datarootdir*) ac_datarootdir_seen=yes;; -+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -- sed "$ac_vpsub -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ ac_datarootdir_hack=' -+ s&@datadir@&$datadir&g -+ s&@docdir@&$docdir&g -+ s&@infodir@&$infodir&g -+ s&@localedir@&$localedir&g -+ s&@mandir@&$mandir&g -+ s&\\\${datarootdir}&$datarootdir&g' ;; -+esac -+_ACEOF -+ -+# Neutralize VPATH when `$srcdir' = `.'. -+# Shell code in configure.ac might set extrasub. -+# FIXME: do we really want to maintain this feature? -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ac_sed_extra="$ac_vpsub - $extrasub - _ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - :t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b --s,@configure_input@,$configure_input,;t t --s,@srcdir@,$ac_srcdir,;t t --s,@abs_srcdir@,$ac_abs_srcdir,;t t --s,@top_srcdir@,$ac_top_srcdir,;t t --s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t --s,@builddir@,$ac_builddir,;t t --s,@abs_builddir@,$ac_abs_builddir,;t t --s,@top_builddir@,$ac_top_builddir,;t t --s,@abs_top_builddir@,$ac_abs_top_builddir,;t t --" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out -- rm -f $tmp/stdin -- if test x"$ac_file" != x-; then -- mv $tmp/out $ac_file -- else -- cat $tmp/out -- rm -f $tmp/out -- fi -+s|@configure_input@|$ac_sed_conf_input|;t t -+s&@top_builddir@&$ac_top_builddir_sub&;t t -+s&@top_build_prefix@&$ac_top_build_prefix&;t t -+s&@srcdir@&$ac_srcdir&;t t -+s&@abs_srcdir@&$ac_abs_srcdir&;t t -+s&@top_srcdir@&$ac_top_srcdir&;t t -+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -+s&@builddir@&$ac_builddir&;t t -+s&@abs_builddir@&$ac_abs_builddir&;t t -+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -+$ac_datarootdir_hack -+" -+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ -+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - --done --_ACEOF -+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && -+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && -+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ -+ "$ac_tmp/out"`; test -z "$ac_out"; } && -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined" >&5 -+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined" >&2;} - --cat >>$CONFIG_STATUS <<\_ACEOF -+ rm -f "$ac_tmp/stdin" -+ case $ac_file in -+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; -+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; -+ esac \ -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 -+ ;; - --{ (exit 0); exit 0; } -+ -+ -+ esac -+ -+done # for ac_tag -+ -+ -+as_fn_exit 0 - _ACEOF --chmod +x $CONFIG_STATUS - ac_clean_files=$ac_clean_files_save - -+test $ac_write_fail = 0 || -+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 -+ - - # configure is writing to config.log, and then calls config.status. - # config.status does its own redirection, appending to config.log. -@@ -7966,23 +7077,27 @@ if test "$no_create" != yes; then - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. -- $ac_cs_success || { (exit 1); exit 1; } -+ $ac_cs_success || as_fn_exit 1 -+fi -+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} - fi - - - if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then -- { echo "$as_me:$LINENO: " >&5 --echo "$as_me: " >&6;} -- { echo "$as_me:$LINENO: --------------------------------------------------" >&5 --echo "$as_me: --------------------------------------------------" >&6;} -- { echo "$as_me:$LINENO: Using erlang compiler: $ERLC" >&5 --echo "$as_me: Using erlang compiler: $ERLC" >&6;} -- { echo "$as_me:$LINENO: wxErlang Install in: $ERLANG_ROOT_DIR/lib/wx-$ERLWX_VSN" >&5 --echo "$as_me: wxErlang Install in: $ERLANG_ROOT_DIR/lib/wx-$ERLWX_VSN" >&6;} -- { echo "$as_me:$LINENO: Erlang driver in priv/$WXERL_SYS_TYPE/wxe_driver$SO_EXT" >&5 --echo "$as_me: Erlang driver in priv/$WXERL_SYS_TYPE/wxe_driver$SO_EXT" >&6;} -- { echo "$as_me:$LINENO: --------------------------------------------------" >&5 --echo "$as_me: --------------------------------------------------" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 -+$as_echo "$as_me: " >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: --------------------------------------------------" >&5 -+$as_echo "$as_me: --------------------------------------------------" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: Using erlang compiler: $ERLC" >&5 -+$as_echo "$as_me: Using erlang compiler: $ERLC" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: wxErlang Install in: $ERLANG_ROOT_DIR/lib/wx-$ERLWX_VSN" >&5 -+$as_echo "$as_me: wxErlang Install in: $ERLANG_ROOT_DIR/lib/wx-$ERLWX_VSN" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: Erlang driver in priv/$WXERL_SYS_TYPE/wxe_driver$SO_EXT" >&5 -+$as_echo "$as_me: Erlang driver in priv/$WXERL_SYS_TYPE/wxe_driver$SO_EXT" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: --------------------------------------------------" >&5 -+$as_echo "$as_me: --------------------------------------------------" >&6;} - fi - - if test X"$WX_BUILDING_INSIDE_ERLSRC" = X"true" ; then diff --git a/lang/fasm/Makefile b/lang/fasm/Makefile index 240e93fdac2..65f4ddb28ae 100644 --- a/lang/fasm/Makefile +++ b/lang/fasm/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= fasm -PORTVERSION= 1.73.09 +PORTVERSION= 1.73.10 CATEGORIES= lang devel MASTER_SITES= https://flatassembler.net/ diff --git a/lang/fasm/distinfo b/lang/fasm/distinfo index 52760587788..2e8ed1f5aa8 100644 --- a/lang/fasm/distinfo +++ b/lang/fasm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1550510545 -SHA256 (fasm-1.73.09.tar.gz) = 933d670714c2935a59698aca5ee4c3393039d8ee3c20a0d43297661ec880e22f -SIZE (fasm-1.73.09.tar.gz) = 275622 +TIMESTAMP = 1554790932 +SHA256 (fasm-1.73.10.tar.gz) = 51e7b57328d3d458b40e33cb83b0fdc35508cb2856c52e78f655f1af1827d867 +SIZE (fasm-1.73.10.tar.gz) = 276181 diff --git a/lang/gcc8-devel/Makefile b/lang/gcc8-devel/Makefile index ca588f1d174..50c10b36219 100644 --- a/lang/gcc8-devel/Makefile +++ b/lang/gcc8-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 8.3.1.s20190329 +PORTVERSION= 8.3.1.s20190405 CATEGORIES= lang MASTER_SITES= GCC/snapshots/${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel diff --git a/lang/gcc8-devel/distinfo b/lang/gcc8-devel/distinfo index 3635530a3a3..aee1e321ecd 100644 --- a/lang/gcc8-devel/distinfo +++ b/lang/gcc8-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554008624 -SHA256 (gcc-8-20190329.tar.xz) = 29e85ff7e5f29f139e30669b1b3192348f72f81b1ba7de4e4686733b79c96e5d -SIZE (gcc-8-20190329.tar.xz) = 61850244 +TIMESTAMP = 1554565225 +SHA256 (gcc-8-20190405.tar.xz) = bb80013e1660ef7c8b73aa1e1e984fb6494de6b8ae0dbf4b0961452624ca1208 +SIZE (gcc-8-20190405.tar.xz) = 61851272 diff --git a/lang/gcc9-devel/Makefile b/lang/gcc9-devel/Makefile index 91be3d55bd1..9259febc00d 100644 --- a/lang/gcc9-devel/Makefile +++ b/lang/gcc9-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 9.0.1.s20190331 +PORTVERSION= 9.0.1.s20190407 CATEGORIES= lang MASTER_SITES= GCC/snapshots/${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel diff --git a/lang/gcc9-devel/distinfo b/lang/gcc9-devel/distinfo index 34f2b79f0a9..437fe6c307c 100644 --- a/lang/gcc9-devel/distinfo +++ b/lang/gcc9-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554131006 -SHA256 (gcc-9-20190331.tar.xz) = d9d5a0f42bd2fe4a942452d1699d3f0310d8bcf5e7068e29003a73161d32b055 -SIZE (gcc-9-20190331.tar.xz) = 68658900 +TIMESTAMP = 1554699966 +SHA256 (gcc-9-20190407.tar.xz) = 1c13fc38f0131fc556a4b7e2252b6a3ce5d1745f75c90413e9efe9c84ed37a0d +SIZE (gcc-9-20190407.tar.xz) = 68704424 diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile index 49bffbc2b28..134d6ff902b 100644 --- a/lang/gjs/Makefile +++ b/lang/gjs/Makefile @@ -3,7 +3,7 @@ PORTNAME= gjs PORTVERSION= 1.52.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 diff --git a/lang/guile2/Makefile b/lang/guile2/Makefile index a82e8e62131..2b10737fd71 100644 --- a/lang/guile2/Makefile +++ b/lang/guile2/Makefile @@ -3,7 +3,7 @@ PORTNAME= guile PORTVERSION= 2.0.14 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= lang scheme MASTER_SITES= GNU PKGNAMESUFFIX= 2 diff --git a/lang/io/Makefile b/lang/io/Makefile index 3b19a526f04..9c0a28f16ac 100644 --- a/lang/io/Makefile +++ b/lang/io/Makefile @@ -3,7 +3,7 @@ PORTNAME= io PORTVERSION= 2017.09.06 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= lang MAINTAINER= gahr@FreeBSD.org diff --git a/lang/kawa/Makefile b/lang/kawa/Makefile index d45e46a2e39..790ef4f7153 100644 --- a/lang/kawa/Makefile +++ b/lang/kawa/Makefile @@ -3,7 +3,7 @@ PORTNAME= kawa PORTVERSION= 3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang scheme java MASTER_SITES= GNU diff --git a/lang/lci/Makefile b/lang/lci/Makefile index e7fc50a855c..31f3c9c426a 100644 --- a/lang/lci/Makefile +++ b/lang/lci/Makefile @@ -3,7 +3,7 @@ PORTNAME= lci PORTVERSION= 0.11.2 DISTVERSIONPREFIX= v -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang MAINTAINER= che@bein.link diff --git a/lang/librep/Makefile b/lang/librep/Makefile index 9b39e2ca413..aa6bcbe8cb0 100644 --- a/lang/librep/Makefile +++ b/lang/librep/Makefile @@ -3,7 +3,7 @@ PORTNAME= librep PORTVERSION= 0.92.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang elisp gnome MASTER_SITES= http://download.tuxfamily.org/librep/ DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/lang/mdk/Makefile b/lang/mdk/Makefile index 107be07297e..b234451353e 100644 --- a/lang/mdk/Makefile +++ b/lang/mdk/Makefile @@ -3,6 +3,7 @@ PORTNAME= mdk PORTVERSION= 1.2.10 +PORTREVISION= 1 CATEGORIES= lang gnome MASTER_SITES= GNU/${PORTNAME}/v${PORTVERSION} diff --git a/lang/micropython/Makefile b/lang/micropython/Makefile index d84ff19fa5d..73047266373 100644 --- a/lang/micropython/Makefile +++ b/lang/micropython/Makefile @@ -3,7 +3,7 @@ PORTNAME= micropython PORTVERSION= 1.5.1 DISTVERSIONPREFIX= v -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang python MAINTAINER= ports@FreeBSD.org diff --git a/lang/mujs/Makefile b/lang/mujs/Makefile index affc5ee9aa2..cefc9b9239c 100644 --- a/lang/mujs/Makefile +++ b/lang/mujs/Makefile @@ -3,6 +3,7 @@ PORTNAME= mujs DISTVERSION= 1.0.5-32 DISTVERSIONSUFFIX= -g0c03f9c +PORTREVISION= 1 CATEGORIES= lang devel PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ diff --git a/lang/newlisp-devel/Makefile b/lang/newlisp-devel/Makefile index 5a288c72ac1..038677e7521 100644 --- a/lang/newlisp-devel/Makefile +++ b/lang/newlisp-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= newlisp PORTVERSION= 10.6.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= http://www.newlisp.org/downloads/development/ PKGNAMESUFFIX= -devel diff --git a/lang/newlisp/Makefile b/lang/newlisp/Makefile index 216df2e764e..d6e8ecee4fb 100644 --- a/lang/newlisp/Makefile +++ b/lang/newlisp/Makefile @@ -3,7 +3,7 @@ PORTNAME= newlisp PORTVERSION= 10.6.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= http://www.newlisp.org/downloads/ diff --git a/lang/nickle/Makefile b/lang/nickle/Makefile index d16e5d828d1..1331f8caae7 100644 --- a/lang/nickle/Makefile +++ b/lang/nickle/Makefile @@ -3,6 +3,7 @@ PORTNAME= nickle PORTVERSION= 2.84 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= http://www.nickle.org/release/ diff --git a/lang/ohugs/Makefile b/lang/ohugs/Makefile index 5e80e96fda5..c5253c720fe 100644 --- a/lang/ohugs/Makefile +++ b/lang/ohugs/Makefile @@ -3,7 +3,7 @@ PORTNAME= ohugs PORTVERSION= 0.5 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= lang haskell MASTER_SITES= http://www.math.chalmers.se/~nordland/ohugs/ DISTNAME= ${PORTNAME}-${PORTVERSION}.src diff --git a/lang/opencoarrays/Makefile b/lang/opencoarrays/Makefile index 122064b8b93..99afee29c36 100644 --- a/lang/opencoarrays/Makefile +++ b/lang/opencoarrays/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= opencoarrays -DISTVERSION= 2.3.1 +DISTVERSION= 2.6.1 CATEGORIES= lang parallel MAINTAINER= ports@FreeBSD.org diff --git a/lang/opencoarrays/distinfo b/lang/opencoarrays/distinfo index ab5a93b9a0a..87f427337bb 100644 --- a/lang/opencoarrays/distinfo +++ b/lang/opencoarrays/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1549999421 -SHA256 (sourceryinstitute-OpenCoarrays-2.3.1_GH0.tar.gz) = 5bb74d0aa4aa39de1910e1154064cfc649ced731da682c257f4b8802c187f25f -SIZE (sourceryinstitute-OpenCoarrays-2.3.1_GH0.tar.gz) = 313995 +TIMESTAMP = 1554794868 +SHA256 (sourceryinstitute-OpenCoarrays-2.6.1_GH0.tar.gz) = 6f308b5d4784fc3d3209b319900500dae8158a05931890f6aa11909fe4a95616 +SIZE (sourceryinstitute-OpenCoarrays-2.6.1_GH0.tar.gz) = 317793 diff --git a/lang/opencoarrays/pkg-plist b/lang/opencoarrays/pkg-plist index a7c09340740..1b3b2d7d757 100644 --- a/lang/opencoarrays/pkg-plist +++ b/lang/opencoarrays/pkg-plist @@ -3,6 +3,7 @@ bin/cafrun include/OpenCoarrays-%%PORTVERSION%%_GNU-%%GCC_VER%%/opencoarrays.mod include/libcaf-gfortran-descriptor.h include/libcaf.h +include/libcaf-version-def.h include/opencoarrays.mod lib/cmake/opencoarrays/OpenCoarraysConfig.cmake lib/cmake/opencoarrays/OpenCoarraysConfigVersion.cmake @@ -11,5 +12,7 @@ lib/cmake/opencoarrays/OpenCoarraysTargets.cmake lib/libcaf_mpi.a lib/libcaf_mpi.so lib/libcaf_mpi.so.%%SOVERSION%% +lib/libopencoarrays_mod.a man/man1/caf.1.gz man/man1/cafrun.1.gz +@dir %%DATADIR%% diff --git a/lang/php71/Makefile b/lang/php71/Makefile index c91b74c3d06..f5b01d88314 100644 --- a/lang/php71/Makefile +++ b/lang/php71/Makefile @@ -3,7 +3,7 @@ PORTNAME= php71 PORTVERSION= 7.1.28 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${PORTVERSION} diff --git a/lang/php71/pkg-message.mod b/lang/php71/pkg-message.mod index f96750445f6..a0c2c87889a 100644 --- a/lang/php71/pkg-message.mod +++ b/lang/php71/pkg-message.mod @@ -1,4 +1,4 @@ -*************************************************************** +****************************************************************************** Make sure index.php is part of your DirectoryIndex. @@ -11,9 +11,9 @@ You should add the following to your Apache configuration file: SetHandler application/x-httpd-php-source -********************************************************************* +****************************************************************************** -If you are building PHP-based ports in poudriere(8) with ZTS enabled, +If you are building PHP-based ports in poudriere(8) or Synth with ZTS enabled, add WITH_MPM=event to /etc/make.conf to prevent build failures. -********************************************************************* +****************************************************************************** diff --git a/lang/php73/Makefile b/lang/php73/Makefile index 44d85a03268..0703912794e 100644 --- a/lang/php73/Makefile +++ b/lang/php73/Makefile @@ -2,7 +2,7 @@ PORTNAME= php73 DISTVERSION= 7.3.4 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${DISTVERSION} diff --git a/lang/php73/pkg-message.mod b/lang/php73/pkg-message.mod index f96750445f6..a0c2c87889a 100644 --- a/lang/php73/pkg-message.mod +++ b/lang/php73/pkg-message.mod @@ -1,4 +1,4 @@ -*************************************************************** +****************************************************************************** Make sure index.php is part of your DirectoryIndex. @@ -11,9 +11,9 @@ You should add the following to your Apache configuration file: SetHandler application/x-httpd-php-source -********************************************************************* +****************************************************************************** -If you are building PHP-based ports in poudriere(8) with ZTS enabled, +If you are building PHP-based ports in poudriere(8) or Synth with ZTS enabled, add WITH_MPM=event to /etc/make.conf to prevent build failures. -********************************************************************* +****************************************************************************** diff --git a/lang/picoc/Makefile b/lang/picoc/Makefile index 677ed3a1385..7a5079ee661 100644 --- a/lang/picoc/Makefile +++ b/lang/picoc/Makefile @@ -2,7 +2,7 @@ PORTNAME= picoc PORTVERSION= 2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang devel MAINTAINER= portmaster@bsdforge.com diff --git a/lang/python-tools/Makefile b/lang/python-tools/Makefile index bdf0566133f..0a5ddb25873 100644 --- a/lang/python-tools/Makefile +++ b/lang/python-tools/Makefile @@ -2,6 +2,7 @@ PORTNAME= python-tools PORTVERSION= ${PYTHON_PORTVERSION} +PORTREVISION= 1 CATEGORIES= lang python devel MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/lang/python35/Makefile b/lang/python35/Makefile index f43f2643cf4..a7ec9b73773 100644 --- a/lang/python35/Makefile +++ b/lang/python35/Makefile @@ -3,7 +3,7 @@ PORTNAME= python PORTVERSION= ${PYTHON_PORTVERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} PKGNAMESUFFIX= ${PYTHON_SUFFIX} diff --git a/lang/python37/Makefile b/lang/python37/Makefile index a3f04f2ebf9..09867561002 100644 --- a/lang/python37/Makefile +++ b/lang/python37/Makefile @@ -3,6 +3,7 @@ PORTNAME= python PORTVERSION= ${PYTHON_PORTVERSION} +PORTREVISION= 1 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} PKGNAMESUFFIX= ${PYTHON_SUFFIX} diff --git a/lang/rexx-regutil/Makefile b/lang/rexx-regutil/Makefile index 18c700a4aa1..f3799b201de 100644 --- a/lang/rexx-regutil/Makefile +++ b/lang/rexx-regutil/Makefile @@ -3,7 +3,7 @@ PORTNAME= regutil PORTVERSION= 1.26 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= http://home.interlog.com/~ptjm/ \ http://www.ancientgeek.org.uk/distfiles/ @@ -21,7 +21,6 @@ USES= ncurses zip WRKSRC= ${WRKDIR}/${PORTNAME} USE_LDCONFIG= yes -LLD_UNSAFE= yes # lld lacks built-in search paths MAKEFILE= Makefile.bsd MAKE_ARGS+= PLIBS="${LDFLAGS:M-L*} -lncurses" CFLAGS+= -D_WANT_SEMUN diff --git a/lang/rexx-regutil/files/patch-Makefile.bsd b/lang/rexx-regutil/files/patch-Makefile.bsd new file mode 100644 index 00000000000..e8498546490 --- /dev/null +++ b/lang/rexx-regutil/files/patch-Makefile.bsd @@ -0,0 +1,11 @@ +--- Makefile.bsd.orig 2019-04-07 21:58:45 UTC ++++ Makefile.bsd +@@ -23,7 +23,7 @@ POPT=-O2 -fomit-frame-pointer + PCDEFS=-D_SEMUN_DEFINED -DUSE_STATFS -DINCL_MOUNT -DHAS_F_MNTFROMNAME -DMMAP\ + -DUSE_TERMCAP_DB -DHAS_GETBOOTFILE -DHAS_WCHAR + PCFLAGS=-fpic -pipe +-PLDFLAGS=-Bdynamic -Bshareable ++PLDFLAGS=-Bdynamic -Bshareable -L/usr/lib + PLIBS=-ltermcap + + include Makefile.inc diff --git a/lang/rubinius/Makefile b/lang/rubinius/Makefile index 7be93b6fbdb..dc9d0276bbf 100644 --- a/lang/rubinius/Makefile +++ b/lang/rubinius/Makefile @@ -3,6 +3,7 @@ PORTNAME= rubinius PORTVERSION= 3.86 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= http://releases.rubini.us/:source DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:source @@ -14,6 +15,8 @@ COMMENT= LLVM based ruby language implementation LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE +ONLY_FOR_ARCHS= amd64 + BUILD_DEPENDS= ${LOCALBASE}/bin/bundle:sysutils/rubygem-bundler \ ${LOCALBASE}/bin/bison:devel/bison \ ${LLVM_CONFIG_PATH}:devel/llvm${LLVM_DEFAULT} @@ -36,8 +39,6 @@ CONFIGURE_ARGS= -P "${PREFIX}" \ --stagingdir "${STAGEDIR}${PREFIX}" --with-execinfo \ --system-name ${OPSYS} -ONLY_FOR_ARCHS= amd64 - USES= gmake perl5 readline tar:bzip2 libedit ssl USE_LOCALE= en_US.UTF-8 USE_RUBY= yes @@ -68,9 +69,12 @@ LLVM_CONFIG_PATH= ${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT} .include -.if ${ARCH} == "sparc64" -BROKEN= Does not compile on sparc64 -.elif ${ARCH} == "amd64" +.if ${SSL_DEFAULT} == base +BROKEN_FreeBSD_12= checking for OpenSSL_add_all_digests() in -lcrypto... no +BROKEN_FreeBSD_13= checking for OpenSSL_add_all_digests() in -lcrypto... no +.endif + +.if ${ARCH} == "amd64" F_ARCH= x86_64 .elif ${ARCH} == "i386" F_ARCH= x86 diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile index b28ee39c88c..be77bfe74a9 100644 --- a/lang/rust-nightly/Makefile +++ b/lang/rust-nightly/Makefile @@ -14,7 +14,7 @@ CONFLICTS_INSTALL= rust # Which source to pull: # https://static.rust-lang.org/dist/${NIGHTLY_DATE}/rustc-nightly-src.tar.gz # https://static.rust-lang.org/dist/channel-rust-nightly.toml -NIGHTLY_DATE= 2019-04-06 +NIGHTLY_DATE= 2019-04-09 NIGHTLY_SUBDIR= ${NIGHTLY_DATE}/ # See WRKSRC/src/stage0.txt for this date diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo index cd3777da468..4ab4931982b 100644 --- a/lang/rust-nightly/distinfo +++ b/lang/rust-nightly/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1554492219 -SHA256 (rust/2019-04-06/rustc-nightly-src.tar.xz) = 16d9407475297f2a6c87cedbaf322d72ae98d9f65390a89db4233d1dceeb4504 -SIZE (rust/2019-04-06/rustc-nightly-src.tar.xz) = 96537724 +TIMESTAMP = 1554692066 +SHA256 (rust/2019-04-09/rustc-nightly-src.tar.xz) = e889fde7464cb606fd9bf62e8a2e9f1c330ce60d8d0b7e6f44f985871ef41738 +SIZE (rust/2019-04-09/rustc-nightly-src.tar.xz) = 96543400 SHA256 (rust/2019-03-20/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 9e5095ff9b6f1bd30ce0f5a9005eb689699a4c0370ef476edaa9c830cdd87b16 SIZE (rust/2019-03-20/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 69811904 SHA256 (rust/2019-03-20/rust-std-beta-x86_64-unknown-freebsd.tar.gz) = 4aa6cef0ea8e29b857a266089187ebcf4f3a30e3377fdbf121f1e995ef797477 diff --git a/lang/scm/Makefile b/lang/scm/Makefile index 117c3209541..a5b0b0becc0 100644 --- a/lang/scm/Makefile +++ b/lang/scm/Makefile @@ -3,7 +3,7 @@ PORTNAME= scm PORTVERSION= 5f2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= lang scheme MASTER_SITES= http://groups.csail.mit.edu/mac/ftpdir/scm/%SUBDIR%/ MASTER_SITE_SUBDIR= . OLD diff --git a/lang/sdcc/Makefile b/lang/sdcc/Makefile index 6f5ab5e158a..fb2a86b57eb 100644 --- a/lang/sdcc/Makefile +++ b/lang/sdcc/Makefile @@ -3,7 +3,7 @@ PORTNAME= sdcc PORTVERSION= 3.7.0 DISTVERSIONPREFIX= src- -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang MASTER_SITES= SF diff --git a/lang/seed7/Makefile b/lang/seed7/Makefile index fa22fc5f843..653f5b60dee 100644 --- a/lang/seed7/Makefile +++ b/lang/seed7/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= seed7 -DISTVERSION= 05_20190303 +DISTVERSION= 05_20190407 PORTREVISION= 0 CATEGORIES= lang MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTNAME}/ diff --git a/lang/seed7/distinfo b/lang/seed7/distinfo index 3401e92dd92..d7ecbc946c7 100644 --- a/lang/seed7/distinfo +++ b/lang/seed7/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1552394132 -SHA256 (seed7_05_20190303.tgz) = e243ca550747aa9e168afa746d2bac56970a8ec2b852996f901fe5a47d14323f -SIZE (seed7_05_20190303.tgz) = 2935981 +TIMESTAMP = 1554715167 +SHA256 (seed7_05_20190407.tgz) = 268c0de9ba7111f272f4990999174190ab712b1e8d64b691c50e387af7e57b4f +SIZE (seed7_05_20190407.tgz) = 2992495 diff --git a/lang/seed7/pkg-plist b/lang/seed7/pkg-plist index dc2e4f947f7..883bf0d07f0 100644 --- a/lang/seed7/pkg-plist +++ b/lang/seed7/pkg-plist @@ -54,8 +54,8 @@ lib/seed7/lib/comp/destr.s7i lib/seed7/lib/comp/drw_act.s7i lib/seed7/lib/comp/enu_act.s7i lib/seed7/lib/comp/error.s7i -lib/seed7/lib/comp/expr.s7i lib/seed7/lib/comp/expr_utl.s7i +lib/seed7/lib/comp/expr.s7i lib/seed7/lib/comp/fil_act.s7i lib/seed7/lib/comp/flt_act.s7i lib/seed7/lib/comp/gkb_act.s7i @@ -128,6 +128,7 @@ lib/seed7/lib/inflate.s7i lib/seed7/lib/inflatefile.s7i lib/seed7/lib/inifile.s7i lib/seed7/lib/integer.s7i +lib/seed7/lib/iobuffer.s7i lib/seed7/lib/keybd.s7i lib/seed7/lib/keydescr.s7i lib/seed7/lib/line.s7i @@ -139,6 +140,7 @@ lib/seed7/lib/mahjng32.s7i lib/seed7/lib/make.s7i lib/seed7/lib/makedata.s7i lib/seed7/lib/math.s7i +lib/seed7/lib/mixarith.s7i lib/seed7/lib/modern27.s7i lib/seed7/lib/more.s7i lib/seed7/lib/msgdigest.s7i diff --git a/lang/spidermonkey17/Makefile b/lang/spidermonkey17/Makefile index 5b44358b440..22a382aa097 100644 --- a/lang/spidermonkey17/Makefile +++ b/lang/spidermonkey17/Makefile @@ -3,7 +3,7 @@ PORTNAME= spidermonkey17 DISTVERSION= 1.7.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= lang MASTER_SITES= MOZILLA/js DISTNAME= js-${DISTVERSION} diff --git a/lang/spidermonkey170/Makefile b/lang/spidermonkey170/Makefile index 9bbdd80c12f..ee4452b8c5b 100644 --- a/lang/spidermonkey170/Makefile +++ b/lang/spidermonkey170/Makefile @@ -3,7 +3,7 @@ PORTNAME= spidermonkey170 PORTVERSION= 17.0.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= lang MASTER_SITES= MOZILLA/js DISTNAME= mozjs${PORTVERSION} diff --git a/lang/spidermonkey185/Makefile b/lang/spidermonkey185/Makefile index d268e51008b..fd7ea771343 100644 --- a/lang/spidermonkey185/Makefile +++ b/lang/spidermonkey185/Makefile @@ -3,7 +3,7 @@ PORTNAME= spidermonkey185 PORTVERSION= 1.8.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= lang MASTER_SITES= MOZILLA/js DISTNAME= js185-1.0.0 diff --git a/lang/spidermonkey24/Makefile b/lang/spidermonkey24/Makefile index 441ef77890c..33039e229c8 100644 --- a/lang/spidermonkey24/Makefile +++ b/lang/spidermonkey24/Makefile @@ -3,7 +3,7 @@ PORTNAME= spidermonkey24 PORTVERSION= 24.2.0 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= lang MASTER_SITES= MOZILLA/js #http://people.mozilla.org/~sstangl/ diff --git a/lang/spidermonkey38/Makefile b/lang/spidermonkey38/Makefile index 0368d204c98..d9f8ccb827b 100644 --- a/lang/spidermonkey38/Makefile +++ b/lang/spidermonkey38/Makefile @@ -3,7 +3,7 @@ PORTNAME= spidermonkey38 PORTVERSION= 38.8.0 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= lang MASTER_SITES= MOZILLA/firefox/releases/${PORTVERSION}esr/source DISTNAME= firefox-${PORTVERSION}esr.source diff --git a/lang/spidermonkey52/Makefile b/lang/spidermonkey52/Makefile index 075ad05dfc6..c7eb630291f 100644 --- a/lang/spidermonkey52/Makefile +++ b/lang/spidermonkey52/Makefile @@ -3,7 +3,7 @@ PORTNAME= spidermonkey PORTVERSION= 52.9.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang MASTER_SITES= MOZILLA/firefox/releases/${PORTVERSION}esr/source PKGNAMESUFFIX= ${SP_VER} diff --git a/lang/swi-pl/Makefile b/lang/swi-pl/Makefile index 642d0629d36..3df3820bef1 100644 --- a/lang/swi-pl/Makefile +++ b/lang/swi-pl/Makefile @@ -3,6 +3,7 @@ PORTNAME= swi-pl PORTVERSION= 7.6.4 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= http://www.swi-prolog.org/download/stable/src/ DISTNAME= swipl-${PORTVERSION} diff --git a/lang/yap-devel/Makefile b/lang/yap-devel/Makefile index 727e151d123..cd441f33c89 100644 --- a/lang/yap-devel/Makefile +++ b/lang/yap-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= yap PORTVERSION= 6.3.3 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= lang MASTER_SITES= http://www.dcc.fc.up.pt/~vsc/Yap/ PKGNAMESUFFIX= -devel diff --git a/lang/yap/Makefile b/lang/yap/Makefile index cf7e12bf1c3..0659a79d3d0 100644 --- a/lang/yap/Makefile +++ b/lang/yap/Makefile @@ -3,7 +3,7 @@ PORTNAME= yap PORTVERSION= 6.2.2 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= lang MASTER_SITES= http://www.dcc.fc.up.pt/~vsc/Yap/ diff --git a/mail/abook/Makefile b/mail/abook/Makefile index 995d117beb1..5dc7c9b00b0 100644 --- a/mail/abook/Makefile +++ b/mail/abook/Makefile @@ -3,7 +3,7 @@ PORTNAME= abook PORTVERSION= 0.6.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= http://abook.sourceforge.net/devel/ diff --git a/mail/automx/Makefile b/mail/automx/Makefile index 7cd92f8a8c8..4bb12202c34 100644 --- a/mail/automx/Makefile +++ b/mail/automx/Makefile @@ -3,7 +3,7 @@ PORTNAME= automx PORTVERSION= 0.10.2 DISTVERSIONPREFIX= v -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MAINTAINER= crees@FreeBSD.org diff --git a/mail/isbg/Makefile b/mail/isbg/Makefile index a199c69cc02..3883bb778dc 100644 --- a/mail/isbg/Makefile +++ b/mail/isbg/Makefile @@ -3,6 +3,7 @@ PORTNAME= isbg PORTVERSION= 1.00 +PORTREVISION= 1 CATEGORIES= mail MAINTAINER= ports@FreeBSD.org diff --git a/mail/mailfromd/Makefile b/mail/mailfromd/Makefile index a3b420804a7..f6d1869beff 100644 --- a/mail/mailfromd/Makefile +++ b/mail/mailfromd/Makefile @@ -3,7 +3,7 @@ PORTNAME= mailfromd PORTVERSION= 8.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= mail MASTER_SITES= http://download.gnu.org.ua/pub/release/${PORTNAME}/ \ http://download.gnu.org.ua/pub/alpha/${PORTNAME}/ diff --git a/mail/mailhog/Makefile b/mail/mailhog/Makefile index 91fb4073c37..9cde8d06e65 100644 --- a/mail/mailhog/Makefile +++ b/mail/mailhog/Makefile @@ -46,4 +46,7 @@ post-extract: @${LN} -sf ${WRKSRC}/src ${WRKDIR} @${LN} -sf ${WRKSRC} ${GO_WRKSRC} +do-install: + ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/MailHog ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + .include diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile index 47745b49def..a962cb2e79b 100644 --- a/mail/nmh/Makefile +++ b/mail/nmh/Makefile @@ -3,6 +3,7 @@ PORTNAME= nmh PORTVERSION= 1.7.1 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= SAVANNAH diff --git a/mail/nmzmail/Makefile b/mail/nmzmail/Makefile index aaf55e5c068..a7295d9a346 100644 --- a/mail/nmzmail/Makefile +++ b/mail/nmzmail/Makefile @@ -3,7 +3,7 @@ PORTNAME= nmzmail PORTVERSION= 0.1.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= mail MASTER_SITES= http://www.ecademix.com/JohannesHofmann/ diff --git a/mail/p5-Mail-DMARC/Makefile b/mail/p5-Mail-DMARC/Makefile index a1da3748612..d907d7aa096 100644 --- a/mail/p5-Mail-DMARC/Makefile +++ b/mail/p5-Mail-DMARC/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= Mail-DMARC -PORTVERSION= 1.20180125 +PORTVERSION= 1.20190308 CATEGORIES= mail perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -20,6 +20,7 @@ RUN_DEPENDS= p5-Crypt-OpenSSL-RSA>=0:security/p5-Crypt-OpenSSL-RSA \ p5-Net-IP>=0:net-mgmt/p5-Net-IP \ p5-Socket6>=0:net/p5-Socket6 \ p5-Email-MIME>=0:mail/p5-Email-MIME \ + p5-HTTP-Message>=0:www/p5-HTTP-Message \ p5-HTTP-Tiny>=0:www/p5-HTTP-Tiny \ p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \ p5-JSON>=0:converters/p5-JSON \ @@ -37,14 +38,14 @@ RUN_DEPENDS= p5-Crypt-OpenSSL-RSA>=0:security/p5-Crypt-OpenSSL-RSA \ p5-Net-HTTP>=0:net/p5-Net-HTTP \ p5-Test-Output>=0:devel/p5-Test-Output \ p5-Net-DNS>=0:dns/p5-Net-DNS \ - p5-Net-IDN-Encode>=0:textproc/p5-Net-IDN-Encode - + p5-Net-IDN-Encode>=0:textproc/p5-Net-IDN-Encode \ + p5-libwww>=0:www/p5-libwww \ + p5-URI>=0:net/p5-URI USES= perl5 shebangfix USE_PERL5= configure + SHEBANG_FILES= bin/* NO_ARCH= yes -#SUB_LIST= PERL5_MAN1=${SITE_PERL_REL}/man/man1 - .include diff --git a/mail/p5-Mail-DMARC/distinfo b/mail/p5-Mail-DMARC/distinfo index d0e1f5c222f..2c5886be80d 100644 --- a/mail/p5-Mail-DMARC/distinfo +++ b/mail/p5-Mail-DMARC/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1519250339 -SHA256 (Mail-DMARC-1.20180125.tar.gz) = 62f7ab98144265a87e5e0a5fb1cf56e6b70457d9234bf15e6af8bba3c7e6e363 -SIZE (Mail-DMARC-1.20180125.tar.gz) = 730191 +TIMESTAMP = 1554736675 +SHA256 (Mail-DMARC-1.20190308.tar.gz) = fc11f1b29a31e94be7805a9230259e3e578bd53461c2ff700679c94104b5a518 +SIZE (Mail-DMARC-1.20190308.tar.gz) = 730115 diff --git a/mail/p5-Sisimai/Makefile b/mail/p5-Sisimai/Makefile index 57c220ec2e1..585da803d13 100644 --- a/mail/p5-Sisimai/Makefile +++ b/mail/p5-Sisimai/Makefile @@ -1,9 +1,8 @@ # $FreeBSD$ PORTNAME= Sisimai -PORTVERSION= 4.24.1 +PORTVERSION= 4.25.0 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= mail perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:AKXLIX diff --git a/mail/p5-Sisimai/distinfo b/mail/p5-Sisimai/distinfo index bc7818f40a1..11f7f08544a 100644 --- a/mail/p5-Sisimai/distinfo +++ b/mail/p5-Sisimai/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1542202487 -SHA256 (Sisimai-v4.24.1.tar.gz) = 668308892ce07c4b8b8a7cce4bc8a0fcb8aa606604d8f8b481dfd4f9837d4f47 -SIZE (Sisimai-v4.24.1.tar.gz) = 1288526 +TIMESTAMP = 1554816941 +SHA256 (Sisimai-v4.25.0.tar.gz) = fcc9754c58cb3cdb1e80e7bd343a44ef23e5c1c8cbcbf9ff5965138bd5ba1a02 +SIZE (Sisimai-v4.25.0.tar.gz) = 1189273 diff --git a/mail/p5-Sisimai/pkg-plist b/mail/p5-Sisimai/pkg-plist index 164b232ac43..a75cad2f824 100644 --- a/mail/p5-Sisimai/pkg-plist +++ b/mail/p5-Sisimai/pkg-plist @@ -4,6 +4,7 @@ %%SITE_PERL%%/Sisimai/Bite.pm %%SITE_PERL%%/Sisimai/Bite/Email.pm %%SITE_PERL%%/Sisimai/Bite/Email/Activehunter.pm +%%SITE_PERL%%/Sisimai/Bite/Email/Amavis.pm %%SITE_PERL%%/Sisimai/Bite/Email/AmazonSES.pm %%SITE_PERL%%/Sisimai/Bite/Email/AmazonWorkMail.pm %%SITE_PERL%%/Sisimai/Bite/Email/Aol.pm @@ -74,6 +75,7 @@ %%SITE_PERL%%/Sisimai/Order.pm %%SITE_PERL%%/Sisimai/Order/Email.pm %%SITE_PERL%%/Sisimai/Order/JSON.pm +%%SITE_PERL%%/Sisimai/RFC1894.pm %%SITE_PERL%%/Sisimai/RFC3464.pm %%SITE_PERL%%/Sisimai/RFC3834.pm %%SITE_PERL%%/Sisimai/RFC5322.pm @@ -113,6 +115,7 @@ %%SITE_PERL%%/Sisimai/Rhost/GoDaddy.pm %%SITE_PERL%%/Sisimai/Rhost/GoogleApps.pm %%SITE_PERL%%/Sisimai/Rhost/KDDI.pm +%%SITE_PERL%%/Sisimai/Rhost/TencentQQ.pm %%SITE_PERL%%/Sisimai/SMTP.pm %%SITE_PERL%%/Sisimai/SMTP/Error.pm %%SITE_PERL%%/Sisimai/SMTP/Reply.pm @@ -125,6 +128,7 @@ %%PERL5_MAN3%%/Sisimai::Bite.3.gz %%PERL5_MAN3%%/Sisimai::Bite::Email.3.gz %%PERL5_MAN3%%/Sisimai::Bite::Email::Activehunter.3.gz +%%PERL5_MAN3%%/Sisimai::Bite::Email::Amavis.3.gz %%PERL5_MAN3%%/Sisimai::Bite::Email::AmazonSES.3.gz %%PERL5_MAN3%%/Sisimai::Bite::Email::AmazonWorkMail.3.gz %%PERL5_MAN3%%/Sisimai::Bite::Email::Aol.3.gz @@ -195,6 +199,7 @@ %%PERL5_MAN3%%/Sisimai::Order.3.gz %%PERL5_MAN3%%/Sisimai::Order::Email.3.gz %%PERL5_MAN3%%/Sisimai::Order::JSON.3.gz +%%PERL5_MAN3%%/Sisimai::RFC1894.3.gz %%PERL5_MAN3%%/Sisimai::RFC3464.3.gz %%PERL5_MAN3%%/Sisimai::RFC3834.3.gz %%PERL5_MAN3%%/Sisimai::RFC5322.3.gz @@ -234,6 +239,7 @@ %%PERL5_MAN3%%/Sisimai::Rhost::GoDaddy.3.gz %%PERL5_MAN3%%/Sisimai::Rhost::GoogleApps.3.gz %%PERL5_MAN3%%/Sisimai::Rhost::KDDI.3.gz +%%PERL5_MAN3%%/Sisimai::Rhost::TencentQQ.3.gz %%PERL5_MAN3%%/Sisimai::SMTP.3.gz %%PERL5_MAN3%%/Sisimai::SMTP::Error.3.gz %%PERL5_MAN3%%/Sisimai::SMTP::Reply.3.gz diff --git a/mail/py-afew/Makefile b/mail/py-afew/Makefile index 2618c4f10a7..0a42cfc11aa 100644 --- a/mail/py-afew/Makefile +++ b/mail/py-afew/Makefile @@ -2,7 +2,7 @@ PORTNAME= afew DISTVERSION= 1.3.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/mail/py-dkimpy/Makefile b/mail/py-dkimpy/Makefile index 288fc90330a..70c1c20bbc2 100644 --- a/mail/py-dkimpy/Makefile +++ b/mail/py-dkimpy/Makefile @@ -3,6 +3,7 @@ PORTNAME= dkimpy DISTVERSION= 0.9.0 +PORTREVISION= 1 CATEGORIES= mail python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/mail/py-mail-parser/Makefile b/mail/py-mail-parser/Makefile index badd9746c3a..e022777f96f 100644 --- a/mail/py-mail-parser/Makefile +++ b/mail/py-mail-parser/Makefile @@ -3,6 +3,7 @@ PORTNAME= mail-parser PORTVERSION= 3.9.3 +PORTREVISION= 1 CATEGORIES= mail python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/mail/py-milter/Makefile b/mail/py-milter/Makefile index 49068b301ff..a3a927ac99c 100644 --- a/mail/py-milter/Makefile +++ b/mail/py-milter/Makefile @@ -31,7 +31,7 @@ post-install: .include -.if ${FLAVOR:Upy27:Mpy3*} +.if ${FLAVOR:Upy36:Mpy3*} EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-miltermodule.c .endif diff --git a/mail/py-pymailq/Makefile b/mail/py-pymailq/Makefile index a7f3ea0a5b5..615f95a061a 100644 --- a/mail/py-pymailq/Makefile +++ b/mail/py-pymailq/Makefile @@ -3,6 +3,7 @@ PORTNAME= pymailq PORTVERSION= 0.9.0 +PORTREVISION= 1 CATEGORIES= mail python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/mail/py-pyspf/Makefile b/mail/py-pyspf/Makefile index e7b70a2487f..7575f26bd9f 100644 --- a/mail/py-pyspf/Makefile +++ b/mail/py-pyspf/Makefile @@ -4,7 +4,7 @@ PORTNAME= pyspf PORTVERSION= 2.0.12 DISTVERSIONSUFFIX= t -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= mail python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/mail/tumgreyspf/Makefile b/mail/tumgreyspf/Makefile index 87513741cea..53ad9c8b1fe 100644 --- a/mail/tumgreyspf/Makefile +++ b/mail/tumgreyspf/Makefile @@ -3,7 +3,7 @@ PORTNAME= tumgreyspf PORTVERSION= 1.38 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= http://ftp.tummy.com/pub/tummy/tumgreyspf/ \ http://ftp.tummy.com/pub/tummy/tumgreyspf/old-releases/ \ diff --git a/math/R/Makefile b/math/R/Makefile index fc4a813f7b4..3aff185bc31 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -3,7 +3,7 @@ PORTNAME= R DISTVERSION= 3.5.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math lang MASTER_SITES= CRAN/src/base/R-${PORTVERSION:C|\..*||} diff --git a/math/SCIP/Makefile b/math/SCIP/Makefile index 22fdc704265..36ad593d535 100644 --- a/math/SCIP/Makefile +++ b/math/SCIP/Makefile @@ -3,6 +3,7 @@ PORTNAME= SCIP DISTVERSION= 6.0.1 +PORTREVISION= 1 CATEGORIES= math science MASTER_SITES= http://scip.zib.de/download/release/ DISTNAME= ${PORTNAME:tl}-${DISTVERSION} diff --git a/math/aamath/Makefile b/math/aamath/Makefile index 60c18cdab57..c7e3ec94d05 100644 --- a/math/aamath/Makefile +++ b/math/aamath/Makefile @@ -3,7 +3,7 @@ PORTNAME= aamath PORTVERSION= 0.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math textproc MASTER_SITES= http://fuse.superglue.se/${PORTNAME}/ \ LOCAL/ehaupt diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile index 71e1abf689b..2a070c7df10 100644 --- a/math/asymptote/Makefile +++ b/math/asymptote/Makefile @@ -3,7 +3,7 @@ PORTNAME= asymptote PORTVERSION= 2.44 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= math MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}.src diff --git a/math/bcal/Makefile b/math/bcal/Makefile index 23f87ed55d7..8956417f1a6 100644 --- a/math/bcal/Makefile +++ b/math/bcal/Makefile @@ -3,6 +3,7 @@ PORTNAME= bcal DISTVERSIONPREFIX= v DISTVERSION= 2.1-12 +PORTREVISION= 1 DISTVERSIONSUFFIX= -g6867abd CATEGORIES= math diff --git a/math/calc/Makefile b/math/calc/Makefile index 876d6dacebb..9e893be8a2d 100644 --- a/math/calc/Makefile +++ b/math/calc/Makefile @@ -3,6 +3,7 @@ PORTNAME= calc PORTVERSION= 2.12.6.5 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= johans@FreeBSD.org diff --git a/math/cvc4/Makefile b/math/cvc4/Makefile index f2e72556b37..4ff94a98726 100644 --- a/math/cvc4/Makefile +++ b/math/cvc4/Makefile @@ -2,7 +2,7 @@ PORTNAME= cvc4 DISTVERSION= 1.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math java MASTER_SITES= https://cvc4.cs.stanford.edu/downloads/builds/src/ diff --git a/math/dbcsr/Makefile b/math/dbcsr/Makefile index be16debf339..a6260e6963c 100644 --- a/math/dbcsr/Makefile +++ b/math/dbcsr/Makefile @@ -2,9 +2,7 @@ PORTNAME= dbcsr DISTVERSIONPREFIX= v -DISTVERSION= 1.0.0-rc.0-40 -PORTREVISION= 1 -DISTVERSIONSUFFIX= -gd9c0dd54 +DISTVERSION= 1.1.0 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org @@ -20,6 +18,8 @@ USE_GITHUB= yes GH_ACCOUNT= cp2k USE_LDCONFIG= yes +LDFLAGS+= -lopenblas + CMAKE_ON= BUILD_SHARED_LIBS CMAKE_ARGS= -DBLA_VENDOR:STRING="OpenBLAS" @@ -38,4 +38,10 @@ OPENMP_LIB_DEPENDS= libomp.so:devel/openmp C_API_DESC= Build the C API library C_API_CMAKE_BOOL= WITH_C_API +do-test: # tests are broken: https://github.com/cp2k/dbcsr/issues/150 + @cd ${BUILD_WRKSRC} && \ + ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test + .include diff --git a/math/dbcsr/distinfo b/math/dbcsr/distinfo index 3a91ea528fb..565cdc5ef3c 100644 --- a/math/dbcsr/distinfo +++ b/math/dbcsr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541005905 -SHA256 (cp2k-dbcsr-v1.0.0-rc.0-40-gd9c0dd54_GH0.tar.gz) = 31ce9b790f3339c82a49993e0a8f483ccb1fac473e01a2694a44c8f0aeadd3d0 -SIZE (cp2k-dbcsr-v1.0.0-rc.0-40-gd9c0dd54_GH0.tar.gz) = 764223 +TIMESTAMP = 1554784384 +SHA256 (cp2k-dbcsr-v1.1.0_GH0.tar.gz) = 59d6c5c4315ee6cc05093d815dce0e818c6df22a3e224015806c6e89fa255195 +SIZE (cp2k-dbcsr-v1.1.0_GH0.tar.gz) = 1795447 diff --git a/math/dbcsr/files/patch-CMakeLists.txt b/math/dbcsr/files/patch-CMakeLists.txt new file mode 100644 index 00000000000..672c7badc36 --- /dev/null +++ b/math/dbcsr/files/patch-CMakeLists.txt @@ -0,0 +1,13 @@ +--- CMakeLists.txt.orig 2019-04-09 04:46:02 UTC ++++ CMakeLists.txt +@@ -23,7 +23,9 @@ set(WITH_GPU "P100" CACHE STRING "Set th + set_property(CACHE WITH_GPU PROPERTY STRINGS K20X K40 K80 P100) + + enable_language(Fortran) +-enable_testing() # enables the `make test` target ++if (BUILD_TESTING) ++ enable_testing() # enables the `make test` target ++endif() + + if (WITH_C_API AND WITH_EXAMPLES) + enable_language(CXX) diff --git a/math/dbcsr/pkg-plist b/math/dbcsr/pkg-plist index 3d2af9bec11..f19bd480047 100644 --- a/math/dbcsr/pkg-plist +++ b/math/dbcsr/pkg-plist @@ -1,8 +1,8 @@ %%C_API%%include/dbcsr.h include/dbcsr_api.mod -%%C_API%%lib/dbcsr/DBCSRCTargets-%%CMAKE_BUILD_TYPE%%.cmake -%%C_API%%lib/dbcsr/DBCSRCTargets.cmake -lib/dbcsr/DBCSRTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/dbcsr/DBCSRTargets.cmake +lib/cmake/dbcsr/DBCSRConfig.cmake +lib/cmake/dbcsr/DBCSRConfigVersion.cmake +lib/cmake/dbcsr/DBCSRTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/dbcsr/DBCSRTargets.cmake lib/libdbcsr.so %%C_API%%lib/libdbcsr_c.so diff --git a/math/eukleides/Makefile b/math/eukleides/Makefile index 3b80ace3ed9..05992026242 100644 --- a/math/eukleides/Makefile +++ b/math/eukleides/Makefile @@ -3,7 +3,7 @@ PORTNAME= eukleides PORTVERSION= 1.5.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= math MASTER_SITES= http://www.eukleides.org/files/ diff --git a/math/eval/Makefile b/math/eval/Makefile index 7b09481b129..afb047943e6 100644 --- a/math/eval/Makefile +++ b/math/eval/Makefile @@ -3,7 +3,7 @@ PORTNAME= eval PORTVERSION= 113 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= ftp://wuarchive.wustl.edu/pub/aminet/util/cli/ \ http://www.netsw.org/math/calc/ \ diff --git a/math/fityk/Makefile b/math/fityk/Makefile index 77be71c3ce1..655faea9845 100644 --- a/math/fityk/Makefile +++ b/math/fityk/Makefile @@ -4,7 +4,7 @@ PORTNAME= fityk PORTVERSION= 1.3.1 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= math MAINTAINER= ports@FreeBSD.org diff --git a/math/giacxcas/Makefile b/math/giacxcas/Makefile index f547829b5bf..6a633d95c9e 100644 --- a/math/giacxcas/Makefile +++ b/math/giacxcas/Makefile @@ -3,6 +3,7 @@ PORTNAME= giacxcas DISTVERSION= 1.5.0-49 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= http://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/:giac \ http://www-fourier.ujf-grenoble.fr/~parisse/giac/freebsd/ diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile index 03bf1d7ff3d..d270fb15352 100644 --- a/math/gnuplot/Makefile +++ b/math/gnuplot/Makefile @@ -2,6 +2,7 @@ PORTNAME= gnuplot PORTVERSION= 5.2.6 +PORTREVISION= 1 CATEGORIES= math graphics MASTER_SITES= SF diff --git a/math/gretl/Makefile b/math/gretl/Makefile index 8659916b5f8..ccbf85e37d9 100644 --- a/math/gretl/Makefile +++ b/math/gretl/Makefile @@ -3,6 +3,7 @@ PORTNAME= gretl DISTVERSION= 2019a +PORTREVISION= 1 CATEGORIES= math finance MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSIONFULL}/ diff --git a/math/gri/Makefile b/math/gri/Makefile index 727abd4eb22..60c78a1fae3 100644 --- a/math/gri/Makefile +++ b/math/gri/Makefile @@ -3,7 +3,7 @@ PORTNAME= gri PORTVERSION= 2.12.23 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= math MASTER_SITES= SF diff --git a/math/lambda/Makefile b/math/lambda/Makefile index ba00b171550..f075c804ebf 100644 --- a/math/lambda/Makefile +++ b/math/lambda/Makefile @@ -3,7 +3,7 @@ PORTNAME= lambda PORTVERSION= 0.1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= http://uniquesoftwaredesigns.com/${PORTNAME}/ diff --git a/math/libqalculate/Makefile b/math/libqalculate/Makefile index 087137e3dd6..f6c372c3e30 100644 --- a/math/libqalculate/Makefile +++ b/math/libqalculate/Makefile @@ -3,6 +3,7 @@ PORTNAME= libqalculate PORTVERSION= 3.0.0 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= https://github.com/Qalculate/${PORTNAME}/releases/download/v${PORTVERSION}/ diff --git a/math/mathomatic/Makefile b/math/mathomatic/Makefile index 8ca6ef28f1d..43f0fa710a1 100644 --- a/math/mathomatic/Makefile +++ b/math/mathomatic/Makefile @@ -3,7 +3,7 @@ PORTNAME= mathomatic PORTVERSION= 16.0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MAINTAINER= ehaupt@FreeBSD.org diff --git a/math/octave/Makefile b/math/octave/Makefile index 1251203ce8b..72636a931c7 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -3,7 +3,7 @@ PORTNAME= octave PORTVERSION= ${OCTAVE_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math java MASTER_SITES= GNU diff --git a/math/pari/Makefile b/math/pari/Makefile index 4f05949739a..0b86cbaf4af 100644 --- a/math/pari/Makefile +++ b/math/pari/Makefile @@ -3,6 +3,7 @@ PORTNAME= pari DISTVERSION= 2.11.1 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= math MASTER_SITES= http://pari.math.u-bordeaux.fr/pub/pari/unix/ \ diff --git a/math/pspp/Makefile b/math/pspp/Makefile index 48a65417721..61c4625a44e 100644 --- a/math/pspp/Makefile +++ b/math/pspp/Makefile @@ -3,6 +3,7 @@ PORTNAME= pspp PORTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= GNU diff --git a/math/py-PuLP/Makefile b/math/py-PuLP/Makefile index caca2acdbd2..e9713b9a8c0 100644 --- a/math/py-PuLP/Makefile +++ b/math/py-PuLP/Makefile @@ -2,6 +2,7 @@ PORTNAME= PuLP DISTVERSION= 1.6.9 +PORTREVISION= 1 CATEGORIES= math python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/math/py-Pyomo/Makefile b/math/py-Pyomo/Makefile index c00b8f88ca4..754e16f169a 100644 --- a/math/py-Pyomo/Makefile +++ b/math/py-Pyomo/Makefile @@ -2,6 +2,7 @@ PORTNAME= Pyomo DISTVERSION= 5.5.1 +PORTREVISION= 1 CATEGORIES= math python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/math/py-bottleneck/Makefile b/math/py-bottleneck/Makefile index 60b49ab5899..2a79bfee9f9 100644 --- a/math/py-bottleneck/Makefile +++ b/math/py-bottleneck/Makefile @@ -15,7 +15,7 @@ COMMENT= Collection of fast NumPy array functions written in Cython LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/bottleneck/LICENSE -BUILD_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= ${PYNUMPY} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} @@ -36,6 +36,6 @@ post-install-DOCS-on: cd ${WRKSRC}/ && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} do-test: - cd ${WRKSRC} && nosetests + cd ${WRKSRC} && nosetests-${PYTHON_VER} .include diff --git a/math/py-igraph/Makefile b/math/py-igraph/Makefile index 20e445ad275..1e19accd9dc 100644 --- a/math/py-igraph/Makefile +++ b/math/py-igraph/Makefile @@ -3,7 +3,7 @@ PORTNAME= igraph PORTVERSION= 0.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math python MASTER_SITES= http://igraph.org/nightly/get/python/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/math/py-matplotlib/Makefile b/math/py-matplotlib/Makefile index 9d7667ffcc5..03d2cd17453 100644 --- a/math/py-matplotlib/Makefile +++ b/math/py-matplotlib/Makefile @@ -35,7 +35,7 @@ OPTIONS_DEFINE= EXAMPLES GTKBACKEND GTKAGGBACKEND \ QT5AGGBACKEND TKAGGBACKEND WXAGGBACKEND OPTIONS_DEFAULT= GTKBACKEND GTKAGGBACKEND TKAGGBACKEND OPTIONS_SUB= yes -.if ${FLAVOR:U:Mpy3*} +.if ${FLAVOR:Upy36:Mpy3*} # x11-toolkits/py-gtk2, x11-toolkits/py-wxPython28 do not support Python 3 OPTIONS_EXCLUDE= GTKBACKEND GTKAGGBACKEND WXAGGBACKEND .endif diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile index c4407f366f7..0f8c318cee4 100644 --- a/math/py-numpy/Makefile +++ b/math/py-numpy/Makefile @@ -3,6 +3,7 @@ PORTNAME= numpy PORTVERSION= 1.16.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= math python MASTER_SITES= CHEESESHOP \ diff --git a/math/py-python-louvain/Makefile b/math/py-python-louvain/Makefile index defa25d4877..3104830bb86 100644 --- a/math/py-python-louvain/Makefile +++ b/math/py-python-louvain/Makefile @@ -2,6 +2,7 @@ PORTNAME= python-louvain DISTVERSION= 0.13 +PORTREVISION= 1 CATEGORIES= math python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/math/py-rpy2/Makefile b/math/py-rpy2/Makefile index 92e5863639b..56bdd6b39f5 100644 --- a/math/py-rpy2/Makefile +++ b/math/py-rpy2/Makefile @@ -3,7 +3,7 @@ PORTNAME= rpy2 DISTVERSION= 3.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/math/py-sympy/Makefile b/math/py-sympy/Makefile index 8fa8245b719..62d59403b71 100644 --- a/math/py-sympy/Makefile +++ b/math/py-sympy/Makefile @@ -3,6 +3,7 @@ PORTNAME= sympy PORTVERSION= 1.3 +PORTREVISION= 1 CATEGORIES= math python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/math/py-theano/Makefile b/math/py-theano/Makefile index 85dc52db34a..0e151dc994f 100644 --- a/math/py-theano/Makefile +++ b/math/py-theano/Makefile @@ -3,6 +3,7 @@ PORTNAME= theano DISTVERSION= 1.0.4 +PORTREVISION= 1 CATEGORIES= math python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/math/rexx-regmath/Makefile b/math/rexx-regmath/Makefile index a12c7db5a09..71335a1d4fe 100644 --- a/math/rexx-regmath/Makefile +++ b/math/rexx-regmath/Makefile @@ -3,6 +3,7 @@ PORTNAME= regmath PORTVERSION= 1.00 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= http://home.interlog.com/~ptjm/ \ http://www.ancientgeek.org.uk/distfiles/ @@ -14,13 +15,12 @@ COMMENT= Two mathematics libraries for Rexx LICENSE= MPL10 -BUILD_DEPENDS= ${LOCALBASE}/include/rexxsaa.h:lang/rexx-regina +BUILD_DEPENDS= rexx:lang/rexx-regina USES= zip WRKSRC= ${WRKDIR}/math USE_LDCONFIG= yes -LLD_UNSAFE= yes MAKEFILE= Makefile.bsd PLIST_FILES= lib/librexxmath.so lib/librxmath.so man/man1/regmath.1.gz diff --git a/math/rexx-regmath/files/patch-Makefile.bsd b/math/rexx-regmath/files/patch-Makefile.bsd index ca52af08705..ad5d61a942d 100644 --- a/math/rexx-regmath/files/patch-Makefile.bsd +++ b/math/rexx-regmath/files/patch-Makefile.bsd @@ -1,11 +1,13 @@ ---- Makefile.bsd.orig 2001-11-04 17:09:04 UTC +--- Makefile.bsd.orig 2001-11-04 18:09:04 UTC +++ Makefile.bsd -@@ -9,7 +9,7 @@ +@@ -9,8 +9,8 @@ POPT=-O -fomit-frame-pointer PLFL=-s DEBUG=-g -CFLAGS=$(OPT) $(DEBUG) -pipe -fpic -I $$HOME/regina -pipe +-LDFLAGS=-Bdynamic -Bshareable $(LFL) +CFLAGS+=$(OPT) $(DEBUG) -pipe -fpic -I $$HOME/regina -pipe -I/usr/local/include - LDFLAGS=-Bdynamic -Bshareable $(LFL) ++LDFLAGS=-Bdynamic -Bshareable $(LFL) -L/usr/lib LIBS=-lm so=so + o=o diff --git a/math/sfst/Makefile b/math/sfst/Makefile index d16b5100a4d..bef23a2b9e4 100644 --- a/math/sfst/Makefile +++ b/math/sfst/Makefile @@ -3,7 +3,7 @@ PORTNAME= sfst PORTVERSION= 1.4.6h -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= http://www.cis.uni-muenchen.de/~schmid/tools/SFST/data/ DISTNAME= ${PORTNAME:tu}-${PORTVERSION} diff --git a/math/spar/Makefile b/math/spar/Makefile index 0f019de4e06..d48de18c780 100644 --- a/math/spar/Makefile +++ b/math/spar/Makefile @@ -3,7 +3,7 @@ PORTNAME= spar PORTVERSION= 0.5.10 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= math devel MASTER_SITES= SF/${PORTNAME}/Spar/${PORTVERSION} diff --git a/math/stp/Makefile b/math/stp/Makefile index 993be2ef92e..ac6781a20ab 100644 --- a/math/stp/Makefile +++ b/math/stp/Makefile @@ -3,6 +3,7 @@ PORTNAME= stp DISTVERSION= 2.3.2 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= math diff --git a/math/topaz/Makefile b/math/topaz/Makefile index 41437eda9d8..c3a24353bc9 100644 --- a/math/topaz/Makefile +++ b/math/topaz/Makefile @@ -3,7 +3,7 @@ PORTNAME= topaz DISTVERSION= 3_41 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= http://hp.vector.co.jp/authors/VA007663/topaz/bin/ DISTNAME= ${PORTNAME}-${DISTVERSION}-src diff --git a/math/wcalc/Makefile b/math/wcalc/Makefile index defe0ab7987..b0f48a9df8c 100644 --- a/math/wcalc/Makefile +++ b/math/wcalc/Makefile @@ -3,7 +3,7 @@ PORTNAME= wcalc PORTVERSION= 2.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MASTER_SITES= SF/w-calc/Wcalc/${PORTVERSION} diff --git a/math/wxmaxima/Makefile b/math/wxmaxima/Makefile index bccc43c991f..99766046920 100644 --- a/math/wxmaxima/Makefile +++ b/math/wxmaxima/Makefile @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= wxmaxima -PORTVERSION= 19.02.0 -PORTREVISION= 1 +PORTVERSION= 19.04.1 DISTVERSIONPREFIX= Version- CATEGORIES= math -MAINTAINER= nivit@FreeBSD.org +MAINTAINER= phascolarctos@protonmail.ch COMMENT= WxWidgets GUI for the computer algebra system maxima LICENSE= GPLv2 diff --git a/math/wxmaxima/distinfo b/math/wxmaxima/distinfo index 893c0d1e368..e7b006c4d0c 100644 --- a/math/wxmaxima/distinfo +++ b/math/wxmaxima/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1549794608 -SHA256 (wxMaxima-Developers-wxmaxima-Version-19.02.0_GH0.tar.gz) = 069fe2f940d0ecfe398d72b5750954e6127e311d2324ac17b07b7fa675f72cac -SIZE (wxMaxima-Developers-wxmaxima-Version-19.02.0_GH0.tar.gz) = 12246820 +TIMESTAMP = 1554498295 +SHA256 (wxMaxima-Developers-wxmaxima-Version-19.04.1_GH0.tar.gz) = 701f67e43c9e996538bc372977d61ef6c79178b10782d6921da395b725951bf6 +SIZE (wxMaxima-Developers-wxmaxima-Version-19.04.1_GH0.tar.gz) = 12073198 diff --git a/misc/biblical-curse/Makefile b/misc/biblical-curse/Makefile index 42ccd864f25..bfbe134aada 100644 --- a/misc/biblical-curse/Makefile +++ b/misc/biblical-curse/Makefile @@ -7,7 +7,7 @@ CATEGORIES= misc MASTER_SITES= # none DISTFILES= # none -MAINTAINER= tobez@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Fake biblical curse generator USES= perl5 shebangfix diff --git a/misc/free42/Makefile b/misc/free42/Makefile index e1e08f18bd6..f40ff42a3f4 100644 --- a/misc/free42/Makefile +++ b/misc/free42/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= free42 -DISTVERSION= 2.1 +DISTVERSION= 2.2 CATEGORIES= misc MASTER_SITES= http://thomasokken.com/free42/upstream/ DISTNAME= ${PORTNAME}-nologo-${DISTVERSION} diff --git a/misc/free42/distinfo b/misc/free42/distinfo index 89abedd35a4..ad77d63ab4b 100644 --- a/misc/free42/distinfo +++ b/misc/free42/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553975645 -SHA256 (free42-nologo-2.1.tgz) = b796f0851feb5a2d9637bca29ecb5f3f33165064f9dadf07cc4cf114daf68a63 -SIZE (free42-nologo-2.1.tgz) = 7393056 +TIMESTAMP = 1554791164 +SHA256 (free42-nologo-2.2.tgz) = 33f5552c1628609bf0d7f32db714bfcd4798b2ef796b0d2859eebd1bcc497eca +SIZE (free42-nologo-2.2.tgz) = 7397487 diff --git a/misc/freebsd-doc-all/Makefile b/misc/freebsd-doc-all/Makefile index aca2c5f7faf..55bd3f2b596 100644 --- a/misc/freebsd-doc-all/Makefile +++ b/misc/freebsd-doc-all/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= freebsd-doc-all -PORTVERSION= 52793 +PORTVERSION= 52910 PORTEPOCH= 1 CATEGORIES= misc docs diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile index ad3a342756d..2ccf3d7c0cc 100644 --- a/misc/freebsd-doc-en/Makefile +++ b/misc/freebsd-doc-en/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= freebsd-doc -PORTVERSION= 52793 +PORTVERSION= 52910 PORTEPOCH= 1 CATEGORIES= misc docs MASTER_SITES= LOCAL/blackend diff --git a/misc/freebsd-doc-en/distinfo b/misc/freebsd-doc-en/distinfo index 565b58330d1..8bb75ebdf97 100644 --- a/misc/freebsd-doc-en/distinfo +++ b/misc/freebsd-doc-en/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1549185129 -SHA256 (freebsd-doc-52793.tar.gz) = 4359099f8b6001dc4a7c64dc032f1f702b9ba638eec6bd6e298def58375aacce -SIZE (freebsd-doc-52793.tar.gz) = 60184869 +TIMESTAMP = 1554649056 +SHA256 (freebsd-doc-52910.tar.gz) = e335b58704f0a4c8b6008d00bf4946f0d26483cea49791f41627f83df606d8ed +SIZE (freebsd-doc-52910.tar.gz) = 60294857 diff --git a/misc/freebsd-doc-en/pkg-plist.html-split b/misc/freebsd-doc-en/pkg-plist.html-split index dee392a282c..62266b5117e 100644 --- a/misc/freebsd-doc-en/pkg-plist.html-split +++ b/misc/freebsd-doc-en/pkg-plist.html-split @@ -36,6 +36,7 @@ %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/pgpkeys.html %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/phabricator.html %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/ports.html +%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/pre-commit-review.html %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/pref-license.html %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/rules.html %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/ssh.guide.html @@ -859,7 +860,7 @@ %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/bundled-libs.html %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/conflicts.html %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-after-port-mk.html -%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-arch-neutral.html +%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-arch.html %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-cc.html %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-cflags.html %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-deprecated.html @@ -984,7 +985,6 @@ %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-fonts.html %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-fortran.html %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-fuse.html -%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-gecko.html %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-gem.html %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-gettext-runtime.html %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-gettext-tools.html diff --git a/misc/freebsd-doc-es/pkg-plist.html b/misc/freebsd-doc-es/pkg-plist.html index 65c545b7ade..d52e4d3e995 100644 --- a/misc/freebsd-doc-es/pkg-plist.html +++ b/misc/freebsd-doc-es/pkg-plist.html @@ -1,6 +1,9 @@ %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.html +%%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.html %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.html %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/article.html +%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.html +%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.html %%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.html %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.html %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.html diff --git a/misc/freebsd-doc-es/pkg-plist.html-common b/misc/freebsd-doc-es/pkg-plist.html-common index 19ab5dc2d69..d4f25b14ece 100644 --- a/misc/freebsd-doc-es/pkg-plist.html-common +++ b/misc/freebsd-doc-es/pkg-plist.html-common @@ -1,6 +1,9 @@ %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/docbook.css +%%DOCSDIR%%/%%DOCLANG%%/articles/cups/docbook.css %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/docbook.css %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/docbook.css +%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/docbook.css +%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/docbook.css %%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/docbook.css %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/docbook.css %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/docbook.css diff --git a/misc/freebsd-doc-es/pkg-plist.html-split b/misc/freebsd-doc-es/pkg-plist.html-split index b0282341103..b05535fa9f8 100644 --- a/misc/freebsd-doc-es/pkg-plist.html-split +++ b/misc/freebsd-doc-es/pkg-plist.html-split @@ -1,10 +1,19 @@ %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contrib-how.html %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/index.html %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/ix01.html -%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/ar01s02.html -%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/ar01s03.html -%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/ar01s04.html +%%DOCSDIR%%/%%DOCLANG%%/articles/cups/index.html +%%DOCSDIR%%/%%DOCLANG%%/articles/cups/ix01.html +%%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-clients.html +%%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-configuring-printers.html +%%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-configuring-server.html +%%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-install.html +%%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-troubleshooting.html +%%DOCSDIR%%/%%DOCLANG%%/articles/cups/trademarks.html +%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/comparing-bsd-and-linux.html %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/index.html +%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/trademarks.html +%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/what-a-real-unix.html +%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/why-is-bsd-not-better-known.html %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/ar01s02.html %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/ar01s03.html %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/ar01s04.html @@ -16,6 +25,24 @@ %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/index.html %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/sintaxis.html %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/voluntarios-fdp-es.html +%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/ar01s02.html +%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/ar01s03.html +%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/ar01s04.html +%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/ar01s05.html +%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/ar01s06.html +%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/ar01s07.html +%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/ar01s08.html +%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/index.html +%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/trademarks.html +%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/IPsec.html +%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/caveat.html +%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/code.html +%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/experiment.html +%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/index.html +%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/ipsec-install.html +%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/kernel.html +%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/solution.html +%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/trademarks.html %%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/index.html %%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/leapseconds-cautions.html %%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/leapseconds-conclusion.html diff --git a/misc/freebsd-doc-es/pkg-plist.pdf b/misc/freebsd-doc-es/pkg-plist.pdf index 1caa9f49f5c..134c840ae01 100644 --- a/misc/freebsd-doc-es/pkg-plist.pdf +++ b/misc/freebsd-doc-es/pkg-plist.pdf @@ -1,6 +1,9 @@ %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf +%%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.pdf %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/article.pdf +%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.pdf +%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.pdf %%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.pdf %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.pdf %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.pdf diff --git a/misc/freebsd-doc-es/pkg-plist.ps b/misc/freebsd-doc-es/pkg-plist.ps index 6886f879906..cb07399332b 100644 --- a/misc/freebsd-doc-es/pkg-plist.ps +++ b/misc/freebsd-doc-es/pkg-plist.ps @@ -1,6 +1,9 @@ %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.ps +%%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.ps %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.ps %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/article.ps +%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.ps +%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.ps %%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.ps %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.ps %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.ps diff --git a/misc/freebsd-doc-es/pkg-plist.txt b/misc/freebsd-doc-es/pkg-plist.txt index 8fa01db2a37..e251aef6c35 100644 --- a/misc/freebsd-doc-es/pkg-plist.txt +++ b/misc/freebsd-doc-es/pkg-plist.txt @@ -1,6 +1,9 @@ %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.txt +%%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.txt %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.txt %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/article.txt +%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.txt +%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.txt %%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.txt %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.txt %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.txt diff --git a/misc/ipa_conv/Makefile b/misc/ipa_conv/Makefile index e39dba9d9db..6711d3871f6 100644 --- a/misc/ipa_conv/Makefile +++ b/misc/ipa_conv/Makefile @@ -7,7 +7,7 @@ PORTREVISION= 2 CATEGORIES= misc MASTER_SITES= SF/ipa-system/modules/ipa_conv -MAINTAINER= misc/ipa_conv +MAINTAINER= ports@FreeBSD.org COMMENT= IPA accounting/database module for converting statistics BUILD_DEPENDS= ${LOCALBASE}/include/ipa_mod.h:sysutils/ipa diff --git a/misc/lxi-tools/Makefile b/misc/lxi-tools/Makefile index ee3c63359d7..262fafaf3be 100644 --- a/misc/lxi-tools/Makefile +++ b/misc/lxi-tools/Makefile @@ -3,6 +3,7 @@ PORTNAME= lxi-tools DISTVERSIONPREFIX= v DISTVERSION= 1.21 +PORTREVISION= 1 CATEGORIES= misc MAINTAINER= dg@syrec.org diff --git a/misc/nnn/Makefile b/misc/nnn/Makefile index d3afbda807b..6820b1de35b 100644 --- a/misc/nnn/Makefile +++ b/misc/nnn/Makefile @@ -3,6 +3,7 @@ PORTNAME= nnn DISTVERSIONPREFIX= v DISTVERSION= 2.4 +PORTREVISION= 1 CATEGORIES= misc shells MAINTAINER= dg@syrec.org diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile index 9a2937d5ef9..523f0a233e3 100644 --- a/misc/pinfo/Makefile +++ b/misc/pinfo/Makefile @@ -3,7 +3,7 @@ PORTNAME= pinfo PORTVERSION= 0.6.10 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= misc MASTER_SITES= GENTOO \ http://alioth.debian.org/frs/download.php/file/3351/ diff --git a/misc/pubs/Makefile b/misc/pubs/Makefile index 0bcd3bb7078..5e0f8926e28 100644 --- a/misc/pubs/Makefile +++ b/misc/pubs/Makefile @@ -3,6 +3,7 @@ PORTNAME= pubs DISTVERSIONPREFIX= v DISTVERSION= 0.8.2 +PORTREVISION= 1 CATEGORIES= misc python MAINTAINER= yuri@FreeBSD.org diff --git a/misc/py-pykml/Makefile b/misc/py-pykml/Makefile index 3ca388d26ce..a52610103db 100644 --- a/misc/py-pykml/Makefile +++ b/misc/py-pykml/Makefile @@ -2,6 +2,7 @@ PORTNAME= pykml DISTVERSION= 0.1.3 +PORTREVISION= 1 CATEGORIES= misc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/misc/py-spdx-lookup/Makefile b/misc/py-spdx-lookup/Makefile index b9ea11fd504..4082e4436a4 100644 --- a/misc/py-spdx-lookup/Makefile +++ b/misc/py-spdx-lookup/Makefile @@ -3,6 +3,7 @@ PORTNAME= spdx-lookup PORTVERSION= 0.3.2 +PORTREVISION= 1 CATEGORIES= misc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/misc/py-tqdm/Makefile b/misc/py-tqdm/Makefile index 0641a25a000..11bb307a3a4 100644 --- a/misc/py-tqdm/Makefile +++ b/misc/py-tqdm/Makefile @@ -2,6 +2,7 @@ PORTNAME= tqdm DISTVERSION= 4.31.1 +PORTREVISION= 1 CATEGORIES= misc MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/misc/tempcontrol/Makefile b/misc/tempcontrol/Makefile index 117dfeede52..b7f1fa115ae 100644 --- a/misc/tempcontrol/Makefile +++ b/misc/tempcontrol/Makefile @@ -3,7 +3,7 @@ PORTNAME= tempcontrol PORTVERSION= 1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc MASTER_SITES= http://www.lemis.com/grog/brewing/src/brewing/tempcontrol/ diff --git a/misc/ytree/Makefile b/misc/ytree/Makefile index 5b07bbd43d1..6a6b10e1362 100644 --- a/misc/ytree/Makefile +++ b/misc/ytree/Makefile @@ -3,7 +3,7 @@ PORTNAME= ytree DISTVERSION= 1.99pl1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc MASTER_SITES= http://www.han.de/~werner/ diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile index d86adaccac5..ef450a26e50 100644 --- a/multimedia/aom/Makefile +++ b/multimedia/aom/Makefile @@ -2,8 +2,8 @@ PORTNAME= aom DISTVERSIONPREFIX= v -DISTVERSION= 1.0.0-1581 -DISTVERSIONSUFFIX= -gc79fd24cf +DISTVERSION= 1.0.0-1586 +DISTVERSIONSUFFIX= -g9a0da648e CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org diff --git a/multimedia/aom/distinfo b/multimedia/aom/distinfo index 86d8e4dc9b8..6e943b803b4 100644 --- a/multimedia/aom/distinfo +++ b/multimedia/aom/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554582898 -SHA256 (jbeich-aom-v1.0.0-1581-gc79fd24cf_GH0.tar.gz) = e5c4ab6b77a471ecf8d06a43c6010428c8cddbee694195b9241a81961a39f626 -SIZE (jbeich-aom-v1.0.0-1581-gc79fd24cf_GH0.tar.gz) = 3243138 +TIMESTAMP = 1554768715 +SHA256 (jbeich-aom-v1.0.0-1586-g9a0da648e_GH0.tar.gz) = c85a001c5edcf0520958a102f07952b87f55ebf9c6b61874236a62b47c32a89b +SIZE (jbeich-aom-v1.0.0-1586-g9a0da648e_GH0.tar.gz) = 3245369 diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index db8864bd082..838f7365e59 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -416,7 +416,7 @@ SRT_CONFIGURE_ENABLE= libsrt # svt-av1 SVTAV1_LIB_DEPENDS= libSvtAv1Enc.so:multimedia/svt-av1 SVTAV1_CONFIGURE_ON= --enable-libsvtav1 -SVTAV1_PATCH_SITES= https://github.com/OpenVisualCloud/SVT-AV1/raw/b114a03/ffmpeg_plugin/:svtav1 +SVTAV1_PATCH_SITES= https://github.com/OpenVisualCloud/SVT-AV1/raw/1bd31d3c/ffmpeg_plugin/:svtav1 SVTAV1_PATCHFILES= 0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch:-p1:svtav1 .if make(makesum) .MAKEFLAGS: WITH+=SVTAV1 diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo index 51ca1613594..386ada817a1 100644 --- a/multimedia/ffmpeg/distinfo +++ b/multimedia/ffmpeg/distinfo @@ -1,8 +1,8 @@ TIMESTAMP = 1554117390 SHA256 (ffmpeg-4.1.3.tar.xz) = 0c3020452880581a8face91595b239198078645e7d7184273b8bcc7758beb63d SIZE (ffmpeg-4.1.3.tar.xz) = 8895988 -SHA256 (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 92731a0b3a995cdd6c4d20c7197cd3ed759de1ce99399480a5a900d320373b4f -SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 20436 +SHA256 (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = d0993fc64c3b3b583386986a4af0092dca9609df99d6f286f5fabbb2eca05c74 +SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 20439 SHA256 (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = cc8ba4ff56cdb38a59650203999c4c8c83fc40bdb905b87b678ff68a4538444d SIZE (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 22815 SHA256 (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 516c5a1b3ab6dc444e2270a1bae90455838fc3b7e3a18de37d7d63e25e79493d diff --git a/multimedia/kissdx/Makefile b/multimedia/kissdx/Makefile index f5562bc8d9b..7c8e5ca5183 100644 --- a/multimedia/kissdx/Makefile +++ b/multimedia/kissdx/Makefile @@ -13,13 +13,11 @@ COMMENT= Multimedia streaming server for KiSS/Linksys player LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libgd.so:graphics/gd \ - libdvdread.so:multimedia/libdvdread - BROKEN_armv6= fails to compile: kissdx.c: function definition is not allowed here BROKEN_armv7= fails to compile: kissdx.c: function definition is not allowed here -BROKEN_mips64= fails to compile: kissdx.c: nested functions are disabled, use -fnested-functions to re-enable -BROKEN_powerpc64= fails to compile: kissdx.c: nested functions are disabled, use -fnested-functions to re-enable + +LIB_DEPENDS= libgd.so:graphics/gd \ + libdvdread.so:multimedia/libdvdread USES= compiler:nestedfct dos2unix iconv jpeg MAKE_ENV= FreeBSD=defined @@ -45,6 +43,10 @@ post-patch: s|^\.o :|${PORTNAME}: $$(OBJS)| ; \ /^all:/s| $$(OBJS)||' ${WRKSRC}/Makefile +.if exists(/usr/lib/libstdc++.so) +CFLAGS+= -fnested-functions +.endif + pre-build: @${RM} ${WRKSRC}/kissdx.o diff --git a/multimedia/libcec/Makefile b/multimedia/libcec/Makefile index aa8bc27fa53..8a54562f94d 100644 --- a/multimedia/libcec/Makefile +++ b/multimedia/libcec/Makefile @@ -3,7 +3,7 @@ PORTNAME= libcec PORTVERSION= 4.0.2 -PORTREVISION= 6 +PORTREVISION= 7 DISTVERSIONPREFIX= ${PORTNAME}- CATEGORIES= multimedia diff --git a/multimedia/libva/Makefile b/multimedia/libva/Makefile index 707910401e9..0122e919fe7 100644 --- a/multimedia/libva/Makefile +++ b/multimedia/libva/Makefile @@ -1,12 +1,12 @@ # $FreeBSD$ PORTNAME= libva -PORTVERSION= 2.4.0 -PORTREVISION= 3 +PORTVERSION= 2.4.1 CATEGORIES= multimedia PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= c2a431cc3cab.patch:-p1 5cfcd31635b1.patch:-p1 +PATCHFILES+= 394b1eb4ce5f.patch:-p1 MAINTAINER= jbeich@FreeBSD.org COMMENT?= VAAPI wrapper and dummy driver diff --git a/multimedia/libva/distinfo b/multimedia/libva/distinfo index f1c1b2caae9..d33f1dc34fc 100644 --- a/multimedia/libva/distinfo +++ b/multimedia/libva/distinfo @@ -1,7 +1,9 @@ -TIMESTAMP = 1548442420 -SHA256 (intel-libva-2.4.0_GH0.tar.gz) = 67f0289944b3c39307ab0f1b7ab33de072f6e674758d2f122b51616c3d7b115b -SIZE (intel-libva-2.4.0_GH0.tar.gz) = 223232 +TIMESTAMP = 1554659087 +SHA256 (intel-libva-2.4.1_GH0.tar.gz) = 8d65764d2efb1fdeb0c2ad51c7e2f9db1b2d6b005c58a85fd814f8f7b8c89a2d +SIZE (intel-libva-2.4.1_GH0.tar.gz) = 223635 SHA256 (c2a431cc3cab.patch) = d749a839b168529d2c424ffa78bd8859eebd831a5dfd50e8cdd1fc760907a232 SIZE (c2a431cc3cab.patch) = 835 SHA256 (5cfcd31635b1.patch) = 16344b56bf7e4bbc8a572183adbfd346d92d54d70a87dc6f30bae2ee946ccc84 SIZE (5cfcd31635b1.patch) = 1091 +SHA256 (394b1eb4ce5f.patch) = 78bb4d0ae07df1b1efffaec4998a4c1fe99b04a772acc299ce67e3c6fc0b49e0 +SIZE (394b1eb4ce5f.patch) = 1599 diff --git a/multimedia/py-av/Makefile b/multimedia/py-av/Makefile index 4058fdf6c0c..17f7b55fa6e 100644 --- a/multimedia/py-av/Makefile +++ b/multimedia/py-av/Makefile @@ -2,6 +2,7 @@ PORTNAME= av PORTVERSION= 6.1.0 +PORTREVISION= 1 CATEGORIES= multimedia python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/multimedia/py-mido/Makefile b/multimedia/py-mido/Makefile index b30f7208f23..c64df9ade70 100644 --- a/multimedia/py-mido/Makefile +++ b/multimedia/py-mido/Makefile @@ -2,6 +2,7 @@ PORTNAME= mido DISTVERSION= 1.2.9 +PORTREVISION= 1 CATEGORIES= multimedia python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/multimedia/py-subliminal/Makefile b/multimedia/py-subliminal/Makefile index 9ede07b281b..bec764fb6ce 100644 --- a/multimedia/py-subliminal/Makefile +++ b/multimedia/py-subliminal/Makefile @@ -3,7 +3,7 @@ PORTNAME= subliminal PORTVERSION= 2.0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/multimedia/rav1e/Makefile b/multimedia/rav1e/Makefile index 87bc430e3ad..32765923c60 100644 --- a/multimedia/rav1e/Makefile +++ b/multimedia/rav1e/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= rav1e -PORTVERSION= s20190404 +PORTVERSION= s20190408 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org @@ -18,7 +18,7 @@ BUILD_DEPENDS_amd64= nasm:devel/nasm USES= cargo USE_GITHUB= yes GH_ACCOUNT= xiph -GH_TAGNAME= e4363d0 +GH_TAGNAME= 5ee66c1 PLIST_FILES= bin/${PORTNAME} CARGO_CRATES= aho-corasick-0.6.10 \ @@ -38,11 +38,11 @@ CARGO_CRATES= aho-corasick-0.6.10 \ bitstream-io-0.8.2 \ byteorder-1.3.1 \ cast-0.2.2 \ - cc-1.0.34 \ + cc-1.0.35 \ cexpr-0.3.5 \ cfg-if-0.1.7 \ clang-sys-0.26.4 \ - clap-2.32.0 \ + clap-2.33.0 \ cloudabi-0.0.3 \ criterion-0.2.10 \ criterion-plot-0.3.0 \ @@ -93,7 +93,7 @@ CARGO_CRATES= aho-corasick-0.6.10 \ rayon-1.0.3 \ rayon-core-1.4.1 \ rdrand-0.4.0 \ - redox_syscall-0.1.52 \ + redox_syscall-0.1.54 \ redox_termios-0.1.1 \ regex-0.2.11 \ regex-1.1.5 \ @@ -107,11 +107,11 @@ CARGO_CRATES= aho-corasick-0.6.10 \ serde-1.0.90 \ serde_derive-1.0.90 \ serde_json-1.0.39 \ - strsim-0.7.0 \ + strsim-0.8.0 \ syn-0.15.30 \ termcolor-1.0.4 \ termion-1.5.1 \ - textwrap-0.10.0 \ + textwrap-0.11.0 \ thread_local-0.3.6 \ tinytemplate-1.0.1 \ toml-0.2.1 \ diff --git a/multimedia/rav1e/distinfo b/multimedia/rav1e/distinfo index 502ea04fd3e..8f7fd0bdb10 100644 --- a/multimedia/rav1e/distinfo +++ b/multimedia/rav1e/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1554507099 +TIMESTAMP = 1554746877 SHA256 (rust/crates/aho-corasick-0.6.10.tar.gz) = 81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5 SIZE (rust/crates/aho-corasick-0.6.10.tar.gz) = 26122 SHA256 (rust/crates/aho-corasick-0.7.3.tar.gz) = e6f484ae0c99fec2e858eb6134949117399f222608d84cadb3f58c1f97c2364c @@ -33,16 +33,16 @@ SHA256 (rust/crates/byteorder-1.3.1.tar.gz) = a019b10a2a7cdeb292db131fc8113e57ea SIZE (rust/crates/byteorder-1.3.1.tar.gz) = 20959 SHA256 (rust/crates/cast-0.2.2.tar.gz) = 926013f2860c46252efceabb19f4a6b308197505082c609025aa6706c011d427 SIZE (rust/crates/cast-0.2.2.tar.gz) = 10318 -SHA256 (rust/crates/cc-1.0.34.tar.gz) = 30f813bf45048a18eda9190fd3c6b78644146056740c43172a5a3699118588fd -SIZE (rust/crates/cc-1.0.34.tar.gz) = 44012 +SHA256 (rust/crates/cc-1.0.35.tar.gz) = 5e5f3fee5eeb60324c2781f1e41286bdee933850fff9b3c672587fed5ec58c83 +SIZE (rust/crates/cc-1.0.35.tar.gz) = 44369 SHA256 (rust/crates/cexpr-0.3.5.tar.gz) = a7fa24eb00d5ffab90eaeaf1092ac85c04c64aaf358ea6f84505b8116d24c6af SIZE (rust/crates/cexpr-0.3.5.tar.gz) = 16938 SHA256 (rust/crates/cfg-if-0.1.7.tar.gz) = 11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4 SIZE (rust/crates/cfg-if-0.1.7.tar.gz) = 7360 SHA256 (rust/crates/clang-sys-0.26.4.tar.gz) = 6ef0c1bcf2e99c649104bd7a7012d8f8802684400e03db0ec0af48583c6fa0e4 SIZE (rust/crates/clang-sys-0.26.4.tar.gz) = 33343 -SHA256 (rust/crates/clap-2.32.0.tar.gz) = b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e -SIZE (rust/crates/clap-2.32.0.tar.gz) = 196073 +SHA256 (rust/crates/clap-2.33.0.tar.gz) = 5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9 +SIZE (rust/crates/clap-2.33.0.tar.gz) = 196458 SHA256 (rust/crates/cloudabi-0.0.3.tar.gz) = ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f SIZE (rust/crates/cloudabi-0.0.3.tar.gz) = 22156 SHA256 (rust/crates/criterion-0.2.10.tar.gz) = 1c6e5ee5b9652d4f851418c448af105642e1f99e9a2741a8ff45c0d2c911b1e0 @@ -143,8 +143,8 @@ SHA256 (rust/crates/rayon-core-1.4.1.tar.gz) = b055d1e92aba6877574d8fe604a63c8b5 SIZE (rust/crates/rayon-core-1.4.1.tar.gz) = 53760 SHA256 (rust/crates/rdrand-0.4.0.tar.gz) = 678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2 SIZE (rust/crates/rdrand-0.4.0.tar.gz) = 6456 -SHA256 (rust/crates/redox_syscall-0.1.52.tar.gz) = d32b3053e5ced86e4bc0411fec997389532bf56b000e66cb4884eeeb41413d69 -SIZE (rust/crates/redox_syscall-0.1.52.tar.gz) = 15595 +SHA256 (rust/crates/redox_syscall-0.1.54.tar.gz) = 12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252 +SIZE (rust/crates/redox_syscall-0.1.54.tar.gz) = 15668 SHA256 (rust/crates/redox_termios-0.1.1.tar.gz) = 7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76 SIZE (rust/crates/redox_termios-0.1.1.tar.gz) = 3227 SHA256 (rust/crates/regex-0.2.11.tar.gz) = 9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384 @@ -171,16 +171,16 @@ SHA256 (rust/crates/serde_derive-1.0.90.tar.gz) = 58fc82bec244f168b23d1963b45c8b SIZE (rust/crates/serde_derive-1.0.90.tar.gz) = 48815 SHA256 (rust/crates/serde_json-1.0.39.tar.gz) = 5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d SIZE (rust/crates/serde_json-1.0.39.tar.gz) = 69621 -SHA256 (rust/crates/strsim-0.7.0.tar.gz) = bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550 -SIZE (rust/crates/strsim-0.7.0.tar.gz) = 8435 +SHA256 (rust/crates/strsim-0.8.0.tar.gz) = 8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a +SIZE (rust/crates/strsim-0.8.0.tar.gz) = 9309 SHA256 (rust/crates/syn-0.15.30.tar.gz) = 66c8865bf5a7cbb662d8b011950060b3c8743dca141b054bf7195b20d314d8e2 SIZE (rust/crates/syn-0.15.30.tar.gz) = 146358 SHA256 (rust/crates/termcolor-1.0.4.tar.gz) = 4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f SIZE (rust/crates/termcolor-1.0.4.tar.gz) = 14416 SHA256 (rust/crates/termion-1.5.1.tar.gz) = 689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096 SIZE (rust/crates/termion-1.5.1.tar.gz) = 20659 -SHA256 (rust/crates/textwrap-0.10.0.tar.gz) = 307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6 -SIZE (rust/crates/textwrap-0.10.0.tar.gz) = 15986 +SHA256 (rust/crates/textwrap-0.11.0.tar.gz) = d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060 +SIZE (rust/crates/textwrap-0.11.0.tar.gz) = 17322 SHA256 (rust/crates/thread_local-0.3.6.tar.gz) = c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b SIZE (rust/crates/thread_local-0.3.6.tar.gz) = 12388 SHA256 (rust/crates/tinytemplate-1.0.1.tar.gz) = 7655088894274afb52b807bd3c87072daa1fedd155068b8705cabfd628956115 @@ -215,5 +215,5 @@ SHA256 (rust/crates/wincolor-1.0.1.tar.gz) = 561ed901ae465d6185fa7864d63fbd5720d SIZE (rust/crates/wincolor-1.0.1.tar.gz) = 4737 SHA256 (rust/crates/y4m-0.3.2.tar.gz) = 61d8cd9e4a938c6d5478e43e92c0b853cff403e28232558fcd8d61dcf9b734e0 SIZE (rust/crates/y4m-0.3.2.tar.gz) = 11083 -SHA256 (xiph-rav1e-s20190404-e4363d0_GH0.tar.gz) = 8efc16ac1c122879961655354693c519ace5b5c9d3072d4dc73523da901310e7 -SIZE (xiph-rav1e-s20190404-e4363d0_GH0.tar.gz) = 370060 +SHA256 (xiph-rav1e-s20190408-5ee66c1_GH0.tar.gz) = 7f16d3b1597aa27cc46c3f1f8bd80c902d9be3508ab200f3edb89481a7d44163 +SIZE (xiph-rav1e-s20190408-5ee66c1_GH0.tar.gz) = 369738 diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile index f938b0afa62..71f46a6b328 100644 --- a/multimedia/xine/Makefile +++ b/multimedia/xine/Makefile @@ -2,7 +2,7 @@ PORTNAME= xine PORTVERSION= 0.99.9 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-ui/${PORTVERSION} DISTNAME= ${PORTNAME}-ui-${PORTVERSION} diff --git a/net-im/folks/Makefile b/net-im/folks/Makefile index c4bae7bcf99..64172ace07f 100644 --- a/net-im/folks/Makefile +++ b/net-im/folks/Makefile @@ -3,7 +3,7 @@ PORTNAME= folks PORTVERSION= 0.11.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-im MASTER_SITES= GNOME diff --git a/net-im/freetalk/Makefile b/net-im/freetalk/Makefile index 3565297869c..7d7e5919cad 100644 --- a/net-im/freetalk/Makefile +++ b/net-im/freetalk/Makefile @@ -4,7 +4,7 @@ PORTNAME= freetalk PORTVERSION= 4.1 DISTVERSIONPREFIX= v -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= net-im MAINTAINER= ports@FreeBSD.org diff --git a/net-im/libaccounts-glib/Makefile b/net-im/libaccounts-glib/Makefile index 350c8a094c3..74267208807 100644 --- a/net-im/libaccounts-glib/Makefile +++ b/net-im/libaccounts-glib/Makefile @@ -3,7 +3,7 @@ PORTNAME= libaccounts-glib PORTVERSION= 1.21 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-im DIST_SUBDIR= KDE/${GL_ACCOUNT} diff --git a/net-im/libsignon-glib/Makefile b/net-im/libsignon-glib/Makefile index 7a5958c3194..3138a5d7f2f 100644 --- a/net-im/libsignon-glib/Makefile +++ b/net-im/libsignon-glib/Makefile @@ -2,7 +2,7 @@ PORTNAME= libsignon-glib PORTVERSION= 1.14 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-im DIST_SUBDIR= KDE/${GL_ACCOUNT} diff --git a/net-im/profanity/Makefile b/net-im/profanity/Makefile index 0bc6851218a..92c5a2c5a7b 100644 --- a/net-im/profanity/Makefile +++ b/net-im/profanity/Makefile @@ -2,6 +2,7 @@ PORTNAME= profanity PORTVERSION= 0.6.0 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= http://www.profanity.im/ \ LOCAL/arved diff --git a/net-im/telegram/Makefile b/net-im/telegram/Makefile index 51165902a80..cfd83aa7619 100644 --- a/net-im/telegram/Makefile +++ b/net-im/telegram/Makefile @@ -3,7 +3,7 @@ PORTNAME= telegram PORTVERSION= 1.4.1.g20161227 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-im MAINTAINER= cpm@FreeBSD.org diff --git a/net-im/telepathy-farsight/Makefile b/net-im/telepathy-farsight/Makefile index e35274ed083..8e9c40e0602 100644 --- a/net-im/telepathy-farsight/Makefile +++ b/net-im/telepathy-farsight/Makefile @@ -11,15 +11,16 @@ MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/ MAINTAINER= gnome@FreeBSD.org COMMENT= Farsight Connection Manager for Telepathy Framework +LICENSE= LGPL21+ +LICENSE_FILE= ${WRKSRC}/COPYING + LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ libtelepathy-glib.so:net-im/telepathy-glib \ libgstfarsight-0.10.so:net-im/farsight2 GNU_CONFIGURE= yes -USES= gmake libtool pathfix pkgconfig python:2.7 +USES= gmake gnome libtool localbase:ldflags pathfix pkgconfig python:2.7 USE_LDCONFIG= yes USE_GNOME= glib20 libxslt:build -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib .include diff --git a/net-im/telepathy-farsight/pkg-descr b/net-im/telepathy-farsight/pkg-descr index b4674f36484..c3116e75782 100644 --- a/net-im/telepathy-farsight/pkg-descr +++ b/net-im/telepathy-farsight/pkg-descr @@ -2,4 +2,4 @@ Farsight is a video conferencing connection manager for the Telepathy framework. Install this package to use Telepathy instant messaging clients with Farsight/Nice servers. -WWW: http://telepathy.freedesktop.org/ +WWW: https://telepathy.freedesktop.org/ diff --git a/net-im/zephyr/Makefile b/net-im/zephyr/Makefile index f9a40bbd01d..8e3c664fed5 100644 --- a/net-im/zephyr/Makefile +++ b/net-im/zephyr/Makefile @@ -3,7 +3,7 @@ PORTNAME= zephyr DISTVERSION= 3.0.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-im MASTER_SITES= http://zephyr.1ts.org/export/2642/distribution/ diff --git a/net-mgmt/alertmanager/Makefile b/net-mgmt/alertmanager/Makefile index a6dfcba3216..97081885560 100644 --- a/net-mgmt/alertmanager/Makefile +++ b/net-mgmt/alertmanager/Makefile @@ -3,7 +3,7 @@ PORTNAME= alertmanager DISTVERSIONPREFIX= v -DISTVERSION= 0.16.1 +DISTVERSION= 0.16.2 CATEGORIES= net-mgmt MAINTAINER= michal@hanu.la diff --git a/net-mgmt/alertmanager/distinfo b/net-mgmt/alertmanager/distinfo index f1797dca0cf..2cf39f15ce8 100644 --- a/net-mgmt/alertmanager/distinfo +++ b/net-mgmt/alertmanager/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551538257 -SHA256 (prometheus-alertmanager-v0.16.1_GH0.tar.gz) = bbfa3a87dc7ac290a08708e0acae6b342d9ff56cb7595cf8e69905ac1745b7bd -SIZE (prometheus-alertmanager-v0.16.1_GH0.tar.gz) = 3611221 +TIMESTAMP = 1554715019 +SHA256 (prometheus-alertmanager-v0.16.2_GH0.tar.gz) = 5934ff312c23637ce331f1a221a9671f9af5d748cabe11b84fb4c5ad6b600430 +SIZE (prometheus-alertmanager-v0.16.2_GH0.tar.gz) = 3616125 diff --git a/net-mgmt/argus3-clients/Makefile b/net-mgmt/argus3-clients/Makefile index b005c73597f..3499e220ae6 100644 --- a/net-mgmt/argus3-clients/Makefile +++ b/net-mgmt/argus3-clients/Makefile @@ -3,7 +3,7 @@ PORTNAME= argus-clients PORTVERSION= 3.0.8.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-mgmt security MASTER_SITES= http://qosient.com/argus/src/ \ ftp://qosient.com/pub/argus/src/ diff --git a/net-mgmt/netbox/Makefile b/net-mgmt/netbox/Makefile index 2aa03582a96..f026bfff58c 100644 --- a/net-mgmt/netbox/Makefile +++ b/net-mgmt/netbox/Makefile @@ -2,7 +2,7 @@ PORTNAME= netbox DISTVERSIONPREFIX= v -DISTVERSION= 2.5.9 +DISTVERSION= 2.5.10 CATEGORIES= net-mgmt MAINTAINER= kai@FreeBSD.org @@ -24,6 +24,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django21>=2.1.5:www/py-django21@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}dj21-drf-yasg>=1.14.0:www/py-dj21-drf-yasg@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gfm>=0.1.4:textproc/py-gfm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}graphviz>=0.10.1:graphics/py-graphviz@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}markdown>=2.6.11:textproc/py-markdown@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.19:net/py-netaddr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycryptodome>=3.7.2:security/py-pycryptodome@${PY_FLAVOR} \ diff --git a/net-mgmt/netbox/distinfo b/net-mgmt/netbox/distinfo index c702b237ef5..5edb3144074 100644 --- a/net-mgmt/netbox/distinfo +++ b/net-mgmt/netbox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554224427 -SHA256 (digitalocean-netbox-v2.5.9_GH0.tar.gz) = 26057b4922d7bef4540ae771f594fb7ba54c6d5bc158a3d9798d0bdd9815600c -SIZE (digitalocean-netbox-v2.5.9_GH0.tar.gz) = 2363174 +TIMESTAMP = 1554758567 +SHA256 (digitalocean-netbox-v2.5.10_GH0.tar.gz) = 1618bd199e0376899a4f5eaa2fa680d0873631dd0af31333ded6d54fb18c502b +SIZE (digitalocean-netbox-v2.5.10_GH0.tar.gz) = 2363340 diff --git a/net-mgmt/netbox/pkg-plist b/net-mgmt/netbox/pkg-plist index 353bd149bb8..b51886c831f 100644 --- a/net-mgmt/netbox/pkg-plist +++ b/net-mgmt/netbox/pkg-plist @@ -213,6 +213,7 @@ %%DATADIR%%/extras/migrations/0015_remove_useraction.py %%DATADIR%%/extras/migrations/0016_exporttemplate_add_cable.py %%DATADIR%%/extras/migrations/0017_exporttemplate_mime_type_length.py +%%DATADIR%%/extras/migrations/0018_exporttemplate_add_jinja2.py %%DATADIR%%/extras/migrations/__init__.py %%DATADIR%%/extras/models.py %%DATADIR%%/extras/querysets.py diff --git a/net-mgmt/nsca-ng/Makefile b/net-mgmt/nsca-ng/Makefile index df1caa46fcf..d486896f683 100644 --- a/net-mgmt/nsca-ng/Makefile +++ b/net-mgmt/nsca-ng/Makefile @@ -40,6 +40,11 @@ OPTIONS_DEFINE= DOCS EXAMPLES .include +.if ${SSL_DEFAULT} == base +BROKEN_FreeBSD_12= cannot link with OpenSSL +BROKEN_FreeBSD_13= cannot link with OpenSSL +.endif + .if ${SSL_DEFAULT:Mlibressl*} IGNORE= Requires PSK which is unsupported by the selected LibreSSL .endif diff --git a/net-mgmt/py-ciscoconfparse/Makefile b/net-mgmt/py-ciscoconfparse/Makefile index 21891861ced..099682c637e 100644 --- a/net-mgmt/py-ciscoconfparse/Makefile +++ b/net-mgmt/py-ciscoconfparse/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ciscoconfparse -DISTVERSION= 1.3.32 +DISTVERSION= 1.3.33 CATEGORIES= net-mgmt python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net-mgmt/py-ciscoconfparse/distinfo b/net-mgmt/py-ciscoconfparse/distinfo index 5be5c12e781..0360d543363 100644 --- a/net-mgmt/py-ciscoconfparse/distinfo +++ b/net-mgmt/py-ciscoconfparse/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553285542 -SHA256 (ciscoconfparse-1.3.32.tar.gz) = 03aa8e39a3dacb199a30edfea119d1ed963b87f7db6df25ba23cfa306c5d7be4 -SIZE (ciscoconfparse-1.3.32.tar.gz) = 93857 +TIMESTAMP = 1554810654 +SHA256 (ciscoconfparse-1.3.33.tar.gz) = 23b04ec4d392484db3cdc512b7b131020b57d23856f0cb205100695a30735552 +SIZE (ciscoconfparse-1.3.33.tar.gz) = 93836 diff --git a/net-mgmt/py-napalm-logs/Makefile b/net-mgmt/py-napalm-logs/Makefile index 83b00943998..8a0eba468fd 100644 --- a/net-mgmt/py-napalm-logs/Makefile +++ b/net-mgmt/py-napalm-logs/Makefile @@ -2,6 +2,7 @@ PORTNAME= napalm-logs DISTVERSION= 0.7.0 +PORTREVISION= 1 CATEGORIES= net-mgmt python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net-mgmt/py-napalm/Makefile b/net-mgmt/py-napalm/Makefile index d9bc091a080..d9d1a768a29 100644 --- a/net-mgmt/py-napalm/Makefile +++ b/net-mgmt/py-napalm/Makefile @@ -2,6 +2,7 @@ PORTNAME= napalm DISTVERSION= 2.4.0 +PORTREVISION= 1 CATEGORIES= net-mgmt python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net-mgmt/py-ncclient/Makefile b/net-mgmt/py-ncclient/Makefile index 25eab8b4722..a3721305729 100644 --- a/net-mgmt/py-ncclient/Makefile +++ b/net-mgmt/py-ncclient/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= ncclient -DISTVERSION= 0.6.3 -PORTREVISION= 1 +DISTVERSION= 0.6.4 CATEGORIES= net-mgmt python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -21,6 +20,7 @@ py27_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}selectors2>=2.0.1:devel/py-selectors2@ USES= python USE_PYTHON= distutils autoplist + NO_ARCH= yes .include diff --git a/net-mgmt/py-ncclient/distinfo b/net-mgmt/py-ncclient/distinfo index a6b220abe48..d28923a6cff 100644 --- a/net-mgmt/py-ncclient/distinfo +++ b/net-mgmt/py-ncclient/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1538043419 -SHA256 (ncclient-0.6.3.tar.gz) = 3ab58ee0d71069cb5b0e2f29a4e605d1d8417bd10af45b73ee3e817fe389fadc -SIZE (ncclient-0.6.3.tar.gz) = 88022 +TIMESTAMP = 1554808082 +SHA256 (ncclient-0.6.4.tar.gz) = 47d5af7398f16d609eebd02be2ecbd997b364032b5dc6d4927c810ea24f39080 +SIZE (ncclient-0.6.4.tar.gz) = 88691 diff --git a/net-mgmt/py-ncclient/files/patch-requirements.txt b/net-mgmt/py-ncclient/files/patch-requirements.txt deleted file mode 100644 index 0dcd6e4bd68..00000000000 --- a/net-mgmt/py-ncclient/files/patch-requirements.txt +++ /dev/null @@ -1,9 +0,0 @@ ---- requirements.txt.orig 2018-08-17 17:52:37 UTC -+++ requirements.txt -@@ -1,5 +1,5 @@ - setuptools>0.6 - paramiko>=1.15.0 - lxml>=3.3.0 --selectors2>=2.0.1 -+selectors2>=2.0.1; python_version <= '3.4' - six diff --git a/net-mgmt/py-pysmi/Makefile b/net-mgmt/py-pysmi/Makefile index 7cc9b0e5ce4..e1143379f4b 100644 --- a/net-mgmt/py-pysmi/Makefile +++ b/net-mgmt/py-pysmi/Makefile @@ -2,7 +2,7 @@ PORTNAME= pysmi PORTVERSION= 0.3.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-mgmt python MASTER_SITES= CHEESESHOP \ SF/pysmi/pysmi/${PORTVERSION} diff --git a/net-mgmt/py-snmpclitools/Makefile b/net-mgmt/py-snmpclitools/Makefile index 416129d8420..c984a2da343 100644 --- a/net-mgmt/py-snmpclitools/Makefile +++ b/net-mgmt/py-snmpclitools/Makefile @@ -2,6 +2,7 @@ PORTNAME= snmpclitools PORTVERSION= 0.6.1 +PORTREVISION= 1 CATEGORIES= net-mgmt python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net-mgmt/scli/Makefile b/net-mgmt/scli/Makefile index 2da4b1d3c6b..c26512b2f71 100644 --- a/net-mgmt/scli/Makefile +++ b/net-mgmt/scli/Makefile @@ -3,7 +3,7 @@ PORTNAME= scli PORTVERSION= 0.3.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-mgmt MASTER_SITES= ftp://ftp.ibr.cs.tu-bs.de/local/${PORTNAME}/ \ http://matt.peterson.org/FreeBSD/ports/ diff --git a/net-mgmt/send/Makefile b/net-mgmt/send/Makefile index 7f61096f292..36733441f1a 100644 --- a/net-mgmt/send/Makefile +++ b/net-mgmt/send/Makefile @@ -4,7 +4,7 @@ PORTNAME= send PORTVERSION= 0.3 DISTVERSIONPREFIX= v -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-mgmt ipv6 MAINTAINER= hrs@FreeBSD.org diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile index baa0f4a5e74..50e92b9ee77 100644 --- a/net-p2p/amule-devel/Makefile +++ b/net-p2p/amule-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= amule PORTVERSION= 10998 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-p2p MASTER_SITES= http://amule.sourceforge.net/tarballs/ PKGNAMESUFFIX= -devel diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile index 185ec849bfa..485bdcff245 100644 --- a/net-p2p/amule/Makefile +++ b/net-p2p/amule/Makefile @@ -3,7 +3,7 @@ PORTNAME= amule PORTVERSION= 2.3.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-p2p MASTER_SITES= SF/${PORTNAME}/aMule/${PORTVERSION} DISTNAME= aMule-${PORTVERSION} diff --git a/net-p2p/microdc2/Makefile b/net-p2p/microdc2/Makefile index ef11ed856c5..26fd24455b6 100644 --- a/net-p2p/microdc2/Makefile +++ b/net-p2p/microdc2/Makefile @@ -3,7 +3,7 @@ PORTNAME= microdc2 PORTVERSION= 0.15.6 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= net-p2p MASTER_SITES= http://corsair626.no-ip.org/microdc/ diff --git a/net-p2p/monero-cli/Makefile b/net-p2p/monero-cli/Makefile index 97000d2af43..bd9e2a86e8a 100644 --- a/net-p2p/monero-cli/Makefile +++ b/net-p2p/monero-cli/Makefile @@ -4,6 +4,7 @@ PORTNAME= monero-cli # To build from an arbitrary git commit comment PORTVERSION and PORTREVISION (if present) PORTVERSION= 0.14.0.2 +PORTREVISION= 1 DISTVERSIONPREFIX= v # and uncomment the following two lines #PORTVERSION= 0 diff --git a/net-p2p/py-vertex/Makefile b/net-p2p/py-vertex/Makefile index 644d6a602eb..91b203d85f7 100644 --- a/net-p2p/py-vertex/Makefile +++ b/net-p2p/py-vertex/Makefile @@ -3,7 +3,7 @@ PORTNAME= vertex PORTVERSION= 0.3.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-p2p python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net-p2p/shx/Makefile b/net-p2p/shx/Makefile index 9302c3e2087..7f50c8520c1 100644 --- a/net-p2p/shx/Makefile +++ b/net-p2p/shx/Makefile @@ -3,7 +3,7 @@ PORTNAME= shx PORTVERSION= 0.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-p2p MASTER_SITES= http://synhxd.sourceforge.net/releases/ diff --git a/net/afpfs-ng/Makefile b/net/afpfs-ng/Makefile index 5cff2e47775..846e5297904 100644 --- a/net/afpfs-ng/Makefile +++ b/net/afpfs-ng/Makefile @@ -3,7 +3,7 @@ PORTNAME= afpfs-ng PORTVERSION= 0.8.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net MASTER_SITES= SF diff --git a/net/bird/Makefile b/net/bird/Makefile index c4fa410a52f..2293a56598f 100644 --- a/net/bird/Makefile +++ b/net/bird/Makefile @@ -3,6 +3,7 @@ PORTNAME= bird PORTVERSION= 1.6.6 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://bird.network.cz/pub/bird/ diff --git a/net/c3270/Makefile b/net/c3270/Makefile index b832b095fb6..66a1aff022b 100644 --- a/net/c3270/Makefile +++ b/net/c3270/Makefile @@ -3,7 +3,7 @@ PORTNAME= c3270 PORTVERSION= 3.3.14ga11 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= http://x3270.bgp.nu/download/03.03.14/ MASTER_SITES_VER_PATH= ${PORTVERSION:C/(0[0-9]\.0[0-9])/} diff --git a/net/ccxstream/Makefile b/net/ccxstream/Makefile index be1fc19732c..96e5ab7cf42 100644 --- a/net/ccxstream/Makefile +++ b/net/ccxstream/Makefile @@ -3,7 +3,7 @@ PORTNAME= ccxstream PORTVERSION= 1.0.15 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= SF/xbplayer/XStream%20Servers/ccXStream%20${PORTVERSION}%20for%20Linux diff --git a/net/frr3/Makefile b/net/frr3/Makefile index 9af64a6336f..c8de90ffd81 100644 --- a/net/frr3/Makefile +++ b/net/frr3/Makefile @@ -2,6 +2,7 @@ PORTNAME= frr PORTVERSION= 3.0.4 +PORTREVISION= 1 DISTVERSIONPREFIX= frr- CATEGORIES= net ipv6 PKGNAMESUFFIX= 3 diff --git a/net/frr4/Makefile b/net/frr4/Makefile index 675f2dfeb48..4c218379af9 100644 --- a/net/frr4/Makefile +++ b/net/frr4/Makefile @@ -2,6 +2,7 @@ PORTNAME= frr PORTVERSION= 4.0.1 +PORTREVISION= 1 DISTVERSIONPREFIX= frr- CATEGORIES= net ipv6 PKGNAMESUFFIX= 4 diff --git a/net/frr6/Makefile b/net/frr6/Makefile index 5ab54145558..2215a8d08a5 100644 --- a/net/frr6/Makefile +++ b/net/frr6/Makefile @@ -3,7 +3,7 @@ PORTNAME= frr PORTVERSION= 6.0.2 DISTVERSIONPREFIX= frr- -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net ipv6 PKGNAMESUFFIX= 6 diff --git a/net/glusterfs/Makefile b/net/glusterfs/Makefile index 3eb7a5a52d5..88ec5f81eb5 100644 --- a/net/glusterfs/Makefile +++ b/net/glusterfs/Makefile @@ -2,7 +2,7 @@ PORTNAME= glusterfs PORTVERSION= 3.11.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net MASTER_SITES= http://bits.gluster.org/pub/gluster/glusterfs/src/ diff --git a/net/kafka/Makefile b/net/kafka/Makefile index 1f85564a1e5..90ecf592d29 100644 --- a/net/kafka/Makefile +++ b/net/kafka/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= kafka -PORTVERSION= 2.1.1 +PORTVERSION= 2.2.0 CATEGORIES= net java MASTER_SITES= APACHE/${PORTNAME}/${PORTVERSION} DISTNAME= ${PORTNAME}_2.12-${PORTVERSION} diff --git a/net/kafka/distinfo b/net/kafka/distinfo index 21b04a6ae66..e1cba5021e8 100644 --- a/net/kafka/distinfo +++ b/net/kafka/distinfo @@ -1,3 +1,3 @@ TIMESTAMP = 1500285144 -SHA256 (kafka_2.12-2.1.1.tgz) = 2053edce853c6c4f1204bf72f2760fc8cfda2cfb8ad624572d81bc3571eca7be -SIZE (kafka_2.12-2.1.1.tgz) = 55351618 +SHA256 (kafka_2.12-2.2.0.tgz) = a009624fae678fa35968f945e18e45fbea9a30fa8080d5dcce7fdea726120027 +SIZE (kafka_2.12-2.2.0.tgz) = 57028557 diff --git a/net/kafka/pkg-plist b/net/kafka/pkg-plist index 46c2730abe4..23d49ea70b1 100644 --- a/net/kafka/pkg-plist +++ b/net/kafka/pkg-plist @@ -43,6 +43,7 @@ %%DATADIR%%/libs/jackson-annotations-2.9.8.jar %%DATADIR%%/libs/jackson-core-2.9.8.jar %%DATADIR%%/libs/jackson-databind-2.9.8.jar +%%DATADIR%%/libs/jackson-datatype-jdk8-2.9.8.jar %%DATADIR%%/libs/jackson-jaxrs-base-2.9.8.jar %%DATADIR%%/libs/jackson-jaxrs-json-provider-2.9.8.jar %%DATADIR%%/libs/jackson-module-jaxb-annotations-2.9.8.jar @@ -61,15 +62,15 @@ %%DATADIR%%/libs/jersey-hk2-2.27.jar %%DATADIR%%/libs/jersey-media-jaxb-2.27.jar %%DATADIR%%/libs/jersey-server-2.27.jar -%%DATADIR%%/libs/jetty-client-9.4.12.v20180830.jar -%%DATADIR%%/libs/jetty-continuation-9.4.12.v20180830.jar -%%DATADIR%%/libs/jetty-http-9.4.12.v20180830.jar -%%DATADIR%%/libs/jetty-io-9.4.12.v20180830.jar -%%DATADIR%%/libs/jetty-security-9.4.12.v20180830.jar -%%DATADIR%%/libs/jetty-server-9.4.12.v20180830.jar -%%DATADIR%%/libs/jetty-servlet-9.4.12.v20180830.jar -%%DATADIR%%/libs/jetty-servlets-9.4.12.v20180830.jar -%%DATADIR%%/libs/jetty-util-9.4.12.v20180830.jar +%%DATADIR%%/libs/jetty-client-9.4.14.v20181114.jar +%%DATADIR%%/libs/jetty-continuation-9.4.14.v20181114.jar +%%DATADIR%%/libs/jetty-http-9.4.14.v20181114.jar +%%DATADIR%%/libs/jetty-io-9.4.14.v20181114.jar +%%DATADIR%%/libs/jetty-security-9.4.14.v20181114.jar +%%DATADIR%%/libs/jetty-server-9.4.14.v20181114.jar +%%DATADIR%%/libs/jetty-servlet-9.4.14.v20181114.jar +%%DATADIR%%/libs/jetty-servlets-9.4.14.v20181114.jar +%%DATADIR%%/libs/jetty-util-9.4.14.v20181114.jar %%DATADIR%%/libs/jopt-simple-5.0.4.jar %%DATADIR%%/libs/kafka-clients-%%PORTVERSION%%.jar %%DATADIR%%/libs/kafka-log4j-appender-%%PORTVERSION%%.jar @@ -86,17 +87,17 @@ %%DATADIR%%/libs/osgi-resource-locator-1.0.1.jar %%DATADIR%%/libs/plexus-utils-3.1.0.jar %%DATADIR%%/libs/reflections-0.9.11.jar -%%DATADIR%%/libs/rocksdbjni-5.14.2.jar -%%DATADIR%%/libs/scala-library-2.12.7.jar +%%DATADIR%%/libs/rocksdbjni-5.15.10.jar +%%DATADIR%%/libs/scala-library-2.12.8.jar %%DATADIR%%/libs/scala-logging_2.12-3.9.0.jar -%%DATADIR%%/libs/scala-reflect-2.12.7.jar +%%DATADIR%%/libs/scala-reflect-2.12.8.jar %%DATADIR%%/libs/slf4j-api-1.7.25.jar %%DATADIR%%/libs/slf4j-log4j12-1.7.25.jar %%DATADIR%%/libs/snappy-java-1.1.7.2.jar %%DATADIR%%/libs/validation-api-1.1.0.Final.jar %%DATADIR%%/libs/zkclient-0.11.jar %%DATADIR%%/libs/zookeeper-3.4.13.jar -%%DATADIR%%/libs/zstd-jni-1.3.7-1.jar +%%DATADIR%%/libs/zstd-jni-1.3.8-1.jar %%ETCDIR%%/trogdor.conf.sample %%PORTDOCS%%%%DOCSDIR%%/site-docs/api.html %%PORTDOCS%%%%DOCSDIR%%/site-docs/configuration.html diff --git a/net/kafkacat/Makefile b/net/kafkacat/Makefile index b0130ff5574..c5b989074c5 100644 --- a/net/kafkacat/Makefile +++ b/net/kafkacat/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= kafkacat -PORTVERSION= 1.3.1 +DISTVERSION= 1.4.0 CATEGORIES= net MAINTAINER= sergey@akhmatov.ru diff --git a/net/kafkacat/distinfo b/net/kafkacat/distinfo index 94ba4859056..b887238a65d 100644 --- a/net/kafkacat/distinfo +++ b/net/kafkacat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1507493143 -SHA256 (edenhill-kafkacat-1.3.1_GH0.tar.gz) = 385f231d7edee417c71b43f6f9d6dd843e9e41bff1bd30483792c6271c09b12b -SIZE (edenhill-kafkacat-1.3.1_GH0.tar.gz) = 52117 +TIMESTAMP = 1554805182 +SHA256 (edenhill-kafkacat-1.4.0_GH0.tar.gz) = 4c043cb86824a8f650d7dbe3aceaec8aa3fadafbd456d7e7444f18f184fe2347 +SIZE (edenhill-kafkacat-1.4.0_GH0.tar.gz) = 57706 diff --git a/net/kamailio/Makefile b/net/kamailio/Makefile index 5de7286c275..787fee1bbc1 100644 --- a/net/kamailio/Makefile +++ b/net/kamailio/Makefile @@ -3,6 +3,7 @@ PORTNAME= kamailio PORTVERSION= 5.2.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.kamailio.org/pub/kamailio/${PORTVERSION}/src/ diff --git a/net/msend/Makefile b/net/msend/Makefile index 5f8da944b4c..d674766493f 100644 --- a/net/msend/Makefile +++ b/net/msend/Makefile @@ -3,7 +3,7 @@ PORTNAME= msend PORTVERSION= 3.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= LOCAL/markp diff --git a/net/nethogs/Makefile b/net/nethogs/Makefile index 19cdcf0498b..890dd1daa90 100644 --- a/net/nethogs/Makefile +++ b/net/nethogs/Makefile @@ -12,6 +12,8 @@ COMMENT= Small net top tool LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING +BROKEN_i386= non-constant-expression cannot be narrowed from type 'unsigned int' to 'time_t' (aka 'int') in initializer list + USE_GITHUB= yes GH_ACCOUNT= raboof diff --git a/net/nfsshell/Makefile b/net/nfsshell/Makefile index 497999053fa..8340f1fbdb6 100644 --- a/net/nfsshell/Makefile +++ b/net/nfsshell/Makefile @@ -3,7 +3,7 @@ PORTNAME= nfsshell PORTVERSION= 20130510 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net #MASTER_SITES= http://www.cs.vu.nl/pub/leendert/ diff --git a/net/ns3/Makefile b/net/ns3/Makefile index 3017b702651..62a1fcafd41 100644 --- a/net/ns3/Makefile +++ b/net/ns3/Makefile @@ -2,7 +2,7 @@ PORTNAME= ns3 PORTVERSION= 3.29 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= https://www.nsnam.org/release/ DISTNAME= ns-allinone-${PORTVERSION} diff --git a/net/ocserv/Makefile b/net/ocserv/Makefile index dd246dd9be8..d665f01d06e 100644 --- a/net/ocserv/Makefile +++ b/net/ocserv/Makefile @@ -3,6 +3,7 @@ PORTNAME= ocserv PORTVERSION= 0.12.3 +PORTREVISION= 1 CATEGORIES= net security MASTER_SITES= ftp://ftp.infradead.org/pub/ocserv/ diff --git a/net/pacemaker1/Makefile b/net/pacemaker1/Makefile index f12f664b5ba..8bbe70c97b1 100644 --- a/net/pacemaker1/Makefile +++ b/net/pacemaker1/Makefile @@ -3,6 +3,7 @@ # $FreeBSD$ PORTVERSION= 1.1.19 +PORTREVISION= 1 PKGNAMESUFFIX= 1 .include "${.CURDIR}/Makefile.common" diff --git a/net/pacemaker2/Makefile b/net/pacemaker2/Makefile index f25a5af3d47..8d0e98b1651 100644 --- a/net/pacemaker2/Makefile +++ b/net/pacemaker2/Makefile @@ -2,6 +2,7 @@ # $FreeBSD$ PORTVERSION= 2.0.0 +PORTREVISION= 1 DISTVERSIONSUFFIX= -rc4 PKGNAMESUFFIX= 2 diff --git a/net/phpldapadmin/Makefile b/net/phpldapadmin/Makefile index de143dae924..60a2e61ca72 100644 --- a/net/phpldapadmin/Makefile +++ b/net/phpldapadmin/Makefile @@ -3,7 +3,7 @@ PORTNAME= phpldapadmin PORTVERSION= 1.2.3 -PORTREVISION= 9 +PORTREVISION= 10 PORTEPOCH= 1 CATEGORIES= net www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-php5/${PORTVERSION} @@ -18,7 +18,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= cpe php:web,flavors tar:tgz USE_PHP= gettext ldap openssl pcre session xml iconv hash -IGNORE_WITH_PHP=73 NO_ARCH= yes NO_BUILD= yes CPE_VENDOR= deon_george diff --git a/net/py-confluent-kafka/Makefile b/net/py-confluent-kafka/Makefile index bcbcb468cb3..0df4a1fa30f 100644 --- a/net/py-confluent-kafka/Makefile +++ b/net/py-confluent-kafka/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= confluent-kafka -DISTVERSION= 0.11.6 +DISTVERSION= 1.0.0 CATEGORIES= net python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,6 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= librdkafka.so:net/librdkafka RUN_DEPENDS= ${PY_ENUM34} \ ${PY_FUTURES} +py27_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} USES= localbase python USE_PYTHON= autoplist distutils diff --git a/net/py-confluent-kafka/distinfo b/net/py-confluent-kafka/distinfo index f3228bf0575..87a1de1c215 100644 --- a/net/py-confluent-kafka/distinfo +++ b/net/py-confluent-kafka/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1542818934 -SHA256 (confluent-kafka-0.11.6.tar.gz) = 2746f7796b3c15dabd07a7750ff2cb3cb9a1e97aab6881c6b1e091fc9ca27fb7 -SIZE (confluent-kafka-0.11.6.tar.gz) = 72996 +TIMESTAMP = 1554227200 +SHA256 (confluent-kafka-1.0.0.tar.gz) = a7427944af963410479c2aaae27cc9d28db39c9a93299f14dcf16df80092c63a +SIZE (confluent-kafka-1.0.0.tar.gz) = 74781 diff --git a/net/py-gspreadsheet/Makefile b/net/py-gspreadsheet/Makefile index 3eb2927c68b..6aa92cec950 100644 --- a/net/py-gspreadsheet/Makefile +++ b/net/py-gspreadsheet/Makefile @@ -16,10 +16,11 @@ LICENSE= APACHE20 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdata>=2.0.14:devel/py-gdata@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} -NO_ARCH= yes USES= python:2.7 USE_PYTHON= autoplist distutils +NO_ARCH= yes + PORTDOCS= README.rst OPTIONS_DEFINE= DOCS @@ -29,6 +30,6 @@ post-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} do-test: - @cd ${WRKSRC} && nosetests + @cd ${WRKSRC} && nosetests-${PYTHON_VER} .include diff --git a/net/py-haproxyctl/Makefile b/net/py-haproxyctl/Makefile index 32c8341c90e..483eaa89f44 100644 --- a/net/py-haproxyctl/Makefile +++ b/net/py-haproxyctl/Makefile @@ -2,6 +2,7 @@ PORTNAME= haproxyctl PORTVERSION= 0.5 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= net python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net/py-ndg_httpsclient/Makefile b/net/py-ndg_httpsclient/Makefile index 4d15166ca0b..fb61ac0ec6f 100644 --- a/net/py-ndg_httpsclient/Makefile +++ b/net/py-ndg_httpsclient/Makefile @@ -3,6 +3,7 @@ PORTNAME= ndg_httpsclient PORTVERSION= 0.5.1 +PORTREVISION= 1 CATEGORIES= net python MASTER_SITES= CHEESESHOP/source/n/ndg-httpsclient PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net/py-port-for/Makefile b/net/py-port-for/Makefile index c866f8a529f..dae98b26c9e 100644 --- a/net/py-port-for/Makefile +++ b/net/py-port-for/Makefile @@ -3,6 +3,7 @@ PORTNAME= port-for PORTVERSION= 0.3.1 +PORTREVISION= 1 CATEGORIES= net devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net/py-python-cinderclient/Makefile b/net/py-python-cinderclient/Makefile index 3202e8c113e..348e859bf5e 100644 --- a/net/py-python-cinderclient/Makefile +++ b/net/py-python-cinderclient/Makefile @@ -3,7 +3,7 @@ PORTNAME= python-cinderclient PORTVERSION= 3.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net/py-python-glanceclient/Makefile b/net/py-python-glanceclient/Makefile index 76b06b2e59f..ded6a496f05 100644 --- a/net/py-python-glanceclient/Makefile +++ b/net/py-python-glanceclient/Makefile @@ -3,6 +3,7 @@ PORTNAME= python-glanceclient PORTVERSION= 2.10.0 +PORTREVISION= 1 CATEGORIES= net python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net/py-python-novaclient/Makefile b/net/py-python-novaclient/Makefile index a3e08a85ea5..6107d1c80ad 100644 --- a/net/py-python-novaclient/Makefile +++ b/net/py-python-novaclient/Makefile @@ -3,6 +3,7 @@ PORTNAME= python-novaclient PORTVERSION= 13.0.0 +PORTREVISION= 1 CATEGORIES= net python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net/py-pyvmomi/Makefile b/net/py-pyvmomi/Makefile index 48675fb88c7..3ea295569d6 100644 --- a/net/py-pyvmomi/Makefile +++ b/net/py-pyvmomi/Makefile @@ -3,6 +3,7 @@ PORTNAME= pyvmomi DISTVERSION= 6.5 +PORTREVISION= 1 CATEGORIES= net python MASTER_SITES= CHEESESHOP/source/p/${PORTNAME} diff --git a/net/py-softlayer/Makefile b/net/py-softlayer/Makefile index 49597a05cdc..c8adfb5ec7e 100644 --- a/net/py-softlayer/Makefile +++ b/net/py-softlayer/Makefile @@ -3,6 +3,7 @@ PORTNAME= softlayer PORTVERSION= 5.5.3 +PORTREVISION= 1 CATEGORIES= net python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net/py-sshtunnel/Makefile b/net/py-sshtunnel/Makefile index 0f9b92894ba..66b09d3197e 100644 --- a/net/py-sshtunnel/Makefile +++ b/net/py-sshtunnel/Makefile @@ -2,6 +2,7 @@ PORTNAME= sshtunnel PORTVERSION= 0.1.4 +PORTREVISION= 1 CATEGORIES= net python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net/py-sshuttle/Makefile b/net/py-sshuttle/Makefile index c8186798334..8cf63129fa1 100644 --- a/net/py-sshuttle/Makefile +++ b/net/py-sshuttle/Makefile @@ -3,6 +3,7 @@ PORTNAME= sshuttle PORTVERSION= 0.78.4 +PORTREVISION= 1 CATEGORIES= net python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net/rubygem-opennebula/Makefile b/net/rubygem-opennebula/Makefile index a67a131c2ef..cc73e42cf96 100644 --- a/net/rubygem-opennebula/Makefile +++ b/net/rubygem-opennebula/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= opennebula -PORTVERSION= 5.8.0 +PORTVERSION= 5.8.1 CATEGORIES= net rubygems MASTER_SITES= RG diff --git a/net/rubygem-opennebula/distinfo b/net/rubygem-opennebula/distinfo index feb5c7ddca1..583d9573d2e 100644 --- a/net/rubygem-opennebula/distinfo +++ b/net/rubygem-opennebula/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554486060 -SHA256 (rubygem/opennebula-5.8.0.gem) = 02b472189d687efc06330265eaa5ad0e3bec3b55248a2e249dc7609cec6052a6 -SIZE (rubygem/opennebula-5.8.0.gem) = 76800 +TIMESTAMP = 1554816920 +SHA256 (rubygem/opennebula-5.8.1.gem) = 06c6cd25fc9b8e57a5157970a0be7d41ff864cbfd9fe6c7a477726e494af6abf +SIZE (rubygem/opennebula-5.8.1.gem) = 77824 diff --git a/net/samba46/Makefile b/net/samba46/Makefile index bb372be1790..124aed1ec08 100644 --- a/net/samba46/Makefile +++ b/net/samba46/Makefile @@ -3,7 +3,7 @@ PORTNAME?= ${SAMBA4_BASENAME}46 PORTVERSION?= ${SAMBA4_VERSION} -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} diff --git a/net/samba47/Makefile b/net/samba47/Makefile index 8ecfc8c4aeb..e64cf743dae 100644 --- a/net/samba47/Makefile +++ b/net/samba47/Makefile @@ -3,7 +3,7 @@ PORTNAME= ${SAMBA4_BASENAME}47 PORTVERSION= ${SAMBA4_VERSION} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} @@ -125,7 +125,7 @@ NSUPDATE_DESC= Use samba NSUPDATE utility for AD DC # the system) # Readline(sponsored by Python) # XXX: USES=readline pollutes CPPFLAGS, so we explicitly put dependency -LIB_DEPENDS+= libreadline.so.7:devel/readline +LIB_DEPENDS+= libreadline.so.8:devel/readline # popt LIB_DEPENDS+= libpopt.so:devel/popt # inotify diff --git a/net/samba48/Makefile b/net/samba48/Makefile index f3737c756db..f0470e8adf0 100644 --- a/net/samba48/Makefile +++ b/net/samba48/Makefile @@ -24,7 +24,7 @@ EXTRA_PATCHES+= ${PATCHDIR}/0001-bug-228462.patch:-p1 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.8.9 +SAMBA4_VERSION= 4.8.11 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} @@ -68,8 +68,9 @@ CONFIGURE_ARGS+= --mandir="${MANPREFIX}/man" \ # XXX: Flags CONFIGURE_ENV+= PTHREAD_LDFLAGS="-lpthread" -USES= compiler:c++11-lang cpe iconv \ - localbase:ldflags perl5 pkgconfig shebangfix waf +USES= compiler:c++11-lang cpe iconv gettext-runtime \ + localbase:ldflags perl5 pkgconfig shebangfix \ + ssl waf USE_PERL5= build USE_LDCONFIG= ${SAMBA4_LIBDIR} WAF_CMD= buildtools/bin/waf @@ -101,7 +102,7 @@ OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BUILTIN GSSAPI_MIT OPTIONS_RADIO= DNS ZEROCONF -OPTIONS_RADIO_DNS= NSUPDATE BIND911 BIND912 BIND913 +OPTIONS_RADIO_DNS= NSUPDATE BIND911 BIND912 BIND913 BIND914 OPTIONS_RADIO_ZEROCONF= MDNSRESPONDER AVAHI ############################################################################## AD_DC_DESC= Active Directory Domain Controller @@ -128,13 +129,14 @@ GSSAPI_BUILTIN_DESC= GSSAPI support via bundled Heimdal BIND911_DESC= Use Bind 9.11 as AD DC DNS server frontend BIND912_DESC= Use Bind 9.12 as AD DC DNS server frontend BIND913_DESC= Use Bind 9.13 as AD DC DNS server frontend +BIND914_DESC= Use Bind 9.14 as AD DC DNS server frontend NSUPDATE_DESC= Use samba NSUPDATE utility for AD DC ############################################################################## # XXX: Unconditional dependencies which can't be switched off(if present in # the system) # Readline(sponsored by Python) # XXX: USES=readline pollutes CPPFLAGS, so we explicitly put dependency -LIB_DEPENDS+= libreadline.so.7:devel/readline +LIB_DEPENDS+= libreadline.so.8:devel/readline # popt LIB_DEPENDS+= libpopt.so:devel/popt # inotify @@ -272,6 +274,7 @@ CONFIGURE_ARGS+= \ BIND911_RUN_DEPENDS= bind911>=9.11.0.0:dns/bind911 BIND912_RUN_DEPENDS= bind912>=9.12.0.0:dns/bind912 BIND913_RUN_DEPENDS= bind913>=9.13.0.0:dns/bind913 +BIND914_RUN_DEPENDS= bind914>=9.14.0.0:dns/bind914 NSUPDATE_RUN_DEPENDS= samba-nsupdate:dns/samba-nsupdate AVAHI_CONFIGURE_ENABLE= avahi diff --git a/net/samba48/distinfo b/net/samba48/distinfo index 16145a7ff0a..31571d68631 100644 --- a/net/samba48/distinfo +++ b/net/samba48/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1549652430 -SHA256 (samba-4.8.9.tar.gz) = ad2acf6bed436c125314a054f0589308eb664ac3d96cfb02d05e654a44e09c80 -SIZE (samba-4.8.9.tar.gz) = 17750151 +TIMESTAMP = 1554714921 +SHA256 (samba-4.8.11.tar.gz) = d294a8d7455d7d252d7bafc9c474855ea6e0ebe559c3babcd303a5c24e58710a +SIZE (samba-4.8.11.tar.gz) = 17761896 diff --git a/net/samba48/files/patch-bind13 b/net/samba48/files/patch-bind13 index 460d64853b6..17c53ea5cda 100644 --- a/net/samba48/files/patch-bind13 +++ b/net/samba48/files/patch-bind13 @@ -1,6 +1,6 @@ --- source4/dns_server/wscript_build.orig 2018-01-14 20:41:58 UTC +++ source4/dns_server/wscript_build -@@ -58,6 +58,26 @@ +@@ -58,6 +58,36 @@ deps='samba-hostconfig samdb-common gensec popt dnsserver_common', enabled=bld.AD_DC_BUILD_IS_ENABLED()) @@ -23,6 +23,16 @@ + install_path='${MODULESDIR}/bind9', + deps='samba-hostconfig samdb-common gensec popt dnsserver_common', + enabled=bld.AD_DC_BUILD_IS_ENABLED()) ++ ++bld.SAMBA_LIBRARY('dlz_bind9_14', ++ source='dlz_bind9.c', ++ cflags='-DBIND_VERSION_9_14', ++ private_library=True, ++ link_name='modules/bind9/dlz_bind9_14.so', ++ realname='dlz_bind9_14.so', ++ install_path='${MODULESDIR}/bind9', ++ deps='samba-hostconfig samdb-common gensec popt dnsserver_common', ++ enabled=bld.AD_DC_BUILD_IS_ENABLED()) + bld.SAMBA_LIBRARY('dlz_bind9_for_torture', source='dlz_bind9.c', @@ -34,13 +44,13 @@ # define DLZ_DLOPEN_VERSION 3 # define DNS_CLIENTINFO_VERSION 1 -#elif defined (BIND_VERSION_9_11) -+#elif defined (BIND_VERSION_9_11) || defined (BIND_VERSION_9_12) || defined (BIND_VERSION_9_13) ++#elif defined (BIND_VERSION_9_11) || defined (BIND_VERSION_9_12) || defined (BIND_VERSION_9_13) || defined (BIND_VERSION_9_14) # define DLZ_DLOPEN_VERSION 3 # define DNS_CLIENTINFO_VERSION 2 #else --- source4/setup/named.conf.dlz.orig 2018-01-14 22:41:59 UTC +++ source4/setup/named.conf.dlz -@@ -21,5 +21,11 @@ dlz "AD DNS Zone" { +@@ -21,5 +21,14 @@ dlz "AD DNS Zone" { # For BIND 9.11.x ${BIND9_11} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_11.so"; @@ -50,20 +60,24 @@ + + # For BIND 9.13.x + ${BIND9_13} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_13.so"; ++ ++ # For BIND 9.14.x ++ ${BIND9_14} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_14.so"; }; --- python/samba/provision/sambadns.py.orig 2018-01-17 09:08:39 UTC +++ python/samba/provision/sambadns.py -@@ -937,6 +937,8 @@ def create_named_conf(paths, realm, dnsd +@@ -937,6 +937,9 @@ def create_named_conf(paths, realm, dnsd bind9_9 = '#' bind9_10 = '#' bind9_11 = '#' + bind9_12 = '#' + bind9_13 = '#' ++ bind9_14 = '#' if bind_info.upper().find('BIND 9.8') != -1: bind9_8 = '' elif bind_info.upper().find('BIND 9.9') != -1: -@@ -945,6 +947,10 @@ def create_named_conf(paths, realm, dnsd +@@ -945,6 +947,12 @@ def create_named_conf(paths, realm, dnsd bind9_10 = '' elif bind_info.upper().find('BIND 9.11') != -1: bind9_11 = '' @@ -71,17 +85,20 @@ + bind9_12 = '' + elif bind_info.upper().find('BIND 9.13') != -1: + bind9_13 = '' ++ elif bind_info.upper().find('BIND 9.14') != -1: ++ bind9_14 = '' elif bind_info.upper().find('BIND 9.7') != -1: raise ProvisioningError("DLZ option incompatible with BIND 9.7.") else: -@@ -955,7 +961,9 @@ def create_named_conf(paths, realm, dnsd +@@ -955,7 +961,10 @@ def create_named_conf(paths, realm, dnsd "BIND9_8" : bind9_8, "BIND9_9" : bind9_9, "BIND9_10" : bind9_10, - "BIND9_11" : bind9_11 + "BIND9_11" : bind9_11, + "BIND9_12" : bind9_12, -+ "BIND9_13" : bind9_13 ++ "BIND9_13" : bind9_13, ++ "BIND9_14" : bind9_14 }) diff --git a/net/samba48/files/patch-source3_rpc__server_mdssvc_mdssvc.c b/net/samba48/files/patch-source3_rpc__server_mdssvc_mdssvc.c new file mode 100644 index 00000000000..c883381b8b5 --- /dev/null +++ b/net/samba48/files/patch-source3_rpc__server_mdssvc_mdssvc.c @@ -0,0 +1,15 @@ +../source3/rpc_server/mdssvc/mdssvc.c:157:9: error: format specifies type 'unsigned long' but the argument has type 'size_t' (aka 'unsigned int') [-Werror,-Wformat] + dalloc_size(dd)); + ^~~~~~~~~~~~~~~ + +--- source3/rpc_server/mdssvc/mdssvc.c.orig 2019-04-09 01:04:10 UTC ++++ source3/rpc_server/mdssvc/mdssvc.c +@@ -151,7 +151,7 @@ char *mds_dalloc_dump(DALLOC_CTX *dd, in + } + + logstring = talloc_asprintf(dd, +- "%s%s(#%lu): {\n", ++ "%s%s(#%zu): {\n", + tab_string1, + talloc_get_name(dd), + dalloc_size(dd)); diff --git a/net/samba48/pkg-plist b/net/samba48/pkg-plist index 0f7452603e1..78852d8f35a 100644 --- a/net/samba48/pkg-plist +++ b/net/samba48/pkg-plist @@ -298,6 +298,7 @@ lib/samba4/private/libxattr-tdb-samba4.so %%AD_DC%%lib/shared-modules/bind9/dlz_bind9_11.so %%AD_DC%%lib/shared-modules/bind9/dlz_bind9_12.so %%AD_DC%%lib/shared-modules/bind9/dlz_bind9_13.so +%%AD_DC%%lib/shared-modules/bind9/dlz_bind9_14.so %%AD_DC%%lib/shared-modules/bind9/dlz_bind9_9.so %%AD_DC%%lib/shared-modules/bind9/dlz_bind9.so %%AD_DC%%lib/shared-modules/gensec/krb5.so diff --git a/net/tcpwatch/Makefile b/net/tcpwatch/Makefile index b838935ca6c..502d60b83f7 100644 --- a/net/tcpwatch/Makefile +++ b/net/tcpwatch/Makefile @@ -3,7 +3,7 @@ PORTNAME= tcpwatch PORTVERSION= 1.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net python MASTER_SITES= http://hathawaymix.org/Software/TCPWatch/ diff --git a/net/turses/Makefile b/net/turses/Makefile index 325d595bb81..b56c313cb82 100644 --- a/net/turses/Makefile +++ b/net/turses/Makefile @@ -3,6 +3,7 @@ PORTNAME= turses PORTVERSION= 0.3.1 +PORTREVISION= 1 CATEGORIES= net python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net/vde2/Makefile b/net/vde2/Makefile index 1c7fb5c5ba7..db12b773a4b 100644 --- a/net/vde2/Makefile +++ b/net/vde2/Makefile @@ -3,7 +3,7 @@ PORTNAME= vde2 PORTVERSION= 2.3.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= SF/vde/${PORTNAME}/${PORTVERSION} diff --git a/net/vether-kmod/Makefile b/net/vether-kmod/Makefile index e01c039eb79..f61554a889a 100644 --- a/net/vether-kmod/Makefile +++ b/net/vether-kmod/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= vether-kmod -DISTVERSION= g20190207 +DISTVERSION= g20190408 CATEGORIES= net MAINTAINER= henning.matyschok@outlook.com @@ -15,7 +15,7 @@ USES= kmod uidfix USE_GITHUB= yes GH_ACCOUNT= hmatyschok GH_PROJECT= if_vether -GH_TAGNAME= fd0507979ee80accf5b4960bdb35f93c2a5325da +GH_TAGNAME= 4d149e8520ec3112265a9ef88f0fa71e70c07cb5 PLIST_FILES= ${KMODDIR}/if_vether.ko \ man/man4/if_vether.4.gz \ diff --git a/net/vether-kmod/distinfo b/net/vether-kmod/distinfo index 0854c9393c7..638973a4830 100644 --- a/net/vether-kmod/distinfo +++ b/net/vether-kmod/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1549542574 -SHA256 (hmatyschok-if_vether-g20190207-fd0507979ee80accf5b4960bdb35f93c2a5325da_GH0.tar.gz) = e6e7e23391673edb8a74b3119cf87eae138886088008c0263fb9cb26bde9d63a -SIZE (hmatyschok-if_vether-g20190207-fd0507979ee80accf5b4960bdb35f93c2a5325da_GH0.tar.gz) = 7481 +TIMESTAMP = 1554706660 +SHA256 (hmatyschok-if_vether-g20190408-4d149e8520ec3112265a9ef88f0fa71e70c07cb5_GH0.tar.gz) = d92f881ec6be53bfd5f4a2f2a4c03288ea4b16f319cac7aa3e15946891f74e65 +SIZE (hmatyschok-if_vether-g20190408-4d149e8520ec3112265a9ef88f0fa71e70c07cb5_GH0.tar.gz) = 7017 diff --git a/net/yaz/Makefile b/net/yaz/Makefile index 2a00bc4a859..5fdb490a1c1 100644 --- a/net/yaz/Makefile +++ b/net/yaz/Makefile @@ -3,7 +3,7 @@ PORTNAME= yaz DISTVERSION= 5.27.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://ftp.indexdata.dk/pub/yaz/ diff --git a/net/zebra/Makefile b/net/zebra/Makefile index bbc203ac743..a87555bb35c 100644 --- a/net/zebra/Makefile +++ b/net/zebra/Makefile @@ -3,7 +3,7 @@ PORTNAME= zebra PORTVERSION= 0.95a -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= net ipv6 MASTER_SITES= ftp://ftp.pop-pr.rnp.br/pub/GNU/ftp.zebra.org/zebra/ \ ftp://ftp.ripe.net/mirrors/sites/ftp.zebra.org/pub/zebra/ \ diff --git a/palm/pilot-link/Makefile b/palm/pilot-link/Makefile index 5d66316dd0b..33807c09211 100644 --- a/palm/pilot-link/Makefile +++ b/palm/pilot-link/Makefile @@ -3,7 +3,7 @@ PORTNAME= pilot-link PORTVERSION= 0.12.5 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= palm comms MASTER_SITES= http://downloads.pilot-link.org/ \ diff --git a/polish/ekg2/Makefile b/polish/ekg2/Makefile index 69115f7e697..dfaf9e31c9e 100644 --- a/polish/ekg2/Makefile +++ b/polish/ekg2/Makefile @@ -3,7 +3,7 @@ PORTNAME= ekg2 PORTVERSION= 0.3.1 -PORTREVISION= 10 +PORTREVISION= 11 PORTEPOCH= 1 CATEGORIES= polish net-im MASTER_SITES= http://pl.ekg2.org/ diff --git a/polish/kadu/Makefile b/polish/kadu/Makefile index 0d228fb05a3..d0ba55e08c8 100644 --- a/polish/kadu/Makefile +++ b/polish/kadu/Makefile @@ -3,7 +3,7 @@ PORTNAME= kadu PORTVERSION= 4.3 -PORTREVISION= 12 +PORTREVISION= 13 PORTEPOCH= 1 CATEGORIES= polish net-im MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/:kadu \ diff --git a/ports-mgmt/portfmt/Makefile b/ports-mgmt/portfmt/Makefile index f54bc048ec8..450347c952d 100644 --- a/ports-mgmt/portfmt/Makefile +++ b/ports-mgmt/portfmt/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= portfmt -PORTVERSION= g20190329 +PORTVERSION= g20190406 CATEGORIES= ports-mgmt MAINTAINER= tobik@FreeBSD.org @@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USE_GITHUB= yes GH_ACCOUNT= t6 -GH_TAGNAME= 5c2ccf1c5f52ec80ce4f12d5463c328de02c5d02 +GH_TAGNAME= ff04b7c3f4863f4597197878c64c3920eff30508 HAS_CONFIGURE= yes CONFIGURE_ARGS= LDFLAGS="${LDFLAGS}" \ diff --git a/ports-mgmt/portfmt/distinfo b/ports-mgmt/portfmt/distinfo index 8927ec9bb64..06a6f2c46e6 100644 --- a/ports-mgmt/portfmt/distinfo +++ b/ports-mgmt/portfmt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553966935 -SHA256 (t6-portfmt-g20190329-5c2ccf1c5f52ec80ce4f12d5463c328de02c5d02_GH0.tar.gz) = 96844e58c45af6fc79d74b54e5ab11a0ee8ddbe183b1fa23789bbf0cbdcb0936 -SIZE (t6-portfmt-g20190329-5c2ccf1c5f52ec80ce4f12d5463c328de02c5d02_GH0.tar.gz) = 41623 +TIMESTAMP = 1554747114 +SHA256 (t6-portfmt-g20190406-ff04b7c3f4863f4597197878c64c3920eff30508_GH0.tar.gz) = d78682697f5fa45a7ba3c8634a638ab725dd1bc6c3bfffd646cdc1a5167700ef +SIZE (t6-portfmt-g20190406-ff04b7c3f4863f4597197878c64c3920eff30508_GH0.tar.gz) = 41877 diff --git a/ports-mgmt/ports-tools/Makefile b/ports-mgmt/ports-tools/Makefile index af885b63df0..8b6a890a2b8 100644 --- a/ports-mgmt/ports-tools/Makefile +++ b/ports-mgmt/ports-tools/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ports-tools -PORTVERSION= 1.7 +PORTVERSION= 1.8 CATEGORIES= ports-mgmt MAINTAINER= ports@FreeBSD.org diff --git a/ports-mgmt/ports-tools/distinfo b/ports-mgmt/ports-tools/distinfo index e9d0fae58b3..0b0dae27050 100644 --- a/ports-mgmt/ports-tools/distinfo +++ b/ports-mgmt/ports-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1517687820 -SHA256 (ppekala-ports-tools-1.7_GH0.tar.gz) = 549bb0f3d5339ccf6dc7a0e5460cdf0801bca681f3d445022d2676142e101b35 -SIZE (ppekala-ports-tools-1.7_GH0.tar.gz) = 23568 +TIMESTAMP = 1554838852 +SHA256 (ppekala-ports-tools-1.8_GH0.tar.gz) = 53c0132ff3b07a89db9153d3523e38e6442a4b9cd91cde4e86d4c58765d92738 +SIZE (ppekala-ports-tools-1.8_GH0.tar.gz) = 24371 diff --git a/print/cloudprint/Makefile b/print/cloudprint/Makefile index c8e2fac7939..c867603ba7a 100644 --- a/print/cloudprint/Makefile +++ b/print/cloudprint/Makefile @@ -3,6 +3,7 @@ PORTNAME= cloudprint PORTVERSION= 0.14.0.20170128 +PORTREVISION= 1 CATEGORIES= print MAINTAINER= decke@FreeBSD.org diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile index ec61b1cfd15..5551e84314a 100644 --- a/print/fontforge/Makefile +++ b/print/fontforge/Makefile @@ -3,6 +3,7 @@ PORTNAME= fontforge PORTVERSION= 20170731 +PORTREVISION= 1 CATEGORIES= print DISTFILES= # Empty but needed because of the freetype distfile diff --git a/print/hplip/Makefile b/print/hplip/Makefile index 541ca5c99c7..2449a48e17d 100644 --- a/print/hplip/Makefile +++ b/print/hplip/Makefile @@ -3,7 +3,7 @@ PORTNAME= hplip PORTVERSION= 3.17.11 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= print MASTER_SITES= SF diff --git a/print/lilypond-devel/Makefile b/print/lilypond-devel/Makefile index 0d573888466..74e8f9d7d0d 100644 --- a/print/lilypond-devel/Makefile +++ b/print/lilypond-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= lilypond -DISTVERSION= 2.19.82 +DISTVERSION= 2.19.83 CATEGORIES= print audio MASTER_SITES= http://lilypond.org/download/source/v${DISTVERSION:R}/ PKGNAMESUFFIX= -devel diff --git a/print/lilypond-devel/distinfo b/print/lilypond-devel/distinfo index 7eddde43fd2..b5427a48f3c 100644 --- a/print/lilypond-devel/distinfo +++ b/print/lilypond-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1529921829 -SHA256 (lilypond-2.19.82.tar.gz) = a5679cddb3e415828642f75027997596b814922aadb1fa633c8f973238ae291b -SIZE (lilypond-2.19.82.tar.gz) = 17407520 +TIMESTAMP = 1554060216 +SHA256 (lilypond-2.19.83.tar.gz) = 96ba4f4b342d21057ad74d85d647aea7e47a5c24f895127c2b3553a252738fb3 +SIZE (lilypond-2.19.83.tar.gz) = 17996428 diff --git a/print/mftrace/Makefile b/print/mftrace/Makefile index 0c36734ad22..f4ed15906d8 100644 --- a/print/mftrace/Makefile +++ b/print/mftrace/Makefile @@ -3,7 +3,7 @@ PORTNAME= mftrace PORTVERSION= 1.2.18 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print MASTER_SITES= http://lilypond.org/download/sources/mftrace/ \ LOCAL/nivit/${PORTNAME}/ diff --git a/print/py-fonttools/Makefile b/print/py-fonttools/Makefile index 898638014ef..b48905b8100 100644 --- a/print/py-fonttools/Makefile +++ b/print/py-fonttools/Makefile @@ -2,7 +2,8 @@ # $FreeBSD$ PORTNAME= fonttools -PORTVERSION= 3.39.0 +PORTVERSION= 3.40.0 +PORTREVISION= 1 CATEGORIES= print python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/print/py-fonttools/distinfo b/print/py-fonttools/distinfo index b5f7b1952b1..6007e65e197 100644 --- a/print/py-fonttools/distinfo +++ b/print/py-fonttools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553089572 -SHA256 (fonttools-3.39.0.zip) = e21f35440877b24fdfe49e9c74d1084b50bd3be881a83e065d62424bd640fb41 -SIZE (fonttools-3.39.0.zip) = 2861041 +TIMESTAMP = 1554816914 +SHA256 (fonttools-3.40.0.zip) = b1c5f2aa4ed4849ec62f32154118aa46429dc95d8be22d3941369ec9a79ca787 +SIZE (fonttools-3.40.0.zip) = 2872259 diff --git a/print/py-psautohint/Makefile b/print/py-psautohint/Makefile index 1aa3ca38908..937ca19bbeb 100644 --- a/print/py-psautohint/Makefile +++ b/print/py-psautohint/Makefile @@ -2,6 +2,7 @@ PORTNAME= psautohint PORTVERSION= 1.9.1 +PORTREVISION= 1 CATEGORIES= print python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/print/py-trml2pdf/Makefile b/print/py-trml2pdf/Makefile index 31af0041e9f..b6bce1fbea6 100644 --- a/print/py-trml2pdf/Makefile +++ b/print/py-trml2pdf/Makefile @@ -3,7 +3,7 @@ PORTNAME= trml2pdf PORTVERSION= 1.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= print python MASTER_SITES= SF/kraft/${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,14 +11,17 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= ports@caomhin.org COMMENT= Tiny RML2PDF easily creates PDF documents +LICENSE= LGPL21 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}reportlab1>=0:print/py-reportlab1@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}reportlab>=0:print/py-reportlab@${PY_FLAVOR} + +USES= python:2.7 shebangfix tar:bzip2 +USE_PYTHON= flavors NO_BUILD= yes NO_ARCH= yes -USES= python:2.7 shebangfix tar:bzip2 -USE_PYTHON= flavors SHEBANG_FILES= trml2pdf/trml2pdf.py DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} diff --git a/science/agrum/Makefile b/science/agrum/Makefile index 5d2f28eff22..0f9ef765a06 100644 --- a/science/agrum/Makefile +++ b/science/agrum/Makefile @@ -2,7 +2,7 @@ PORTNAME= agrum DISTVERSION= 0.14.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= science math MAINTAINER= yuri@FreeBSD.org diff --git a/science/cp2k/Makefile b/science/cp2k/Makefile index 647319260b3..9a76ed90584 100644 --- a/science/cp2k/Makefile +++ b/science/cp2k/Makefile @@ -73,7 +73,7 @@ pre-configure: .endif post-patch: - @${REINPLACE_CMD} 's|LIBS.*=.*|& ${LDFLAGS}|; s|^FCFLAGS.*=.*|& -I${LOCALBASE}/include|' ${WRKSRC}/arch/FreeBSD-* + @${REINPLACE_CMD} 's|LIBS.*=.*|& ${LDFLAGS}|; s|^FCFLAGS.*=.*|& -I${LOCALBASE}/include|; s| -march=native||' ${WRKSRC}/arch/FreeBSD-* pre-build: @${MKDIR} ${BUILD_WRKSRC} diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile index 8fceb69cb85..0fb9e538945 100644 --- a/science/gnudatalanguage/Makefile +++ b/science/gnudatalanguage/Makefile @@ -4,7 +4,7 @@ PORTNAME= gnudatalanguage PORTVERSION= 0.9.9 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= science lang .if defined(BUILD_PYTHON_MODULE) PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/science/libsvm-python/Makefile b/science/libsvm-python/Makefile index b7b32630bf7..a0f3acb6db6 100644 --- a/science/libsvm-python/Makefile +++ b/science/libsvm-python/Makefile @@ -1,6 +1,7 @@ # Created by: rafan@infor.org # $FreeBSD$ +PORTREVISION= 1 PKGNAMESUFFIX= -python MAINTAINER= ports@FreeBSD.org diff --git a/science/openbabel/Makefile b/science/openbabel/Makefile index 55f91efeb71..cbbaf73c937 100644 --- a/science/openbabel/Makefile +++ b/science/openbabel/Makefile @@ -3,7 +3,7 @@ PORTNAME= openbabel PORTVERSION= 2.4.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= science MASTER_SITES= SF diff --git a/science/py-GPyOpt/Makefile b/science/py-GPyOpt/Makefile index dc9127bb106..4807574120a 100644 --- a/science/py-GPyOpt/Makefile +++ b/science/py-GPyOpt/Makefile @@ -2,6 +2,7 @@ PORTNAME= GPyOpt DISTVERSION= 1.2.5 +PORTREVISION= 1 CATEGORIES= science python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/science/py-ase/Makefile b/science/py-ase/Makefile index 96a530ee355..c110952fb09 100644 --- a/science/py-ase/Makefile +++ b/science/py-ase/Makefile @@ -2,7 +2,7 @@ PORTNAME= ase DISTVERSION= 3.17.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= science python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/science/py-coards/Makefile b/science/py-coards/Makefile index a0d7d689f65..3b49feb1d9f 100644 --- a/science/py-coards/Makefile +++ b/science/py-coards/Makefile @@ -3,7 +3,7 @@ PORTNAME= coards PORTVERSION= 1.0.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= science python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/science/py-gpaw/Makefile b/science/py-gpaw/Makefile index ba811e100b0..5e48bc63814 100644 --- a/science/py-gpaw/Makefile +++ b/science/py-gpaw/Makefile @@ -2,6 +2,7 @@ PORTNAME= gpaw DISTVERSION= 1.5.1 +PORTREVISION= 1 CATEGORIES= science python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/science/py-netCDF4/Makefile b/science/py-netCDF4/Makefile index d3f2c1b4e91..78535daa581 100644 --- a/science/py-netCDF4/Makefile +++ b/science/py-netCDF4/Makefile @@ -5,7 +5,7 @@ PORTNAME= netCDF4 PORTVERSION= 1.3.1 DISTVERSIONPREFIX= v DISTVERSIONSUFFIX= rel -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= science python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/science/py-oddt/Makefile b/science/py-oddt/Makefile index 2d9538191ec..fe478faa84a 100644 --- a/science/py-oddt/Makefile +++ b/science/py-oddt/Makefile @@ -2,6 +2,7 @@ PORTNAME= oddt DISTVERSION= 0.6 +PORTREVISION= 1 CATEGORIES= science python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/science/py-pyaixi/Makefile b/science/py-pyaixi/Makefile index a350b2edfce..35e121da764 100644 --- a/science/py-pyaixi/Makefile +++ b/science/py-pyaixi/Makefile @@ -3,7 +3,7 @@ PORTNAME= pyaixi PORTVERSION= 1.0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= science python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/science/py-rmsd/Makefile b/science/py-rmsd/Makefile index fcc640c41a9..09c2d70169b 100644 --- a/science/py-rmsd/Makefile +++ b/science/py-rmsd/Makefile @@ -2,6 +2,7 @@ PORTNAME= rmsd DISTVERSION= 1.3.2 +PORTREVISION= 1 CATEGORIES= science MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/science/pybrain/Makefile b/science/pybrain/Makefile index 7687bef3d01..ecdd338c980 100644 --- a/science/pybrain/Makefile +++ b/science/pybrain/Makefile @@ -3,7 +3,7 @@ PORTNAME= pybrain PORTVERSION= 0.3.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= science python MAINTAINER= wen@FreeBSD.org diff --git a/science/qcl/Makefile b/science/qcl/Makefile index b3a75fa05a1..c2475ee1ab7 100644 --- a/science/qcl/Makefile +++ b/science/qcl/Makefile @@ -3,7 +3,7 @@ PORTNAME= qcl PORTVERSION= 0.6.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= science math MASTER_SITES= http://tph.tuwien.ac.at/~oemer/tgz/ diff --git a/science/quantum-espresso/Makefile b/science/quantum-espresso/Makefile index cc23db54878..b415449664d 100644 --- a/science/quantum-espresso/Makefile +++ b/science/quantum-espresso/Makefile @@ -2,7 +2,7 @@ PORTNAME= quantum-espresso DISTVERSIONPREFIX= qe- -DISTVERSION= 6.4 +DISTVERSION= 6.4.1 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org diff --git a/science/quantum-espresso/distinfo b/science/quantum-espresso/distinfo index 98a576ad3e1..f2ae994285d 100644 --- a/science/quantum-espresso/distinfo +++ b/science/quantum-espresso/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551838190 -SHA256 (QEF-q-e-qe-6.4_GH0.tar.gz) = 781366d03da75516fdcf9100a1caadb26ccdd1dedd942a6f8595ff0edca74bfe -SIZE (QEF-q-e-qe-6.4_GH0.tar.gz) = 83097382 +TIMESTAMP = 1554789366 +SHA256 (QEF-q-e-qe-6.4.1_GH0.tar.gz) = b0d7e9f617b848753ad923d8c6ca5490d5d82495f82b032b71a0ff2f2e9cfa08 +SIZE (QEF-q-e-qe-6.4.1_GH0.tar.gz) = 83100337 diff --git a/science/rdkit/Makefile b/science/rdkit/Makefile index e198afc599a..07b046ef8c9 100644 --- a/science/rdkit/Makefile +++ b/science/rdkit/Makefile @@ -3,6 +3,7 @@ PORTNAME= rdkit DISTVERSIONPREFIX= Release_ DISTVERSION= 2018_09_3 +PORTREVISION= 1 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org diff --git a/science/scidavis/Makefile b/science/scidavis/Makefile index 968a42938aa..18603c20d2e 100644 --- a/science/scidavis/Makefile +++ b/science/scidavis/Makefile @@ -2,6 +2,7 @@ PORTNAME= scidavis PORTVERSION= 2.0.1 +PORTREVISION= 1 CATEGORIES= science MAINTAINER= makc@FreeBSD.org diff --git a/science/silo/Makefile b/science/silo/Makefile index 62ed09e7f9c..1ad48f408cb 100644 --- a/science/silo/Makefile +++ b/science/silo/Makefile @@ -4,7 +4,7 @@ PORTNAME= silo PORTVERSION= 4.10.2 DISTVERSIONSUFFIX= -bsd -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= science MASTER_SITES= http://wci.llnl.gov/content/assets/docs/simulation/computer-codes/${PORTNAME}/silo-${PORTVERSION}/ diff --git a/security/Makefile b/security/Makefile index 92baa6cdf86..197186bb167 100644 --- a/security/Makefile +++ b/security/Makefile @@ -99,6 +99,7 @@ PORTREVISION= 1 SUBDIR += courierpassd SUBDIR += courierpasswd SUBDIR += courieruserinfo + SUBDIR += cowrie SUBDIR += cp2fwb SUBDIR += cracklib SUBDIR += crackpkcs12 diff --git a/security/authforce/Makefile b/security/authforce/Makefile index f0146f1ecb2..6fc2e12090e 100644 --- a/security/authforce/Makefile +++ b/security/authforce/Makefile @@ -3,7 +3,7 @@ PORTNAME= authforce PORTVERSION= 0.9.9 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= security www MASTER_SITES= GHC diff --git a/security/binwalk/Makefile b/security/binwalk/Makefile index 56cb261f367..2389662006b 100644 --- a/security/binwalk/Makefile +++ b/security/binwalk/Makefile @@ -2,6 +2,7 @@ PORTNAME= binwalk PORTVERSION= 2.1.1 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= security python diff --git a/security/botan2/Makefile b/security/botan2/Makefile index 2baa459461e..100e2d54555 100644 --- a/security/botan2/Makefile +++ b/security/botan2/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ PORTNAME= botan -DISTVERSION= 2.9.0 +DISTVERSION= 2.10.0 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://botan.randombit.net/releases/ PKGNAMESUFFIX= 2 @@ -14,7 +15,6 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/license.txt BROKEN_armv6= include/arm_neon.h:28:2: error: "NEON support not enabled" -BROKEN_armv7= fails to package: pkg-static: Unable to access file stage/usr/local/include/botan-2/botan/rdrand_rng.h:No such file or directory LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs @@ -30,6 +30,9 @@ CONFIGURE_ARGS= --with-external-includedir=${PREFIX}/include \ --cc=${COMPILER_TYPE} LDFLAGS+= -pthread +SHLIBVER= ${DISTVERSION:S/./ /g:[2]} +PLIST_SUB= SHLIBVER=${SHLIBVER} + DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} PORTDOCS= * @@ -60,6 +63,6 @@ post-patch: ${WRKSRC}/src/build-data/cc/clang.txt post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/botan ${STAGEDIR}${PREFIX}/lib/libbotan-2.so.9.9.0 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/botan ${STAGEDIR}${PREFIX}/lib/libbotan-2.so.${SHLIBVER}.${SHLIBVER}.0 .include diff --git a/security/botan2/distinfo b/security/botan2/distinfo index 5a902d542d7..0ff1501b093 100644 --- a/security/botan2/distinfo +++ b/security/botan2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1547467989 -SHA256 (Botan-2.9.0.tgz) = 305564352334dd63ae63db039077d96ae52dfa57a3248871081719b6a9f2d119 -SIZE (Botan-2.9.0.tgz) = 7216373 +TIMESTAMP = 1554050060 +SHA256 (Botan-2.10.0.tgz) = 88481997578c27924724fea76610d43d9f59c99edfe561d41803bbc98871ad31 +SIZE (Botan-2.10.0.tgz) = 7240021 diff --git a/security/botan2/files/patch-boost-1.70 b/security/botan2/files/patch-boost-1.70 new file mode 100644 index 00000000000..055854e2d93 --- /dev/null +++ b/security/botan2/files/patch-boost-1.70 @@ -0,0 +1,51 @@ +boost 1.70 compatibility (accepted upstream) +https://github.com/randombit/botan/pull/1881 + +--- src/cli/tls_http_server.cpp.orig 2019-01-04 11:14:58 UTC ++++ src/cli/tls_http_server.cpp +@@ -41,6 +41,12 @@ + + #include "credentials.h" + ++#if BOOST_VERSION >= 107000 ++#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context()) ++#else ++#define GET_IO_SERVICE(s) ((s).get_io_service()) ++#endif ++ + namespace Botan_CLI { + + namespace { +@@ -435,7 +441,7 @@ class TLS_Asio_HTTP_Server final + session::pointer make_session() + { + return session::create( +- m_acceptor.get_io_service(), ++ GET_IO_SERVICE(m_acceptor), + m_session_manager, + m_creds, + m_policy); +--- src/cli/tls_proxy.cpp.orig 2019-01-04 11:14:58 UTC ++++ src/cli/tls_proxy.cpp +@@ -33,6 +33,12 @@ + + #include "credentials.h" + ++#if BOOST_VERSION >= 107000 ++#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context()) ++#else ++#define GET_IO_SERVICE(s) ((s).get_io_service()) ++#endif ++ + namespace Botan_CLI { + + namespace { +@@ -370,7 +376,7 @@ class tls_proxy_server final + session::pointer make_session() + { + return session::create( +- m_acceptor.get_io_service(), ++ GET_IO_SERVICE(m_acceptor), + m_session_manager, + m_creds, + m_policy, diff --git a/security/botan2/pkg-plist b/security/botan2/pkg-plist index cba2b469e02..8f6e9454e9e 100644 --- a/security/botan2/pkg-plist +++ b/security/botan2/pkg-plist @@ -308,7 +308,7 @@ include/botan-2/botan/xts.h include/botan-2/botan/zlib.h lib/libbotan-2.a lib/libbotan-2.so -lib/libbotan-2.so.9 -lib/libbotan-2.so.9.9.0 +lib/libbotan-2.so.%%SHLIBVER%% +lib/libbotan-2.so.%%SHLIBVER%%.%%SHLIBVER%%.0 %%PYTHON_SITELIBDIR%%/botan2.py libdata/pkgconfig/botan-2.pc diff --git a/security/certificate-transparency/Makefile b/security/certificate-transparency/Makefile index 19abf28628a..cec88aa08aa 100644 --- a/security/certificate-transparency/Makefile +++ b/security/certificate-transparency/Makefile @@ -37,4 +37,11 @@ CPPFLAGS+= "-I${LOCALBASE}/include" CPPFLAGS+= "-I${LOCALBASE}/include/evhtp" LDFLAGS+= "-L${LOCALBASE}/lib" -.include +.include + +.if ${SSL_DEFAULT} == base +BROKEN_FreeBSD_12= could not find the OpenSSL libraries +BROKEN_FreeBSD_13= could not find the OpenSSL libraries +.endif + +.include diff --git a/security/chkrootkit/Makefile b/security/chkrootkit/Makefile index 1e17caa4854..7f70d53a65c 100644 --- a/security/chkrootkit/Makefile +++ b/security/chkrootkit/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= chkrootkit -PORTVERSION= 0.52 +PORTVERSION= 0.53 CATEGORIES= security MASTER_SITES= ftp://ftp.pangeia.com.br/pub/seg/pac/ diff --git a/security/chkrootkit/distinfo b/security/chkrootkit/distinfo index 902081ff057..cc2d71747fb 100644 --- a/security/chkrootkit/distinfo +++ b/security/chkrootkit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1507844098 -SHA256 (chkrootkit-0.52.tar.gz) = c578c0b9c8ae0729c2de7075f896f3d168e768c52e319a7706c9a7e46ff7a211 -SIZE (chkrootkit-0.52.tar.gz) = 40031 +TIMESTAMP = 1554352045 +SHA256 (chkrootkit-0.53.tar.gz) = 7262dae33b338976828b5d156b70d159e0043c0db43ada8dee66c97387cf45b5 +SIZE (chkrootkit-0.53.tar.gz) = 40483 diff --git a/security/cowrie/Makefile b/security/cowrie/Makefile new file mode 100644 index 00000000000..5d9726a80f3 --- /dev/null +++ b/security/cowrie/Makefile @@ -0,0 +1,36 @@ +# $FreeBSD$ + +PORTNAME= cowrie +DISTVERSION= 1.6.0 +CATEGORIES= security python + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Cowrie SSH/Telnet honeypot + +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/docs/LICENSE.rst + +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}incremental>0:devel/py-incremental@${PY_FLAVOR} +xRUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}salt-common>=2017.7.1:sysutils/py-salt-common@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}GitPython>=1:devel/py-gitpython@${FLAVOR} +RUN_DEPENDS= bash:shells/bash \ + ${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.0:devel/py-appdirs@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}configparser>=0:devel/py-configparser@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cryptography>=0.9.1:security/py-cryptography@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}incremental>0:devel/py-incremental@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyparsing>0:devel/py-pyparsing@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}service_identity>0:security/py-service_identity@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=17.1.0:devel/py-twisted@${PY_FLAVOR} + +USES= python shebangfix +SHEBANG_FILES= bin/cowrie +USE_GITHUB= yes +USE_PYTHON= distutils noflavors autoplist + +NO_ARCH= yes + +.include diff --git a/security/cowrie/distinfo b/security/cowrie/distinfo new file mode 100644 index 00000000000..b7e0c11dd99 --- /dev/null +++ b/security/cowrie/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1554706169 +SHA256 (cowrie-cowrie-1.6.0_GH0.tar.gz) = 5a3d170506c74d68a2803b4aed129917ff8c8a5f05b23fd0bb303defa636720f +SIZE (cowrie-cowrie-1.6.0_GH0.tar.gz) = 749172 diff --git a/security/cowrie/pkg-descr b/security/cowrie/pkg-descr new file mode 100644 index 00000000000..d707088ae67 --- /dev/null +++ b/security/cowrie/pkg-descr @@ -0,0 +1,4 @@ +Cowrie is a medium interaction SSH and Telnet honeypot designed to log brute +force attacks and the shell interaction performed by the attacker. + +WWW: https://www.cowrie.org/ diff --git a/security/gnomint/Makefile b/security/gnomint/Makefile index e2d6d7b5de8..a9890953554 100644 --- a/security/gnomint/Makefile +++ b/security/gnomint/Makefile @@ -3,7 +3,7 @@ PORTNAME= gnomint PORTVERSION= 1.2.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= security MASTER_SITES= SF diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile index 7e47de1dcae..7b9291b3093 100644 --- a/security/gnupg1/Makefile +++ b/security/gnupg1/Makefile @@ -2,7 +2,7 @@ PORTNAME= gnupg PORTVERSION= 1.4.23 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= GNUPG PKGNAMESUFFIX= 1 diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index b7385c340ed..5099317445d 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -3,7 +3,7 @@ PORTNAME= heimdal PORTVERSION= 7.5.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security ipv6 MASTER_SITES= https://github.com/heimdal/heimdal/releases/download/${DISTNAME}/ diff --git a/security/kc24/Makefile b/security/kc24/Makefile index 9d7fdb68f87..fef2086b4d9 100644 --- a/security/kc24/Makefile +++ b/security/kc24/Makefile @@ -3,6 +3,7 @@ PORTNAME= kc PORTVERSION= 2.4.2 +PORTREVISION= 1 CATEGORIES= security PKGNAMESUFFIX= 24 diff --git a/security/krb5-115/Makefile b/security/krb5-115/Makefile index 45566e5cf55..901caa65c7d 100644 --- a/security/krb5-115/Makefile +++ b/security/krb5-115/Makefile @@ -3,7 +3,7 @@ PORTNAME= krb5 PORTVERSION= 1.15.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/ .if !defined(MASTERDIR) diff --git a/security/krb5-116/Makefile b/security/krb5-116/Makefile index 6eb8ee9fc75..48df8bc40b9 100644 --- a/security/krb5-116/Makefile +++ b/security/krb5-116/Makefile @@ -3,7 +3,7 @@ PORTNAME= krb5 PORTVERSION= 1.16.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/ .if !defined(MASTERDIR) diff --git a/security/krb5-devel/Makefile b/security/krb5-devel/Makefile index 6851b20a334..f9e30434303 100644 --- a/security/krb5-devel/Makefile +++ b/security/krb5-devel/Makefile @@ -3,6 +3,7 @@ PORTNAME= krb5 PORTVERSION= 1.18.${MIT_COMMIT_DATE} +PORTREVISION= 1 CATEGORIES= security .if !defined(MASTERDIR) PKGNAMESUFFIX= -devel diff --git a/security/libdecaf/Makefile b/security/libdecaf/Makefile index 7ee924c9bbb..8578af7862a 100644 --- a/security/libdecaf/Makefile +++ b/security/libdecaf/Makefile @@ -12,9 +12,7 @@ COMMENT= Implementation of elliptic curve cryptography LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES= cmake python:2.7 tar:tgz +USES= cmake compiler:c++11-lang localbase:ldflags python:2.7 tar:tgz USE_LDCONFIG= yes -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib .include diff --git a/security/libpwquality/Makefile b/security/libpwquality/Makefile index 4d13da1156a..1651fa35184 100644 --- a/security/libpwquality/Makefile +++ b/security/libpwquality/Makefile @@ -2,6 +2,7 @@ PORTNAME= libpwquality PORTVERSION= 1.4.0 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTNAME}-${PORTVERSION}/ diff --git a/security/nextcloud-twofactor_u2f/Makefile b/security/nextcloud-twofactor_u2f/Makefile index e24c5133010..d5ab67b11b7 100644 --- a/security/nextcloud-twofactor_u2f/Makefile +++ b/security/nextcloud-twofactor_u2f/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= twofactor_u2f -PORTVERSION= 2.1.2 +PORTVERSION= 2.1.3 CATEGORIES= security MASTER_SITES= https://github.com/${PKGNAMEPREFIX:S/-//}/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/ PKGNAMEPREFIX= nextcloud- diff --git a/security/nextcloud-twofactor_u2f/distinfo b/security/nextcloud-twofactor_u2f/distinfo index 6eca8d5ad6e..a9c32497d02 100644 --- a/security/nextcloud-twofactor_u2f/distinfo +++ b/security/nextcloud-twofactor_u2f/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551988707 -SHA256 (nextcloud/twofactor_u2f-v2.1.2/twofactor_u2f.tar.gz) = aad32baf2d8bc2cb48ef59370c138965388d37457b7a5799573500fdf026ecc2 -SIZE (nextcloud/twofactor_u2f-v2.1.2/twofactor_u2f.tar.gz) = 701121 +TIMESTAMP = 1554733685 +SHA256 (nextcloud/twofactor_u2f-v2.1.3/twofactor_u2f.tar.gz) = 3cde81309e9329530958e91beef0c3003f6b9776a576f23c8458771171b5a458 +SIZE (nextcloud/twofactor_u2f-v2.1.3/twofactor_u2f.tar.gz) = 706111 diff --git a/security/nextcloud-twofactor_u2f/pkg-plist b/security/nextcloud-twofactor_u2f/pkg-plist index dff5e9a0cdf..3ea64d3afd6 100644 --- a/security/nextcloud-twofactor_u2f/pkg-plist +++ b/security/nextcloud-twofactor_u2f/pkg-plist @@ -2,6 +2,7 @@ @comment %%WWWDIR%%/.github/ISSUE_TEMPLATE/bug.md @comment %%WWWDIR%%/.github/ISSUE_TEMPLATE/feature_request.md @comment %%WWWDIR%%/.github/ISSUE_TEMPLATE/question.md +%%WWWDIR%%/.jshintrc %%WWWDIR%%/CHANGELOG.md %%WWWDIR%%/README.md %%WWWDIR%%/appinfo/autoload.php @@ -53,6 +54,8 @@ %%WWWDIR%%/l10n/ru.json %%WWWDIR%%/l10n/sk.js %%WWWDIR%%/l10n/sk.json +%%WWWDIR%%/l10n/sq.js +%%WWWDIR%%/l10n/sq.json %%WWWDIR%%/l10n/sr.js %%WWWDIR%%/l10n/sr.json %%WWWDIR%%/l10n/sv.js diff --git a/security/nyx/Makefile b/security/nyx/Makefile index f77c73f8fef..bdc343779d3 100644 --- a/security/nyx/Makefile +++ b/security/nyx/Makefile @@ -3,6 +3,7 @@ PORTNAME= nyx PORTVERSION= 2.1.0 +PORTREVISION= 1 CATEGORIES= security net MASTER_SITES= CHEESESHOP diff --git a/security/osiris/Makefile b/security/osiris/Makefile index c69ebc96d40..5185bc896ca 100644 --- a/security/osiris/Makefile +++ b/security/osiris/Makefile @@ -2,7 +2,7 @@ PORTNAME= osiris PORTVERSION= 4.2.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security MASTER_SITES= http://osiris.shmoo.com/data/ \ http://redundancy.redundancy.org/mirror/ diff --git a/security/ossec-hids-local/Makefile b/security/ossec-hids-local/Makefile index 3ebac9a06c4..4abb0370028 100644 --- a/security/ossec-hids-local/Makefile +++ b/security/ossec-hids-local/Makefile @@ -2,7 +2,7 @@ PORTNAME= ossec-hids PORTVERSION= 3.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security PKGNAMESUFFIX= -${OSSEC_TYPE} diff --git a/security/pixiewps/Makefile b/security/pixiewps/Makefile index 4a0e0f44b7d..f143d80554f 100644 --- a/security/pixiewps/Makefile +++ b/security/pixiewps/Makefile @@ -12,8 +12,6 @@ COMMENT= Offline WPS bruteforce utility LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/../LICENSE.md -BROKEN_powerpc64= fails to compile: /usr/include/sys/sysctl.h:1033:25: unknown type name 'u_int' - USES= gmake WRKSRC_SUBDIR= src USE_GITHUB= yes diff --git a/security/pixiewps/files/patch-Makefile b/security/pixiewps/files/patch-Makefile new file mode 100644 index 00000000000..fd7664dd28c --- /dev/null +++ b/security/pixiewps/files/patch-Makefile @@ -0,0 +1,8 @@ +--- Makefile.orig 2019-04-08 08:32:00 UTC ++++ Makefile +@@ -1,4 +1,4 @@ +-CFLAGS = -std=c99 -O3 ++CFLAGS += -std=c99 -D__BSD_VISIBLE + + LIBS = -lpthread + ifeq ($(OPENSSL),1) diff --git a/security/pixiewps/files/patch-pixiewps.c b/security/pixiewps/files/patch-pixiewps.c new file mode 100644 index 00000000000..8f0a1c7c75d --- /dev/null +++ b/security/pixiewps/files/patch-pixiewps.c @@ -0,0 +1,13 @@ +--- pixiewps.c.orig 2019-04-08 08:26:23 UTC ++++ pixiewps.c +@@ -32,6 +32,10 @@ + # include + #endif + ++#ifdef __FreeBSD__ ++# include ++#endif ++ + #ifdef __APPLE__ + # define _DARWIN_C_SOURCE + #endif diff --git a/security/pssh/Makefile b/security/pssh/Makefile index 1906647e7b1..23aa6738556 100644 --- a/security/pssh/Makefile +++ b/security/pssh/Makefile @@ -2,6 +2,7 @@ PORTNAME= pssh PORTVERSION= 2.3.1 +PORTREVISION= 1 CATEGORIES= security net sysutils MASTER_SITES= CHEESESHOP diff --git a/security/pwman3/Makefile b/security/pwman3/Makefile index 9a47a41c9c6..9368c21f922 100644 --- a/security/pwman3/Makefile +++ b/security/pwman3/Makefile @@ -3,7 +3,7 @@ PORTNAME= pwman3 PORTVERSION= 0.0.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security python MASTER_SITES= http://pwman.bleurgh.com/~ivan/pwman3/source/ \ http://source.antisupport.com/pwman3/ diff --git a/security/py-artifacts/Makefile b/security/py-artifacts/Makefile index 572f42bdc95..98b61a022aa 100644 --- a/security/py-artifacts/Makefile +++ b/security/py-artifacts/Makefile @@ -3,6 +3,7 @@ PORTNAME= artifacts PORTVERSION= 20190320 +PORTREVISION= 1 CATEGORIES= security python MASTER_SITES= CHEESESHOP \ https://github.com/ForensicArtifacts/artifacts/releases/download/${PORTVERSION}/ diff --git a/security/py-bro-pkg/Makefile b/security/py-bro-pkg/Makefile index 680d92198f4..70cdc185800 100644 --- a/security/py-bro-pkg/Makefile +++ b/security/py-bro-pkg/Makefile @@ -3,6 +3,7 @@ PORTNAME= bro-pkg DISTVERSIONPREFIX= v DISTVERSION= 1.4.2 +PORTREVISION= 1 CATEGORIES= security python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/security/py-certbot/Makefile b/security/py-certbot/Makefile index 54a39cfbf2a..d26e1ac06bb 100644 --- a/security/py-certbot/Makefile +++ b/security/py-certbot/Makefile @@ -3,6 +3,7 @@ PORTNAME= certbot PORTVERSION= ${ACME_VERSION} +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= security python MASTER_SITES= CHEESESHOP diff --git a/security/py-certstream/Makefile b/security/py-certstream/Makefile index f9de1767d76..9827c718376 100644 --- a/security/py-certstream/Makefile +++ b/security/py-certstream/Makefile @@ -2,6 +2,7 @@ PORTNAME= certstream PORTVERSION= 1.10 +PORTREVISION= 1 CATEGORIES= security www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/security/py-josepy/Makefile b/security/py-josepy/Makefile index 5ab638e35ae..46bc2ef1e96 100644 --- a/security/py-josepy/Makefile +++ b/security/py-josepy/Makefile @@ -3,6 +3,7 @@ PORTNAME= josepy PORTVERSION= 1.1.0 +PORTREVISION= 1 CATEGORIES= security python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/security/py-keepkey/Makefile b/security/py-keepkey/Makefile index f127a94f2eb..09795ad8d0d 100644 --- a/security/py-keepkey/Makefile +++ b/security/py-keepkey/Makefile @@ -3,6 +3,7 @@ PORTNAME= keepkey PORTVERSION= 6.0.3 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/security/py-keyring/Makefile b/security/py-keyring/Makefile index 76517411d1c..469a7cf8fd7 100644 --- a/security/py-keyring/Makefile +++ b/security/py-keyring/Makefile @@ -3,6 +3,7 @@ PORTNAME= keyring DISTVERSION= 12.0.1 +PORTREVISION= 1 CATEGORIES= security python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/security/py-msoffcrypto-tool/Makefile b/security/py-msoffcrypto-tool/Makefile index bd0efdce0e3..9c38ed1cc85 100644 --- a/security/py-msoffcrypto-tool/Makefile +++ b/security/py-msoffcrypto-tool/Makefile @@ -2,6 +2,7 @@ PORTNAME= msoffcrypto-tool PORTVERSION= 4.9.0 +PORTREVISION= 1 CATEGORIES= security python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/security/py-pysaml2/Makefile b/security/py-pysaml2/Makefile index 75d43b58ada..1a0c66f925c 100644 --- a/security/py-pysaml2/Makefile +++ b/security/py-pysaml2/Makefile @@ -3,6 +3,7 @@ PORTNAME= pysaml2 PORTVERSION= 4.7.0 +PORTREVISION= 1 CATEGORIES= security devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/security/py-requests-credssp/Makefile b/security/py-requests-credssp/Makefile index 1eb8fa738a9..29aff1734b4 100644 --- a/security/py-requests-credssp/Makefile +++ b/security/py-requests-credssp/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= requests-credssp -PORTVERSION= 0.1.0 +PORTVERSION= 1.0.2 CATEGORIES= security python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -9,14 +9,18 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= rozhuk.im@gmail.com COMMENT= Authentication handler for using CredSSP with Python Requests -LICENSE= ISCL +LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ntlm-auth>=0:security/py-ntlm-auth@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}ntlm-auth>=0:security/py-ntlm-auth@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.3.1:devel/py-pyasn1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} -NO_ARCH= yes USES= python USE_PYTHON= autoplist distutils +NO_ARCH= yes + .include diff --git a/security/py-requests-credssp/distinfo b/security/py-requests-credssp/distinfo index 43d36d92020..cae3be6cfb3 100644 --- a/security/py-requests-credssp/distinfo +++ b/security/py-requests-credssp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1520514244 -SHA256 (requests-credssp-0.1.0.tar.gz) = f2888920b065bc1d3c8c13004fbb0df76fbd6585ee4d951d89c42ef22becee03 -SIZE (requests-credssp-0.1.0.tar.gz) = 14545 +TIMESTAMP = 1554397685 +SHA256 (requests-credssp-1.0.2.tar.gz) = b1fe2c42eb7258d4a754a9ad31344ad31a68375a87a10384e6519cdc0edfa546 +SIZE (requests-credssp-1.0.2.tar.gz) = 21813 diff --git a/security/py-rsa/Makefile b/security/py-rsa/Makefile index e607b61fce2..6fd76dc2b0f 100644 --- a/security/py-rsa/Makefile +++ b/security/py-rsa/Makefile @@ -3,6 +3,7 @@ PORTNAME= rsa PORTVERSION= 3.4.2 +PORTREVISION= 1 CATEGORIES= security python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/security/py-stem/Makefile b/security/py-stem/Makefile index 2ad7469a10e..679cac0edbb 100644 --- a/security/py-stem/Makefile +++ b/security/py-stem/Makefile @@ -3,6 +3,7 @@ PORTNAME= stem PORTVERSION= 1.7.1 +PORTREVISION= 1 CATEGORIES= security net python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/security/py-tuf/Makefile b/security/py-tuf/Makefile index eb612813e1e..a75fd717c9f 100644 --- a/security/py-tuf/Makefile +++ b/security/py-tuf/Makefile @@ -3,6 +3,7 @@ PORTNAME= tuf PORTVERSION= 0.10.0 +PORTREVISION= 1 CATEGORIES= security devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/security/py-yubikey-manager/Makefile b/security/py-yubikey-manager/Makefile index ccfd9a30739..34cbd3196f3 100644 --- a/security/py-yubikey-manager/Makefile +++ b/security/py-yubikey-manager/Makefile @@ -2,6 +2,7 @@ PORTNAME= yubikey-manager PORTVERSION= 2.1.0 +PORTREVISION= 1 CATEGORIES= security python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/security/silktools/Makefile b/security/silktools/Makefile index 1a713ee6ce1..853f002f8eb 100644 --- a/security/silktools/Makefile +++ b/security/silktools/Makefile @@ -3,6 +3,7 @@ PORTNAME= silktools PORTVERSION= 3.18.0 +PORTREVISION= 1 CATEGORIES= security net MASTER_SITES= http://tools.netsa.cert.org/releases/ DISTNAME= silk-${PORTVERSION} diff --git a/security/softether-devel/Makefile b/security/softether-devel/Makefile index 9d02c8a6fb9..c1d1fbc10f3 100644 --- a/security/softether-devel/Makefile +++ b/security/softether-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME= softether DISTVERSION= 4.28-9669-beta -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= https://www.softether-download.com/files/softether/v${DISTVERSION}-2018.09.11-tree/Source_Code/ PKGNAMESUFFIX= -devel diff --git a/security/softether5/Makefile b/security/softether5/Makefile index 3b133092ed3..34e5d5a0da3 100644 --- a/security/softether5/Makefile +++ b/security/softether5/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= softether -DISTVERSION= 5.01.9669 -PORTREVISION= 3 +DISTVERSION= 5.01.9670 +PORTREVISION= 1 CATEGORIES= security PKGNAMESUFFIX= 5 diff --git a/security/softether5/distinfo b/security/softether5/distinfo index 85013d26b6f..c25c8ce6bc6 100644 --- a/security/softether5/distinfo +++ b/security/softether5/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1549591284 -SHA256 (SoftEtherVPN-SoftEtherVPN-5.01.9669_GH0.tar.gz) = e40597094bd551767043fd5a8553ca03bfb5ab3938ea2523414d03b1bb7fddd5 -SIZE (SoftEtherVPN-SoftEtherVPN-5.01.9669_GH0.tar.gz) = 65709105 +TIMESTAMP = 1554791789 +SHA256 (SoftEtherVPN-SoftEtherVPN-5.01.9670_GH0.tar.gz) = 7179ba04cec0ab8d7cecc27dd2f7cb56d14e8a5bb231418307324c0823d3531d +SIZE (SoftEtherVPN-SoftEtherVPN-5.01.9670_GH0.tar.gz) = 65710983 diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile index 94efc7344d5..56271a1225f 100644 --- a/security/stunnel/Makefile +++ b/security/stunnel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= stunnel -PORTVERSION= 5.51 +PORTVERSION= 5.52 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= https://www.stunnel.org/downloads/%SUBDIR%/ \ diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo index 2c1411e23c7..11c2cd0e121 100644 --- a/security/stunnel/distinfo +++ b/security/stunnel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554416695 -SHA256 (stunnel-5.51.tar.gz) = 77437cdd1aef1a621824bb3607e966534642fe90c69f4d2279a9da9fa36c3253 -SIZE (stunnel-5.51.tar.gz) = 979334 +TIMESTAMP = 1554758769 +SHA256 (stunnel-5.52.tar.gz) = 00b973aa0d48b0707dd722c4e0a20b8378fc9b0ba301fdb785ffb75341024e21 +SIZE (stunnel-5.52.tar.gz) = 979636 diff --git a/security/theonionbox/Makefile b/security/theonionbox/Makefile index a7220e04623..707e332804b 100644 --- a/security/theonionbox/Makefile +++ b/security/theonionbox/Makefile @@ -2,6 +2,7 @@ PORTNAME= theonionbox PORTVERSION= 4.3.0 +PORTREVISION= 1 CATEGORIES= security net python MASTER_SITES= CHEESESHOP diff --git a/security/tinc-devel/Makefile b/security/tinc-devel/Makefile index 5abc3b6db82..f87aaa05e48 100644 --- a/security/tinc-devel/Makefile +++ b/security/tinc-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME= tinc PORTVERSION= 1.1pre17 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= https://www.tinc-vpn.org/packages/ \ http://www.tinc-vpn.org/packages/ diff --git a/security/vanguards-tor/Makefile b/security/vanguards-tor/Makefile index e586e769446..962bcdb5ef3 100644 --- a/security/vanguards-tor/Makefile +++ b/security/vanguards-tor/Makefile @@ -2,6 +2,7 @@ PORTNAME= vanguards DISTVERSION= 0.3.0 +PORTREVISION= 1 CATEGORIES= security python MASTER_SITES= CHEESESHOP PKGNAMESUFFIX= -tor diff --git a/security/vinetto/Makefile b/security/vinetto/Makefile index d13c65b1c67..9bb67705beb 100644 --- a/security/vinetto/Makefile +++ b/security/vinetto/Makefile @@ -3,7 +3,7 @@ PORTNAME= vinetto PORTVERSION= 0.07 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-beta-${PORTVERSION} DISTNAME= ${PORTNAME}-beta-${PORTVERSION} diff --git a/security/wapiti/Makefile b/security/wapiti/Makefile index d833bf0a33b..d0ffbed8e1e 100644 --- a/security/wapiti/Makefile +++ b/security/wapiti/Makefile @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= wapiti -PORTVERSION= 3.0.0 -PORTREVISION= 1 +PORTVERSION= 3.0.1 CATEGORIES= security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +DISTNAME= ${PORTNAME}3-${DISTVERSIONFULL} MAINTAINER= antoine@FreeBSD.org COMMENT= Wapiti is a vulnerability scanner for web applications @@ -15,7 +15,7 @@ LICENSE= GPLv2 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}html5lib>=0:www/py-html5lib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tld>=0:dns/py-tld@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaswfp>=0:graphics/py-yaswfp@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako@${PY_FLAVOR} \ diff --git a/security/wapiti/distinfo b/security/wapiti/distinfo index ad8c9ed92b2..aa88951af17 100644 --- a/security/wapiti/distinfo +++ b/security/wapiti/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1516688241 -SHA256 (wapiti-3.0.0.tar.gz) = 4238b336773b6cb1a36a5a2f2fa0bbe413a41e13fa6f5b109dbf6bbc897e4b46 -SIZE (wapiti-3.0.0.tar.gz) = 528312 +TIMESTAMP = 1554896146 +SHA256 (wapiti3-3.0.1.tar.gz) = bbb8c8f572afe77319734489a6ca0b211df4b87ad294db79b8bf0bda1c5aff29 +SIZE (wapiti3-3.0.1.tar.gz) = 530486 diff --git a/security/wapiti/files/patch-setup.py b/security/wapiti/files/patch-setup.py index e7d3605f17a..844b925f0bf 100644 --- a/security/wapiti/files/patch-setup.py +++ b/security/wapiti/files/patch-setup.py @@ -1,6 +1,6 @@ ---- setup.py.orig 2018-01-03 08:51:42 UTC +--- setup.py.orig 2018-05-11 13:42:27 UTC +++ setup.py -@@ -24,7 +24,7 @@ doc_and_conf_files = [ +@@ -23,7 +23,7 @@ doc_and_conf_files = [ ] ), ( diff --git a/security/yubico-piv-tool/Makefile b/security/yubico-piv-tool/Makefile index 8ab4ab526ea..7c6c892e3e2 100644 --- a/security/yubico-piv-tool/Makefile +++ b/security/yubico-piv-tool/Makefile @@ -37,4 +37,13 @@ PLIST_FILES= bin/yubico-piv-tool \ libdata/pkgconfig/ykpiv.pc \ man/man1/yubico-piv-tool.1.gz +post-patch: +.if exists(/usr/lib/libstdc++.so) + @${REINPLACE_CMD} -e '/#pragma GCC diagnostic/d' \ + ${WRKSRC}/lib/ykpiv.c \ + ${WRKSRC}/lib/util.c \ + ${WRKSRC}/lib/internal.c \ + ${WRKSRC}/tool/yubico-piv-tool.c +.endif + .include diff --git a/shells/es/Makefile b/shells/es/Makefile index 52038ce1f20..0795db4f2fe 100644 --- a/shells/es/Makefile +++ b/shells/es/Makefile @@ -3,7 +3,7 @@ PORTNAME= es PORTVERSION= 0.9.b1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= shells MASTER_SITES= ftp://ftp.sys.toronto.edu/pub/es/ DISTNAME= es-0.9-beta1 diff --git a/shells/esh/Makefile b/shells/esh/Makefile index 668cb5b7d6b..e79dbf2904f 100644 --- a/shells/esh/Makefile +++ b/shells/esh/Makefile @@ -3,7 +3,7 @@ PORTNAME= esh PORTVERSION= 0.8.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= shells MASTER_SITES= GENTOO diff --git a/shells/pear-PHP_Shell/Makefile b/shells/pear-PHP_Shell/Makefile index d730a4344d0..6e44b54aa55 100644 --- a/shells/pear-PHP_Shell/Makefile +++ b/shells/pear-PHP_Shell/Makefile @@ -3,6 +3,7 @@ PORTNAME= PHP_Shell PORTVERSION= 0.3.2 +PORTREVISION= 1 CATEGORIES= shells www pear MAINTAINER= joneum@FreeBSD.org diff --git a/shells/rc/Makefile b/shells/rc/Makefile index 854fc3c398d..34d04834099 100644 --- a/shells/rc/Makefile +++ b/shells/rc/Makefile @@ -3,7 +3,7 @@ PORTNAME= rc PORTVERSION= 1.7.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= shells plan9 MASTER_SITES= http://static.tobold.org/rc/ diff --git a/shells/sparforte/Makefile b/shells/sparforte/Makefile index 7491a5b4c8c..8a3e7937e23 100644 --- a/shells/sparforte/Makefile +++ b/shells/sparforte/Makefile @@ -3,7 +3,7 @@ PORTNAME= sparforte PORTVERSION= 2.0.2 -PORTREVISION= 4 +PORTREVISION= 5 DISTVERSIONPREFIX= v CATEGORIES= shells lang diff --git a/sysutils/afflib/Makefile b/sysutils/afflib/Makefile index 7d3c174bc11..da73d55aa05 100644 --- a/sysutils/afflib/Makefile +++ b/sysutils/afflib/Makefile @@ -3,6 +3,7 @@ PORTNAME= afflib PORTVERSION= 3.7.16 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= sysutils diff --git a/sysutils/aimage/Makefile b/sysutils/aimage/Makefile index 2e096965fb0..6650ab8abaf 100644 --- a/sysutils/aimage/Makefile +++ b/sysutils/aimage/Makefile @@ -3,7 +3,7 @@ PORTNAME= aimage PORTVERSION= 3.2.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://digitalcorpora.org/downloads/ diff --git a/sysutils/android-file-transfer/Makefile b/sysutils/android-file-transfer/Makefile index 15c27785671..773968f4ae6 100644 --- a/sysutils/android-file-transfer/Makefile +++ b/sysutils/android-file-transfer/Makefile @@ -3,7 +3,7 @@ PORTNAME= android-file-transfer DISTVERSIONPREFIX= v DISTVERSION= 3.7 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= sysutils MAINTAINER= jbeich@FreeBSD.org diff --git a/sysutils/ansible23/Makefile b/sysutils/ansible23/Makefile index 5da8a8144e7..c3e3ab094e4 100644 --- a/sysutils/ansible23/Makefile +++ b/sysutils/ansible23/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTVERSION= 2.3.3.0 -PORTREVISION= 3 +PORTREVISION= 4 PKGNAMESUFFIX= 23 CONFLICTS= ansible-* \ diff --git a/sysutils/ansible24/Makefile b/sysutils/ansible24/Makefile index 811182cdb19..e0f5a98427f 100644 --- a/sysutils/ansible24/Makefile +++ b/sysutils/ansible24/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTVERSION= 2.4.6.0 -PORTREVISION= 2 +PORTREVISION= 3 PKGNAMESUFFIX= 24 CONFLICTS= ansible-* \ diff --git a/sysutils/ansible25/Makefile b/sysutils/ansible25/Makefile index e7f926816b1..890e23d02eb 100644 --- a/sysutils/ansible25/Makefile +++ b/sysutils/ansible25/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTVERSION= 2.5.15 -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX= 25 CONFLICTS= ansible-* \ diff --git a/sysutils/ansible26/Makefile b/sysutils/ansible26/Makefile index 49ff2dd08f8..c8533161fc1 100644 --- a/sysutils/ansible26/Makefile +++ b/sysutils/ansible26/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTVERSION= 2.6.15 +PORTREVISION= 1 PKGNAMESUFFIX= 26 CONFLICTS= ansible-* \ diff --git a/sysutils/apachetop/Makefile b/sysutils/apachetop/Makefile index 7c9758e70d0..3d829bdfc66 100644 --- a/sysutils/apachetop/Makefile +++ b/sysutils/apachetop/Makefile @@ -3,6 +3,7 @@ PORTNAME= apachetop PORTVERSION= 0.18.4 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= lukasz@wasikowski.net diff --git a/sysutils/bacula9-server/Makefile b/sysutils/bacula9-server/Makefile index 26ef7fcd4c6..75fe99862b7 100644 --- a/sysutils/bacula9-server/Makefile +++ b/sysutils/bacula9-server/Makefile @@ -3,7 +3,7 @@ PORTNAME= bacula PORTVERSION= 9.4.2 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${PORTVERSION} PKGNAMEPREFIX?= # @@ -12,6 +12,9 @@ PKGNAMESUFFIX?= 9-server MAINTAINER= dvl@FreeBSD.org COMMENT?= Network backup solution (server) +LICENSE= AGPLv3 +LICENSE_FILE= ${WRKSRC}/LICENSE + USES+= libtool readline shebangfix ssl SHEBANG_FILES= src/cats/make_catalog_backup.pl.in python_OLD_CMD= @PYTHON@ diff --git a/sysutils/bacula9-server/pkg-descr b/sysutils/bacula9-server/pkg-descr index 4167c26533d..20aa3c67fed 100644 --- a/sysutils/bacula9-server/pkg-descr +++ b/sysutils/bacula9-server/pkg-descr @@ -8,4 +8,4 @@ recover lost or damaged files. Due to its modular design, Bacula is scalable from small single computer systems to systems consisting of hundreds of computers located over a large network. -WWW: http://www.bacula.org/ +WWW: https://www.bacula.org/ diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile index c3ac0e983c2..14d959cc0ac 100644 --- a/sysutils/bareos-server/Makefile +++ b/sysutils/bareos-server/Makefile @@ -3,7 +3,7 @@ PORTNAME= bareos DISTVERSIONPREFIX= Release/ DISTVERSION= 17.2.7 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= sysutils PKGNAMEPREFIX?= # PKGNAMESUFFIX?= -server diff --git a/sysutils/bareos16-server/Makefile b/sysutils/bareos16-server/Makefile index 4e1a02e978b..e5eb41f367c 100644 --- a/sysutils/bareos16-server/Makefile +++ b/sysutils/bareos16-server/Makefile @@ -3,7 +3,7 @@ PORTNAME= bareos16 DISTVERSIONPREFIX= Release/ DISTVERSION= 16.2.8 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= sysutils PKGNAMEPREFIX?= # PKGNAMESUFFIX?= -server diff --git a/sysutils/burp-devel/Makefile b/sysutils/burp-devel/Makefile index e46a3ad6cb4..b1c835d635e 100644 --- a/sysutils/burp-devel/Makefile +++ b/sysutils/burp-devel/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTVERSION= 2.2.16 +PORTVERSION= 2.3.4 PKGNAMESUFFIX= -devel COMMENT= Network backup and restore program (development) @@ -10,5 +10,6 @@ DISTINFO_FILE= ${.CURDIR}/distinfo PLIST= ${.CURDIR}/pkg-plist CONFLICTS_INSTALL= burp +PORTSCOUT= .include "${MASTERDIR}/Makefile" diff --git a/sysutils/burp-devel/distinfo b/sysutils/burp-devel/distinfo index 93c92c8d231..02ff836b1ac 100644 --- a/sysutils/burp-devel/distinfo +++ b/sysutils/burp-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1546339847 -SHA256 (grke-burp-2.2.16_GH0.tar.gz) = 56a4c7fdc679365d3fdb5b1046a277d6cf1c44003f3bdc38921984b496d6c3c9 -SIZE (grke-burp-2.2.16_GH0.tar.gz) = 630949 +TIMESTAMP = 1554212824 +SHA256 (grke-burp-2.3.4_GH0.tar.gz) = d06c1d672849a38e5e184312a9c679bd51b59426225cd518f5e8791e7519e2ba +SIZE (grke-burp-2.3.4_GH0.tar.gz) = 617825 diff --git a/sysutils/burp-devel/pkg-plist b/sysutils/burp-devel/pkg-plist index 5b6bb30658e..da1b5968346 100644 --- a/sysutils/burp-devel/pkg-plist +++ b/sysutils/burp-devel/pkg-plist @@ -22,5 +22,5 @@ sbin/burp_ca %%DATADIR%%/scripts/timer_script @dir %%ETCDIR%%/CA-client @dir %%ETCDIR%%/autoupgrade/server/win32 -@dir %%ETCDIR%%/autoupgrade/server/win64/2.2.16 +@dir %%ETCDIR%%/autoupgrade/server/win64/2.3.4 @dir /var/spool/burp diff --git a/sysutils/burp/Makefile b/sysutils/burp/Makefile index 4788cd701fb..75cef9f8dd7 100644 --- a/sysutils/burp/Makefile +++ b/sysutils/burp/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= burp -PORTVERSION?= 2.1.32 +PORTVERSION?= 2.2.18 CATEGORIES= sysutils MAINTAINER= phascolarctos@protonmail.ch @@ -27,6 +27,7 @@ CONFIGURE_ARGS= --sysconfdir=${ETCDIR} INSTALL_TARGET= install-all CONFLICTS_INSTALL?= burp-devel +PORTSCOUT?= limit:^2\.2\. OPTIONS_DEFINE= IPV6 IPV6_CONFIGURE_ENABLE= ipv6 diff --git a/sysutils/burp/distinfo b/sysutils/burp/distinfo index aa95427af31..f59cf1381bc 100644 --- a/sysutils/burp/distinfo +++ b/sysutils/burp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1543919893 -SHA256 (grke-burp-2.1.32_GH0.tar.gz) = 1b2299670032eb5f0fc0783b7989b1cc6227d3d0758452a42b50d167b63d8d30 -SIZE (grke-burp-2.1.32_GH0.tar.gz) = 591737 +TIMESTAMP = 1553621533 +SHA256 (grke-burp-2.2.18_GH0.tar.gz) = 7d3e4b4563dbe0b399a050462f4be01dc39a331f7a6eba760341fb1cf80cdd00 +SIZE (grke-burp-2.2.18_GH0.tar.gz) = 632805 diff --git a/sysutils/burp/pkg-plist b/sysutils/burp/pkg-plist index 13ad0970ad3..180981cadde 100644 --- a/sysutils/burp/pkg-plist +++ b/sysutils/burp/pkg-plist @@ -15,11 +15,12 @@ sbin/bsigs sbin/bsparse sbin/burp sbin/burp_ca +%%DATADIR%%/scripts/backup_tool_script %%DATADIR%%/scripts/notify_script %%DATADIR%%/scripts/ssl_extra_checks_script %%DATADIR%%/scripts/summary_script %%DATADIR%%/scripts/timer_script @dir %%ETCDIR%%/CA-client @dir %%ETCDIR%%/autoupgrade/server/win32 -@dir %%ETCDIR%%/autoupgrade/server/win64/2.1.32 +@dir %%ETCDIR%%/autoupgrade/server/win64/2.2.18 @dir /var/spool/burp diff --git a/sysutils/deltarpm/Makefile b/sysutils/deltarpm/Makefile index d50ecbced7b..f261f156c9a 100644 --- a/sysutils/deltarpm/Makefile +++ b/sysutils/deltarpm/Makefile @@ -3,6 +3,7 @@ PORTNAME= deltarpm PORTVERSION= 3.6 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.suse.com/pub/projects/deltarpm/ diff --git a/sysutils/djmount/Makefile b/sysutils/djmount/Makefile index cd4e8069057..4e73edd66c5 100644 --- a/sysutils/djmount/Makefile +++ b/sysutils/djmount/Makefile @@ -3,7 +3,7 @@ PORTNAME= djmount PORTVERSION= 0.71 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= sysutils MASTER_SITES= SF diff --git a/sysutils/docker-compose/Makefile b/sysutils/docker-compose/Makefile index 48de082e82b..2c33dc4a864 100644 --- a/sysutils/docker-compose/Makefile +++ b/sysutils/docker-compose/Makefile @@ -2,6 +2,7 @@ PORTNAME= docker-compose PORTVERSION= 1.23.2 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP diff --git a/sysutils/eksctl/Makefile b/sysutils/eksctl/Makefile index 4ca7d82cde3..24d9384a8e1 100644 --- a/sysutils/eksctl/Makefile +++ b/sysutils/eksctl/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= eksctl -PORTVERSION= 0.1.27 +PORTVERSION= 0.1.28 CATEGORIES= sysutils MAINTAINER= danilo@FreeBSD.org diff --git a/sysutils/eksctl/distinfo b/sysutils/eksctl/distinfo index 821b09039aa..819f2a4b125 100644 --- a/sysutils/eksctl/distinfo +++ b/sysutils/eksctl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554323806 -SHA256 (weaveworks-eksctl-0.1.27_GH0.tar.gz) = 3274df76b4238ababf93e899d9a5aeb6bc83c7e830f6e30f6a3e352d8358e222 -SIZE (weaveworks-eksctl-0.1.27_GH0.tar.gz) = 19994546 +TIMESTAMP = 1554579037 +SHA256 (weaveworks-eksctl-0.1.28_GH0.tar.gz) = c2e8d8899be4e2275979987e5d9f9d0432a83cb36cd709783a8f44404d59167b +SIZE (weaveworks-eksctl-0.1.28_GH0.tar.gz) = 19998327 diff --git a/sysutils/fusefs-gitfs/Makefile b/sysutils/fusefs-gitfs/Makefile index 19c67fa4dfe..3ee0391ea63 100644 --- a/sysutils/fusefs-gitfs/Makefile +++ b/sysutils/fusefs-gitfs/Makefile @@ -2,6 +2,7 @@ PORTNAME= gitfs DISTVERSION= 0.4.5.1 +PORTREVISION= 1 CATEGORIES= sysutils devel PKGNAMEPREFIX= fusefs- diff --git a/sysutils/hstr/Makefile b/sysutils/hstr/Makefile index 6dd454b5221..474ba76b862 100644 --- a/sysutils/hstr/Makefile +++ b/sysutils/hstr/Makefile @@ -3,6 +3,7 @@ PORTNAME= hstr DISTVERSION= 2.0 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= monsieurp@gentoo.org diff --git a/sysutils/kubectl/Makefile b/sysutils/kubectl/Makefile index 9c1f7429bdb..cdf3353c953 100644 --- a/sysutils/kubectl/Makefile +++ b/sysutils/kubectl/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= kubectl -PORTVERSION= 1.14.0 +PORTVERSION= 1.14.1 DISTVERSIONPREFIX= v CATEGORIES= sysutils diff --git a/sysutils/kubectl/distinfo b/sysutils/kubectl/distinfo index cfd31823627..39878746f87 100644 --- a/sysutils/kubectl/distinfo +++ b/sysutils/kubectl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554066509 -SHA256 (kubernetes-kubernetes-v1.14.0_GH0.tar.gz) = 30049fbdcd1bedd6c139ddc842ff593fff9b0f52c4fd8dc8e82ec6185d684b52 -SIZE (kubernetes-kubernetes-v1.14.0_GH0.tar.gz) = 27797992 +TIMESTAMP = 1554754295 +SHA256 (kubernetes-kubernetes-v1.14.1_GH0.tar.gz) = c2a0fc68bea7c9eca567360c22df42e92873d83e0c0ac53a9b3c45f6ac91108b +SIZE (kubernetes-kubernetes-v1.14.1_GH0.tar.gz) = 28008273 diff --git a/sysutils/lnav/Makefile b/sysutils/lnav/Makefile index 5d6ecd6c9db..e979b6fc946 100644 --- a/sysutils/lnav/Makefile +++ b/sysutils/lnav/Makefile @@ -3,6 +3,7 @@ PORTNAME= lnav PORTVERSION= 0.8.4 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= sysutils diff --git a/sysutils/manck/Makefile b/sysutils/manck/Makefile index 0d1850efb4c..4cab043d810 100644 --- a/sysutils/manck/Makefile +++ b/sysutils/manck/Makefile @@ -7,7 +7,7 @@ PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://wolfram.schneider.org/src/ -MAINTAINER= wosch@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Manual page consistency checker USES= perl5 shebangfix uidfix diff --git a/sysutils/mmc-utils/Makefile b/sysutils/mmc-utils/Makefile index 796a4fd4ff6..718544aef52 100644 --- a/sysutils/mmc-utils/Makefile +++ b/sysutils/mmc-utils/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= mmc-utils -PORTVERSION= 20180327 -DISTVERSIONSUFFIX= -b4fe0c8c +PORTVERSION= 20181214 +DISTVERSIONSUFFIX= -aef913e3 CATEGORIES= sysutils MASTER_SITES= LOCAL/marius diff --git a/sysutils/mmc-utils/distinfo b/sysutils/mmc-utils/distinfo index 67210c95fbe..57cb4013e08 100644 --- a/sysutils/mmc-utils/distinfo +++ b/sysutils/mmc-utils/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1526225095 -SHA256 (mmc-utils-20180327-b4fe0c8c.tar.bz2) = 35ec111a5286f6fe59d863b5a9fd9eaeda1f9ae984896fe11c8bd8f2854762f4 -SIZE (mmc-utils-20180327-b4fe0c8c.tar.bz2) = 40044 +TIMESTAMP = 1545854044 +SHA256 (mmc-utils-20181214-aef913e3.tar.bz2) = e41f5a17dd35a40e5f1877f49e7162349792ae01ec5e0e1bd7b78496b1327f63 +SIZE (mmc-utils-20181214-aef913e3.tar.bz2) = 40246 diff --git a/sysutils/mmc-utils/files/patch-mmc__cmds.c b/sysutils/mmc-utils/files/patch-mmc__cmds.c index 48b6de071de..e58640a0398 100644 --- a/sysutils/mmc-utils/files/patch-mmc__cmds.c +++ b/sysutils/mmc-utils/files/patch-mmc__cmds.c @@ -1,4 +1,4 @@ ---- mmc_cmds.c.orig 2018-02-26 22:10:51 UTC +--- mmc_cmds.c.orig 2018-12-26 19:54:04 UTC +++ mmc_cmds.c @@ -28,7 +28,12 @@ #include @@ -53,3 +53,12 @@ if (reg & 0x20) printf(" HS200 Single Data Rate eMMC @200MHz 1.2VI/O\n"); if (reg & 0x10) printf(" HS200 Single Data Rate eMMC @200MHz 1.8VI/O\n"); if (reg & 0x08) printf(" HS Dual Data Rate eMMC @52MHz 1.2VI/O\n"); +@@ -1883,7 +1904,7 @@ static int do_rpmb_op(int fd, + u_int16_t rpmb_type; + struct mmc_ioc_multi_cmd *mioc; + struct mmc_ioc_cmd *ioc; +- struct rpmb_frame frame_status = {0}; ++ struct rpmb_frame frame_status = {{0}}; + + if (!frame_in || !frame_out || !out_cnt) + return -EINVAL; diff --git a/sysutils/mog/Makefile b/sysutils/mog/Makefile index 8c2f9d9be73..6ecee37ebab 100644 --- a/sysutils/mog/Makefile +++ b/sysutils/mog/Makefile @@ -3,6 +3,7 @@ PORTNAME= mog PORTVERSION= 0.6.0 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= ehaupt@FreeBSD.org diff --git a/sysutils/ohmu/Makefile b/sysutils/ohmu/Makefile index 4b19094d844..71a971d3703 100644 --- a/sysutils/ohmu/Makefile +++ b/sysutils/ohmu/Makefile @@ -2,7 +2,7 @@ PORTNAME= ohmu PORTVERSION= 1.1.0 -PORTREVISION= 3 +PORTREVISION= 4 DISTVERSIONPREFIX= v CATEGORIES= sysutils diff --git a/sysutils/openipmi/Makefile b/sysutils/openipmi/Makefile index 977d80bf137..82cc8b5d009 100644 --- a/sysutils/openipmi/Makefile +++ b/sysutils/openipmi/Makefile @@ -3,6 +3,7 @@ PORTNAME= openipmi PORTVERSION= 2.0.27 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME}/OpenIPMI%202.0%20Library DISTNAME= OpenIPMI-${PORTVERSION} diff --git a/sysutils/p5-BackupPC-XS/Makefile b/sysutils/p5-BackupPC-XS/Makefile index 6f6110f554d..c3aee483211 100644 --- a/sysutils/p5-BackupPC-XS/Makefile +++ b/sysutils/p5-BackupPC-XS/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= BackupPC-XS -PORTVERSION= 0.58 +PORTVERSION= 0.59 CATEGORIES= sysutils perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:CBARRATT diff --git a/sysutils/p5-BackupPC-XS/distinfo b/sysutils/p5-BackupPC-XS/distinfo index e426af71593..737d30ac3f2 100644 --- a/sysutils/p5-BackupPC-XS/distinfo +++ b/sysutils/p5-BackupPC-XS/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1543477303 -SHA256 (BackupPC-XS-0.58.tar.gz) = 00e31bd5fd9de774308a60aa3059829b0f80dd60dc2b4a23a52bd6a0dd011d21 -SIZE (BackupPC-XS-0.58.tar.gz) = 288074 +TIMESTAMP = 1554702887 +SHA256 (BackupPC-XS-0.59.tar.gz) = 8a4ddaedcdcbd5993f9343d60de191ac08ee7b71037d15941e8fecaa463fe5e6 +SIZE (BackupPC-XS-0.59.tar.gz) = 288173 diff --git a/sysutils/pwsafe/Makefile b/sysutils/pwsafe/Makefile index 72288f4910b..0b40422fbe8 100644 --- a/sysutils/pwsafe/Makefile +++ b/sysutils/pwsafe/Makefile @@ -3,7 +3,7 @@ PORTNAME= pwsafe PORTVERSION= 0.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= http://nsd.dyndns.org/pwsafe/releases/ diff --git a/sysutils/py-ansible-lint/Makefile b/sysutils/py-ansible-lint/Makefile index ede62418360..9f0ef425ba3 100644 --- a/sysutils/py-ansible-lint/Makefile +++ b/sysutils/py-ansible-lint/Makefile @@ -2,6 +2,7 @@ PORTNAME= ansible-lint PORTVERSION= 4.1.0 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/py-ansible-runner/Makefile b/sysutils/py-ansible-runner/Makefile index 44aadc3495c..d7234af1250 100644 --- a/sysutils/py-ansible-runner/Makefile +++ b/sysutils/py-ansible-runner/Makefile @@ -2,6 +2,7 @@ PORTNAME= ansible-runner DISTVERSION= 1.1.2 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/py-azure-cli/Makefile b/sysutils/py-azure-cli/Makefile index 0956c7ceaa4..12bf4acc0fb 100644 --- a/sysutils/py-azure-cli/Makefile +++ b/sysutils/py-azure-cli/Makefile @@ -2,6 +2,7 @@ PORTNAME= azure-cli PORTVERSION= 2.0.61 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/py-dirsync/Makefile b/sysutils/py-dirsync/Makefile index 0d62f62ee80..ad839949784 100644 --- a/sysutils/py-dirsync/Makefile +++ b/sysutils/py-dirsync/Makefile @@ -3,7 +3,7 @@ PORTNAME= dirsync PORTVERSION= 2.2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/py-distro/Makefile b/sysutils/py-distro/Makefile index 66f26d03388..5c383aac2b4 100644 --- a/sysutils/py-distro/Makefile +++ b/sysutils/py-distro/Makefile @@ -3,6 +3,7 @@ PORTNAME= distro PORTVERSION= 1.4.0 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/py-dlipower/Makefile b/sysutils/py-dlipower/Makefile index 858eb83f0b6..10fc5af1022 100644 --- a/sysutils/py-dlipower/Makefile +++ b/sysutils/py-dlipower/Makefile @@ -3,6 +3,7 @@ PORTNAME= dlipower PORTVERSION= 0.7.165 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP diff --git a/sysutils/py-google-compute-engine/Makefile b/sysutils/py-google-compute-engine/Makefile index b4c805b6e52..d53f89fe2de 100644 --- a/sysutils/py-google-compute-engine/Makefile +++ b/sysutils/py-google-compute-engine/Makefile @@ -2,6 +2,7 @@ PORTNAME= google-compute-engine DISTVERSION= 2.8.13 +PORTREVISION= 1 CATEGORIES= sysutils python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/py-honcho/Makefile b/sysutils/py-honcho/Makefile index 54fb53ebba5..4ef9bc53539 100644 --- a/sysutils/py-honcho/Makefile +++ b/sysutils/py-honcho/Makefile @@ -3,6 +3,7 @@ PORTNAME= honcho PORTVERSION= 1.0.1 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= sysutils python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/py-hpilo/Makefile b/sysutils/py-hpilo/Makefile index e2c88aa7d19..2a3473f780d 100644 --- a/sysutils/py-hpilo/Makefile +++ b/sysutils/py-hpilo/Makefile @@ -2,6 +2,7 @@ PORTNAME= hpilo PORTVERSION= 4.3 +PORTREVISION= 1 CATEGORIES= sysutils python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/py-pkginfo/Makefile b/sysutils/py-pkginfo/Makefile index ad801fd46df..f1d61baa306 100644 --- a/sysutils/py-pkginfo/Makefile +++ b/sysutils/py-pkginfo/Makefile @@ -2,6 +2,7 @@ PORTNAME= pkginfo DISTVERSION= 1.4.2 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/py-pywatchman/Makefile b/sysutils/py-pywatchman/Makefile index 7173605b319..c054b435b8c 100644 --- a/sysutils/py-pywatchman/Makefile +++ b/sysutils/py-pywatchman/Makefile @@ -2,6 +2,7 @@ PORTNAME= pywatchman PORTVERSION= 4.9.0 +PORTREVISION= 1 DISTVERSIONPREFIX=v CATEGORIES= sysutils python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/py-tmuxp/Makefile b/sysutils/py-tmuxp/Makefile index f777f150ad7..2627d7a57af 100644 --- a/sysutils/py-tmuxp/Makefile +++ b/sysutils/py-tmuxp/Makefile @@ -3,6 +3,7 @@ PORTNAME= tmuxp DISTVERSION= 1.5.1 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/renameutils/Makefile b/sysutils/renameutils/Makefile index 5275af1d778..0aeb5e3676c 100644 --- a/sysutils/renameutils/Makefile +++ b/sysutils/renameutils/Makefile @@ -3,7 +3,7 @@ PORTNAME= renameutils PORTVERSION= 0.12.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils converters MASTER_SITES= SAVANNAH diff --git a/sysutils/riak-cs/Makefile b/sysutils/riak-cs/Makefile index c70ac222dc4..b23dfd8dad2 100644 --- a/sysutils/riak-cs/Makefile +++ b/sysutils/riak-cs/Makefile @@ -2,7 +2,7 @@ PORTNAME= riak-cs PORTVERSION= 2.1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= http://s3.amazonaws.com/downloads.basho.com/riak-cs/${PORTVERSION:R}/${PORTVERSION}/ \ http://downloads.basho.com.s3.amazonaws.com/riak-cs/${PORTVERSION:R}/${PORTVERSION}/ diff --git a/sysutils/s-tui/Makefile b/sysutils/s-tui/Makefile index adc0f65f9a5..6c9b20e31eb 100644 --- a/sysutils/s-tui/Makefile +++ b/sysutils/s-tui/Makefile @@ -2,6 +2,7 @@ PORTNAME= s-tui DISTVERSION= 0.8.2 +PORTREVISION= 1 CATEGORIES= sysutils python MAINTAINER= kai@FreeBSD.org diff --git a/sysutils/slurm-wlm/Makefile b/sysutils/slurm-wlm/Makefile index f519c2c60be..d47ae468b51 100644 --- a/sysutils/slurm-wlm/Makefile +++ b/sysutils/slurm-wlm/Makefile @@ -2,7 +2,7 @@ PORTNAME= slurm DISTVERSION= 17.02.11 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= http://www.schedmd.com/download/latest/ \ http://www.schedmd.com/download/archive/ \ diff --git a/sysutils/socket/Makefile b/sysutils/socket/Makefile index eb28083fa5d..5eaa5eb81e8 100644 --- a/sysutils/socket/Makefile +++ b/sysutils/socket/Makefile @@ -7,7 +7,7 @@ PORTVERSION= 1.2 CATEGORIES= sysutils net ipv6 MASTER_SITES= https://wolfram.schneider.org/src/ LOCAL/wosch -MAINTAINER= wosch@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Create TCP socket and connect to stdin/out LICENSE= GPLv1 diff --git a/sysutils/solaar/Makefile b/sysutils/solaar/Makefile index 330d8668ab2..03557100336 100644 --- a/sysutils/solaar/Makefile +++ b/sysutils/solaar/Makefile @@ -6,6 +6,7 @@ PORTNAME= solaar # https://github.com/pwr/Solaar/issues/288 # https://github.com/pwr/Solaar/issues/296 DISTVERSION= 0.9.2-259 +PORTREVISION= 1 DISTVERSIONSUFFIX= -gc07c115 CATEGORIES= sysutils diff --git a/sysutils/stanchion/Makefile b/sysutils/stanchion/Makefile index ba580fee654..6a65288ac89 100644 --- a/sysutils/stanchion/Makefile +++ b/sysutils/stanchion/Makefile @@ -2,7 +2,7 @@ PORTNAME= stanchion PORTVERSION= 2.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://s3.amazonaws.com/downloads.basho.com/stanchion/${PORTVERSION:R}/${PORTVERSION}/ \ http://downloads.basho.com.s3.amazonaws.com/stanchion/${PORTVERSION:R}/${PORTVERSION}/ diff --git a/sysutils/vm-bhyve/Makefile b/sysutils/vm-bhyve/Makefile index 8f146e494db..b1f7e3e0a1d 100644 --- a/sysutils/vm-bhyve/Makefile +++ b/sysutils/vm-bhyve/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= vm-bhyve -PORTVERSION= 1.2.3 +PORTVERSION= 1.3.0 DISTVERSIONPREFIX=v CATEGORIES= sysutils diff --git a/sysutils/vm-bhyve/distinfo b/sysutils/vm-bhyve/distinfo index 727ec3ee026..26d38f6d1bc 100644 --- a/sysutils/vm-bhyve/distinfo +++ b/sysutils/vm-bhyve/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1533896629 -SHA256 (churchers-vm-bhyve-v1.2.3_GH0.tar.gz) = a29020702e2c5940c0c9d5660137f3e3012ade77b2b666342cdd2c5fc4fc1d2b -SIZE (churchers-vm-bhyve-v1.2.3_GH0.tar.gz) = 65196 +TIMESTAMP = 1554468038 +SHA256 (churchers-vm-bhyve-v1.3.0_GH0.tar.gz) = aa6b98a25cb437ff7334f376eca75423f82a5b8cac5d2246e7b7a1042ea90267 +SIZE (churchers-vm-bhyve-v1.3.0_GH0.tar.gz) = 71219 diff --git a/sysutils/vm-bhyve/pkg-plist b/sysutils/vm-bhyve/pkg-plist index 7494c005c85..c4950dc9ca5 100644 --- a/sysutils/vm-bhyve/pkg-plist +++ b/sysutils/vm-bhyve/pkg-plist @@ -1,4 +1,5 @@ etc/rc.d/vm +lib/vm-bhyve/vm-base lib/vm-bhyve/vm-cmd lib/vm-bhyve/vm-config lib/vm-bhyve/vm-core @@ -28,6 +29,7 @@ sbin/vm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dragonfly.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/freebsd-zvol.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/freepbx.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/linux-zvol.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/netbsd.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/openbsd.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/resflash.conf diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile index 5fa977c6376..8f6604e487e 100644 --- a/sysutils/webmin/Makefile +++ b/sysutils/webmin/Makefile @@ -3,6 +3,7 @@ PORTNAME= webmin PORTVERSION= 1.900 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://download.webmin.com/updates/:up \ SF/webadmin/${PORTNAME}/${PORTVERSION}:sf diff --git a/sysutils/xfsprogs/Makefile b/sysutils/xfsprogs/Makefile index 223481cd948..aea42928e45 100644 --- a/sysutils/xfsprogs/Makefile +++ b/sysutils/xfsprogs/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfsprogs PORTVERSION= 3.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= ftp://oss.sgi.com/projects/xfs/cmd_tars/ \ ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/ diff --git a/sysutils/xorriso/Makefile b/sysutils/xorriso/Makefile index a8b185c590f..ed8eba3640c 100644 --- a/sysutils/xorriso/Makefile +++ b/sysutils/xorriso/Makefile @@ -3,7 +3,7 @@ PORTNAME= xorriso PORTVERSION= 1.5.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= http://files.libburnia-project.org/releases/ DISTNAME= libisoburn-${PORTVERSION} diff --git a/textproc/augeas/Makefile b/textproc/augeas/Makefile index 2af4da54acb..a7489071d99 100644 --- a/textproc/augeas/Makefile +++ b/textproc/augeas/Makefile @@ -3,7 +3,7 @@ PORTNAME= augeas PORTVERSION= 1.11.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MASTER_SITES= http://download.augeas.net/ diff --git a/textproc/cdiff/Makefile b/textproc/cdiff/Makefile index 0f9483a2f49..8cf754636ac 100644 --- a/textproc/cdiff/Makefile +++ b/textproc/cdiff/Makefile @@ -3,6 +3,7 @@ PORTNAME= cdiff DISTVERSION= 1.0-3 +PORTREVISION= 1 DISTVERSIONSUFFIX= -ga1a33a5 PORTEPOCH= 1 MASTER_SITES= LOCAL/mat/cdiff GH diff --git a/textproc/cmark/Makefile b/textproc/cmark/Makefile index d89672fdf1f..678de049cce 100644 --- a/textproc/cmark/Makefile +++ b/textproc/cmark/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= cmark -PORTVERSION= 0.28.3 +DISTVERSION= 0.29.0 CATEGORIES= textproc MAINTAINER= tobik@FreeBSD.org diff --git a/textproc/cmark/distinfo b/textproc/cmark/distinfo index f20e1a6c6a1..f2245167993 100644 --- a/textproc/cmark/distinfo +++ b/textproc/cmark/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1508662072 -SHA256 (commonmark-cmark-0.28.3_GH0.tar.gz) = acc98685d3c1b515ff787ac7c994188dadaf28a2d700c10c1221da4199bae1fc -SIZE (commonmark-cmark-0.28.3_GH0.tar.gz) = 229391 +TIMESTAMP = 1554745995 +SHA256 (commonmark-cmark-0.29.0_GH0.tar.gz) = 2558ace3cbeff85610de3bda32858f722b359acdadf0c4691851865bb84924a6 +SIZE (commonmark-cmark-0.29.0_GH0.tar.gz) = 234545 diff --git a/textproc/coccigrep/Makefile b/textproc/coccigrep/Makefile index 00305eabc52..1b2b10a55b4 100644 --- a/textproc/coccigrep/Makefile +++ b/textproc/coccigrep/Makefile @@ -3,6 +3,7 @@ PORTNAME= coccigrep PORTVERSION= 1.17 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= textproc diff --git a/textproc/hunspell/Makefile b/textproc/hunspell/Makefile index 58e306e7bbc..2f7300528a3 100644 --- a/textproc/hunspell/Makefile +++ b/textproc/hunspell/Makefile @@ -3,6 +3,7 @@ PORTNAME= hunspell PORTVERSION= 1.7.0 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= textproc DIST_SUBDIR= ${PORTNAME} diff --git a/textproc/icdiff/Makefile b/textproc/icdiff/Makefile index e7cfbc14e8e..14a0f8cb9e3 100644 --- a/textproc/icdiff/Makefile +++ b/textproc/icdiff/Makefile @@ -3,6 +3,7 @@ PORTNAME= icdiff PORTVERSION= 1.9.1 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= CHEESESHOP diff --git a/textproc/libe-book/Makefile b/textproc/libe-book/Makefile index 82f1ebecc61..e5bb087d1f9 100644 --- a/textproc/libe-book/Makefile +++ b/textproc/libe-book/Makefile @@ -2,7 +2,7 @@ PORTNAME= libe-book PORTVERSION= 0.1.3 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= textproc MASTER_SITES= SF/libebook/${PORTNAME}-${PORTVERSION}/ diff --git a/textproc/markdown/Makefile b/textproc/markdown/Makefile index 735cddaa835..80a8a39711a 100644 --- a/textproc/markdown/Makefile +++ b/textproc/markdown/Makefile @@ -8,7 +8,7 @@ CATEGORIES= textproc perl5 MASTER_SITES= http://daringfireball.net/projects/downloads/ DISTNAME= Markdown_${PORTVERSION} -MAINTAINER= tobez@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Text-to-HTML conversion tool for web writers LICENSE= BSD3CLAUSE diff --git a/textproc/p5-CSS-Sass/Makefile b/textproc/p5-CSS-Sass/Makefile index cb7dc00bf5a..4b556f939fc 100644 --- a/textproc/p5-CSS-Sass/Makefile +++ b/textproc/p5-CSS-Sass/Makefile @@ -25,6 +25,8 @@ TEST_DEPENDS= p5-File-chdir>=0.01:devel/p5-File-chdir \ USES= compiler:c++11-lang gmake perl5 USE_PERL5= configure +MAKE_JOBS_UNSAFE= yes + .include .if ${PERL_LEVEL} < 502600 diff --git a/textproc/p5-Excel-Writer-XLSX/Makefile b/textproc/p5-Excel-Writer-XLSX/Makefile index feaf204d582..afc3aea7253 100644 --- a/textproc/p5-Excel-Writer-XLSX/Makefile +++ b/textproc/p5-Excel-Writer-XLSX/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Excel-Writer-XLSX -PORTVERSION= 0.99 +PORTVERSION= 1.00 CATEGORIES= textproc perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:JMCNAMARA diff --git a/textproc/p5-Excel-Writer-XLSX/distinfo b/textproc/p5-Excel-Writer-XLSX/distinfo index 7388f517262..49075fca9c7 100644 --- a/textproc/p5-Excel-Writer-XLSX/distinfo +++ b/textproc/p5-Excel-Writer-XLSX/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1549892497 -SHA256 (Excel-Writer-XLSX-0.99.tar.gz) = c2e42f9c1c524bb160fdb65d3cff70a6649c53bc695be5174b140166a9804033 -SIZE (Excel-Writer-XLSX-0.99.tar.gz) = 2048759 +TIMESTAMP = 1554740462 +SHA256 (Excel-Writer-XLSX-1.00.tar.gz) = 3484aa8a74e2c79b789a0483e222dda01d9c8212d645545edd1e4f6e51e26e0c +SIZE (Excel-Writer-XLSX-1.00.tar.gz) = 2695963 diff --git a/textproc/py-CommonMark/Makefile b/textproc/py-CommonMark/Makefile index c3fb70ab754..fa3e24e4890 100644 --- a/textproc/py-CommonMark/Makefile +++ b/textproc/py-CommonMark/Makefile @@ -2,6 +2,7 @@ PORTNAME= CommonMark PORTVERSION= 0.8.1 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-QDarkStyle/Makefile b/textproc/py-QDarkStyle/Makefile index 602f99ae484..461d26d769d 100644 --- a/textproc/py-QDarkStyle/Makefile +++ b/textproc/py-QDarkStyle/Makefile @@ -3,6 +3,7 @@ PORTNAME= QDarkStyle PORTVERSION= 2.6.5 +PORTREVISION= 1 CATEGORIES= textproc devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-autopep8/Makefile b/textproc/py-autopep8/Makefile index 2fed3887d0f..28764b38959 100644 --- a/textproc/py-autopep8/Makefile +++ b/textproc/py-autopep8/Makefile @@ -2,6 +2,7 @@ PORTNAME= autopep8 PORTVERSION= 1.3.5 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-citeproc-py/Makefile b/textproc/py-citeproc-py/Makefile index a5794b74ef7..e44d1eab78d 100644 --- a/textproc/py-citeproc-py/Makefile +++ b/textproc/py-citeproc-py/Makefile @@ -2,6 +2,7 @@ PORTNAME= citeproc-py DISTVERSION= 0.4.0 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-docx2txt/Makefile b/textproc/py-docx2txt/Makefile index 5989efd0a84..85a968cc5f3 100644 --- a/textproc/py-docx2txt/Makefile +++ b/textproc/py-docx2txt/Makefile @@ -2,6 +2,7 @@ PORTNAME= docx2txt DISTVERSION= 0.7 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-duecredit/Makefile b/textproc/py-duecredit/Makefile index a7f064868a9..e10def47328 100644 --- a/textproc/py-duecredit/Makefile +++ b/textproc/py-duecredit/Makefile @@ -2,6 +2,7 @@ PORTNAME= duecredit DISTVERSION= 0.7.0 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-enchant/Makefile b/textproc/py-enchant/Makefile index 6b5b26b99c4..084929866d2 100644 --- a/textproc/py-enchant/Makefile +++ b/textproc/py-enchant/Makefile @@ -20,7 +20,7 @@ OPTIONS_DEFINE= WX OPTIONS_DEFAULT=WX WX_DESC= Provide a wxSpellCheckerDialog OPTIONS_SUB= yes -.if ${FLAVOR:U:Mpy3*} +.if ${FLAVOR:Upy36:Mpy3*} OPTIONS_EXCLUDE= WX .endif diff --git a/textproc/py-html2text/Makefile b/textproc/py-html2text/Makefile index f3cb3547c55..9e6e3ba19d6 100644 --- a/textproc/py-html2text/Makefile +++ b/textproc/py-html2text/Makefile @@ -3,7 +3,7 @@ PORTNAME= html2text PORTVERSION= 2018.1.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-humanfriendly/Makefile b/textproc/py-humanfriendly/Makefile index acffb13b1ca..ac1c7dad06e 100644 --- a/textproc/py-humanfriendly/Makefile +++ b/textproc/py-humanfriendly/Makefile @@ -2,6 +2,7 @@ PORTNAME= humanfriendly PORTVERSION= 4.16.1 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-m2r/Makefile b/textproc/py-m2r/Makefile index 118e4fcd09e..f387d6a7db6 100644 --- a/textproc/py-m2r/Makefile +++ b/textproc/py-m2r/Makefile @@ -2,6 +2,7 @@ PORTNAME= m2r DISTVERSION= 0.2.1 +PORTREVISION= 1 CATEGORIES= textproc devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-mako/Makefile b/textproc/py-mako/Makefile index a1ee7ba2ce3..6fbeb1866b0 100644 --- a/textproc/py-mako/Makefile +++ b/textproc/py-mako/Makefile @@ -3,6 +3,7 @@ PORTNAME= mako PORTVERSION= 1.0.8 +PORTREVISION= 1 CATEGORIES= textproc www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-markdown/Makefile b/textproc/py-markdown/Makefile index 1024c110b0e..26e7a5acc2d 100644 --- a/textproc/py-markdown/Makefile +++ b/textproc/py-markdown/Makefile @@ -3,6 +3,7 @@ PORTNAME= markdown PORTVERSION= 2.6.11 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-mkdocs/Makefile b/textproc/py-mkdocs/Makefile index d5e4678870f..1be4c6c9483 100644 --- a/textproc/py-mkdocs/Makefile +++ b/textproc/py-mkdocs/Makefile @@ -2,6 +2,7 @@ PORTNAME= mkdocs DISTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-pdfminer.six/Makefile b/textproc/py-pdfminer.six/Makefile index 9cecf219861..3ed3b7d143a 100644 --- a/textproc/py-pdfminer.six/Makefile +++ b/textproc/py-pdfminer.six/Makefile @@ -2,6 +2,7 @@ PORTNAME= pdfminer.six PORTVERSION= 20170720 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-pdftotext/Makefile b/textproc/py-pdftotext/Makefile index a2bc3ece5af..184cd7109e5 100644 --- a/textproc/py-pdftotext/Makefile +++ b/textproc/py-pdftotext/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libpoppler.so:graphics/poppler -USES= python +USES= compiler:c11 python USE_PYTHON= autoplist distutils .include diff --git a/textproc/py-pss/Makefile b/textproc/py-pss/Makefile index ff7215bd03b..1b68a7f621e 100644 --- a/textproc/py-pss/Makefile +++ b/textproc/py-pss/Makefile @@ -3,6 +3,7 @@ PORTNAME= pss PORTVERSION= 1.42 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-pygtail/Makefile b/textproc/py-pygtail/Makefile index 996bc6ecd09..f6d7bc24311 100644 --- a/textproc/py-pygtail/Makefile +++ b/textproc/py-pygtail/Makefile @@ -3,6 +3,7 @@ PORTNAME= pygtail PORTVERSION= 0.6.1 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-pyjade/Makefile b/textproc/py-pyjade/Makefile index 04ccde185f5..6dc89860438 100644 --- a/textproc/py-pyjade/Makefile +++ b/textproc/py-pyjade/Makefile @@ -3,6 +3,7 @@ PORTNAME= pyjade PORTVERSION= 4.0.0 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-pystache/Makefile b/textproc/py-pystache/Makefile index 75e6f2966e2..83fa8c9f672 100644 --- a/textproc/py-pystache/Makefile +++ b/textproc/py-pystache/Makefile @@ -3,6 +3,7 @@ PORTNAME= pystache PORTVERSION= 0.5.4 +PORTREVISION= 1 CATEGORIES= textproc www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-python-bidi/Makefile b/textproc/py-python-bidi/Makefile index 18fe6db294c..df423c22f39 100644 --- a/textproc/py-python-bidi/Makefile +++ b/textproc/py-python-bidi/Makefile @@ -2,6 +2,7 @@ PORTNAME= python-bidi DISTVERSION= 0.4.0 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-qrcode/Makefile b/textproc/py-qrcode/Makefile index 3fa266b9e45..80821eca073 100644 --- a/textproc/py-qrcode/Makefile +++ b/textproc/py-qrcode/Makefile @@ -3,6 +3,7 @@ PORTNAME= qrcode PORTVERSION= 6.0 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-qt5-xml/Makefile b/textproc/py-qt5-xml/Makefile index 8c1dcd8f76b..b5c12a2d8b2 100644 --- a/textproc/py-qt5-xml/Makefile +++ b/textproc/py-qt5-xml/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= xml +PORTREVISION= 1 CATEGORIES= textproc devel python MAINTAINER= kde@FreeBSD.org diff --git a/textproc/py-reno/Makefile b/textproc/py-reno/Makefile index a2fdf1529f1..489ee1ea53b 100644 --- a/textproc/py-reno/Makefile +++ b/textproc/py-reno/Makefile @@ -2,6 +2,7 @@ PORTNAME= reno DISTVERSION= 2.9.2 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-rnc2rng/Makefile b/textproc/py-rnc2rng/Makefile index 7803df0db36..f4bc165ba42 100644 --- a/textproc/py-rnc2rng/Makefile +++ b/textproc/py-rnc2rng/Makefile @@ -2,6 +2,7 @@ PORTNAME= rnc2rng DISTVERSION= 2.6.1 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-rst2html5/Makefile b/textproc/py-rst2html5/Makefile index 1155052c6cf..7d3fd31f863 100644 --- a/textproc/py-rst2html5/Makefile +++ b/textproc/py-rst2html5/Makefile @@ -3,6 +3,7 @@ PORTNAME= rst2html5 PORTVERSION= 1.9.5 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-transifex-client/Makefile b/textproc/py-transifex-client/Makefile index 57cafb1c8f6..ce4845ebd26 100644 --- a/textproc/py-transifex-client/Makefile +++ b/textproc/py-transifex-client/Makefile @@ -3,6 +3,7 @@ PORTNAME= transifex-client PORTVERSION= 0.11 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-xhtml2pdf/Makefile b/textproc/py-xhtml2pdf/Makefile index e1dc48115a4..795e44f2b49 100644 --- a/textproc/py-xhtml2pdf/Makefile +++ b/textproc/py-xhtml2pdf/Makefile @@ -3,6 +3,7 @@ PORTNAME= xhtml2pdf PORTVERSION= 0.2.3 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-xlrd/Makefile b/textproc/py-xlrd/Makefile index 0b08284a2ba..76a638759fe 100644 --- a/textproc/py-xlrd/Makefile +++ b/textproc/py-xlrd/Makefile @@ -3,6 +3,7 @@ PORTNAME= xlrd PORTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-xlsxwriter/Makefile b/textproc/py-xlsxwriter/Makefile index b8b4d5eaf82..5bc7c682674 100644 --- a/textproc/py-xlsxwriter/Makefile +++ b/textproc/py-xlsxwriter/Makefile @@ -3,6 +3,7 @@ PORTNAME= XlsxWriter PORTVERSION= 1.1.5 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-yapf/Makefile b/textproc/py-yapf/Makefile index 93141c8dac5..6f42205933e 100644 --- a/textproc/py-yapf/Makefile +++ b/textproc/py-yapf/Makefile @@ -2,6 +2,7 @@ PORTNAME= yapf PORTVERSION= 0.26.0 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/qstardict/Makefile b/textproc/qstardict/Makefile index 64b9556f8e6..76f0319e038 100644 --- a/textproc/qstardict/Makefile +++ b/textproc/qstardict/Makefile @@ -13,7 +13,7 @@ COMMENT= Qt based dictionary program (stardict clone) LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= gl gnome pkgconfig qmake qt:5 tar:bzip2 +USES= compiler:c++11-lang gl gnome pkgconfig qmake qt:5 tar:bzip2 USE_GL= gl USE_GNOME= glib20 USE_QT= core dbus gui network printsupport widgets xml \ diff --git a/textproc/re-flex/Makefile b/textproc/re-flex/Makefile index 0ebc8de246d..7336b5f1fee 100644 --- a/textproc/re-flex/Makefile +++ b/textproc/re-flex/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= re-flex -PORTVERSION= 1.1.3 +PORTVERSION= 1.1.5 DISTVERSIONPREFIX= v CATEGORIES= textproc diff --git a/textproc/re-flex/distinfo b/textproc/re-flex/distinfo index 38f1fb52e96..f6c013fe163 100644 --- a/textproc/re-flex/distinfo +++ b/textproc/re-flex/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1552397938 -SHA256 (Genivia-RE-flex-v1.1.3_GH0.tar.gz) = f46b87db2c39cee8f36282a69b3b63559189bc84c8af5f893ef381b575ed35cd -SIZE (Genivia-RE-flex-v1.1.3_GH0.tar.gz) = 3969994 +TIMESTAMP = 1554721179 +SHA256 (Genivia-RE-flex-v1.1.5_GH0.tar.gz) = ec457a186e01855c6558a5c61bdd50b6b187763b3dd6b0ee9001df59e450be8d +SIZE (Genivia-RE-flex-v1.1.5_GH0.tar.gz) = 3973076 diff --git a/textproc/redland-bindings/Makefile b/textproc/redland-bindings/Makefile index 103fd52d1b2..3832699c38b 100644 --- a/textproc/redland-bindings/Makefile +++ b/textproc/redland-bindings/Makefile @@ -3,7 +3,7 @@ PORTNAME= redland-bindings PORTVERSION= 1.0.17.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc MASTER_SITES= http://download.librdf.org/source/ diff --git a/textproc/refdb/Makefile b/textproc/refdb/Makefile index 67bf82462d9..ad5bd0cc355 100644 --- a/textproc/refdb/Makefile +++ b/textproc/refdb/Makefile @@ -4,7 +4,7 @@ PORTNAME= refdb PORTVERSION= 0.9.9 DISTVERSIONSUFFIX= -1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= textproc MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTNAME}-src-${PORTVERSION}-1 diff --git a/textproc/rubygem-autoprefixer-rails/Makefile b/textproc/rubygem-autoprefixer-rails/Makefile index f8f3ae3ad83..03bfb5e09b0 100644 --- a/textproc/rubygem-autoprefixer-rails/Makefile +++ b/textproc/rubygem-autoprefixer-rails/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= autoprefixer-rails -PORTVERSION= 9.5.0 +PORTVERSION= 9.5.1 CATEGORIES= textproc ruby MASTER_SITES= RG diff --git a/textproc/rubygem-autoprefixer-rails/distinfo b/textproc/rubygem-autoprefixer-rails/distinfo index 3eeabb198bc..66718302e94 100644 --- a/textproc/rubygem-autoprefixer-rails/distinfo +++ b/textproc/rubygem-autoprefixer-rails/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554233183 -SHA256 (rubygem/autoprefixer-rails-9.5.0.gem) = 624d4585935d28ad62143fd9a64a1c179288e21fd4fb83c664789cb0972ea14e -SIZE (rubygem/autoprefixer-rails-9.5.0.gem) = 217600 +TIMESTAMP = 1554740475 +SHA256 (rubygem/autoprefixer-rails-9.5.1.gem) = e2b71b9444bbf0e657e70b1278f167b1fdf12949577c611ade15faf9850dd8a6 +SIZE (rubygem/autoprefixer-rails-9.5.1.gem) = 216576 diff --git a/textproc/rubygem-commonmarker/Makefile b/textproc/rubygem-commonmarker/Makefile index 3058935f004..95aa34da5c7 100644 --- a/textproc/rubygem-commonmarker/Makefile +++ b/textproc/rubygem-commonmarker/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= commonmarker -PORTVERSION= 0.19.0 +PORTVERSION= 0.20.0 CATEGORIES= textproc rubygems MASTER_SITES= RG diff --git a/textproc/rubygem-commonmarker/distinfo b/textproc/rubygem-commonmarker/distinfo index 5122b9dec68..bc2183caba1 100644 --- a/textproc/rubygem-commonmarker/distinfo +++ b/textproc/rubygem-commonmarker/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554486065 -SHA256 (rubygem/commonmarker-0.19.0.gem) = 83a31a2bea6773eac53f2c8a017a763b2e23e32d8ce23321b603cdff1bf55105 -SIZE (rubygem/commonmarker-0.19.0.gem) = 149504 +TIMESTAMP = 1554816923 +SHA256 (rubygem/commonmarker-0.20.0.gem) = 90d2943e5b2343c9e3528a9de41c85db481fcf71a68bb17bdd31c72bde4f0d2a +SIZE (rubygem/commonmarker-0.20.0.gem) = 149504 diff --git a/textproc/rubygem-elasticsearch-api/Makefile b/textproc/rubygem-elasticsearch-api/Makefile index d494b8ee23f..edc42346d71 100644 --- a/textproc/rubygem-elasticsearch-api/Makefile +++ b/textproc/rubygem-elasticsearch-api/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= elasticsearch-api -PORTVERSION= 6.2.0 +PORTVERSION= 6.3.0 CATEGORIES= textproc rubygems MASTER_SITES= RG diff --git a/textproc/rubygem-elasticsearch-api/distinfo b/textproc/rubygem-elasticsearch-api/distinfo index aa018ac0041..c7c3746edf2 100644 --- a/textproc/rubygem-elasticsearch-api/distinfo +++ b/textproc/rubygem-elasticsearch-api/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1552573809 -SHA256 (rubygem/elasticsearch-api-6.2.0.gem) = d4b009c86e39e32012450cb0d5e8b02db2caa82c306c2ce868e53d49127db827 -SIZE (rubygem/elasticsearch-api-6.2.0.gem) = 92672 +TIMESTAMP = 1554816929 +SHA256 (rubygem/elasticsearch-api-6.3.0.gem) = 75e9695858d68e5ec1b6e701e2dfd93488d2c2c28cbb1709681842654188b219 +SIZE (rubygem/elasticsearch-api-6.3.0.gem) = 84992 diff --git a/textproc/rubygem-elasticsearch-transport/Makefile b/textproc/rubygem-elasticsearch-transport/Makefile index bfbfdbafc51..c61994cdb89 100644 --- a/textproc/rubygem-elasticsearch-transport/Makefile +++ b/textproc/rubygem-elasticsearch-transport/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= elasticsearch-transport -PORTVERSION= 6.2.0 +PORTVERSION= 6.3.0 CATEGORIES= textproc rubygems MASTER_SITES= RG diff --git a/textproc/rubygem-elasticsearch-transport/distinfo b/textproc/rubygem-elasticsearch-transport/distinfo index bd6f9b9f6fb..bffc86f05e6 100644 --- a/textproc/rubygem-elasticsearch-transport/distinfo +++ b/textproc/rubygem-elasticsearch-transport/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1552573813 -SHA256 (rubygem/elasticsearch-transport-6.2.0.gem) = edfdb41477b09d6cdb8d74b9e76673d4379f3e76b71f141345f83c21689fce86 -SIZE (rubygem/elasticsearch-transport-6.2.0.gem) = 39936 +TIMESTAMP = 1554816932 +SHA256 (rubygem/elasticsearch-transport-6.3.0.gem) = bf9a85777669b2d2da6fe53d92fb59c43dd7db3616f2cbebf4b9f921e905ac08 +SIZE (rubygem/elasticsearch-transport-6.3.0.gem) = 39936 diff --git a/textproc/rubygem-elasticsearch-xpack/Makefile b/textproc/rubygem-elasticsearch-xpack/Makefile index 82a3aafa0cb..d3feb8d0c92 100644 --- a/textproc/rubygem-elasticsearch-xpack/Makefile +++ b/textproc/rubygem-elasticsearch-xpack/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= elasticsearch-xpack -PORTVERSION= 6.2.0 +PORTVERSION= 6.3.0 CATEGORIES= textproc rubygems MASTER_SITES= RG @@ -11,7 +11,7 @@ COMMENT= Ruby integrations for the X-Pack extensions for Elasticsearch LICENSE= APACHE20 -RUN_DEPENDS= rubygem-elasticsearch-api>=6:textproc/rubygem-elasticsearch-api +RUN_DEPENDS= rubygem-elasticsearch-api>=${PORTVERSION:R:R}:textproc/rubygem-elasticsearch-api USES= gem USE_RUBY= yes diff --git a/textproc/rubygem-elasticsearch-xpack/distinfo b/textproc/rubygem-elasticsearch-xpack/distinfo index 5a2d87b1ae7..bf1175e717c 100644 --- a/textproc/rubygem-elasticsearch-xpack/distinfo +++ b/textproc/rubygem-elasticsearch-xpack/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1552572533 -SHA256 (rubygem/elasticsearch-xpack-6.2.0.gem) = 4f3e11d3f12292c059509b4864bc318b44ef6872573da1e56efd558016316964 -SIZE (rubygem/elasticsearch-xpack-6.2.0.gem) = 86528 +TIMESTAMP = 1554816935 +SHA256 (rubygem/elasticsearch-xpack-6.3.0.gem) = 0f7a9a59de8de23a218818a343a48ca5329160137ad2bf9cfaa5ade35f903604 +SIZE (rubygem/elasticsearch-xpack-6.3.0.gem) = 88064 diff --git a/textproc/rubygem-elasticsearch/Makefile b/textproc/rubygem-elasticsearch/Makefile index 7e1de8293db..2b4bf405ece 100644 --- a/textproc/rubygem-elasticsearch/Makefile +++ b/textproc/rubygem-elasticsearch/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= elasticsearch -PORTVERSION= 6.2.0 +PORTVERSION= 6.3.0 CATEGORIES= textproc rubygems MASTER_SITES= RG diff --git a/textproc/rubygem-elasticsearch/distinfo b/textproc/rubygem-elasticsearch/distinfo index 39888c675af..36ecc81ad32 100644 --- a/textproc/rubygem-elasticsearch/distinfo +++ b/textproc/rubygem-elasticsearch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1552573816 -SHA256 (rubygem/elasticsearch-6.2.0.gem) = 916db1ffaf09dbfce0f9cafce0e5453c0c4aa8b3abf49729c411fd3d6a412761 -SIZE (rubygem/elasticsearch-6.2.0.gem) = 9216 +TIMESTAMP = 1554816926 +SHA256 (rubygem/elasticsearch-6.3.0.gem) = 16fb0d6404bcca967b372eb4dd710afb56593547d0a0faf873b9da06121fa1cf +SIZE (rubygem/elasticsearch-6.3.0.gem) = 9216 diff --git a/textproc/sdcv/Makefile b/textproc/sdcv/Makefile index 552d8006299..7c9c9641a14 100644 --- a/textproc/sdcv/Makefile +++ b/textproc/sdcv/Makefile @@ -3,7 +3,7 @@ PORTNAME= sdcv PORTVERSION= 0.5.2 -PORTREVISION= 2 +PORTREVISION= 3 DISTVERSIONPREFIX= v CATEGORIES= textproc diff --git a/textproc/ucto/Makefile b/textproc/ucto/Makefile index f9451270cf5..61b3b019e24 100644 --- a/textproc/ucto/Makefile +++ b/textproc/ucto/Makefile @@ -3,7 +3,7 @@ PORTNAME= ucto DISTVERSIONPREFIX= v DISTVERSION= 0.14.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MAINTAINER= yuri@FreeBSD.org diff --git a/textproc/xml2rfc/Makefile b/textproc/xml2rfc/Makefile index 12c2cbf9d80..75df8342788 100644 --- a/textproc/xml2rfc/Makefile +++ b/textproc/xml2rfc/Makefile @@ -3,6 +3,7 @@ PORTNAME= xml2rfc PORTVERSION= 2.8.4 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://tools.ietf.org/tools/xml2rfc2/cli/ diff --git a/www/butterfly/Makefile b/www/butterfly/Makefile index a644cd1702a..dcb81e2cd2b 100644 --- a/www/butterfly/Makefile +++ b/www/butterfly/Makefile @@ -3,6 +3,7 @@ PORTNAME= butterfly PORTVERSION= 2.0.1 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= CHEESESHOP diff --git a/www/edbrowse/Makefile b/www/edbrowse/Makefile index 6fb532160b1..4e84193ffd1 100644 --- a/www/edbrowse/Makefile +++ b/www/edbrowse/Makefile @@ -3,7 +3,7 @@ PORTNAME= edbrowse DISTVERSIONPREFIX= v DISTVERSION= 3.7.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www editors MAINTAINER= alfix86@gmail.com diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 2ece3ea8b70..91414f54755 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -3,6 +3,7 @@ PORTNAME= firefox DISTVERSION= 66.0.2 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ diff --git a/www/firefox/files/patch-bug1513605 b/www/firefox/files/patch-bug1513605 new file mode 100644 index 00000000000..a1ac7717503 --- /dev/null +++ b/www/firefox/files/patch-bug1513605 @@ -0,0 +1,59 @@ +commit 7b5468921fef +Author: Mike Hommey +Date: Tue Mar 12 14:14:43 2019 +0000 + + Bug 1513605 - Add PIC flags when running the clock_gettime(CLOCK_MONOTONIC) check. r=dmajor + + Differential Revision: https://phabricator.services.mozilla.com/D23091 + + --HG-- + extra : moz-landing-system : lando +--- + js/src/old-configure.in | 3 +++ + old-configure.in | 3 +++ + 2 files changed, 6 insertions(+) + +diff --git js/src/old-configure.in js/src/old-configure.in +index 64654df2230b..ce4458098a6c 100644 +--- js/src/old-configure.in ++++ js/src/old-configure.in +@@ -1015,7 +1015,9 @@ Darwin) + ac_cv_clock_monotonic, + [for libs in "" -lrt; do + _SAVE_LIBS="$LIBS" ++ _SAVE_CFLAGS="$CFLAGS" + LIBS="$LIBS $libs" ++ CFLAGS="$CFLAGS $DSO_PIC_CFLAGS" + AC_TRY_LINK([#include ], + [ struct timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); ], +@@ -1024,6 +1026,7 @@ Darwin) + break, + ac_cv_clock_monotonic=no) + LIBS="$_SAVE_LIBS" ++ CFLAGS="$_SAVE_CFLAGS" + done]) + if test "$ac_cv_clock_monotonic" != "no"; then + HAVE_CLOCK_MONOTONIC=1 +diff --git old-configure.in old-configure.in +index d6a587d54b3b..1ed22938205e 100644 +--- old-configure.in ++++ old-configure.in +@@ -1303,7 +1303,9 @@ Darwin) + ac_cv_clock_monotonic, + [for libs in "" -lrt; do + _SAVE_LIBS="$LIBS" ++ _SAVE_CFLAGS="$CFLAGS" + LIBS="$LIBS $libs" ++ CFLAGS="$CFLAGS $DSO_PIC_CFLAGS" + AC_TRY_LINK([#include ], + [ struct timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); ], +@@ -1312,6 +1314,7 @@ Darwin) + break, + ac_cv_clock_monotonic=no) + LIBS="$_SAVE_LIBS" ++ CFLAGS="$_SAVE_CFLAGS" + done]) + if test "$ac_cv_clock_monotonic" != "no"; then + HAVE_CLOCK_MONOTONIC=1 diff --git a/www/flashplayer/Makefile b/www/flashplayer/Makefile index 72630ec4e8c..a92c1ae2ab6 100644 --- a/www/flashplayer/Makefile +++ b/www/flashplayer/Makefile @@ -2,7 +2,7 @@ PORTNAME= flashplayer PORTVERSION= 32.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www multimedia DISTFILES= diff --git a/www/groupoffice/Makefile b/www/groupoffice/Makefile index d977ff03c19..67215b4a734 100644 --- a/www/groupoffice/Makefile +++ b/www/groupoffice/Makefile @@ -3,7 +3,7 @@ PORTNAME= groupoffice DISTVERSIONPREFIX= com- -DISTVERSION= 6.3.67 +DISTVERSION= 6.3.68 CATEGORIES= www MASTER_SITES= SF/group-office/${DISTVERSION:R} DISTNAME= ${PORTNAME}-${DISTVERSION}-php-71 diff --git a/www/groupoffice/distinfo b/www/groupoffice/distinfo index e98ba80ce2d..e889bff5e0a 100644 --- a/www/groupoffice/distinfo +++ b/www/groupoffice/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553511822 -SHA256 (groupoffice-6.3.67-php-71.tar.gz) = 3379a4f57257d4df579e1c4944d1bf44f6009231160d8810725be6230a04c026 -SIZE (groupoffice-6.3.67-php-71.tar.gz) = 38332624 +TIMESTAMP = 1554625959 +SHA256 (groupoffice-6.3.68-php-71.tar.gz) = d46c817f30704dd472924b80fbd71b3cf80111658dfad357445e3217903cd2f3 +SIZE (groupoffice-6.3.68-php-71.tar.gz) = 38341361 diff --git a/www/groupoffice/files/patch-go_base_Config.php b/www/groupoffice/files/patch-go_base_Config.php index 37ac8b8c6df..1d2f350eac6 100644 --- a/www/groupoffice/files/patch-go_base_Config.php +++ b/www/groupoffice/files/patch-go_base_Config.php @@ -1,11 +1,11 @@ ---- go/base/Config.php.orig 2018-12-04 16:00:23 UTC -+++ go/base/Config.php +--- go/base/Config.php.orig 2019-04-08 07:57:41.914244000 +0200 ++++ go/base/Config.php 2019-04-08 09:52:10.501481000 +0200 @@ -22,7 +22,7 @@ * This class holds the main configuration options of Group-Office * Don't modify this file. The values defined here are just default values. * They are overwritten by the configuration options in /config.php or - * /etc/groupoffice/{HOSTNAME}/config.php -+ * /usr/local/usr/local/etc/groupoffice/{HOSTNAME}/config.php ++ * /usr/local/usr/local/etc//groupoffice/{HOSTNAME}/config.php * * To edit these options use install.php. * @@ -79,12 +79,12 @@ /** -@@ -1350,7 +1350,7 @@ var $billing_clear_payment_method_on_duplicate = true; +@@ -1343,7 +1343,7 @@ var $billing_clear_payment_method_on_duplicate = true; } private function getGlobalConfig() { - $globalConfigFile = '/etc/groupoffice/globalconfig.inc.php'; + $globalConfigFile = '/usr/local/usr/local/etc/groupoffice/globalconfig.inc.php'; - if (file_exists($globalConfigFile)) { - require($globalConfigFile); - } + try { + if (file_exists($globalConfigFile)) { + require($globalConfigFile); diff --git a/www/groupoffice/pkg-plist b/www/groupoffice/pkg-plist index 19d03971f2d..a7f00429948 100644 --- a/www/groupoffice/pkg-plist +++ b/www/groupoffice/pkg-plist @@ -459,6 +459,7 @@ %%WWWDIR%%/go/modules/community/multi_instance/language/en.php %%WWWDIR%%/go/modules/community/multi_instance/language/hu.php %%WWWDIR%%/go/modules/community/multi_instance/language/id.php +%%WWWDIR%%/go/modules/community/multi_instance/language/it.php %%WWWDIR%%/go/modules/community/multi_instance/language/pt_br.php %%WWWDIR%%/go/modules/community/multi_instance/model/Instance.php %%WWWDIR%%/go/modules/community/multi_instance/oninstall.php @@ -528,6 +529,7 @@ %%WWWDIR%%/go/modules/community/serverclient/language/el.php %%WWWDIR%%/go/modules/community/serverclient/language/en.php %%WWWDIR%%/go/modules/community/serverclient/language/fr.php +%%WWWDIR%%/go/modules/community/serverclient/language/it.php %%WWWDIR%%/go/modules/community/serverclient/language/ko.php %%WWWDIR%%/go/modules/community/serverclient/language/nb.php %%WWWDIR%%/go/modules/community/serverclient/language/nl.php @@ -726,6 +728,7 @@ %%WWWDIR%%/go/modules/core/search/controller/Search.php %%WWWDIR%%/go/modules/core/search/language/cs.php %%WWWDIR%%/go/modules/core/search/language/en.php +%%WWWDIR%%/go/modules/core/search/language/it.php %%WWWDIR%%/go/modules/core/search/language/pt_br.php %%WWWDIR%%/go/modules/core/search/model/Search.php %%WWWDIR%%/go/modules/core/search/views/extjs3/Module.js @@ -1010,6 +1013,7 @@ %%WWWDIR%%/modules/assistant/language/en.php %%WWWDIR%%/modules/assistant/language/hu.php %%WWWDIR%%/modules/assistant/language/id.php +%%WWWDIR%%/modules/assistant/language/it.php %%WWWDIR%%/modules/assistant/language/pt_br.php %%WWWDIR%%/modules/assistant/scripts.txt %%WWWDIR%%/modules/assistant/themes/Default/images/assistant.png @@ -1621,6 +1625,7 @@ %%WWWDIR%%/modules/customcss/language/fr.php %%WWWDIR%%/modules/customcss/language/hu.php %%WWWDIR%%/modules/customcss/language/id.php +%%WWWDIR%%/modules/customcss/language/it.php %%WWWDIR%%/modules/customcss/language/ko.php %%WWWDIR%%/modules/customcss/language/nb.php %%WWWDIR%%/modules/customcss/language/pl.php @@ -1761,6 +1766,7 @@ %%WWWDIR%%/modules/documenttemplates/language/fr.php %%WWWDIR%%/modules/documenttemplates/language/hu.php %%WWWDIR%%/modules/documenttemplates/language/id.php +%%WWWDIR%%/modules/documenttemplates/language/it.php %%WWWDIR%%/modules/documenttemplates/language/ko.php %%WWWDIR%%/modules/documenttemplates/language/nb.php %%WWWDIR%%/modules/documenttemplates/language/nl.php @@ -1910,6 +1916,7 @@ %%WWWDIR%%/modules/exactonline/language/fr.php %%WWWDIR%%/modules/exactonline/language/hu.php %%WWWDIR%%/modules/exactonline/language/id.php +%%WWWDIR%%/modules/exactonline/language/it.php %%WWWDIR%%/modules/exactonline/language/nl.php %%WWWDIR%%/modules/exactonline/language/pt_br.php %%WWWDIR%%/modules/exactonline/model/AddressbookAddressbookExtension.php @@ -2137,6 +2144,7 @@ %%WWWDIR%%/modules/favorites/language/fr.php %%WWWDIR%%/modules/favorites/language/hu.php %%WWWDIR%%/modules/favorites/language/id.php +%%WWWDIR%%/modules/favorites/language/it.php %%WWWDIR%%/modules/favorites/language/pt_br.php %%WWWDIR%%/modules/favorites/model/Addressbook.php %%WWWDIR%%/modules/favorites/model/Calendar.php @@ -2315,6 +2323,7 @@ %%WWWDIR%%/modules/filesearch/language/fr.php %%WWWDIR%%/modules/filesearch/language/hu.php %%WWWDIR%%/modules/filesearch/language/id.php +%%WWWDIR%%/modules/filesearch/language/it.php %%WWWDIR%%/modules/filesearch/language/nb.php %%WWWDIR%%/modules/filesearch/language/nl.php %%WWWDIR%%/modules/filesearch/language/pt_br.php @@ -2464,6 +2473,7 @@ %%WWWDIR%%/modules/groups/language/en.php %%WWWDIR%%/modules/groups/language/hu.php %%WWWDIR%%/modules/groups/language/id.php +%%WWWDIR%%/modules/groups/language/it.php %%WWWDIR%%/modules/groups/language/pt_br.php %%WWWDIR%%/modules/groups/scripts.txt %%WWWDIR%%/modules/groups/themes/Default/images/groups.png @@ -2480,6 +2490,7 @@ %%WWWDIR%%/modules/hoursapproval2/language/hr.php %%WWWDIR%%/modules/hoursapproval2/language/hu.php %%WWWDIR%%/modules/hoursapproval2/language/id.php +%%WWWDIR%%/modules/hoursapproval2/language/it.php %%WWWDIR%%/modules/hoursapproval2/language/nb.php %%WWWDIR%%/modules/hoursapproval2/language/nl.php %%WWWDIR%%/modules/hoursapproval2/language/pl.php @@ -2511,6 +2522,7 @@ %%WWWDIR%%/modules/leavedays/language/fr.php %%WWWDIR%%/modules/leavedays/language/hu.php %%WWWDIR%%/modules/leavedays/language/id.php +%%WWWDIR%%/modules/leavedays/language/it.php %%WWWDIR%%/modules/leavedays/language/nl.php %%WWWDIR%%/modules/leavedays/language/pt_br.php %%WWWDIR%%/modules/leavedays/model/Credit.php @@ -2783,6 +2795,7 @@ %%WWWDIR%%/modules/pr2analyzer/language/fr.php %%WWWDIR%%/modules/pr2analyzer/language/hu.php %%WWWDIR%%/modules/pr2analyzer/language/id.php +%%WWWDIR%%/modules/pr2analyzer/language/it.php %%WWWDIR%%/modules/pr2analyzer/language/nl.php %%WWWDIR%%/modules/pr2analyzer/language/pt_br.php %%WWWDIR%%/modules/pr2analyzer/themes/Default/images/pr2analizer.png @@ -2851,6 +2864,7 @@ %%WWWDIR%%/modules/projects2/controller/TypeController.php %%WWWDIR%%/modules/projects2/controller/WeekController.php %%WWWDIR%%/modules/projects2/cron/IncomeNotification.php +%%WWWDIR%%/modules/projects2/cron/ScanEmailForLinks.php %%WWWDIR%%/modules/projects2/customfields/model/Project.php %%WWWDIR%%/modules/projects2/customfields/model/TimeEntry.php %%WWWDIR%%/modules/projects2/export/CurrentGrid.php @@ -3012,6 +3026,7 @@ %%WWWDIR%%/modules/savemailas/language/fr.php %%WWWDIR%%/modules/savemailas/language/hu.php %%WWWDIR%%/modules/savemailas/language/id.php +%%WWWDIR%%/modules/savemailas/language/it.php %%WWWDIR%%/modules/savemailas/language/ko.php %%WWWDIR%%/modules/savemailas/language/nb.php %%WWWDIR%%/modules/savemailas/language/nl.php @@ -3030,6 +3045,7 @@ %%WWWDIR%%/modules/scanbox/language/fr.php %%WWWDIR%%/modules/scanbox/language/hu.php %%WWWDIR%%/modules/scanbox/language/id.php +%%WWWDIR%%/modules/scanbox/language/it.php %%WWWDIR%%/modules/scanbox/language/nb.php %%WWWDIR%%/modules/scanbox/language/nl.php %%WWWDIR%%/modules/scanbox/language/pt_br.php @@ -3136,6 +3152,7 @@ %%WWWDIR%%/modules/site/language/fr.php %%WWWDIR%%/modules/site/language/hu.php %%WWWDIR%%/modules/site/language/id.php +%%WWWDIR%%/modules/site/language/it.php %%WWWDIR%%/modules/site/language/nl.php %%WWWDIR%%/modules/site/language/pt_br.php %%WWWDIR%%/modules/site/model/Content.php @@ -3288,6 +3305,7 @@ %%WWWDIR%%/modules/smime/language/fr.php %%WWWDIR%%/modules/smime/language/hu.php %%WWWDIR%%/modules/smime/language/id.php +%%WWWDIR%%/modules/smime/language/it.php %%WWWDIR%%/modules/smime/language/ko.php %%WWWDIR%%/modules/smime/language/nb.php %%WWWDIR%%/modules/smime/language/nl.php @@ -3530,6 +3548,7 @@ %%WWWDIR%%/modules/tickets/language/fr.php %%WWWDIR%%/modules/tickets/language/hu.php %%WWWDIR%%/modules/tickets/language/id.php +%%WWWDIR%%/modules/tickets/language/it.php %%WWWDIR%%/modules/tickets/language/ko.php %%WWWDIR%%/modules/tickets/language/nb.php %%WWWDIR%%/modules/tickets/language/nl.php @@ -3584,6 +3603,7 @@ %%WWWDIR%%/modules/timeregistration2/language/hr.php %%WWWDIR%%/modules/timeregistration2/language/hu.php %%WWWDIR%%/modules/timeregistration2/language/id.php +%%WWWDIR%%/modules/timeregistration2/language/it.php %%WWWDIR%%/modules/timeregistration2/language/nb.php %%WWWDIR%%/modules/timeregistration2/language/nl.php %%WWWDIR%%/modules/timeregistration2/language/pl.php @@ -4015,6 +4035,7 @@ %%WWWDIR%%/modules/zpushadmin/language/fr.php %%WWWDIR%%/modules/zpushadmin/language/hu.php %%WWWDIR%%/modules/zpushadmin/language/id.php +%%WWWDIR%%/modules/zpushadmin/language/it.php %%WWWDIR%%/modules/zpushadmin/language/nb.php %%WWWDIR%%/modules/zpushadmin/language/nl.php %%WWWDIR%%/modules/zpushadmin/language/sv.php diff --git a/www/itop/Makefile b/www/itop/Makefile index 8b710268359..b08ce04ce46 100644 --- a/www/itop/Makefile +++ b/www/itop/Makefile @@ -2,6 +2,7 @@ PORTNAME= itop PORTVERSION= 2.4.1 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= SF DISTNAME= iTop-${PORTVERSION}-3714 diff --git a/www/linux-flashplayer/Makefile b/www/linux-flashplayer/Makefile index 775539cb405..7fdebd760b2 100644 --- a/www/linux-flashplayer/Makefile +++ b/www/linux-flashplayer/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= flashplayer -PORTVERSION= 32.0.0.156 +PORTVERSION= 32.0.0.171 CATEGORIES= www multimedia linux MASTER_SITES= https://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION}/ PKGNAMEPREFIX= linux- diff --git a/www/linux-flashplayer/distinfo b/www/linux-flashplayer/distinfo index ee1118d0050..243e3edbb37 100644 --- a/www/linux-flashplayer/distinfo +++ b/www/linux-flashplayer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1552414478 -SHA256 (flashplayer/32.0.0.156/flash_player_npapi_linux.i386.tar.gz) = 1e52104984f8c05774d0a93819103671693e9ea1c2bab492060910bd69e60d0f -SIZE (flashplayer/32.0.0.156/flash_player_npapi_linux.i386.tar.gz) = 8530759 +TIMESTAMP = 1554881679 +SHA256 (flashplayer/32.0.0.171/flash_player_npapi_linux.i386.tar.gz) = 15b029eff8f4eb3b10d7077c58e2919da4e4abb5af8e31ae229413ebfbb2c935 +SIZE (flashplayer/32.0.0.171/flash_player_npapi_linux.i386.tar.gz) = 8530615 diff --git a/www/matomo/Makefile b/www/matomo/Makefile index ca9e84ef5f5..4aec7575d4c 100644 --- a/www/matomo/Makefile +++ b/www/matomo/Makefile @@ -2,6 +2,7 @@ PORTNAME= matomo DISTVERSION= 3.9.1 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://builds.matomo.org/ PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} diff --git a/www/mediawiki127/Makefile b/www/mediawiki127/Makefile index ea529cae8f6..f16a239f7ed 100644 --- a/www/mediawiki127/Makefile +++ b/www/mediawiki127/Makefile @@ -3,6 +3,7 @@ PORTNAME= mediawiki PORTVERSION= 1.27.5 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://releases.wikimedia.org/mediawiki/${PORTVERSION:R}/ PKGNAMESUFFIX= 127 diff --git a/www/mediawiki130/Makefile b/www/mediawiki130/Makefile index f60a3b96b5b..c6c50da4cda 100644 --- a/www/mediawiki130/Makefile +++ b/www/mediawiki130/Makefile @@ -3,6 +3,7 @@ PORTNAME= mediawiki PORTVERSION= 1.30.1 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://releases.wikimedia.org/mediawiki/${PORTVERSION:R}/ PKGNAMESUFFIX= 130 diff --git a/www/mediawiki131/Makefile b/www/mediawiki131/Makefile index 8611f7ad57f..36f93e03a54 100644 --- a/www/mediawiki131/Makefile +++ b/www/mediawiki131/Makefile @@ -3,7 +3,7 @@ PORTNAME= mediawiki PORTVERSION= 1.31.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://releases.wikimedia.org/mediawiki/${PORTVERSION:R}/ PKGNAMESUFFIX= 131${PHP_PKGNAMESUFFIX} diff --git a/www/mediawiki132/Makefile b/www/mediawiki132/Makefile index e0a61788281..4c2ba446c54 100644 --- a/www/mediawiki132/Makefile +++ b/www/mediawiki132/Makefile @@ -3,6 +3,7 @@ PORTNAME= mediawiki PORTVERSION= 1.32.0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://releases.wikimedia.org/mediawiki/${PORTVERSION:R}/ PKGNAMESUFFIX= 132${PHP_PKGNAMESUFFIX} diff --git a/www/mergelog/Makefile b/www/mergelog/Makefile index 79072b85187..6d4d7e8a051 100644 --- a/www/mergelog/Makefile +++ b/www/mergelog/Makefile @@ -7,7 +7,7 @@ PORTREVISION= 2 CATEGORIES= www textproc MASTER_SITES= SF -MAINTAINER= tobez@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Tool to merge and sort by date http log files USES= gmake diff --git a/www/nextcloud-contacts/Makefile b/www/nextcloud-contacts/Makefile index fc4be9fba2e..6864406203c 100644 --- a/www/nextcloud-contacts/Makefile +++ b/www/nextcloud-contacts/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= contacts -PORTVERSION= 3.0.5 +PORTVERSION= 3.1.0 DISTVERSIONPREFIX= v CATEGORIES= www MASTER_SITES= https://github.com/${PKGNAMEPREFIX:S/-//}/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/ diff --git a/www/nextcloud-contacts/distinfo b/www/nextcloud-contacts/distinfo index 2e0d335064c..a34b960ba06 100644 --- a/www/nextcloud-contacts/distinfo +++ b/www/nextcloud-contacts/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1552292871 -SHA256 (nextcloud/contacts-v3.0.5/contacts.tar.gz) = 9cfc72fce0d929a89047db0f02e5adcf7a4b044c74537bcfc75952e2c4578c57 -SIZE (nextcloud/contacts-v3.0.5/contacts.tar.gz) = 1320273 +TIMESTAMP = 1554745243 +SHA256 (nextcloud/contacts-v3.1.0/contacts.tar.gz) = e3d331287e6b57d6902c3c89c42e36911df5da74740e7c7609c8a292d5130956 +SIZE (nextcloud/contacts-v3.1.0/contacts.tar.gz) = 1697870 diff --git a/www/nextcloud-contacts/pkg-plist b/www/nextcloud-contacts/pkg-plist index 375e1ad9cc4..dc4f0c0f63b 100644 --- a/www/nextcloud-contacts/pkg-plist +++ b/www/nextcloud-contacts/pkg-plist @@ -1,3 +1,4 @@ +%%WWWDIR%%/CHANGELOG.md %%WWWDIR%%/COPYING %%WWWDIR%%/appinfo/app.php %%WWWDIR%%/appinfo/info.xml @@ -29,6 +30,7 @@ %%WWWDIR%%/img/favicon.svg %%WWWDIR%%/img/group.svg %%WWWDIR%%/img/phone.svg +%%WWWDIR%%/img/qrcode.svg %%WWWDIR%%/img/social.svg %%WWWDIR%%/img/up.svg %%WWWDIR%%/js/chunks/0.js @@ -285,6 +287,8 @@ %%WWWDIR%%/js/chunks/98.js.map %%WWWDIR%%/js/chunks/99.js %%WWWDIR%%/js/chunks/99.js.map +%%WWWDIR%%/js/chunks/128.js +%%WWWDIR%%/js/chunks/128.js.map %%WWWDIR%%/js/contacts.js %%WWWDIR%%/js/contacts.js.map %%WWWDIR%%/l10n/.gitkeep @@ -382,8 +386,6 @@ %%WWWDIR%%/l10n/lt_LT.json %%WWWDIR%%/l10n/lv.js %%WWWDIR%%/l10n/lv.json -%%WWWDIR%%/l10n/mn.js -%%WWWDIR%%/l10n/mn.json %%WWWDIR%%/l10n/nb.js %%WWWDIR%%/l10n/nb.json %%WWWDIR%%/l10n/nl.js diff --git a/www/nextcloud/Makefile b/www/nextcloud/Makefile index df6f54e017c..1952a604e6a 100644 --- a/www/nextcloud/Makefile +++ b/www/nextcloud/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= nextcloud -DISTVERSION= 15.0.5 +DISTVERSION= 15.0.7 CATEGORIES= www MASTER_SITES= https://download.nextcloud.com/server/releases/ PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} diff --git a/www/nextcloud/distinfo b/www/nextcloud/distinfo index f3ddfc9eb89..d26d1b7102d 100644 --- a/www/nextcloud/distinfo +++ b/www/nextcloud/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551525232 -SHA256 (nextcloud-15.0.5.tar.bz2) = 4661869b797a340cd967abb3dbe6931b375434e0a44480346a27ccd73250b988 -SIZE (nextcloud-15.0.5.tar.bz2) = 56489515 +TIMESTAMP = 1554836187 +SHA256 (nextcloud-15.0.7.tar.bz2) = 3e6158951fa72010ccd50dbeac05d8df162183f7bbc62a1c6c89ed7081fa9d49 +SIZE (nextcloud-15.0.7.tar.bz2) = 56417492 diff --git a/www/nextcloud/pkg-plist b/www/nextcloud/pkg-plist index e3d1b8916fe..b062945fa03 100644 --- a/www/nextcloud/pkg-plist +++ b/www/nextcloud/pkg-plist @@ -4871,7 +4871,6 @@ %%WWWDIR%%/apps-pkg/federatedfilesharing/css/settings-personal.css %%WWWDIR%%/apps-pkg/federatedfilesharing/img/social-diaspora.svg %%WWWDIR%%/apps-pkg/federatedfilesharing/img/social-facebook.svg -%%WWWDIR%%/apps-pkg/federatedfilesharing/img/social-googleplus.svg %%WWWDIR%%/apps-pkg/federatedfilesharing/img/social-twitter.svg %%WWWDIR%%/apps-pkg/federatedfilesharing/js/external.js %%WWWDIR%%/apps-pkg/federatedfilesharing/js/settings-admin.js @@ -7673,8 +7672,6 @@ %%WWWDIR%%/apps-pkg/firstrunwizard/js/activate.js %%WWWDIR%%/apps-pkg/firstrunwizard/js/firstrunwizard.js %%WWWDIR%%/apps-pkg/firstrunwizard/js/jquery.colorbox.js -%%WWWDIR%%/apps-pkg/firstrunwizard/l10n/ast.js -%%WWWDIR%%/apps-pkg/firstrunwizard/l10n/ast.json %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/bg.js %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/bg.json %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/bn_IN.php @@ -7696,8 +7693,6 @@ %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/eo.json %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/es.js %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/es.json -%%WWWDIR%%/apps-pkg/firstrunwizard/l10n/es_419.js -%%WWWDIR%%/apps-pkg/firstrunwizard/l10n/es_419.json %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/es_CL.js %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/es_CL.json %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/es_CO.js @@ -7710,26 +7705,10 @@ %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/es_EC.json %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/es_GT.js %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/es_GT.json -%%WWWDIR%%/apps-pkg/firstrunwizard/l10n/es_HN.js -%%WWWDIR%%/apps-pkg/firstrunwizard/l10n/es_HN.json %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/es_MX.js %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/es_MX.json -%%WWWDIR%%/apps-pkg/firstrunwizard/l10n/es_NI.js -%%WWWDIR%%/apps-pkg/firstrunwizard/l10n/es_NI.json -%%WWWDIR%%/apps-pkg/firstrunwizard/l10n/es_PA.js -%%WWWDIR%%/apps-pkg/firstrunwizard/l10n/es_PA.json -%%WWWDIR%%/apps-pkg/firstrunwizard/l10n/es_PE.js -%%WWWDIR%%/apps-pkg/firstrunwizard/l10n/es_PE.json -%%WWWDIR%%/apps-pkg/firstrunwizard/l10n/es_PR.js -%%WWWDIR%%/apps-pkg/firstrunwizard/l10n/es_PR.json -%%WWWDIR%%/apps-pkg/firstrunwizard/l10n/es_PY.js -%%WWWDIR%%/apps-pkg/firstrunwizard/l10n/es_PY.json %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/es_SV.js %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/es_SV.json -%%WWWDIR%%/apps-pkg/firstrunwizard/l10n/es_UY.js -%%WWWDIR%%/apps-pkg/firstrunwizard/l10n/es_UY.json -%%WWWDIR%%/apps-pkg/firstrunwizard/l10n/et_EE.js -%%WWWDIR%%/apps-pkg/firstrunwizard/l10n/et_EE.json %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/eu.js %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/eu.json %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/fi.js @@ -7748,11 +7727,7 @@ %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/it.json %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/ja.js %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/ja.json -%%WWWDIR%%/apps-pkg/firstrunwizard/l10n/ka_GE.js -%%WWWDIR%%/apps-pkg/firstrunwizard/l10n/ka_GE.json %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/km.php -%%WWWDIR%%/apps-pkg/firstrunwizard/l10n/ko.js -%%WWWDIR%%/apps-pkg/firstrunwizard/l10n/ko.json %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/ku_IQ.php %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/lt_LT.js %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/lt_LT.json @@ -7772,8 +7747,6 @@ %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/sk.json %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/sl.js %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/sl.json -%%WWWDIR%%/apps-pkg/firstrunwizard/l10n/sq.js -%%WWWDIR%%/apps-pkg/firstrunwizard/l10n/sq.json %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/sr.js %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/sr.json %%WWWDIR%%/apps-pkg/firstrunwizard/l10n/sv.js @@ -9708,6 +9681,8 @@ %%WWWDIR%%/apps-pkg/theming/l10n/el.json %%WWWDIR%%/apps-pkg/theming/l10n/en_GB.js %%WWWDIR%%/apps-pkg/theming/l10n/en_GB.json +%%WWWDIR%%/apps-pkg/theming/l10n/eo.js +%%WWWDIR%%/apps-pkg/theming/l10n/eo.json %%WWWDIR%%/apps-pkg/theming/l10n/es.js %%WWWDIR%%/apps-pkg/theming/l10n/es.json %%WWWDIR%%/apps-pkg/theming/l10n/es_419.js @@ -9854,6 +9829,8 @@ %%WWWDIR%%/apps-pkg/twofactor_backupcodes/l10n/el.json %%WWWDIR%%/apps-pkg/twofactor_backupcodes/l10n/en_GB.js %%WWWDIR%%/apps-pkg/twofactor_backupcodes/l10n/en_GB.json +%%WWWDIR%%/apps-pkg/twofactor_backupcodes/l10n/eo.js +%%WWWDIR%%/apps-pkg/twofactor_backupcodes/l10n/eo.json %%WWWDIR%%/apps-pkg/twofactor_backupcodes/l10n/es.js %%WWWDIR%%/apps-pkg/twofactor_backupcodes/l10n/es.json %%WWWDIR%%/apps-pkg/twofactor_backupcodes/l10n/es_419.js @@ -9953,6 +9930,7 @@ %%WWWDIR%%/apps-pkg/twofactor_backupcodes/lib/Listener/ActivityPublisher.php %%WWWDIR%%/apps-pkg/twofactor_backupcodes/lib/Listener/ClearNotifications.php %%WWWDIR%%/apps-pkg/twofactor_backupcodes/lib/Listener/IListener.php +%%WWWDIR%%/apps-pkg/twofactor_backupcodes/lib/Listener/ProviderDisabled.php %%WWWDIR%%/apps-pkg/twofactor_backupcodes/lib/Listener/ProviderEnabled.php %%WWWDIR%%/apps-pkg/twofactor_backupcodes/lib/Listener/RegistryUpdater.php %%WWWDIR%%/apps-pkg/twofactor_backupcodes/lib/Migration/CheckBackupCodes.php @@ -12041,10 +12019,14 @@ %%WWWDIR%%/lib/l10n/ast.json %%WWWDIR%%/lib/l10n/az.js %%WWWDIR%%/lib/l10n/az.json +%%WWWDIR%%/lib/l10n/be.js +%%WWWDIR%%/lib/l10n/be.json %%WWWDIR%%/lib/l10n/bg.js %%WWWDIR%%/lib/l10n/bg.json %%WWWDIR%%/lib/l10n/bn_BD.js %%WWWDIR%%/lib/l10n/bn_BD.json +%%WWWDIR%%/lib/l10n/br.js +%%WWWDIR%%/lib/l10n/br.json %%WWWDIR%%/lib/l10n/bs.js %%WWWDIR%%/lib/l10n/bs.json %%WWWDIR%%/lib/l10n/ca.js @@ -12121,6 +12103,8 @@ %%WWWDIR%%/lib/l10n/hu.json %%WWWDIR%%/lib/l10n/hy.js %%WWWDIR%%/lib/l10n/hy.json +%%WWWDIR%%/lib/l10n/ia.js +%%WWWDIR%%/lib/l10n/ia.json %%WWWDIR%%/lib/l10n/id.js %%WWWDIR%%/lib/l10n/id.json %%WWWDIR%%/lib/l10n/is.js @@ -12129,6 +12113,8 @@ %%WWWDIR%%/lib/l10n/it.json %%WWWDIR%%/lib/l10n/ja.js %%WWWDIR%%/lib/l10n/ja.json +%%WWWDIR%%/lib/l10n/ka.js +%%WWWDIR%%/lib/l10n/ka.json %%WWWDIR%%/lib/l10n/ka_GE.js %%WWWDIR%%/lib/l10n/ka_GE.json %%WWWDIR%%/lib/l10n/km.js @@ -12189,6 +12175,8 @@ %%WWWDIR%%/lib/l10n/uk.json %%WWWDIR%%/lib/l10n/ur_PK.js %%WWWDIR%%/lib/l10n/ur_PK.json +%%WWWDIR%%/lib/l10n/uz.js +%%WWWDIR%%/lib/l10n/uz.json %%WWWDIR%%/lib/l10n/vi.js %%WWWDIR%%/lib/l10n/vi.json %%WWWDIR%%/lib/l10n/zh_CN.js @@ -13195,6 +13183,8 @@ %%WWWDIR%%/resources/locales.json %%WWWDIR%%/robots.txt %%WWWDIR%%/settings/.babelrc.js +%%WWWDIR%%/settings/Activity/GroupProvider.php +%%WWWDIR%%/settings/Activity/GroupSetting.php %%WWWDIR%%/settings/Activity/Provider.php %%WWWDIR%%/settings/Activity/SecurityFilter.php %%WWWDIR%%/settings/Activity/SecurityProvider.php @@ -13264,6 +13254,8 @@ %%WWWDIR%%/settings/js/templates/authtoken.handlebars %%WWWDIR%%/settings/js/templates/federationscopemenu.handlebars %%WWWDIR%%/settings/js/usersettings.js +%%WWWDIR%%/settings/l10n/ar.js +%%WWWDIR%%/settings/l10n/ar.json %%WWWDIR%%/settings/l10n/ast.js %%WWWDIR%%/settings/l10n/ast.json %%WWWDIR%%/settings/l10n/bg.js diff --git a/www/p5-Catalyst-Plugin-Session-Store-Cache/Makefile b/www/p5-Catalyst-Plugin-Session-Store-Cache/Makefile index 9996dcde7d1..d8db391bccd 100644 --- a/www/p5-Catalyst-Plugin-Session-Store-Cache/Makefile +++ b/www/p5-Catalyst-Plugin-Session-Store-Cache/Makefile @@ -11,10 +11,14 @@ PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org COMMENT= Store sessions using a Catalyst::Plugin::Cache +LICENSE= ART10 GPLv1+ +LICENSE_COMB= dual + BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= p5-Catalyst-Plugin-Session>=0.06:www/p5-Catalyst-Plugin-Session USES= perl5 USE_PERL5= configure +NO_ARCH= yes .include diff --git a/www/palemoon/Makefile b/www/palemoon/Makefile index 8abac16fd87..c837a8816bf 100644 --- a/www/palemoon/Makefile +++ b/www/palemoon/Makefile @@ -10,8 +10,7 @@ CATEGORIES= www ipv6 MAINTAINER= lichray@gmail.com COMMENT= Open Source Goanna-based web browser -DEPRECATED= Multiple vulnerabilities and crashes if built by Clang 8 -EXPIRATION_DATE=2019-08-31 +BROKEN_FreeBSD_13_amd64= xpcshell crashes after base Clang updated to 8.0.0 BUILD_DEPENDS= nspr>=4.15:devel/nspr \ nss>=3.31.1:security/nss \ diff --git a/www/py-bokeh/Makefile b/www/py-bokeh/Makefile index 59c414274c6..14c94413a9f 100644 --- a/www/py-bokeh/Makefile +++ b/www/py-bokeh/Makefile @@ -3,7 +3,7 @@ PORTNAME= bokeh PORTVERSION= 0.12.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-bottle/Makefile b/www/py-bottle/Makefile index 7ec35e8f5ff..8338d73735b 100644 --- a/www/py-bottle/Makefile +++ b/www/py-bottle/Makefile @@ -3,7 +3,7 @@ PORTNAME= bottle PORTVERSION= 0.12.15 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-cachecontrol/Makefile b/www/py-cachecontrol/Makefile index eb733a0a9e1..02b47dd0359 100644 --- a/www/py-cachecontrol/Makefile +++ b/www/py-cachecontrol/Makefile @@ -3,7 +3,7 @@ PORTNAME= CacheControl DISTVERSION= 0.12.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-cherrypy/Makefile b/www/py-cherrypy/Makefile index 8c83d0f6cc7..3741f4dfbc6 100644 --- a/www/py-cherrypy/Makefile +++ b/www/py-cherrypy/Makefile @@ -3,7 +3,7 @@ PORTNAME= cherrypy PORTVERSION= 5.4.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-cssmin/Makefile b/www/py-cssmin/Makefile index 80296c1c916..61f9bea8616 100644 --- a/www/py-cssmin/Makefile +++ b/www/py-cssmin/Makefile @@ -2,7 +2,7 @@ PORTNAME= cssmin PORTVERSION= 0.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-cssutils/Makefile b/www/py-cssutils/Makefile index b9fad5f6f7f..208946be809 100644 --- a/www/py-cssutils/Makefile +++ b/www/py-cssutils/Makefile @@ -3,6 +3,7 @@ PORTNAME= cssutils PORTVERSION= 1.0.2 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP diff --git a/www/py-django-annotations/Makefile b/www/py-django-annotations/Makefile index 9e091750ef2..bcafa3e6e35 100644 --- a/www/py-django-annotations/Makefile +++ b/www/py-django-annotations/Makefile @@ -2,7 +2,7 @@ PORTNAME= django-annotations PORTVERSION= 0.0.0.2016041401 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-django-configurations/Makefile b/www/py-django-configurations/Makefile index adcffc8086e..b4342b2b350 100644 --- a/www/py-django-configurations/Makefile +++ b/www/py-django-configurations/Makefile @@ -3,6 +3,7 @@ PORTNAME= django-configurations PORTVERSION= 2.1 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-django-mezzanine/Makefile b/www/py-django-mezzanine/Makefile index 0c4a91ca4ca..0d972dee941 100644 --- a/www/py-django-mezzanine/Makefile +++ b/www/py-django-mezzanine/Makefile @@ -3,6 +3,7 @@ PORTNAME= django-mezzanine DISTVERSION= 4.2.3-148 +PORTREVISION= 1 DISTVERSIONSUFFIX= -g12114051 CATEGORIES= www python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-flask/Makefile b/www/py-flask/Makefile index b6308394a37..699e3f6faa2 100644 --- a/www/py-flask/Makefile +++ b/www/py-flask/Makefile @@ -3,6 +3,7 @@ PORTNAME= Flask PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-gandi.cli/Makefile b/www/py-gandi.cli/Makefile index cacf47ce7fe..c758e3e55c2 100644 --- a/www/py-gandi.cli/Makefile +++ b/www/py-gandi.cli/Makefile @@ -3,6 +3,7 @@ PORTNAME= gandi.cli PORTVERSION= 1.2 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-grip/Makefile b/www/py-grip/Makefile index 1223b3a22a3..615d06c1edf 100644 --- a/www/py-grip/Makefile +++ b/www/py-grip/Makefile @@ -2,6 +2,7 @@ PORTNAME= grip PORTVERSION= 4.5.2 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-hyperlink/Makefile b/www/py-hyperlink/Makefile index 82d9deda589..43d4dc3bb4b 100644 --- a/www/py-hyperlink/Makefile +++ b/www/py-hyperlink/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= hyperlink -PORTVERSION= 18.0.0 +PORTVERSION= 19.0.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,8 +15,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}idna>=2.5:dns/py-idna@${PY_FLAVOR} -NO_ARCH= yes -USE_PYTHON= autoplist concurrent distutils USES= python +USE_PYTHON= autoplist concurrent distutils + +NO_ARCH= yes .include diff --git a/www/py-hyperlink/distinfo b/www/py-hyperlink/distinfo index 71c77085e70..0b506ee652f 100644 --- a/www/py-hyperlink/distinfo +++ b/www/py-hyperlink/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1519732284 -SHA256 (hyperlink-18.0.0.tar.gz) = f01b4ff744f14bc5d0a22a6b9f1525ab7d6312cb0ff967f59414bbac52f0a306 -SIZE (hyperlink-18.0.0.tar.gz) = 97625 +TIMESTAMP = 1554740473 +SHA256 (hyperlink-19.0.0.tar.gz) = 4288e34705da077fada1111a24a0aa08bb1e76699c9ce49876af722441845654 +SIZE (hyperlink-19.0.0.tar.gz) = 99099 diff --git a/www/py-imdbpy/Makefile b/www/py-imdbpy/Makefile index 051cf699247..06ce2e96c07 100644 --- a/www/py-imdbpy/Makefile +++ b/www/py-imdbpy/Makefile @@ -3,6 +3,7 @@ PORTNAME= imdbpy PORTVERSION= 6.6 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP \ SF/${PORTNAME}/IMDbPY/${PORTVERSION} diff --git a/www/py-internetarchive/Makefile b/www/py-internetarchive/Makefile index dc14300e078..d566ff81683 100644 --- a/www/py-internetarchive/Makefile +++ b/www/py-internetarchive/Makefile @@ -3,6 +3,7 @@ PORTNAME= internetarchive DISTVERSIONPREFIX= v DISTVERSION= 1.8.1 +PORTREVISION= 1 CATEGORIES= www python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-lesscpy/Makefile b/www/py-lesscpy/Makefile index 9d651125a58..0246223e8c7 100644 --- a/www/py-lesscpy/Makefile +++ b/www/py-lesscpy/Makefile @@ -2,6 +2,7 @@ PORTNAME= lesscpy DISTVERSION= 0.13.0 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-livereload/Makefile b/www/py-livereload/Makefile index 4fac6467363..43ead3faeda 100644 --- a/www/py-livereload/Makefile +++ b/www/py-livereload/Makefile @@ -2,6 +2,7 @@ PORTNAME= livereload DISTVERSION= 2.6.0 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-notebook/Makefile b/www/py-notebook/Makefile index 1d2caf85da4..617ec7f345a 100644 --- a/www/py-notebook/Makefile +++ b/www/py-notebook/Makefile @@ -2,6 +2,7 @@ PORTNAME= notebook PORTVERSION= 5.7.8 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-pafy/Makefile b/www/py-pafy/Makefile index 1d56299a28e..fceb5c9d786 100644 --- a/www/py-pafy/Makefile +++ b/www/py-pafy/Makefile @@ -3,7 +3,7 @@ PORTNAME= pafy PORTVERSION= 0.5.4 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-pelican/Makefile b/www/py-pelican/Makefile index 3485adf0e50..ad228aef863 100644 --- a/www/py-pelican/Makefile +++ b/www/py-pelican/Makefile @@ -3,6 +3,7 @@ PORTNAME= pelican PORTVERSION= 4.0.1 +PORTREVISION= 1 CATEGORIES= www textproc python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-planet/Makefile b/www/py-planet/Makefile index 36c4183df3b..39679d2b784 100644 --- a/www/py-planet/Makefile +++ b/www/py-planet/Makefile @@ -3,6 +3,7 @@ PORTNAME= planet PORTVERSION= 1.2.2 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-praw/Makefile b/www/py-praw/Makefile index 784e242381b..ef69f57bbfd 100644 --- a/www/py-praw/Makefile +++ b/www/py-praw/Makefile @@ -3,6 +3,7 @@ PORTNAME= praw PORTVERSION= 3.5.0 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= www python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-pyjwt/Makefile b/www/py-pyjwt/Makefile index 47511ca8cca..bae8334b2b1 100644 --- a/www/py-pyjwt/Makefile +++ b/www/py-pyjwt/Makefile @@ -2,6 +2,7 @@ PORTNAME= pyjwt PORTVERSION= 1.4.0 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-python-dotenv/Makefile b/www/py-python-dotenv/Makefile index 7e50d209ac4..5f28108482d 100644 --- a/www/py-python-dotenv/Makefile +++ b/www/py-python-dotenv/Makefile @@ -3,6 +3,7 @@ PORTNAME= python-dotenv PORTVERSION= 0.10.1 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-scrapy/Makefile b/www/py-scrapy/Makefile index 9a96daddb0b..a2b8e05591d 100644 --- a/www/py-scrapy/Makefile +++ b/www/py-scrapy/Makefile @@ -3,7 +3,7 @@ PORTNAME= Scrapy DISTVERSION= 1.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-spyne/Makefile b/www/py-spyne/Makefile index bb41fdba50b..3effddb13fb 100644 --- a/www/py-spyne/Makefile +++ b/www/py-spyne/Makefile @@ -3,6 +3,7 @@ PORTNAME= spyne PORTVERSION= 2.12.16 +PORTREVISION= 1 CATEGORIES= www devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-wagtail/Makefile b/www/py-wagtail/Makefile index bbad765500c..9f4ef3407a1 100644 --- a/www/py-wagtail/Makefile +++ b/www/py-wagtail/Makefile @@ -3,6 +3,7 @@ PORTNAME= wagtail PORTVERSION= 2.4 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-waitress/Makefile b/www/py-waitress/Makefile index bd56432022f..b1152375591 100644 --- a/www/py-waitress/Makefile +++ b/www/py-waitress/Makefile @@ -3,6 +3,7 @@ PORTNAME= waitress PORTVERSION= 1.2.1 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-wfuzz/Makefile b/www/py-wfuzz/Makefile index 65b4e1ab21b..8598a7ff958 100644 --- a/www/py-wfuzz/Makefile +++ b/www/py-wfuzz/Makefile @@ -2,6 +2,7 @@ PORTNAME= wfuzz DISTVERSION= 2.2.11 +PORTREVISION= 1 CATEGORIES= www security python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/radicale/Makefile b/www/radicale/Makefile index 691a3b4752c..9af4b9c87ac 100644 --- a/www/radicale/Makefile +++ b/www/radicale/Makefile @@ -3,7 +3,7 @@ PORTNAME= radicale PORTVERSION= 1.1.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/rtv/Makefile b/www/rtv/Makefile index 1209b48473f..e9636b4cdf0 100644 --- a/www/rtv/Makefile +++ b/www/rtv/Makefile @@ -2,6 +2,7 @@ PORTNAME= rtv PORTVERSION= 1.26.0 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= www diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index 498b470a11e..c2fd4d6c9a8 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -13,8 +13,7 @@ DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= The open source, standards compliant web browser -DEPRECATED= Multiple vulnerabilities and crashes if built by Clang 8 -EXPIRATION_DATE=2019-08-31 +BROKEN_FreeBSD_13_amd64= xpcshell crashes after base Clang updated to 8.0.0 BUILD_DEPENDS= nspr>=4.13.1:devel/nspr \ nss>=3.28.6:security/nss \ diff --git a/www/squid-devel/files/patch-src_security_ServerOptions.h b/www/squid-devel/files/patch-src_security_ServerOptions.h new file mode 100644 index 00000000000..bd40ec4feaf --- /dev/null +++ b/www/squid-devel/files/patch-src_security_ServerOptions.h @@ -0,0 +1,11 @@ +--- src/security/ServerOptions.h.orig 2018-06-11 16:30:57 UTC ++++ src/security/ServerOptions.h +@@ -29,7 +29,7 @@ class ServerOptions : public PeerOptions (public) + // is more secure to have only a small set of trusted CA. + flags.tlsDefaultCa.defaultTo(false); + } +- ServerOptions(const ServerOptions &) = default; ++ ServerOptions(const ServerOptions &) = delete; + ServerOptions &operator =(const ServerOptions &); + ServerOptions(ServerOptions &&o) { this->operator =(o); } + ServerOptions &operator =(ServerOptions &&o) { this->operator =(o); return *this; } diff --git a/www/tomcat85/Makefile b/www/tomcat85/Makefile index 73b001e31f6..a5a2447fa98 100644 --- a/www/tomcat85/Makefile +++ b/www/tomcat85/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tomcat -PORTVERSION= 8.5.38 +PORTVERSION= 8.5.39 CATEGORIES= www java MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin PKGNAMESUFFIX= 85 diff --git a/www/tomcat85/distinfo b/www/tomcat85/distinfo index a87e8e9a9db..ff791815512 100644 --- a/www/tomcat85/distinfo +++ b/www/tomcat85/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1549974375 -SHA256 (apache-tomcat-8.5.38.tar.gz) = e6c8c4fd2880391c9cd699ff5e1362d73b466642a8e033c6ae3d2bca7d4f8877 -SIZE (apache-tomcat-8.5.38.tar.gz) = 9672042 +TIMESTAMP = 1554284805 +SHA256 (apache-tomcat-8.5.39.tar.gz) = 18f8b26468389202eaf5ad0f40b16ace1addea312bedbd2a09b72558d8aad696 +SIZE (apache-tomcat-8.5.39.tar.gz) = 9672485 diff --git a/www/tomcat9/Makefile b/www/tomcat9/Makefile index 62e3bfec570..85bd460bf93 100644 --- a/www/tomcat9/Makefile +++ b/www/tomcat9/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tomcat -PORTVERSION= 9.0.16 +PORTVERSION= 9.0.17 CATEGORIES= www java MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin PKGNAMESUFFIX= 9 diff --git a/www/tomcat9/distinfo b/www/tomcat9/distinfo index 57bd1b86880..1094009e3b3 100644 --- a/www/tomcat9/distinfo +++ b/www/tomcat9/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1549972451 -SHA256 (apache-tomcat-9.0.16.tar.gz) = 1f45dd960c6cbc044e75ce0ed5ae5d3af62aff0152fa56b8160d2e3dc23f417a -SIZE (apache-tomcat-9.0.16.tar.gz) = 10783080 +TIMESTAMP = 1554283887 +SHA256 (apache-tomcat-9.0.17.tar.gz) = 6c8a8bccc2bee1b28b3a8da128db26f6e22a3546a6cd44e655c8e34157a215a6 +SIZE (apache-tomcat-9.0.17.tar.gz) = 10798037 diff --git a/www/uwsgi/Makefile b/www/uwsgi/Makefile index dd85fae12fa..fe5d7c03685 100644 --- a/www/uwsgi/Makefile +++ b/www/uwsgi/Makefile @@ -3,7 +3,7 @@ PORTNAME= uwsgi PORTVERSION= 2.0.16 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www python MASTER_SITES= http://projects.unbit.it/downloads/ diff --git a/www/uwsgitop/Makefile b/www/uwsgitop/Makefile index 533c867ecba..122dc3fa89d 100644 --- a/www/uwsgitop/Makefile +++ b/www/uwsgitop/Makefile @@ -3,6 +3,7 @@ PORTNAME= uwsgitop PORTVERSION= 0.10 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= CHEESESHOP diff --git a/www/varnish4/Makefile b/www/varnish4/Makefile index 0c9dad86a20..c67ad1d48f1 100644 --- a/www/varnish4/Makefile +++ b/www/varnish4/Makefile @@ -3,7 +3,7 @@ PORTNAME= varnish PORTVERSION= 4.1.10 DISTVERSIONPREFIX= varnish- -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= www PKGNAMESUFFIX= 4 diff --git a/www/varnish6/Makefile b/www/varnish6/Makefile index 8306c65db90..3732f155425 100644 --- a/www/varnish6/Makefile +++ b/www/varnish6/Makefile @@ -3,7 +3,7 @@ PORTNAME= varnish PORTVERSION= 6.2.0 DISTVERSIONPREFIX= varnish- -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= www PKGNAMESUFFIX= 6 diff --git a/x11-fonts/Makefile b/x11-fonts/Makefile index ea918c9d79f..c5c03bd9758 100644 --- a/x11-fonts/Makefile +++ b/x11-fonts/Makefile @@ -167,6 +167,7 @@ SUBDIR += noto-sc SUBDIR += noto-tc SUBDIR += nucleus + SUBDIR += orbitron SUBDIR += ohsnap SUBDIR += oldschool-pc-fonts SUBDIR += p5-Font-AFM diff --git a/x11-fonts/orbitron/Makefile b/x11-fonts/orbitron/Makefile new file mode 100644 index 00000000000..8d99abf1707 --- /dev/null +++ b/x11-fonts/orbitron/Makefile @@ -0,0 +1,26 @@ +# Created by: Florian Limberger +# $FreeBSD$ + +PORTNAME= orbitron +DISTVERSION= g20110525 +CATEGORIES= x11-fonts + +MAINTAINER= flo@snakeoilproductions.net +COMMENT= Geometric sans-serif typeface intended for display purposes + +LICENSE= OFL11 +LICENSE_FILE= ${WRKSRC}/Open\ Font\ License.markdown + +USES= fonts +USE_GITHUB= yes +GH_ACCOUNT= theleagueof +GH_TAGNAME= 13e6a5222aa6818d81c9acd27edd701a2d744152 + +NO_ARCH= yes +NO_BUILD= yes + +do-install: + ${MKDIR} ${STAGEDIR}${FONTSDIR} + ${INSTALL_DATA} ${WRKSRC}/*.otf ${STAGEDIR}${FONTSDIR} + +.include diff --git a/x11-fonts/orbitron/distinfo b/x11-fonts/orbitron/distinfo new file mode 100644 index 00000000000..ddc23254870 --- /dev/null +++ b/x11-fonts/orbitron/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1554739704 +SHA256 (theleagueof-orbitron-g20110525-13e6a5222aa6818d81c9acd27edd701a2d744152_GH0.tar.gz) = aded1f80ff6a2500367336058a8e2ce03f508e325ffc38b815bea7c2b4e964df +SIZE (theleagueof-orbitron-g20110525-13e6a5222aa6818d81c9acd27edd701a2d744152_GH0.tar.gz) = 939319 diff --git a/x11-fonts/orbitron/pkg-descr b/x11-fonts/orbitron/pkg-descr new file mode 100644 index 00000000000..fa99845cc9d --- /dev/null +++ b/x11-fonts/orbitron/pkg-descr @@ -0,0 +1,5 @@ +Orbitron is a geometric sans-serif typeface intended for display purposes. It +features four weights (light, medium, bold, and black), a stylistic +alternative, small caps, and a ton of alternate glyphs. + +WWW: https://github.com/theleagueof/orbitron diff --git a/x11-fonts/orbitron/pkg-plist b/x11-fonts/orbitron/pkg-plist new file mode 100644 index 00000000000..bc5cf81a44e --- /dev/null +++ b/x11-fonts/orbitron/pkg-plist @@ -0,0 +1,4 @@ +%%FONTSDIR%%/Orbitron Black.otf +%%FONTSDIR%%/Orbitron Bold.otf +%%FONTSDIR%%/Orbitron Light.otf +%%FONTSDIR%%/Orbitron Medium.otf diff --git a/x11-fonts/py-bdflib/Makefile b/x11-fonts/py-bdflib/Makefile index 2f08fe258b7..c4c8e5f55bf 100644 --- a/x11-fonts/py-bdflib/Makefile +++ b/x11-fonts/py-bdflib/Makefile @@ -3,6 +3,7 @@ PORTNAME= bdflib PORTVERSION= 1.0.4 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= x11-fonts python MASTER_SITES= CHEESESHOP diff --git a/x11-fonts/py-compreffor/Makefile b/x11-fonts/py-compreffor/Makefile index 23e459302a1..15184b790ff 100644 --- a/x11-fonts/py-compreffor/Makefile +++ b/x11-fonts/py-compreffor/Makefile @@ -2,6 +2,7 @@ PORTNAME= compreffor PORTVERSION= 0.4.6 +PORTREVISION= 1 CATEGORIES= x11-fonts python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/x11-fonts/py-cu2qu/Makefile b/x11-fonts/py-cu2qu/Makefile index c0e415ece6a..c27f6e24161 100644 --- a/x11-fonts/py-cu2qu/Makefile +++ b/x11-fonts/py-cu2qu/Makefile @@ -2,6 +2,7 @@ PORTNAME= cu2qu PORTVERSION= 1.6.4 +PORTREVISION= 1 CATEGORIES= x11-fonts python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/x11-fonts/py-fontmake/Makefile b/x11-fonts/py-fontmake/Makefile index bd24d48f4c2..ff00312eabb 100644 --- a/x11-fonts/py-fontmake/Makefile +++ b/x11-fonts/py-fontmake/Makefile @@ -2,6 +2,7 @@ PORTNAME= fontmake PORTVERSION= 1.7.5 +PORTREVISION= 1 CATEGORIES= x11-fonts python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/x11-fonts/py-glyphsLib/Makefile b/x11-fonts/py-glyphsLib/Makefile index 1d9fd6cda8e..96f6899b50c 100644 --- a/x11-fonts/py-glyphsLib/Makefile +++ b/x11-fonts/py-glyphsLib/Makefile @@ -2,6 +2,7 @@ PORTNAME= glyphsLib PORTVERSION= 3.1.2 +PORTREVISION= 1 CATEGORIES= x11-fonts python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/x11-toolkits/nanogui/Makefile b/x11-toolkits/nanogui/Makefile index 047a87c3737..b7081564d20 100644 --- a/x11-toolkits/nanogui/Makefile +++ b/x11-toolkits/nanogui/Makefile @@ -2,7 +2,7 @@ PORTNAME= nanogui DISTVERSION= g20180413 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits MAINTAINER= yuri@FreeBSD.org diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile index 42e1a2dabd2..69ae06f0a7c 100644 --- a/x11-wm/fvwm2/Makefile +++ b/x11-wm/fvwm2/Makefile @@ -3,7 +3,7 @@ PORTNAME= fvwm PORTVERSION= 2.6.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm MASTER_SITES= https://github.com/fvwmorg/fvwm/releases/download/${PORTVERSION}/ \ http://www.fvwm.org/generated/icon_download/ diff --git a/x11-wm/ratpoison/Makefile b/x11-wm/ratpoison/Makefile index 14e5976048c..696efdd9f22 100644 --- a/x11-wm/ratpoison/Makefile +++ b/x11-wm/ratpoison/Makefile @@ -3,7 +3,7 @@ PORTNAME= ratpoison PORTVERSION= 1.4.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm MASTER_SITES= SAVANNAH diff --git a/x11/alacritty/Makefile b/x11/alacritty/Makefile index 3acac6c88ca..d6cde701306 100644 --- a/x11/alacritty/Makefile +++ b/x11/alacritty/Makefile @@ -1,9 +1,8 @@ # $FreeBSD$ PORTNAME= alacritty -PORTVERSION= 0.2.9 +PORTVERSION= 0.3.0 DISTVERSIONPREFIX= v -PORTREVISION= 3 CATEGORIES= x11 MAINTAINER= zeising@FreeBSD.org @@ -22,9 +21,10 @@ GH_ACCOUNT= jwilm OPTIONS_DEFINE= EXAMPLES PLIST_FILES= bin/alacritty \ + etc/bash_completion.d/alacritty.bash \ man/man1/alacritty.1.gz \ - etc/bash_completion.d/alacritty-completions.bash \ - share/fish/completions/alacritty-completions.fish \ + share/fish/completions/alacritty.fish \ + share/pixmaps/Alacritty.svg \ share/zsh/site-functions/_alacritty \ ${DESKTOPDIR:S,^${PREFIX}/,,}/alacritty.desktop @@ -32,18 +32,19 @@ PORTEXAMPLES= alacritty.yml CARGO_CRATES= MacTypes-sys-2.1.0 \ adler32-1.0.3 \ - advapi32-sys-0.2.0 \ - aho-corasick-0.6.9 \ - andrew-0.1.6 \ + aho-corasick-0.6.10 \ + aho-corasick-0.7.3 \ + andrew-0.2.1 \ android_glue-0.2.3 \ ansi_term-0.11.0 \ - approx-0.3.1 \ + approx-0.3.2 \ + arc-swap-0.3.9 \ argon2rs-0.2.5 \ - arraydeque-0.4.3 \ + arraydeque-0.4.5 \ arrayvec-0.4.10 \ atty-0.2.11 \ autocfg-0.1.2 \ - backtrace-0.3.13 \ + backtrace-0.3.15 \ backtrace-sys-0.1.28 \ base64-0.10.1 \ bindgen-0.33.2 \ @@ -51,64 +52,70 @@ CARGO_CRATES= MacTypes-sys-2.1.0 \ bitflags-1.0.4 \ blake2-rfc-0.2.18 \ block-0.1.6 \ + build_const-0.2.1 \ byteorder-1.3.1 \ - bytes-0.4.11 \ + bytes-0.4.12 \ bzip2-0.3.3 \ bzip2-sys-0.1.7 \ - cc-1.0.29 \ + cc-1.0.34 \ cexpr-0.2.3 \ - cfg-if-0.1.6 \ + cfg-if-0.1.7 \ cgl-0.2.3 \ clang-sys-0.22.0 \ - clap-2.32.0 \ - clipboard-0.4.6 \ + clap-2.33.0 \ + clipboard-0.5.0 \ clipboard-win-2.1.2 \ cloudabi-0.0.3 \ - cmake-0.1.35 \ + cmake-0.1.38 \ cocoa-0.18.4 \ color_quant-1.0.1 \ constant_time_eq-0.1.3 \ core-foundation-0.5.1 \ - core-foundation-0.6.3 \ + core-foundation-0.6.4 \ core-foundation-sys-0.5.1 \ core-foundation-sys-0.6.2 \ - core-graphics-0.13.0 \ + core-graphics-0.14.0 \ core-graphics-0.17.3 \ - core-text-13.1.1 \ - core-text-9.2.0 \ - crc32fast-1.1.2 \ - crossbeam-0.6.0 \ + core-text-10.0.0 \ + core-text-13.2.0 \ + crc-1.8.1 \ + crc32fast-1.2.0 \ crossbeam-channel-0.3.8 \ crossbeam-deque-0.2.0 \ - crossbeam-deque-0.6.3 \ + crossbeam-deque-0.7.1 \ crossbeam-epoch-0.3.1 \ crossbeam-epoch-0.7.1 \ + crossbeam-queue-0.1.2 \ crossbeam-utils-0.2.2 \ crossbeam-utils-0.6.5 \ deflate-0.7.19 \ - dirs-1.0.4 \ + derivative-1.0.2 \ + dirs-1.0.5 \ dlib-0.4.1 \ downcast-rs-1.0.3 \ dtoa-0.4.3 \ - dunce-0.1.1 \ - either-1.5.0 \ - embed-resource-1.1.4 \ - encoding_rs-0.8.16 \ + dunce-1.0.0 \ + either-1.5.2 \ + embed-resource-1.2.0 \ + encoding_rs-0.8.17 \ env_logger-0.5.13 \ - env_logger-0.6.0 \ + env_logger-0.6.1 \ errno-0.2.4 \ errno-dragonfly-0.1.1 \ - error-chain-0.11.0 \ - euclid-0.19.5 \ + euclid-0.19.7 \ euclid_macros-0.1.0 \ expat-sys-2.1.6 \ failure-0.1.5 \ failure_derive-0.1.5 \ filetime-0.2.4 \ + flate2-1.0.7 \ fnv-1.0.6 \ - font-loader-0.6.0 \ + font-loader-0.8.0 \ foreign-types-0.3.2 \ + foreign-types-0.4.0 \ + foreign-types-macros-0.1.0 \ foreign-types-shared-0.1.1 \ + foreign-types-shared-0.2.0 \ freetype-rs-0.19.1 \ freetype-sys-0.7.1 \ fsevent-0.2.17 \ @@ -116,80 +123,86 @@ CARGO_CRATES= MacTypes-sys-2.1.0 \ fuchsia-cprng-0.1.1 \ fuchsia-zircon-0.3.3 \ fuchsia-zircon-sys-0.3.3 \ - futures-0.1.25 \ + futures-0.1.26 \ futures-cpupool-0.1.8 \ gcc-0.3.55 \ - gdi32-sys-0.2.0 \ gif-0.10.1 \ gl_generator-0.10.0 \ - gleam-0.6.8 \ + gl_generator-0.11.0 \ + gleam-0.6.16 \ glob-0.2.11 \ - glutin-0.19.0 \ - h2-0.1.16 \ - http-0.1.15 \ + glutin-0.21.0-rc1 \ + glutin_egl_sys-0.1.2 \ + glutin_emscripten_sys-0.1.0 \ + glutin_gles2_sys-0.1.2 \ + glutin_glx_sys-0.1.3 \ + glutin_wgl_sys-0.1.2 \ + h2-0.1.17 \ + http-0.1.17 \ httparse-1.3.3 \ humantime-1.2.0 \ - hyper-0.12.24 \ - hyper-tls-0.3.1 \ + hyper-0.12.25 \ + hyper-tls-0.3.2 \ idna-0.1.5 \ - image-0.20.1 \ + image-0.21.0 \ indexmap-1.0.2 \ - inflate-0.4.4 \ + inflate-0.4.5 \ inotify-0.6.1 \ inotify-sys-0.1.3 \ iovec-0.1.2 \ itoa-0.4.3 \ jpeg-decoder-0.1.15 \ kernel32-sys-0.2.2 \ - khronos_api-3.0.0 \ - lazy_static-1.2.0 \ + khronos_api-3.1.0 \ + lazy_static-1.3.0 \ lazycell-1.2.1 \ - libc-0.2.49 \ - libflate-0.1.19 \ + libc-0.2.51 \ + libflate-0.1.21 \ libloading-0.5.0 \ libz-sys-1.0.25 \ line_drawing-0.7.0 \ - linked-hash-map-0.5.1 \ + linked-hash-map-0.5.2 \ lock_api-0.1.5 \ log-0.4.6 \ lzw-0.10.0 \ malloc_buf-0.0.6 \ matches-0.1.8 \ memchr-1.0.2 \ - memchr-2.1.3 \ + memchr-2.2.0 \ memmap-0.7.0 \ memoffset-0.2.1 \ mime-0.3.13 \ mime_guess-2.0.0-alpha.6 \ + miniz_oxide-0.2.1 \ + miniz_oxide_c_api-0.2.1 \ mio-0.6.16 \ mio-anonymous-pipes-0.1.0 \ mio-extras-2.0.5 \ mio-named-pipes-0.1.6 \ + mio-uds-0.6.7 \ miow-0.2.1 \ miow-0.3.3 \ - named_pipe-0.3.0 \ + named_pipe-0.4.1 \ native-tls-0.2.2 \ net2-0.2.33 \ - nix-0.12.0 \ + nix-0.13.0 \ nodrop-0.1.13 \ nom-3.2.1 \ - nom-4.2.0 \ - notify-4.0.9 \ + nom-4.2.3 \ + notify-4.0.10 \ num-derive-0.2.4 \ num-integer-0.1.39 \ num-iter-0.1.37 \ num-rational-0.2.1 \ - num-traits-0.1.43 \ num-traits-0.2.6 \ num_cpus-1.10.0 \ - objc-0.2.5 \ + objc-0.2.6 \ objc-foundation-0.1.1 \ objc_id-0.1.1 \ - openssl-0.10.16 \ + openssl-0.10.20 \ openssl-probe-0.1.2 \ - openssl-sys-0.9.40 \ - ordered-float-0.5.2 \ - ordered-float-1.0.1 \ + openssl-sys-0.9.43 \ + ordered-float-1.0.2 \ osmesa-sys-0.1.2 \ owning_ref-0.4.0 \ parking_lot-0.7.1 \ @@ -201,13 +214,12 @@ CARGO_CRATES= MacTypes-sys-2.1.0 \ phf_generator-0.7.24 \ phf_shared-0.7.24 \ pkg-config-0.3.14 \ - png-0.12.0 \ + png-0.14.0 \ podio-0.1.6 \ proc-macro2-0.4.27 \ quick-error-1.2.2 \ quote-0.3.15 \ quote-0.6.11 \ - rand-0.4.6 \ rand-0.6.5 \ rand_chacha-0.1.1 \ rand_core-0.3.1 \ @@ -215,132 +227,138 @@ CARGO_CRATES= MacTypes-sys-2.1.0 \ rand_hc-0.1.0 \ rand_isaac-0.1.1 \ rand_jitter-0.1.3 \ - rand_os-0.1.2 \ - rand_pcg-0.1.1 \ + rand_os-0.1.3 \ + rand_pcg-0.1.2 \ rand_xorshift-0.1.1 \ rayon-1.0.3 \ rayon-core-1.4.1 \ rdrand-0.4.0 \ - redox_syscall-0.1.51 \ + redox_syscall-0.1.53 \ redox_termios-0.1.1 \ - redox_users-0.2.0 \ + redox_users-0.3.0 \ regex-0.2.11 \ - regex-1.1.0 \ + regex-1.1.5 \ regex-syntax-0.5.6 \ - regex-syntax-0.6.5 \ + regex-syntax-0.6.6 \ remove_dir_all-0.5.1 \ - reqwest-0.9.9 \ + reqwest-0.9.13 \ rustc-demangle-0.1.13 \ rustc_version-0.2.3 \ - rusttype-0.4.3 \ rusttype-0.7.5 \ ryu-0.2.7 \ + safe-transmute-0.10.1 \ same-file-1.0.4 \ - schannel-0.1.14 \ + schannel-0.1.15 \ scoped_threadpool-0.1.9 \ scopeguard-0.3.3 \ security-framework-0.2.2 \ security-framework-sys-0.2.3 \ semver-0.9.0 \ semver-parser-0.7.0 \ - serde-1.0.87 \ - serde_derive-1.0.87 \ - serde_json-1.0.38 \ + serde-1.0.90 \ + serde_derive-1.0.90 \ + serde_json-1.0.39 \ serde_urlencoded-0.5.4 \ serde_yaml-0.8.8 \ servo-fontconfig-0.4.0 \ servo-fontconfig-sys-4.0.7 \ shared_library-0.1.9 \ + signal-hook-0.1.8 \ siphasher-0.2.3 \ slab-0.4.2 \ - smallvec-0.6.8 \ - smithay-client-toolkit-0.4.4 \ + smallvec-0.6.9 \ + smithay-client-toolkit-0.4.5 \ socket2-0.3.8 \ spsc-buffer-0.1.1 \ stable_deref_trait-1.1.1 \ static_assertions-0.3.1 \ stb_truetype-0.2.6 \ string-0.1.3 \ - strsim-0.7.0 \ - syn-0.15.26 \ + strsim-0.8.0 \ + syn-0.15.30 \ synstructure-0.10.1 \ - tempfile-3.0.6 \ + tempfile-3.0.7 \ termcolor-1.0.4 \ terminfo-0.6.1 \ termion-1.5.1 \ - textwrap-0.10.0 \ + textwrap-0.11.0 \ thread_local-0.3.6 \ tiff-0.2.2 \ time-0.1.42 \ - tokio-0.1.15 \ - tokio-current-thread-0.1.4 \ - tokio-executor-0.1.6 \ - tokio-io-0.1.11 \ - tokio-reactor-0.1.8 \ + tokio-0.1.18 \ + tokio-current-thread-0.1.6 \ + tokio-executor-0.1.7 \ + tokio-io-0.1.12 \ + tokio-reactor-0.1.9 \ + tokio-sync-0.1.4 \ tokio-tcp-0.1.3 \ - tokio-threadpool-0.1.11 \ + tokio-threadpool-0.1.13 \ tokio-timer-0.2.10 \ + tokio-trace-core-0.1.0 \ try-lock-0.2.2 \ ucd-util-0.1.3 \ unicase-1.4.2 \ - unicase-2.2.0 \ + unicase-2.3.0 \ unicode-bidi-0.3.4 \ unicode-normalization-0.1.8 \ unicode-width-0.1.5 \ unicode-xid-0.1.0 \ - unreachable-1.0.0 \ url-1.7.2 \ - user32-sys-0.2.0 \ utf8-ranges-1.0.2 \ utf8parse-0.1.1 \ - uuid-0.7.2 \ + uuid-0.7.4 \ vcpkg-0.2.6 \ vec_map-0.8.1 \ version_check-0.1.5 \ void-1.0.2 \ + vswhom-0.1.0 \ + vswhom-sys-0.1.0 \ vte-0.3.3 \ walkdir-2.2.7 \ want-0.0.6 \ - wayland-client-0.21.11 \ - wayland-commons-0.21.11 \ - wayland-protocols-0.21.11 \ - wayland-scanner-0.21.11 \ - wayland-sys-0.21.11 \ + wayland-client-0.21.12 \ + wayland-commons-0.21.12 \ + wayland-protocols-0.21.12 \ + wayland-scanner-0.21.12 \ + wayland-sys-0.21.12 \ which-1.0.5 \ - widestring-0.2.2 \ widestring-0.4.0 \ winapi-0.2.8 \ - winapi-0.3.6 \ + winapi-0.3.7 \ winapi-build-0.1.1 \ winapi-i686-pc-windows-gnu-0.4.0 \ winapi-util-0.1.2 \ winapi-x86_64-pc-windows-gnu-0.4.0 \ wincolor-1.0.1 \ - winit-0.18.1 \ + winit-0.19.1 \ winpty-sys-0.4.3 \ - winreg-0.4.0 \ + winreg-0.5.1 \ ws2_32-sys-0.2.1 \ - x11-clipboard-0.2.2 \ + x11-clipboard-0.3.1 \ x11-dl-2.18.3 \ xcb-0.8.2 \ xdg-2.2.0 \ xml-rs-0.8.0 \ - yaml-rust-0.4.2 \ - zip-0.5.0 + yaml-rust-0.4.3 \ + zip-0.5.2 post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/alacritty - ${INSTALL_DATA} ${WRKSRC}/alacritty.desktop ${STAGEDIR}${DESKTOPDIR} - ${INSTALL_MAN} ${WRKSRC}/alacritty.man ${STAGEDIR}${MANPREFIX}/man/man1/alacritty.1 + ${INSTALL_DATA} ${WRKSRC}/extra/linux/alacritty.desktop \ + ${STAGEDIR}${DESKTOPDIR} + ${INSTALL_DATA} ${WRKSRC}/extra/logo/alacritty-term.svg \ + ${STAGEDIR}${PREFIX}/share/pixmaps/Alacritty.svg + ${INSTALL_MAN} ${WRKSRC}/extra/alacritty.man \ + ${STAGEDIR}${MANPREFIX}/man/man1/alacritty.1 @${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d - ${INSTALL_DATA} ${WRKSRC}/alacritty-completions.bash \ + ${INSTALL_DATA} ${WRKSRC}/extra/completions/alacritty.bash \ ${STAGEDIR}${PREFIX}/etc/bash_completion.d @${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions - ${INSTALL_DATA} ${WRKSRC}/alacritty-completions.fish \ + ${INSTALL_DATA} ${WRKSRC}/extra/completions/alacritty.fish \ ${STAGEDIR}${PREFIX}/share/fish/completions @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions - ${INSTALL_DATA} ${WRKSRC}/alacritty-completions.zsh \ - ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_alacritty + ${INSTALL_DATA} ${WRKSRC}/extra/completions/_alacritty \ + ${STAGEDIR}${PREFIX}/share/zsh/site-functions post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} diff --git a/x11/alacritty/distinfo b/x11/alacritty/distinfo index 1398997cd73..da267f79c70 100644 --- a/x11/alacritty/distinfo +++ b/x11/alacritty/distinfo @@ -1,32 +1,34 @@ -TIMESTAMP = 1550164554 +TIMESTAMP = 1554752071 SHA256 (rust/crates/MacTypes-sys-2.1.0.tar.gz) = eaf9f0d0b1cc33a4d2aee14fb4b2eac03462ef4db29c8ac4057327d8a71ad86f SIZE (rust/crates/MacTypes-sys-2.1.0.tar.gz) = 9274 SHA256 (rust/crates/adler32-1.0.3.tar.gz) = 7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c SIZE (rust/crates/adler32-1.0.3.tar.gz) = 5734 -SHA256 (rust/crates/advapi32-sys-0.2.0.tar.gz) = e06588080cb19d0acb6739808aafa5f26bfb2ca015b2b6370028b44cf7cb8a9a -SIZE (rust/crates/advapi32-sys-0.2.0.tar.gz) = 7217 -SHA256 (rust/crates/aho-corasick-0.6.9.tar.gz) = 1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e -SIZE (rust/crates/aho-corasick-0.6.9.tar.gz) = 25979 -SHA256 (rust/crates/andrew-0.1.6.tar.gz) = 142e9e6a99ad0d63a4cf6ce58a4c979f472c5815cbf7e5ca4e47b26a10dc728e -SIZE (rust/crates/andrew-0.1.6.tar.gz) = 9173 +SHA256 (rust/crates/aho-corasick-0.6.10.tar.gz) = 81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5 +SIZE (rust/crates/aho-corasick-0.6.10.tar.gz) = 26122 +SHA256 (rust/crates/aho-corasick-0.7.3.tar.gz) = e6f484ae0c99fec2e858eb6134949117399f222608d84cadb3f58c1f97c2364c +SIZE (rust/crates/aho-corasick-0.7.3.tar.gz) = 55093 +SHA256 (rust/crates/andrew-0.2.1.tar.gz) = 9b7f09f89872c2b6b29e319377b1fbe91c6f5947df19a25596e121cf19a7b35e +SIZE (rust/crates/andrew-0.2.1.tar.gz) = 9595 SHA256 (rust/crates/android_glue-0.2.3.tar.gz) = 000444226fcff248f2bc4c7625be32c63caccfecc2723a2b9f78a7487a49c407 SIZE (rust/crates/android_glue-0.2.3.tar.gz) = 1572 SHA256 (rust/crates/ansi_term-0.11.0.tar.gz) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b SIZE (rust/crates/ansi_term-0.11.0.tar.gz) = 17087 -SHA256 (rust/crates/approx-0.3.1.tar.gz) = 3c57ff1a5b00753647aebbbcf4ea67fa1e711a65ea7a30eb90dbf07de2485aee -SIZE (rust/crates/approx-0.3.1.tar.gz) = 14133 +SHA256 (rust/crates/approx-0.3.2.tar.gz) = f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3 +SIZE (rust/crates/approx-0.3.2.tar.gz) = 14288 +SHA256 (rust/crates/arc-swap-0.3.9.tar.gz) = bcee9b73d8a058eebb0b567fd3687f6761fb232049f92c23bdd2c82b6fe0c0cc +SIZE (rust/crates/arc-swap-0.3.9.tar.gz) = 44082 SHA256 (rust/crates/argon2rs-0.2.5.tar.gz) = 3f67b0b6a86dae6e67ff4ca2b6201396074996379fba2b92ff649126f37cb392 SIZE (rust/crates/argon2rs-0.2.5.tar.gz) = 353096 -SHA256 (rust/crates/arraydeque-0.4.3.tar.gz) = e300327073b806ffc81fccb228b2d4131ac7ef1b1a015f7b0c399c7f886cacc6 -SIZE (rust/crates/arraydeque-0.4.3.tar.gz) = 17884 +SHA256 (rust/crates/arraydeque-0.4.5.tar.gz) = f0ffd3d69bd89910509a5d31d1f1353f38ccffdd116dd0099bbd6627f7bd8ad8 +SIZE (rust/crates/arraydeque-0.4.5.tar.gz) = 19936 SHA256 (rust/crates/arrayvec-0.4.10.tar.gz) = 92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71 SIZE (rust/crates/arrayvec-0.4.10.tar.gz) = 26133 SHA256 (rust/crates/atty-0.2.11.tar.gz) = 9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652 SIZE (rust/crates/atty-0.2.11.tar.gz) = 5916 SHA256 (rust/crates/autocfg-0.1.2.tar.gz) = a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799 SIZE (rust/crates/autocfg-0.1.2.tar.gz) = 10444 -SHA256 (rust/crates/backtrace-0.3.13.tar.gz) = b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5 -SIZE (rust/crates/backtrace-0.3.13.tar.gz) = 34101 +SHA256 (rust/crates/backtrace-0.3.15.tar.gz) = f106c02a3604afcdc0df5d36cc47b44b55917dbaf3d808f71c163a0ddba64637 +SIZE (rust/crates/backtrace-0.3.15.tar.gz) = 33807 SHA256 (rust/crates/backtrace-sys-0.1.28.tar.gz) = 797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6 SIZE (rust/crates/backtrace-sys-0.1.28.tar.gz) = 522603 SHA256 (rust/crates/base64-0.10.1.tar.gz) = 0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e @@ -41,34 +43,36 @@ SHA256 (rust/crates/blake2-rfc-0.2.18.tar.gz) = 5d6d530bdd2d52966a6d03b7a964add7 SIZE (rust/crates/blake2-rfc-0.2.18.tar.gz) = 15676 SHA256 (rust/crates/block-0.1.6.tar.gz) = 0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a SIZE (rust/crates/block-0.1.6.tar.gz) = 4077 +SHA256 (rust/crates/build_const-0.2.1.tar.gz) = 39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39 +SIZE (rust/crates/build_const-0.2.1.tar.gz) = 4499 SHA256 (rust/crates/byteorder-1.3.1.tar.gz) = a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb SIZE (rust/crates/byteorder-1.3.1.tar.gz) = 20959 -SHA256 (rust/crates/bytes-0.4.11.tar.gz) = 40ade3d27603c2cb345eb0912aec461a6dec7e06a4ae48589904e808335c7afa -SIZE (rust/crates/bytes-0.4.11.tar.gz) = 45988 +SHA256 (rust/crates/bytes-0.4.12.tar.gz) = 206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c +SIZE (rust/crates/bytes-0.4.12.tar.gz) = 46361 SHA256 (rust/crates/bzip2-0.3.3.tar.gz) = 42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b SIZE (rust/crates/bzip2-0.3.3.tar.gz) = 15346 SHA256 (rust/crates/bzip2-sys-0.1.7.tar.gz) = 6584aa36f5ad4c9247f5323b0a42f37802b37a836f0ad87084d7a33961abe25f SIZE (rust/crates/bzip2-sys-0.1.7.tar.gz) = 609563 -SHA256 (rust/crates/cc-1.0.29.tar.gz) = 4390a3b5f4f6bce9c1d0c00128379df433e53777fdd30e92f16a529332baec4e -SIZE (rust/crates/cc-1.0.29.tar.gz) = 42386 +SHA256 (rust/crates/cc-1.0.34.tar.gz) = 30f813bf45048a18eda9190fd3c6b78644146056740c43172a5a3699118588fd +SIZE (rust/crates/cc-1.0.34.tar.gz) = 44012 SHA256 (rust/crates/cexpr-0.2.3.tar.gz) = 42aac45e9567d97474a834efdee3081b3c942b2205be932092f53354ce503d6c SIZE (rust/crates/cexpr-0.2.3.tar.gz) = 15747 -SHA256 (rust/crates/cfg-if-0.1.6.tar.gz) = 082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4 -SIZE (rust/crates/cfg-if-0.1.6.tar.gz) = 7411 +SHA256 (rust/crates/cfg-if-0.1.7.tar.gz) = 11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4 +SIZE (rust/crates/cfg-if-0.1.7.tar.gz) = 7360 SHA256 (rust/crates/cgl-0.2.3.tar.gz) = 55e7ec0b74fe5897894cbc207092c577e87c52f8a59e8ca8d97ef37551f60a49 SIZE (rust/crates/cgl-0.2.3.tar.gz) = 7488 SHA256 (rust/crates/clang-sys-0.22.0.tar.gz) = 939a1a34310b120d26eba35c29475933128b0ec58e24b43327f8dbe6036fc538 SIZE (rust/crates/clang-sys-0.22.0.tar.gz) = 30872 -SHA256 (rust/crates/clap-2.32.0.tar.gz) = b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e -SIZE (rust/crates/clap-2.32.0.tar.gz) = 196073 -SHA256 (rust/crates/clipboard-0.4.6.tar.gz) = b9b4623b47d8637fc9d47564583d4cc01eb8c8e34e26b2bf348bf4b036acb657 -SIZE (rust/crates/clipboard-0.4.6.tar.gz) = 10096 +SHA256 (rust/crates/clap-2.33.0.tar.gz) = 5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9 +SIZE (rust/crates/clap-2.33.0.tar.gz) = 196458 +SHA256 (rust/crates/clipboard-0.5.0.tar.gz) = 25a904646c0340239dcf7c51677b33928bf24fdf424b79a57909c0109075b2e7 +SIZE (rust/crates/clipboard-0.5.0.tar.gz) = 10009 SHA256 (rust/crates/clipboard-win-2.1.2.tar.gz) = 289da2fc09ab964a4948a63287c94fcb4698fa823c46da84c3792928c9d36110 SIZE (rust/crates/clipboard-win-2.1.2.tar.gz) = 8972 SHA256 (rust/crates/cloudabi-0.0.3.tar.gz) = ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f SIZE (rust/crates/cloudabi-0.0.3.tar.gz) = 22156 -SHA256 (rust/crates/cmake-0.1.35.tar.gz) = 6ec65ee4f9c9d16f335091d23693457ed4928657ba4982289d7fafee03bc614a -SIZE (rust/crates/cmake-0.1.35.tar.gz) = 13617 +SHA256 (rust/crates/cmake-0.1.38.tar.gz) = 96210eec534fc3fbfc0452a63769424eaa80205fda6cea98e5b61cb3d97bcec8 +SIZE (rust/crates/cmake-0.1.38.tar.gz) = 13624 SHA256 (rust/crates/cocoa-0.18.4.tar.gz) = cf79daa4e11e5def06e55306aa3601b87de6b5149671529318da048f67cdd77b SIZE (rust/crates/cocoa-0.18.4.tar.gz) = 41217 SHA256 (rust/crates/color_quant-1.0.1.tar.gz) = 0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd @@ -77,68 +81,70 @@ SHA256 (rust/crates/constant_time_eq-0.1.3.tar.gz) = 8ff012e225ce166d4422e0e7841 SIZE (rust/crates/constant_time_eq-0.1.3.tar.gz) = 1279 SHA256 (rust/crates/core-foundation-0.5.1.tar.gz) = 286e0b41c3a20da26536c6000a280585d519fd07b3956b43aed8a79e9edce980 SIZE (rust/crates/core-foundation-0.5.1.tar.gz) = 22519 -SHA256 (rust/crates/core-foundation-0.6.3.tar.gz) = 4e2640d6d0bf22e82bed1b73c6aef8d5dd31e5abe6666c57e6d45e2649f4f887 -SIZE (rust/crates/core-foundation-0.6.3.tar.gz) = 24267 +SHA256 (rust/crates/core-foundation-0.6.4.tar.gz) = 25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d +SIZE (rust/crates/core-foundation-0.6.4.tar.gz) = 25233 SHA256 (rust/crates/core-foundation-sys-0.5.1.tar.gz) = 716c271e8613ace48344f723b60b900a93150271e5be206212d052bbc0883efa SIZE (rust/crates/core-foundation-sys-0.5.1.tar.gz) = 15974 SHA256 (rust/crates/core-foundation-sys-0.6.2.tar.gz) = e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b SIZE (rust/crates/core-foundation-sys-0.6.2.tar.gz) = 16204 -SHA256 (rust/crates/core-graphics-0.13.0.tar.gz) = fb0ed45fdc32f9ab426238fba9407dfead7bacd7900c9b4dd3f396f46eafdae3 -SIZE (rust/crates/core-graphics-0.13.0.tar.gz) = 21866 +SHA256 (rust/crates/core-graphics-0.14.0.tar.gz) = e54c4ab33705fa1fc8af375bb7929d68e1c1546c1ecef408966d8c3e49a1d84a +SIZE (rust/crates/core-graphics-0.14.0.tar.gz) = 22125 SHA256 (rust/crates/core-graphics-0.17.3.tar.gz) = 56790968ab1c8a1202a102e6de05fc6e1ec87da99e4e93e9a7d13efbfc1e95a9 SIZE (rust/crates/core-graphics-0.17.3.tar.gz) = 26460 -SHA256 (rust/crates/core-text-13.1.1.tar.gz) = 7210eea4baa4b51d7319d90e4787d8a2b472c8d5d9926dc39be85fecac0e6df7 -SIZE (rust/crates/core-text-13.1.1.tar.gz) = 14024 -SHA256 (rust/crates/core-text-9.2.0.tar.gz) = 2bd581c37283d0c23311d179aefbb891f2324ee0405da58a26e8594ab76e5748 -SIZE (rust/crates/core-text-9.2.0.tar.gz) = 13084 -SHA256 (rust/crates/crc32fast-1.1.2.tar.gz) = e91d5240c6975ef33aeb5f148f35275c25eda8e8a5f95abe421978b05b8bf192 -SIZE (rust/crates/crc32fast-1.1.2.tar.gz) = 38312 -SHA256 (rust/crates/crossbeam-0.6.0.tar.gz) = ad4c7ea749d9fb09e23c5cb17e3b70650860553a0e2744e38446b1803bf7db94 -SIZE (rust/crates/crossbeam-0.6.0.tar.gz) = 19911 +SHA256 (rust/crates/core-text-10.0.0.tar.gz) = 81f59bff773954e5cd058a3f5983406b52bec7cc65202bef340ba64a0c40ac91 +SIZE (rust/crates/core-text-10.0.0.tar.gz) = 13083 +SHA256 (rust/crates/core-text-13.2.0.tar.gz) = d95a72b5e50e549969dd88eff3047495fe5b8c6f028635442c2b708be707e669 +SIZE (rust/crates/core-text-13.2.0.tar.gz) = 15396 +SHA256 (rust/crates/crc-1.8.1.tar.gz) = d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb +SIZE (rust/crates/crc-1.8.1.tar.gz) = 9114 +SHA256 (rust/crates/crc32fast-1.2.0.tar.gz) = ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1 +SIZE (rust/crates/crc32fast-1.2.0.tar.gz) = 39161 SHA256 (rust/crates/crossbeam-channel-0.3.8.tar.gz) = 0f0ed1a4de2235cabda8558ff5840bffb97fcb64c97827f354a451307df5f72b SIZE (rust/crates/crossbeam-channel-0.3.8.tar.gz) = 79923 SHA256 (rust/crates/crossbeam-deque-0.2.0.tar.gz) = f739f8c5363aca78cfb059edf753d8f0d36908c348f3d8d1503f03d8b75d9cf3 SIZE (rust/crates/crossbeam-deque-0.2.0.tar.gz) = 12638 -SHA256 (rust/crates/crossbeam-deque-0.6.3.tar.gz) = 05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13 -SIZE (rust/crates/crossbeam-deque-0.6.3.tar.gz) = 14238 +SHA256 (rust/crates/crossbeam-deque-0.7.1.tar.gz) = b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71 +SIZE (rust/crates/crossbeam-deque-0.7.1.tar.gz) = 19407 SHA256 (rust/crates/crossbeam-epoch-0.3.1.tar.gz) = 927121f5407de9956180ff5e936fe3cf4324279280001cd56b669d28ee7e9150 SIZE (rust/crates/crossbeam-epoch-0.3.1.tar.gz) = 33093 SHA256 (rust/crates/crossbeam-epoch-0.7.1.tar.gz) = 04c9e3102cc2d69cd681412141b390abd55a362afc1540965dad0ad4d34280b4 SIZE (rust/crates/crossbeam-epoch-0.7.1.tar.gz) = 35215 +SHA256 (rust/crates/crossbeam-queue-0.1.2.tar.gz) = 7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b +SIZE (rust/crates/crossbeam-queue-0.1.2.tar.gz) = 14104 SHA256 (rust/crates/crossbeam-utils-0.2.2.tar.gz) = 2760899e32a1d58d5abb31129f8fae5de75220bc2176e77ff7c627ae45c918d9 SIZE (rust/crates/crossbeam-utils-0.2.2.tar.gz) = 11901 SHA256 (rust/crates/crossbeam-utils-0.6.5.tar.gz) = f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c SIZE (rust/crates/crossbeam-utils-0.6.5.tar.gz) = 31735 SHA256 (rust/crates/deflate-0.7.19.tar.gz) = 8a6abb26e16e8d419b5c78662aa9f82857c2386a073da266840e474d5055ec86 SIZE (rust/crates/deflate-0.7.19.tar.gz) = 125078 -SHA256 (rust/crates/dirs-1.0.4.tar.gz) = 88972de891f6118092b643d85a0b28e0678e0f948d7f879aa32f2d5aafe97d2a -SIZE (rust/crates/dirs-1.0.4.tar.gz) = 12844 +SHA256 (rust/crates/derivative-1.0.2.tar.gz) = 6073e9676dbebdddeabaeb63e3b7cefd23c86f5c41d381ee1237cc77b1079898 +SIZE (rust/crates/derivative-1.0.2.tar.gz) = 39388 +SHA256 (rust/crates/dirs-1.0.5.tar.gz) = 3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901 +SIZE (rust/crates/dirs-1.0.5.tar.gz) = 12908 SHA256 (rust/crates/dlib-0.4.1.tar.gz) = 77e51249a9d823a4cb79e3eca6dcd756153e8ed0157b6c04775d04bf1b13b76a SIZE (rust/crates/dlib-0.4.1.tar.gz) = 3761 SHA256 (rust/crates/downcast-rs-1.0.3.tar.gz) = 18df8ce4470c189d18aa926022da57544f31e154631eb4cfe796aea97051fe6c SIZE (rust/crates/downcast-rs-1.0.3.tar.gz) = 9272 SHA256 (rust/crates/dtoa-0.4.3.tar.gz) = 6d301140eb411af13d3115f9a562c85cc6b541ade9dfa314132244aaee7489dd SIZE (rust/crates/dtoa-0.4.3.tar.gz) = 14456 -SHA256 (rust/crates/dunce-0.1.1.tar.gz) = e86b07356baf1cc7058c95807ffba0bebe0c8cadd0df4c40b292c86194eabb37 -SIZE (rust/crates/dunce-0.1.1.tar.gz) = 4311 -SHA256 (rust/crates/either-1.5.0.tar.gz) = 3be565ca5c557d7f59e7cfcf1844f9e3033650c929c6566f511e8005f205c1d0 -SIZE (rust/crates/either-1.5.0.tar.gz) = 10900 -SHA256 (rust/crates/embed-resource-1.1.4.tar.gz) = 59edbe56442f96505f79c9116006f2e26c7f5655cccdc2c1546b2528c63bd612 -SIZE (rust/crates/embed-resource-1.1.4.tar.gz) = 7239 -SHA256 (rust/crates/encoding_rs-0.8.16.tar.gz) = 0535f350c60aac0b87ccf28319abc749391e912192255b0c00a2c12c6917bd73 -SIZE (rust/crates/encoding_rs-0.8.16.tar.gz) = 1401377 +SHA256 (rust/crates/dunce-1.0.0.tar.gz) = d0ad6bf6a88548d1126045c413548df1453d9be094a8ab9fd59bf1fdd338da4f +SIZE (rust/crates/dunce-1.0.0.tar.gz) = 5167 +SHA256 (rust/crates/either-1.5.2.tar.gz) = 5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b +SIZE (rust/crates/either-1.5.2.tar.gz) = 12124 +SHA256 (rust/crates/embed-resource-1.2.0.tar.gz) = ee11dd277e159f3a7845341f8c800899cf918a366956e31dd52f35eff638a403 +SIZE (rust/crates/embed-resource-1.2.0.tar.gz) = 7854 +SHA256 (rust/crates/encoding_rs-0.8.17.tar.gz) = 4155785c79f2f6701f185eb2e6b4caf0555ec03477cb4c70db67b465311620ed +SIZE (rust/crates/encoding_rs-0.8.17.tar.gz) = 1401378 SHA256 (rust/crates/env_logger-0.5.13.tar.gz) = 15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38 SIZE (rust/crates/env_logger-0.5.13.tar.gz) = 25275 -SHA256 (rust/crates/env_logger-0.6.0.tar.gz) = afb070faf94c85d17d50ca44f6ad076bce18ae92f0037d350947240a36e9d42e -SIZE (rust/crates/env_logger-0.6.0.tar.gz) = 27887 +SHA256 (rust/crates/env_logger-0.6.1.tar.gz) = b61fa891024a945da30a9581546e8cfaf5602c7b3f4c137a2805cf388f92075a +SIZE (rust/crates/env_logger-0.6.1.tar.gz) = 28567 SHA256 (rust/crates/errno-0.2.4.tar.gz) = c2a071601ed01b988f896ab14b95e67335d1eeb50190932a1320f7fe3cadc84e SIZE (rust/crates/errno-0.2.4.tar.gz) = 8486 SHA256 (rust/crates/errno-dragonfly-0.1.1.tar.gz) = 14ca354e36190500e1e1fb267c647932382b54053c50b14970856c0b00a35067 SIZE (rust/crates/errno-dragonfly-0.1.1.tar.gz) = 1370 -SHA256 (rust/crates/error-chain-0.11.0.tar.gz) = ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3 -SIZE (rust/crates/error-chain-0.11.0.tar.gz) = 27207 -SHA256 (rust/crates/euclid-0.19.5.tar.gz) = d1a7698bdda3d7444a79d33bdc96e8b518d44ea3ff101d8492a6ca1207b886ea -SIZE (rust/crates/euclid-0.19.5.tar.gz) = 47347 +SHA256 (rust/crates/euclid-0.19.7.tar.gz) = 6a8acd6a7f2740b7b936008acd58b1def492854254dc4af9d2b850ca01f4960e +SIZE (rust/crates/euclid-0.19.7.tar.gz) = 57028 SHA256 (rust/crates/euclid_macros-0.1.0.tar.gz) = fdcb84c18ea5037a1c5a23039b4ff29403abce2e0d6b1daa11cf0bde2b30be15 SIZE (rust/crates/euclid_macros-0.1.0.tar.gz) = 7196 SHA256 (rust/crates/expat-sys-2.1.6.tar.gz) = 658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa @@ -149,14 +155,22 @@ SHA256 (rust/crates/failure_derive-0.1.5.tar.gz) = ea1063915fd7ef4309e222a5a07cf SIZE (rust/crates/failure_derive-0.1.5.tar.gz) = 4884 SHA256 (rust/crates/filetime-0.2.4.tar.gz) = a2df5c1a8c4be27e7707789dc42ae65976e60b394afd293d1419ab915833e646 SIZE (rust/crates/filetime-0.2.4.tar.gz) = 12044 +SHA256 (rust/crates/flate2-1.0.7.tar.gz) = f87e68aa82b2de08a6e037f1385455759df6e445a8df5e005b4297191dbf18aa +SIZE (rust/crates/flate2-1.0.7.tar.gz) = 65912 SHA256 (rust/crates/fnv-1.0.6.tar.gz) = 2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3 SIZE (rust/crates/fnv-1.0.6.tar.gz) = 11131 -SHA256 (rust/crates/font-loader-0.6.0.tar.gz) = 2fbd86bafc9e14ab7076e084d31eed4633120f910d0c42a017e5382aac89937f -SIZE (rust/crates/font-loader-0.6.0.tar.gz) = 7113 +SHA256 (rust/crates/font-loader-0.8.0.tar.gz) = 4ece0e8a5dd99a65f8de977b4a3f89e3b5a5259e15ae610952cdb894e96f5e2e +SIZE (rust/crates/font-loader-0.8.0.tar.gz) = 7145 SHA256 (rust/crates/foreign-types-0.3.2.tar.gz) = f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1 SIZE (rust/crates/foreign-types-0.3.2.tar.gz) = 7504 +SHA256 (rust/crates/foreign-types-0.4.0.tar.gz) = 3684708dacd3b83f4bbe6506d4ccb08bed3c16f521d34366f131b9ecd1884431 +SIZE (rust/crates/foreign-types-0.4.0.tar.gz) = 7787 +SHA256 (rust/crates/foreign-types-macros-0.1.0.tar.gz) = 66626064d64b429efe601d7aabd7b0a9721b2611548ca684e78c4ecde48bd29b +SIZE (rust/crates/foreign-types-macros-0.1.0.tar.gz) = 7656 SHA256 (rust/crates/foreign-types-shared-0.1.1.tar.gz) = 00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b SIZE (rust/crates/foreign-types-shared-0.1.1.tar.gz) = 5672 +SHA256 (rust/crates/foreign-types-shared-0.2.0.tar.gz) = c61f9b85573bf0f203eed3633f5018abce85250886a62ca073e0eee022ed564d +SIZE (rust/crates/foreign-types-shared-0.2.0.tar.gz) = 5833 SHA256 (rust/crates/freetype-rs-0.19.1.tar.gz) = 28cc92a7040ee7b631e4279e263f9a83aedc1eb6085c68d8ca4d072b5644e705 SIZE (rust/crates/freetype-rs-0.19.1.tar.gz) = 103875 SHA256 (rust/crates/freetype-sys-0.7.1.tar.gz) = 0f9c8666cce7cf6e51a290623647febfbab92480b4c3e0f495cb9d4d312b5d38 @@ -171,44 +185,54 @@ SHA256 (rust/crates/fuchsia-zircon-0.3.3.tar.gz) = 2e9763c69ebaae630ba35f74888db SIZE (rust/crates/fuchsia-zircon-0.3.3.tar.gz) = 22565 SHA256 (rust/crates/fuchsia-zircon-sys-0.3.3.tar.gz) = 3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7 SIZE (rust/crates/fuchsia-zircon-sys-0.3.3.tar.gz) = 7191 -SHA256 (rust/crates/futures-0.1.25.tar.gz) = 49e7653e374fe0d0c12de4250f0bdb60680b8c80eed558c5c7538eec9c89e21b -SIZE (rust/crates/futures-0.1.25.tar.gz) = 158626 +SHA256 (rust/crates/futures-0.1.26.tar.gz) = 62941eff9507c8177d448bd83a44d9b9760856e184081d8cd79ba9f03dd24981 +SIZE (rust/crates/futures-0.1.26.tar.gz) = 158085 SHA256 (rust/crates/futures-cpupool-0.1.8.tar.gz) = ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4 SIZE (rust/crates/futures-cpupool-0.1.8.tar.gz) = 10583 SHA256 (rust/crates/gcc-0.3.55.tar.gz) = 8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2 SIZE (rust/crates/gcc-0.3.55.tar.gz) = 37262 -SHA256 (rust/crates/gdi32-sys-0.2.0.tar.gz) = 0912515a8ff24ba900422ecda800b52f4016a56251922d397c576bf92c690518 -SIZE (rust/crates/gdi32-sys-0.2.0.tar.gz) = 7643 SHA256 (rust/crates/gif-0.10.1.tar.gz) = dd4bca55ac1f213920ce3527ccd62386f1f15fa3f1714aeee1cf93f2c416903f SIZE (rust/crates/gif-0.10.1.tar.gz) = 25076 SHA256 (rust/crates/gl_generator-0.10.0.tar.gz) = a0ffaf173cf76c73a73e080366bf556b4776ece104b06961766ff11449f38604 SIZE (rust/crates/gl_generator-0.10.0.tar.gz) = 21885 -SHA256 (rust/crates/gleam-0.6.8.tar.gz) = 4b47f5b15742aee359c7895ab98cf2cceecc89bb4feb6f4e42f802d7899877da -SIZE (rust/crates/gleam-0.6.8.tar.gz) = 25619 +SHA256 (rust/crates/gl_generator-0.11.0.tar.gz) = 39a23d5e872a275135d66895d954269cf5e8661d234eb1c2480f4ce0d586acbd +SIZE (rust/crates/gl_generator-0.11.0.tar.gz) = 22189 +SHA256 (rust/crates/gleam-0.6.16.tar.gz) = 39bb69499005e11b7b7cc0af38404a1bc0f53d954bffa8adcdb6e8d5b14f75d5 +SIZE (rust/crates/gleam-0.6.16.tar.gz) = 26363 SHA256 (rust/crates/glob-0.2.11.tar.gz) = 8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb SIZE (rust/crates/glob-0.2.11.tar.gz) = 18065 -SHA256 (rust/crates/glutin-0.19.0.tar.gz) = 535c6eda58adbb227604b2db10a022ffd6339d7ea3e970f338e7d98aeb24fcc3 -SIZE (rust/crates/glutin-0.19.0.tar.gz) = 57366 -SHA256 (rust/crates/h2-0.1.16.tar.gz) = ddb2b25a33e231484694267af28fec74ac63b5ccf51ee2065a5e313b834d836e -SIZE (rust/crates/h2-0.1.16.tar.gz) = 140597 -SHA256 (rust/crates/http-0.1.15.tar.gz) = 1a10e5b573b9a0146545010f50772b9e8b1dd0a256564cc4307694c68832a2f5 -SIZE (rust/crates/http-0.1.15.tar.gz) = 97629 +SHA256 (rust/crates/glutin-0.21.0-rc1.tar.gz) = 575aa103046461547a41351fdf8705a045b4874d0fb26fadbfa3df50fc796b2f +SIZE (rust/crates/glutin-0.21.0-rc1.tar.gz) = 52055 +SHA256 (rust/crates/glutin_egl_sys-0.1.2.tar.gz) = 55294554b495063a8dc641bffb657e3e6f21f3829a5dfcbdb1a80787dbb9f6ca +SIZE (rust/crates/glutin_egl_sys-0.1.2.tar.gz) = 1948 +SHA256 (rust/crates/glutin_emscripten_sys-0.1.0.tar.gz) = 245b3fdb08df6ffed7585365851f8404af9c7e2dd4b59f15262e968b6a95a0c7 +SIZE (rust/crates/glutin_emscripten_sys-0.1.0.tar.gz) = 1882 +SHA256 (rust/crates/glutin_gles2_sys-0.1.2.tar.gz) = b33e192f35b6f76ad3efb2ddf2184a1ff17106c42f11269f66151ba3036996a8 +SIZE (rust/crates/glutin_gles2_sys-0.1.2.tar.gz) = 2113 +SHA256 (rust/crates/glutin_glx_sys-0.1.3.tar.gz) = 28e9e7abe70853eb96f358e5db642377aa084f7b0f1e8d9e1c232c2fd823b6d7 +SIZE (rust/crates/glutin_glx_sys-0.1.3.tar.gz) = 1703 +SHA256 (rust/crates/glutin_wgl_sys-0.1.2.tar.gz) = 2d0f023d00cfb4a100f6af038c9d03e182daa328796a915b56b0d69942066c8d +SIZE (rust/crates/glutin_wgl_sys-0.1.2.tar.gz) = 1575 +SHA256 (rust/crates/h2-0.1.17.tar.gz) = 910a5e7be6283a9c91b3982fa5188368c8719cce2a3cf3b86048673bf9d9c36b +SIZE (rust/crates/h2-0.1.17.tar.gz) = 142819 +SHA256 (rust/crates/http-0.1.17.tar.gz) = eed324f0f0daf6ec10c474f150505af2c143f251722bf9dbd1261bd1f2ee2c1a +SIZE (rust/crates/http-0.1.17.tar.gz) = 98437 SHA256 (rust/crates/httparse-1.3.3.tar.gz) = e8734b0cfd3bc3e101ec59100e101c2eecd19282202e87808b3037b442777a83 SIZE (rust/crates/httparse-1.3.3.tar.gz) = 23689 SHA256 (rust/crates/humantime-1.2.0.tar.gz) = 3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114 SIZE (rust/crates/humantime-1.2.0.tar.gz) = 16795 -SHA256 (rust/crates/hyper-0.12.24.tar.gz) = fdfa9b401ef6c4229745bb6e9b2529192d07b920eed624cdee2a82348cd550af -SIZE (rust/crates/hyper-0.12.24.tar.gz) = 114317 -SHA256 (rust/crates/hyper-tls-0.3.1.tar.gz) = 32cd73f14ad370d3b4d4b7dce08f69b81536c82e39fcc89731930fe5788cd661 -SIZE (rust/crates/hyper-tls-0.3.1.tar.gz) = 8836 +SHA256 (rust/crates/hyper-0.12.25.tar.gz) = 7d5b6658b016965ae301fa995306db965c93677880ea70765a84235a96eae896 +SIZE (rust/crates/hyper-0.12.25.tar.gz) = 116748 +SHA256 (rust/crates/hyper-tls-0.3.2.tar.gz) = 3a800d6aa50af4b5850b2b0f659625ce9504df908e9733b635720483be26174f +SIZE (rust/crates/hyper-tls-0.3.2.tar.gz) = 8901 SHA256 (rust/crates/idna-0.1.5.tar.gz) = 38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e SIZE (rust/crates/idna-0.1.5.tar.gz) = 258735 -SHA256 (rust/crates/image-0.20.1.tar.gz) = 44665b4395d1844c96e7dc8ed5754782a1cdfd9ef458a80bbe45702681450504 -SIZE (rust/crates/image-0.20.1.tar.gz) = 121979 +SHA256 (rust/crates/image-0.21.0.tar.gz) = 52fb0666a1273dac46f9725aa4859bcd5595fc3554cf3495051b4de8db745e7d +SIZE (rust/crates/image-0.21.0.tar.gz) = 126260 SHA256 (rust/crates/indexmap-1.0.2.tar.gz) = 7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d SIZE (rust/crates/indexmap-1.0.2.tar.gz) = 38255 -SHA256 (rust/crates/inflate-0.4.4.tar.gz) = 84c683bde2d8413b8f1be3e459c30e4817672b6e7a31d9212b0323154e76eba7 -SIZE (rust/crates/inflate-0.4.4.tar.gz) = 17868 +SHA256 (rust/crates/inflate-0.4.5.tar.gz) = 1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff +SIZE (rust/crates/inflate-0.4.5.tar.gz) = 17715 SHA256 (rust/crates/inotify-0.6.1.tar.gz) = 40b54539f3910d6f84fbf9a643efd6e3aa6e4f001426c0329576128255994718 SIZE (rust/crates/inotify-0.6.1.tar.gz) = 19667 SHA256 (rust/crates/inotify-sys-0.1.3.tar.gz) = e74a1aa87c59aeff6ef2cc2fa62d41bc43f54952f55652656b18a02fd5e356c0 @@ -221,24 +245,24 @@ SHA256 (rust/crates/jpeg-decoder-0.1.15.tar.gz) = c8b7d43206b34b3f94ea9445174bda SIZE (rust/crates/jpeg-decoder-0.1.15.tar.gz) = 29660 SHA256 (rust/crates/kernel32-sys-0.2.2.tar.gz) = 7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d SIZE (rust/crates/kernel32-sys-0.2.2.tar.gz) = 24537 -SHA256 (rust/crates/khronos_api-3.0.0.tar.gz) = 62237e6d326bd5871cd21469323bf096de81f1618cd82cbaf5d87825335aeb49 -SIZE (rust/crates/khronos_api-3.0.0.tar.gz) = 351245 -SHA256 (rust/crates/lazy_static-1.2.0.tar.gz) = a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1 -SIZE (rust/crates/lazy_static-1.2.0.tar.gz) = 10840 +SHA256 (rust/crates/khronos_api-3.1.0.tar.gz) = e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc +SIZE (rust/crates/khronos_api-3.1.0.tar.gz) = 599718 +SHA256 (rust/crates/lazy_static-1.3.0.tar.gz) = bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14 +SIZE (rust/crates/lazy_static-1.3.0.tar.gz) = 10616 SHA256 (rust/crates/lazycell-1.2.1.tar.gz) = b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f SIZE (rust/crates/lazycell-1.2.1.tar.gz) = 11691 -SHA256 (rust/crates/libc-0.2.49.tar.gz) = 413f3dfc802c5dc91dc570b05125b6cda9855edfaa9825c9849807876376e70e -SIZE (rust/crates/libc-0.2.49.tar.gz) = 375486 -SHA256 (rust/crates/libflate-0.1.19.tar.gz) = bff3ac7d6f23730d3b533c35ed75eef638167634476a499feef16c428d74b57b -SIZE (rust/crates/libflate-0.1.19.tar.gz) = 35247 +SHA256 (rust/crates/libc-0.2.51.tar.gz) = bedcc7a809076656486ffe045abeeac163da1b558e963a31e29fbfbeba916917 +SIZE (rust/crates/libc-0.2.51.tar.gz) = 397323 +SHA256 (rust/crates/libflate-0.1.21.tar.gz) = 7346a83e8a2c3958d44d24225d905385dc31fc16e89dffb356c457b278914d20 +SIZE (rust/crates/libflate-0.1.21.tar.gz) = 35830 SHA256 (rust/crates/libloading-0.5.0.tar.gz) = 9c3ad660d7cb8c5822cd83d10897b0f1f1526792737a179e73896152f85b88c2 SIZE (rust/crates/libloading-0.5.0.tar.gz) = 15990 SHA256 (rust/crates/libz-sys-1.0.25.tar.gz) = 2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe SIZE (rust/crates/libz-sys-1.0.25.tar.gz) = 650151 SHA256 (rust/crates/line_drawing-0.7.0.tar.gz) = 5cc7ad3d82c845bdb5dde34ffdcc7a5fb4d2996e1e1ee0f19c33bc80e15196b9 SIZE (rust/crates/line_drawing-0.7.0.tar.gz) = 10452 -SHA256 (rust/crates/linked-hash-map-0.5.1.tar.gz) = 70fb39025bc7cdd76305867c4eccf2f2dcf6e9a57f5b21a93e1c2d86cd03ec9e -SIZE (rust/crates/linked-hash-map-0.5.1.tar.gz) = 16559 +SHA256 (rust/crates/linked-hash-map-0.5.2.tar.gz) = ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83 +SIZE (rust/crates/linked-hash-map-0.5.2.tar.gz) = 16109 SHA256 (rust/crates/lock_api-0.1.5.tar.gz) = 62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c SIZE (rust/crates/lock_api-0.1.5.tar.gz) = 16967 SHA256 (rust/crates/log-0.4.6.tar.gz) = c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6 @@ -251,8 +275,8 @@ SHA256 (rust/crates/matches-0.1.8.tar.gz) = 7ffc5c5338469d4d3ea17d269fa8ea3512ad SIZE (rust/crates/matches-0.1.8.tar.gz) = 2216 SHA256 (rust/crates/memchr-1.0.2.tar.gz) = 148fab2e51b4f1cfc66da2a7c32981d1d3c083a803978268bb11fe4b86925e7a SIZE (rust/crates/memchr-1.0.2.tar.gz) = 8639 -SHA256 (rust/crates/memchr-2.1.3.tar.gz) = e1dd4eaac298c32ce07eb6ed9242eda7d82955b9170b7d6db59b2e02cc63fcb8 -SIZE (rust/crates/memchr-2.1.3.tar.gz) = 20069 +SHA256 (rust/crates/memchr-2.2.0.tar.gz) = 2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39 +SIZE (rust/crates/memchr-2.2.0.tar.gz) = 20939 SHA256 (rust/crates/memmap-0.7.0.tar.gz) = 6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b SIZE (rust/crates/memmap-0.7.0.tar.gz) = 15214 SHA256 (rust/crates/memoffset-0.2.1.tar.gz) = 0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3 @@ -261,6 +285,10 @@ SHA256 (rust/crates/mime-0.3.13.tar.gz) = 3e27ca21f40a310bd06d9031785f4801710d56 SIZE (rust/crates/mime-0.3.13.tar.gz) = 14939 SHA256 (rust/crates/mime_guess-2.0.0-alpha.6.tar.gz) = 30de2e4613efcba1ec63d8133f344076952090c122992a903359be5a4f99c3ed SIZE (rust/crates/mime_guess-2.0.0-alpha.6.tar.gz) = 17579 +SHA256 (rust/crates/miniz_oxide-0.2.1.tar.gz) = c468f2369f07d651a5d0bb2c9079f8488a66d5466efe42d0c5c6466edcb7f71e +SIZE (rust/crates/miniz_oxide-0.2.1.tar.gz) = 49241 +SHA256 (rust/crates/miniz_oxide_c_api-0.2.1.tar.gz) = b7fe927a42e3807ef71defb191dc87d4e24479b221e67015fe38ae2b7b447bab +SIZE (rust/crates/miniz_oxide_c_api-0.2.1.tar.gz) = 163410 SHA256 (rust/crates/mio-0.6.16.tar.gz) = 71646331f2619b1026cc302f87a2b8b648d5c6dd6937846a16cc8ce0f347f432 SIZE (rust/crates/mio-0.6.16.tar.gz) = 126174 SHA256 (rust/crates/mio-anonymous-pipes-0.1.0.tar.gz) = f8c274c3c52dcd1d78c5d7ed841eca1e9ea2db8353f3b8ec25789cc62c471aaf @@ -269,26 +297,28 @@ SHA256 (rust/crates/mio-extras-2.0.5.tar.gz) = 46e73a04c2fa6250b8d802134d56d554a SIZE (rust/crates/mio-extras-2.0.5.tar.gz) = 16151 SHA256 (rust/crates/mio-named-pipes-0.1.6.tar.gz) = f5e374eff525ce1c5b7687c4cef63943e7686524a387933ad27ca7ec43779cb3 SIZE (rust/crates/mio-named-pipes-0.1.6.tar.gz) = 14766 +SHA256 (rust/crates/mio-uds-0.6.7.tar.gz) = 966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125 +SIZE (rust/crates/mio-uds-0.6.7.tar.gz) = 14389 SHA256 (rust/crates/miow-0.2.1.tar.gz) = 8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919 SIZE (rust/crates/miow-0.2.1.tar.gz) = 21133 SHA256 (rust/crates/miow-0.3.3.tar.gz) = 396aa0f2003d7df8395cb93e09871561ccc3e785f0acb369170e8cc74ddf9226 SIZE (rust/crates/miow-0.3.3.tar.gz) = 22850 -SHA256 (rust/crates/named_pipe-0.3.0.tar.gz) = 8ed10a5ac4f5f7e5d75552b12c1d5d542debca81e573279dd1e4c19fde6efa6d -SIZE (rust/crates/named_pipe-0.3.0.tar.gz) = 12840 +SHA256 (rust/crates/named_pipe-0.4.1.tar.gz) = ad9c443cce91fc3e12f017290db75dde490d685cdaaf508d7159d7cf41f0eb2b +SIZE (rust/crates/named_pipe-0.4.1.tar.gz) = 13985 SHA256 (rust/crates/native-tls-0.2.2.tar.gz) = ff8e08de0070bbf4c31f452ea2a70db092f36f6f2e4d897adf5674477d488fb2 SIZE (rust/crates/native-tls-0.2.2.tar.gz) = 29238 SHA256 (rust/crates/net2-0.2.33.tar.gz) = 42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88 SIZE (rust/crates/net2-0.2.33.tar.gz) = 20936 -SHA256 (rust/crates/nix-0.12.0.tar.gz) = 921f61dc817b379d0834e45d5ec45beaacfae97082090a49c2cf30dcbc30206f -SIZE (rust/crates/nix-0.12.0.tar.gz) = 172736 +SHA256 (rust/crates/nix-0.13.0.tar.gz) = 46f0f3210768d796e8fa79ec70ee6af172dacbe7147f5e69be5240a47778302b +SIZE (rust/crates/nix-0.13.0.tar.gz) = 176804 SHA256 (rust/crates/nodrop-0.1.13.tar.gz) = 2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945 SIZE (rust/crates/nodrop-0.1.13.tar.gz) = 7508 SHA256 (rust/crates/nom-3.2.1.tar.gz) = 05aec50c70fd288702bcd93284a8444607f3292dbdf2a30de5ea5dcdbe72287b SIZE (rust/crates/nom-3.2.1.tar.gz) = 104073 -SHA256 (rust/crates/nom-4.2.0.tar.gz) = b30adc557058ce00c9d0d7cb3c6e0b5bc6f36e2e2eabe74b0ba726d194abd588 -SIZE (rust/crates/nom-4.2.0.tar.gz) = 114516 -SHA256 (rust/crates/notify-4.0.9.tar.gz) = 9cc7ed2bd4b7edad3ee93b659c38e53dabb619f7274e127a0fab054ad2bb998d -SIZE (rust/crates/notify-4.0.9.tar.gz) = 47992 +SHA256 (rust/crates/nom-4.2.3.tar.gz) = 2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6 +SIZE (rust/crates/nom-4.2.3.tar.gz) = 115343 +SHA256 (rust/crates/notify-4.0.10.tar.gz) = abb1581693e44d8a0ec347ef12289625063f52a1dddc3f3c9befd5fc59e88943 +SIZE (rust/crates/notify-4.0.10.tar.gz) = 48124 SHA256 (rust/crates/num-derive-0.2.4.tar.gz) = d9fe8fcafd1b86a37ce8a1cfa15ae504817e0c8c2e7ad42767371461ac1d316d SIZE (rust/crates/num-derive-0.2.4.tar.gz) = 12925 SHA256 (rust/crates/num-integer-0.1.39.tar.gz) = e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea @@ -297,28 +327,24 @@ SHA256 (rust/crates/num-iter-0.1.37.tar.gz) = af3fdbbc3291a5464dc57b03860ec37ca6 SIZE (rust/crates/num-iter-0.1.37.tar.gz) = 10201 SHA256 (rust/crates/num-rational-0.2.1.tar.gz) = 4e96f040177bb3da242b5b1ecf3f54b5d5af3efbbfb18608977a5d2767b22f10 SIZE (rust/crates/num-rational-0.2.1.tar.gz) = 19311 -SHA256 (rust/crates/num-traits-0.1.43.tar.gz) = 92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31 -SIZE (rust/crates/num-traits-0.1.43.tar.gz) = 7659 SHA256 (rust/crates/num-traits-0.2.6.tar.gz) = 0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1 SIZE (rust/crates/num-traits-0.2.6.tar.gz) = 39923 SHA256 (rust/crates/num_cpus-1.10.0.tar.gz) = 1a23f0ed30a54abaa0c7e83b1d2d87ada7c3c23078d1d87815af3e3b6385fbba SIZE (rust/crates/num_cpus-1.10.0.tar.gz) = 10669 -SHA256 (rust/crates/objc-0.2.5.tar.gz) = 9833ab0efe5361b1e2122a0544a5d3359576911a42cb098c2e59be8650807367 -SIZE (rust/crates/objc-0.2.5.tar.gz) = 21308 +SHA256 (rust/crates/objc-0.2.6.tar.gz) = 31d20fd2b37e07cf5125be68357b588672e8cefe9a96f8c17a9d46053b3e590d +SIZE (rust/crates/objc-0.2.6.tar.gz) = 21395 SHA256 (rust/crates/objc-foundation-0.1.1.tar.gz) = 1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9 SIZE (rust/crates/objc-foundation-0.1.1.tar.gz) = 9063 SHA256 (rust/crates/objc_id-0.1.1.tar.gz) = c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b SIZE (rust/crates/objc_id-0.1.1.tar.gz) = 3258 -SHA256 (rust/crates/openssl-0.10.16.tar.gz) = ec7bd7ca4cce6dbdc77e7c1230682740d307d1218a87fb0349a571272be749f9 -SIZE (rust/crates/openssl-0.10.16.tar.gz) = 168681 +SHA256 (rust/crates/openssl-0.10.20.tar.gz) = 5a0d6b781aac4ac1bd6cafe2a2f0ad8c16ae8e1dd5184822a16c50139f8838d9 +SIZE (rust/crates/openssl-0.10.20.tar.gz) = 178977 SHA256 (rust/crates/openssl-probe-0.1.2.tar.gz) = 77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de SIZE (rust/crates/openssl-probe-0.1.2.tar.gz) = 6427 -SHA256 (rust/crates/openssl-sys-0.9.40.tar.gz) = 1bb974e77de925ef426b6bc82fce15fd45bdcbeb5728bffcfc7cdeeb7ce1c2d6 -SIZE (rust/crates/openssl-sys-0.9.40.tar.gz) = 43360 -SHA256 (rust/crates/ordered-float-0.5.2.tar.gz) = 7eb5259643245d3f292c7a146b2df53bba24d7eab159410e648eb73dc164669d -SIZE (rust/crates/ordered-float-0.5.2.tar.gz) = 6515 -SHA256 (rust/crates/ordered-float-1.0.1.tar.gz) = 2f0015e9e8e28ee20c581cfbfe47c650cedeb9ed0721090e0b7ebb10b9cdbcc2 -SIZE (rust/crates/ordered-float-1.0.1.tar.gz) = 9276 +SHA256 (rust/crates/openssl-sys-0.9.43.tar.gz) = 33c86834957dd5b915623e94f2f4ab2c70dd8f6b70679824155d5ae21dbd495d +SIZE (rust/crates/openssl-sys-0.9.43.tar.gz) = 43849 +SHA256 (rust/crates/ordered-float-1.0.2.tar.gz) = 18869315e81473c951eb56ad5558bbc56978562d3ecfb87abb7a1e944cea4518 +SIZE (rust/crates/ordered-float-1.0.2.tar.gz) = 9458 SHA256 (rust/crates/osmesa-sys-0.1.2.tar.gz) = 88cfece6e95d2e717e0872a7f53a8684712ad13822a7979bc760b9c77ec0013b SIZE (rust/crates/osmesa-sys-0.1.2.tar.gz) = 1322 SHA256 (rust/crates/owning_ref-0.4.0.tar.gz) = 49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13 @@ -341,8 +367,8 @@ SHA256 (rust/crates/phf_shared-0.7.24.tar.gz) = 234f71a15de2288bcb7e3b6515828d22 SIZE (rust/crates/phf_shared-0.7.24.tar.gz) = 2170 SHA256 (rust/crates/pkg-config-0.3.14.tar.gz) = 676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c SIZE (rust/crates/pkg-config-0.3.14.tar.gz) = 13565 -SHA256 (rust/crates/png-0.12.0.tar.gz) = f54b9600d584d3b8a739e1662a595fab051329eff43f20e7d8cc22872962145b -SIZE (rust/crates/png-0.12.0.tar.gz) = 28345 +SHA256 (rust/crates/png-0.14.0.tar.gz) = 9adebf7fb91ccf5eac9da1a8e00e83cb8ae882c3e8d8e4ad59da73cb8c82a2c9 +SIZE (rust/crates/png-0.14.0.tar.gz) = 30158 SHA256 (rust/crates/podio-0.1.6.tar.gz) = 780fb4b6698bbf9cf2444ea5d22411cef2953f0824b98f33cf454ec5615645bd SIZE (rust/crates/podio-0.1.6.tar.gz) = 10186 SHA256 (rust/crates/proc-macro2-0.4.27.tar.gz) = 4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915 @@ -353,8 +379,6 @@ SHA256 (rust/crates/quote-0.3.15.tar.gz) = 7a6e920b65c65f10b2ae65c831a81a073a89e SIZE (rust/crates/quote-0.3.15.tar.gz) = 12041 SHA256 (rust/crates/quote-0.6.11.tar.gz) = cdd8e04bd9c52e0342b406469d494fcb033be4bdbe5c606016defbb1681411e1 SIZE (rust/crates/quote-0.6.11.tar.gz) = 17283 -SHA256 (rust/crates/rand-0.4.6.tar.gz) = 552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293 -SIZE (rust/crates/rand-0.4.6.tar.gz) = 76401 SHA256 (rust/crates/rand-0.6.5.tar.gz) = 6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca SIZE (rust/crates/rand-0.6.5.tar.gz) = 104814 SHA256 (rust/crates/rand_chacha-0.1.1.tar.gz) = 556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef @@ -369,10 +393,10 @@ SHA256 (rust/crates/rand_isaac-0.1.1.tar.gz) = ded997c9d5f13925be2a6fd7e66bf1872 SIZE (rust/crates/rand_isaac-0.1.1.tar.gz) = 16020 SHA256 (rust/crates/rand_jitter-0.1.3.tar.gz) = 7b9ea758282efe12823e0d952ddb269d2e1897227e464919a554f2a03ef1b832 SIZE (rust/crates/rand_jitter-0.1.3.tar.gz) = 18341 -SHA256 (rust/crates/rand_os-0.1.2.tar.gz) = b7c690732391ae0abafced5015ffb53656abfaec61b342290e5eb56b286a679d -SIZE (rust/crates/rand_os-0.1.2.tar.gz) = 18359 -SHA256 (rust/crates/rand_pcg-0.1.1.tar.gz) = 086bd09a33c7044e56bb44d5bdde5a60e7f119a9e95b0775f545de759a32fe05 -SIZE (rust/crates/rand_pcg-0.1.1.tar.gz) = 10881 +SHA256 (rust/crates/rand_os-0.1.3.tar.gz) = 7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071 +SIZE (rust/crates/rand_os-0.1.3.tar.gz) = 18965 +SHA256 (rust/crates/rand_pcg-0.1.2.tar.gz) = abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44 +SIZE (rust/crates/rand_pcg-0.1.2.tar.gz) = 10844 SHA256 (rust/crates/rand_xorshift-0.1.1.tar.gz) = cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c SIZE (rust/crates/rand_xorshift-0.1.1.tar.gz) = 8997 SHA256 (rust/crates/rayon-1.0.3.tar.gz) = 373814f27745b2686b350dd261bfd24576a6fb0e2c5919b3a2b6005f820b0473 @@ -381,38 +405,38 @@ SHA256 (rust/crates/rayon-core-1.4.1.tar.gz) = b055d1e92aba6877574d8fe604a63c8b5 SIZE (rust/crates/rayon-core-1.4.1.tar.gz) = 53760 SHA256 (rust/crates/rdrand-0.4.0.tar.gz) = 678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2 SIZE (rust/crates/rdrand-0.4.0.tar.gz) = 6456 -SHA256 (rust/crates/redox_syscall-0.1.51.tar.gz) = 423e376fffca3dfa06c9e9790a9ccd282fafb3cc6e6397d01dbf64f9bacc6b85 -SIZE (rust/crates/redox_syscall-0.1.51.tar.gz) = 15646 +SHA256 (rust/crates/redox_syscall-0.1.53.tar.gz) = 53848511b7ee6eb9d5c3db48481aaa5779b38fc0131bc133c98cb4f2b2411928 +SIZE (rust/crates/redox_syscall-0.1.53.tar.gz) = 15725 SHA256 (rust/crates/redox_termios-0.1.1.tar.gz) = 7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76 SIZE (rust/crates/redox_termios-0.1.1.tar.gz) = 3227 -SHA256 (rust/crates/redox_users-0.2.0.tar.gz) = 214a97e49be64fd2c86f568dd0cb2c757d2cc53de95b273b6ad0a1c908482f26 -SIZE (rust/crates/redox_users-0.2.0.tar.gz) = 11104 +SHA256 (rust/crates/redox_users-0.3.0.tar.gz) = 3fe5204c3a17e97dde73f285d49be585df59ed84b50a872baf416e73b62c3828 +SIZE (rust/crates/redox_users-0.3.0.tar.gz) = 12766 SHA256 (rust/crates/regex-0.2.11.tar.gz) = 9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384 SIZE (rust/crates/regex-0.2.11.tar.gz) = 209507 -SHA256 (rust/crates/regex-1.1.0.tar.gz) = 37e7cbbd370869ce2e8dff25c7018702d10b21a20ef7135316f8daecd6c25b7f -SIZE (rust/crates/regex-1.1.0.tar.gz) = 241219 +SHA256 (rust/crates/regex-1.1.5.tar.gz) = 559008764a17de49a3146b234641644ed37d118d1ef641a0bb573d146edc6ce0 +SIZE (rust/crates/regex-1.1.5.tar.gz) = 243275 SHA256 (rust/crates/regex-syntax-0.5.6.tar.gz) = 7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7 SIZE (rust/crates/regex-syntax-0.5.6.tar.gz) = 233912 -SHA256 (rust/crates/regex-syntax-0.6.5.tar.gz) = 8c2f35eedad5295fdf00a63d7d4b238135723f92b434ec06774dad15c7ab0861 -SIZE (rust/crates/regex-syntax-0.6.5.tar.gz) = 272475 +SHA256 (rust/crates/regex-syntax-0.6.6.tar.gz) = dcfd8681eebe297b81d98498869d4aae052137651ad7b96822f09ceb690d0a96 +SIZE (rust/crates/regex-syntax-0.6.6.tar.gz) = 273068 SHA256 (rust/crates/remove_dir_all-0.5.1.tar.gz) = 3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5 SIZE (rust/crates/remove_dir_all-0.5.1.tar.gz) = 8726 -SHA256 (rust/crates/reqwest-0.9.9.tar.gz) = 09d6e187a58d923ee132fcda141c94e716bcfe301c2ea2bef5c81536e0085376 -SIZE (rust/crates/reqwest-0.9.9.tar.gz) = 75460 +SHA256 (rust/crates/reqwest-0.9.13.tar.gz) = 3c4ef83e0beb14bfe38b9f01330a5bc8e965a9f9628690aa28383746dac1e925 +SIZE (rust/crates/reqwest-0.9.13.tar.gz) = 78145 SHA256 (rust/crates/rustc-demangle-0.1.13.tar.gz) = adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619 SIZE (rust/crates/rustc-demangle-0.1.13.tar.gz) = 11726 SHA256 (rust/crates/rustc_version-0.2.3.tar.gz) = 138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a SIZE (rust/crates/rustc_version-0.2.3.tar.gz) = 10210 -SHA256 (rust/crates/rusttype-0.4.3.tar.gz) = 11ff03da02f6d340bbee5ec55eed03ff9abd6ea013b93bc7c35973cc28f65999 -SIZE (rust/crates/rusttype-0.4.3.tar.gz) = 36193 SHA256 (rust/crates/rusttype-0.7.5.tar.gz) = ce3926a2057b315b3e8bca6d1cec1e97f19436a8f9127621cd538cda9c96a38b SIZE (rust/crates/rusttype-0.7.5.tar.gz) = 58151 SHA256 (rust/crates/ryu-0.2.7.tar.gz) = eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7 SIZE (rust/crates/ryu-0.2.7.tar.gz) = 41382 +SHA256 (rust/crates/safe-transmute-0.10.1.tar.gz) = 9604873ffe1980bc1f179103704a65c8aca141c248d9e52b7af95ff10578166e +SIZE (rust/crates/safe-transmute-0.10.1.tar.gz) = 14891 SHA256 (rust/crates/same-file-1.0.4.tar.gz) = 8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267 SIZE (rust/crates/same-file-1.0.4.tar.gz) = 8678 -SHA256 (rust/crates/schannel-0.1.14.tar.gz) = 0e1a231dc10abf6749cfa5d7767f25888d484201accbd919b66ab5413c502d56 -SIZE (rust/crates/schannel-0.1.14.tar.gz) = 38833 +SHA256 (rust/crates/schannel-0.1.15.tar.gz) = f2f6abf258d99c3c1c5c2131d99d064e94b7b3dd5f416483057f308fea253339 +SIZE (rust/crates/schannel-0.1.15.tar.gz) = 38901 SHA256 (rust/crates/scoped_threadpool-0.1.9.tar.gz) = 1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8 SIZE (rust/crates/scoped_threadpool-0.1.9.tar.gz) = 7800 SHA256 (rust/crates/scopeguard-0.3.3.tar.gz) = 94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27 @@ -425,12 +449,12 @@ SHA256 (rust/crates/semver-0.9.0.tar.gz) = 1d7eb9ef2c18661902cc47e535f9bc51b78ac SIZE (rust/crates/semver-0.9.0.tar.gz) = 17344 SHA256 (rust/crates/semver-parser-0.7.0.tar.gz) = 388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3 SIZE (rust/crates/semver-parser-0.7.0.tar.gz) = 10268 -SHA256 (rust/crates/serde-1.0.87.tar.gz) = 2e20fde37801e83c891a2dc4ebd3b81f0da4d1fb67a9e0a2a3b921e2536a58ee -SIZE (rust/crates/serde-1.0.87.tar.gz) = 71223 -SHA256 (rust/crates/serde_derive-1.0.87.tar.gz) = 633e97856567e518b59ffb2ad7c7a4fd4c5d91d9c7f32dd38a27b2bf7e8114ea -SIZE (rust/crates/serde_derive-1.0.87.tar.gz) = 48593 -SHA256 (rust/crates/serde_json-1.0.38.tar.gz) = 27dce848e7467aa0e2fcaf0a413641499c0b745452aaca1194d24dedde9e13c9 -SIZE (rust/crates/serde_json-1.0.38.tar.gz) = 69619 +SHA256 (rust/crates/serde-1.0.90.tar.gz) = aa5f7c20820475babd2c077c3ab5f8c77a31c15e16ea38687b4c02d3e48680f4 +SIZE (rust/crates/serde-1.0.90.tar.gz) = 71415 +SHA256 (rust/crates/serde_derive-1.0.90.tar.gz) = 58fc82bec244f168b23d1963b45c8bf5726e9a15a9d146a067f9081aeed2de79 +SIZE (rust/crates/serde_derive-1.0.90.tar.gz) = 48815 +SHA256 (rust/crates/serde_json-1.0.39.tar.gz) = 5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d +SIZE (rust/crates/serde_json-1.0.39.tar.gz) = 69621 SHA256 (rust/crates/serde_urlencoded-0.5.4.tar.gz) = d48f9f99cd749a2de71d29da5f948de7f2764cc5a9d7f3c97e3514d4ee6eabf2 SIZE (rust/crates/serde_urlencoded-0.5.4.tar.gz) = 12552 SHA256 (rust/crates/serde_yaml-0.8.8.tar.gz) = 0887a8e097a69559b56aa2526bf7aff7c3048cf627dff781f0b56a6001534593 @@ -441,14 +465,16 @@ SHA256 (rust/crates/servo-fontconfig-sys-4.0.7.tar.gz) = b46d201addcfbd25c1798ad SIZE (rust/crates/servo-fontconfig-sys-4.0.7.tar.gz) = 1786797 SHA256 (rust/crates/shared_library-0.1.9.tar.gz) = 5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11 SIZE (rust/crates/shared_library-0.1.9.tar.gz) = 10566 +SHA256 (rust/crates/signal-hook-0.1.8.tar.gz) = 97a47ae722318beceb0294e6f3d601205a1e6abaa4437d9d33e3a212233e3021 +SIZE (rust/crates/signal-hook-0.1.8.tar.gz) = 24492 SHA256 (rust/crates/siphasher-0.2.3.tar.gz) = 0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac SIZE (rust/crates/siphasher-0.2.3.tar.gz) = 8717 SHA256 (rust/crates/slab-0.4.2.tar.gz) = c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8 SIZE (rust/crates/slab-0.4.2.tar.gz) = 10136 -SHA256 (rust/crates/smallvec-0.6.8.tar.gz) = 88aea073965ab29f6edb5493faf96ad662fb18aa9eeb186a3b7057951605ed15 -SIZE (rust/crates/smallvec-0.6.8.tar.gz) = 21448 -SHA256 (rust/crates/smithay-client-toolkit-0.4.4.tar.gz) = d858330eeed4efaf71c560555e2a6a0597d01b7d52685c3cc964ab1cc360f8c6 -SIZE (rust/crates/smithay-client-toolkit-0.4.4.tar.gz) = 96861 +SHA256 (rust/crates/smallvec-0.6.9.tar.gz) = c4488ae950c49d403731982257768f48fada354a5203fe81f9bb6f43ca9002be +SIZE (rust/crates/smallvec-0.6.9.tar.gz) = 21548 +SHA256 (rust/crates/smithay-client-toolkit-0.4.5.tar.gz) = aa4899558362a65589b53313935099835acf999740915e134dff20cca7c6a28b +SIZE (rust/crates/smithay-client-toolkit-0.4.5.tar.gz) = 94096 SHA256 (rust/crates/socket2-0.3.8.tar.gz) = c4d11a52082057d87cb5caa31ad812f4504b97ab44732cd8359df2e9ff9f48e7 SIZE (rust/crates/socket2-0.3.8.tar.gz) = 30379 SHA256 (rust/crates/spsc-buffer-0.1.1.tar.gz) = be6c3f39c37a4283ee4b43d1311c828f2e1fb0541e76ea0cb1a2abd9ef2f5b3b @@ -461,52 +487,56 @@ SHA256 (rust/crates/stb_truetype-0.2.6.tar.gz) = 69b7df505db8e81d54ff8be4693421e SIZE (rust/crates/stb_truetype-0.2.6.tar.gz) = 21093 SHA256 (rust/crates/string-0.1.3.tar.gz) = b639411d0b9c738748b5397d5ceba08e648f4f1992231aa859af1a017f31f60b SIZE (rust/crates/string-0.1.3.tar.gz) = 4143 -SHA256 (rust/crates/strsim-0.7.0.tar.gz) = bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550 -SIZE (rust/crates/strsim-0.7.0.tar.gz) = 8435 -SHA256 (rust/crates/syn-0.15.26.tar.gz) = f92e629aa1d9c827b2bb8297046c1ccffc57c99b947a680d3ccff1f136a3bee9 -SIZE (rust/crates/syn-0.15.26.tar.gz) = 145493 +SHA256 (rust/crates/strsim-0.8.0.tar.gz) = 8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a +SIZE (rust/crates/strsim-0.8.0.tar.gz) = 9309 +SHA256 (rust/crates/syn-0.15.30.tar.gz) = 66c8865bf5a7cbb662d8b011950060b3c8743dca141b054bf7195b20d314d8e2 +SIZE (rust/crates/syn-0.15.30.tar.gz) = 146358 SHA256 (rust/crates/synstructure-0.10.1.tar.gz) = 73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015 SIZE (rust/crates/synstructure-0.10.1.tar.gz) = 17836 -SHA256 (rust/crates/tempfile-3.0.6.tar.gz) = 37daa55a7240c4931c84559f03b3cad7d19535840d1c4a0cc4e9b2fb0dcf70ff -SIZE (rust/crates/tempfile-3.0.6.tar.gz) = 23337 +SHA256 (rust/crates/tempfile-3.0.7.tar.gz) = b86c784c88d98c801132806dadd3819ed29d8600836c4088e855cdf3e178ed8a +SIZE (rust/crates/tempfile-3.0.7.tar.gz) = 23922 SHA256 (rust/crates/termcolor-1.0.4.tar.gz) = 4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f SIZE (rust/crates/termcolor-1.0.4.tar.gz) = 14416 SHA256 (rust/crates/terminfo-0.6.1.tar.gz) = 8e51065bafd2abe106b6036483b69d1741f4a1ec56ce8a2378de341637de689e SIZE (rust/crates/terminfo-0.6.1.tar.gz) = 44031 SHA256 (rust/crates/termion-1.5.1.tar.gz) = 689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096 SIZE (rust/crates/termion-1.5.1.tar.gz) = 20659 -SHA256 (rust/crates/textwrap-0.10.0.tar.gz) = 307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6 -SIZE (rust/crates/textwrap-0.10.0.tar.gz) = 15986 +SHA256 (rust/crates/textwrap-0.11.0.tar.gz) = d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060 +SIZE (rust/crates/textwrap-0.11.0.tar.gz) = 17322 SHA256 (rust/crates/thread_local-0.3.6.tar.gz) = c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b SIZE (rust/crates/thread_local-0.3.6.tar.gz) = 12388 SHA256 (rust/crates/tiff-0.2.2.tar.gz) = 1e4834f28a0330cb9f3f2c87d2649dca723cb33802e2bdcf18da32759fbec7ce SIZE (rust/crates/tiff-0.2.2.tar.gz) = 622226 SHA256 (rust/crates/time-0.1.42.tar.gz) = db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f SIZE (rust/crates/time-0.1.42.tar.gz) = 30005 -SHA256 (rust/crates/tokio-0.1.15.tar.gz) = e0500b88064f08bebddd0c0bed39e19f5c567a5f30975bee52b0c0d3e2eeb38c -SIZE (rust/crates/tokio-0.1.15.tar.gz) = 81870 -SHA256 (rust/crates/tokio-current-thread-0.1.4.tar.gz) = 331c8acc267855ec06eb0c94618dcbbfea45bed2d20b77252940095273fb58f6 -SIZE (rust/crates/tokio-current-thread-0.1.4.tar.gz) = 19400 -SHA256 (rust/crates/tokio-executor-0.1.6.tar.gz) = 30c6dbf2d1ad1de300b393910e8a3aa272b724a400b6531da03eed99e329fbf0 -SIZE (rust/crates/tokio-executor-0.1.6.tar.gz) = 10059 -SHA256 (rust/crates/tokio-io-0.1.11.tar.gz) = b53aeb9d3f5ccf2ebb29e19788f96987fa1355f8fe45ea193928eaaaf3ae820f -SIZE (rust/crates/tokio-io-0.1.11.tar.gz) = 33322 -SHA256 (rust/crates/tokio-reactor-0.1.8.tar.gz) = afbcdb0f0d2a1e4c440af82d7bbf0bf91a8a8c0575bcd20c05d15be7e9d3a02f -SIZE (rust/crates/tokio-reactor-0.1.8.tar.gz) = 23805 +SHA256 (rust/crates/tokio-0.1.18.tar.gz) = 65641e515a437b308ab131a82ce3042ff9795bef5d6c5a9be4eb24195c417fd9 +SIZE (rust/crates/tokio-0.1.18.tar.gz) = 45700 +SHA256 (rust/crates/tokio-current-thread-0.1.6.tar.gz) = d16217cad7f1b840c5a97dfb3c43b0c871fef423a6e8d2118c604e843662a443 +SIZE (rust/crates/tokio-current-thread-0.1.6.tar.gz) = 19339 +SHA256 (rust/crates/tokio-executor-0.1.7.tar.gz) = 83ea44c6c0773cc034771693711c35c677b4b5a4b21b9e7071704c54de7d555e +SIZE (rust/crates/tokio-executor-0.1.7.tar.gz) = 11344 +SHA256 (rust/crates/tokio-io-0.1.12.tar.gz) = 5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926 +SIZE (rust/crates/tokio-io-0.1.12.tar.gz) = 33555 +SHA256 (rust/crates/tokio-reactor-0.1.9.tar.gz) = 6af16bfac7e112bea8b0442542161bfc41cbfa4466b580bdda7d18cb88b911ce +SIZE (rust/crates/tokio-reactor-0.1.9.tar.gz) = 20657 +SHA256 (rust/crates/tokio-sync-0.1.4.tar.gz) = fda385df506bf7546e70872767f71e81640f1f251bdf2fd8eb81a0eaec5fe022 +SIZE (rust/crates/tokio-sync-0.1.4.tar.gz) = 39715 SHA256 (rust/crates/tokio-tcp-0.1.3.tar.gz) = 1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119 SIZE (rust/crates/tokio-tcp-0.1.3.tar.gz) = 12629 -SHA256 (rust/crates/tokio-threadpool-0.1.11.tar.gz) = c3fd86cb15547d02daa2b21aadaf4e37dee3368df38a526178a5afa3c034d2fb -SIZE (rust/crates/tokio-threadpool-0.1.11.tar.gz) = 49521 +SHA256 (rust/crates/tokio-threadpool-0.1.13.tar.gz) = ec5759cf26cf9659555f36c431b515e3d05f66831741c85b4b5d5dfb9cf1323c +SIZE (rust/crates/tokio-threadpool-0.1.13.tar.gz) = 49301 SHA256 (rust/crates/tokio-timer-0.2.10.tar.gz) = 2910970404ba6fa78c5539126a9ae2045d62e3713041e447f695f41405a120c6 SIZE (rust/crates/tokio-timer-0.2.10.tar.gz) = 37593 +SHA256 (rust/crates/tokio-trace-core-0.1.0.tar.gz) = 350c9edade9830dc185ae48ba45667a445ab59f6167ef6d0254ec9d2430d9dd3 +SIZE (rust/crates/tokio-trace-core-0.1.0.tar.gz) = 20087 SHA256 (rust/crates/try-lock-0.2.2.tar.gz) = e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382 SIZE (rust/crates/try-lock-0.2.2.tar.gz) = 3638 SHA256 (rust/crates/ucd-util-0.1.3.tar.gz) = 535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86 SIZE (rust/crates/ucd-util-0.1.3.tar.gz) = 25897 SHA256 (rust/crates/unicase-1.4.2.tar.gz) = 7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33 SIZE (rust/crates/unicase-1.4.2.tar.gz) = 3907 -SHA256 (rust/crates/unicase-2.2.0.tar.gz) = 9d3218ea14b4edcaccfa0df0a64a3792a2c32cc706f1b336e48867f9d3147f90 -SIZE (rust/crates/unicase-2.2.0.tar.gz) = 19587 +SHA256 (rust/crates/unicase-2.3.0.tar.gz) = 41d17211f887da8e4a70a45b9536f26fc5de166b81e2d5d80de4a17fd22553bd +SIZE (rust/crates/unicase-2.3.0.tar.gz) = 19921 SHA256 (rust/crates/unicode-bidi-0.3.4.tar.gz) = 49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5 SIZE (rust/crates/unicode-bidi-0.3.4.tar.gz) = 32228 SHA256 (rust/crates/unicode-normalization-0.1.8.tar.gz) = 141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426 @@ -515,18 +545,14 @@ SHA256 (rust/crates/unicode-width-0.1.5.tar.gz) = 882386231c45df4700b275c7ff55b6 SIZE (rust/crates/unicode-width-0.1.5.tar.gz) = 15761 SHA256 (rust/crates/unicode-xid-0.1.0.tar.gz) = fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc SIZE (rust/crates/unicode-xid-0.1.0.tar.gz) = 16000 -SHA256 (rust/crates/unreachable-1.0.0.tar.gz) = 382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56 -SIZE (rust/crates/unreachable-1.0.0.tar.gz) = 6355 SHA256 (rust/crates/url-1.7.2.tar.gz) = dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a SIZE (rust/crates/url-1.7.2.tar.gz) = 68597 -SHA256 (rust/crates/user32-sys-0.2.0.tar.gz) = 4ef4711d107b21b410a3a974b1204d9accc8b10dad75d8324b5d755de1617d47 -SIZE (rust/crates/user32-sys-0.2.0.tar.gz) = 10624 SHA256 (rust/crates/utf8-ranges-1.0.2.tar.gz) = 796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737 SIZE (rust/crates/utf8-ranges-1.0.2.tar.gz) = 8510 SHA256 (rust/crates/utf8parse-0.1.1.tar.gz) = 8772a4ccbb4e89959023bc5b7cb8623a795caa7092d99f3aa9501b9484d4557d SIZE (rust/crates/utf8parse-0.1.1.tar.gz) = 13995 -SHA256 (rust/crates/uuid-0.7.2.tar.gz) = 0238db0c5b605dd1cf51de0f21766f97fba2645897024461d6a00c036819a768 -SIZE (rust/crates/uuid-0.7.2.tar.gz) = 35126 +SHA256 (rust/crates/uuid-0.7.4.tar.gz) = 90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a +SIZE (rust/crates/uuid-0.7.4.tar.gz) = 36325 SHA256 (rust/crates/vcpkg-0.2.6.tar.gz) = def296d3eb3b12371b2c7d0e83bfe1403e4db2d7a0bba324a12b21c4ee13143d SIZE (rust/crates/vcpkg-0.2.6.tar.gz) = 9866 SHA256 (rust/crates/vec_map-0.8.1.tar.gz) = 05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a @@ -535,32 +561,34 @@ SHA256 (rust/crates/version_check-0.1.5.tar.gz) = 914b1a6776c4c929a602fafd8bc742 SIZE (rust/crates/version_check-0.1.5.tar.gz) = 8173 SHA256 (rust/crates/void-1.0.2.tar.gz) = 6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d SIZE (rust/crates/void-1.0.2.tar.gz) = 2356 +SHA256 (rust/crates/vswhom-0.1.0.tar.gz) = be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b +SIZE (rust/crates/vswhom-0.1.0.tar.gz) = 9420 +SHA256 (rust/crates/vswhom-sys-0.1.0.tar.gz) = fc2f5402d3d0e79a069714f7b48e3ecc60be7775a2c049cb839457457a239532 +SIZE (rust/crates/vswhom-sys-0.1.0.tar.gz) = 15589 SHA256 (rust/crates/vte-0.3.3.tar.gz) = 4f42f536e22f7fcbb407639765c8fd78707a33109301f834a594758bedd6e8cf SIZE (rust/crates/vte-0.3.3.tar.gz) = 2397439 SHA256 (rust/crates/walkdir-2.2.7.tar.gz) = 9d9d7ed3431229a144296213105a390676cc49c9b6a72bd19f3176c98e129fa1 SIZE (rust/crates/walkdir-2.2.7.tar.gz) = 23507 SHA256 (rust/crates/want-0.0.6.tar.gz) = 797464475f30ddb8830cc529aaaae648d581f99e2036a928877dfde027ddf6b3 SIZE (rust/crates/want-0.0.6.tar.gz) = 5434 -SHA256 (rust/crates/wayland-client-0.21.11.tar.gz) = 96041810afa07e7953867d46f8f03c41cbca49ebd1e840eef6abefde8b458b30 -SIZE (rust/crates/wayland-client-0.21.11.tar.gz) = 58835 -SHA256 (rust/crates/wayland-commons-0.21.11.tar.gz) = 92af0c5dc724c049e9bd927f8563d9a6abaa94893c5305ef0a6d2805e661f3d3 -SIZE (rust/crates/wayland-commons-0.21.11.tar.gz) = 15305 -SHA256 (rust/crates/wayland-protocols-0.21.11.tar.gz) = fd94211387fa8ff50df1e4ff7a5529b5a9aebe68ba88acc48e5b7f5fd98f6eef -SIZE (rust/crates/wayland-protocols-0.21.11.tar.gz) = 108906 -SHA256 (rust/crates/wayland-scanner-0.21.11.tar.gz) = 3611f231e675e15c2feb7623103e6449edc6f10b0598cafb3e16e590a0561355 -SIZE (rust/crates/wayland-scanner-0.21.11.tar.gz) = 16053 -SHA256 (rust/crates/wayland-sys-0.21.11.tar.gz) = 2a69d729a1747a5bf40ae05b94c7904b64fbf2381e365c046d872ce4a34aa826 -SIZE (rust/crates/wayland-sys-0.21.11.tar.gz) = 6666 +SHA256 (rust/crates/wayland-client-0.21.12.tar.gz) = e77d1e6887f07ea2e5d79a3d7d03a875e62d3746334a909b5035d779d849a523 +SIZE (rust/crates/wayland-client-0.21.12.tar.gz) = 58659 +SHA256 (rust/crates/wayland-commons-0.21.12.tar.gz) = dff69a5399ca212efa4966f3ee2a3773f19960d0fa329b9aca046a8508a0e09f +SIZE (rust/crates/wayland-commons-0.21.12.tar.gz) = 15234 +SHA256 (rust/crates/wayland-protocols-0.21.12.tar.gz) = c9ccddf6a4407d982898e0f0a1172217843f3d40fe4272f828060b56a2d40d81 +SIZE (rust/crates/wayland-protocols-0.21.12.tar.gz) = 108602 +SHA256 (rust/crates/wayland-scanner-0.21.12.tar.gz) = 63bc5efa7dcdb8f04d2e5d1571c0d0577fc47076d133d68e056bdb299f1b60e2 +SIZE (rust/crates/wayland-scanner-0.21.12.tar.gz) = 15955 +SHA256 (rust/crates/wayland-sys-0.21.12.tar.gz) = e76af81a601b84d400744f85f083381daa77ac01f6c8711e57e662dc3a35d69d +SIZE (rust/crates/wayland-sys-0.21.12.tar.gz) = 6630 SHA256 (rust/crates/which-1.0.5.tar.gz) = e84a603e7e0b1ce1aa1ee2b109c7be00155ce52df5081590d1ffb93f4f515cb2 SIZE (rust/crates/which-1.0.5.tar.gz) = 5366 -SHA256 (rust/crates/widestring-0.2.2.tar.gz) = 7157704c2e12e3d2189c507b7482c52820a16dfa4465ba91add92f266667cadb -SIZE (rust/crates/widestring-0.2.2.tar.gz) = 17327 SHA256 (rust/crates/widestring-0.4.0.tar.gz) = effc0e4ff8085673ea7b9b2e3c73f6bd4d118810c9009ed8f1e16bd96c331db6 SIZE (rust/crates/widestring-0.4.0.tar.gz) = 24241 SHA256 (rust/crates/winapi-0.2.8.tar.gz) = 167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a SIZE (rust/crates/winapi-0.2.8.tar.gz) = 455145 -SHA256 (rust/crates/winapi-0.3.6.tar.gz) = 92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0 -SIZE (rust/crates/winapi-0.3.6.tar.gz) = 1029391 +SHA256 (rust/crates/winapi-0.3.7.tar.gz) = f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770 +SIZE (rust/crates/winapi-0.3.7.tar.gz) = 1075776 SHA256 (rust/crates/winapi-build-0.1.1.tar.gz) = 2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc SIZE (rust/crates/winapi-build-0.1.1.tar.gz) = 669 SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6 @@ -571,16 +599,16 @@ SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 712e227841d057c SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 2947998 SHA256 (rust/crates/wincolor-1.0.1.tar.gz) = 561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba SIZE (rust/crates/wincolor-1.0.1.tar.gz) = 4737 -SHA256 (rust/crates/winit-0.18.1.tar.gz) = 8c57c15bd4c0ef18dff33e263e452abe32d00e2e05771cacaa410a14cc1c0776 -SIZE (rust/crates/winit-0.18.1.tar.gz) = 191627 +SHA256 (rust/crates/winit-0.19.1.tar.gz) = d233301129ddd33260b47f76900b50e154b7254546e2edba0e5468a1a5fe4de3 +SIZE (rust/crates/winit-0.19.1.tar.gz) = 196353 SHA256 (rust/crates/winpty-sys-0.4.3.tar.gz) = 3dade7ecea144b3578a02925f93900f32370abfb8768630883971f4ef716b568 SIZE (rust/crates/winpty-sys-0.4.3.tar.gz) = 123868 -SHA256 (rust/crates/winreg-0.4.0.tar.gz) = cbf285379f20d7f26abd990d9a566be9d31ab7a9d335299baaa1f0604f5f96af -SIZE (rust/crates/winreg-0.4.0.tar.gz) = 14351 +SHA256 (rust/crates/winreg-0.5.1.tar.gz) = a27a759395c1195c4cc5cda607ef6f8f6498f64e78f7900f5de0a127a424704a +SIZE (rust/crates/winreg-0.5.1.tar.gz) = 17693 SHA256 (rust/crates/ws2_32-sys-0.2.1.tar.gz) = d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e SIZE (rust/crates/ws2_32-sys-0.2.1.tar.gz) = 4697 -SHA256 (rust/crates/x11-clipboard-0.2.2.tar.gz) = 2e7374c7699210cca7084ca61d57e09640fc744d1391808cb9ae2fe4ca9bd1df -SIZE (rust/crates/x11-clipboard-0.2.2.tar.gz) = 5820 +SHA256 (rust/crates/x11-clipboard-0.3.1.tar.gz) = 0a129731ff75b29ff277686904c0e8e3e378f42f1b27fe4c25e81c1ad2d0a8d1 +SIZE (rust/crates/x11-clipboard-0.3.1.tar.gz) = 6750 SHA256 (rust/crates/x11-dl-2.18.3.tar.gz) = 940586acb859ea05c53971ac231685799a7ec1dee66ac0bccc0e6ad96e06b4e3 SIZE (rust/crates/x11-dl-2.18.3.tar.gz) = 61983 SHA256 (rust/crates/xcb-0.8.2.tar.gz) = 5e917a3f24142e9ff8be2414e36c649d47d6cc2ba81f16201cdef96e533e02de @@ -589,9 +617,9 @@ SHA256 (rust/crates/xdg-2.2.0.tar.gz) = d089681aa106a86fade1b0128fb5daf07d5867a5 SIZE (rust/crates/xdg-2.2.0.tar.gz) = 13387 SHA256 (rust/crates/xml-rs-0.8.0.tar.gz) = 541b12c998c5b56aa2b4e6f18f03664eef9a4fd0a246a55594efae6cc2d964b5 SIZE (rust/crates/xml-rs-0.8.0.tar.gz) = 50974 -SHA256 (rust/crates/yaml-rust-0.4.2.tar.gz) = 95acf0db5515d07da9965ec0e0ba6cc2d825e2caeb7303b66ca441729801254e -SIZE (rust/crates/yaml-rust-0.4.2.tar.gz) = 45338 -SHA256 (rust/crates/zip-0.5.0.tar.gz) = 00acf1fafb786ff450b6726e5be41ef029142597b47a40ce80f952f1471730a0 -SIZE (rust/crates/zip-0.5.0.tar.gz) = 29345 -SHA256 (jwilm-alacritty-v0.2.9_GH0.tar.gz) = 0261d427bd93262403c3acdda6ebcb06c6a37062124e96fe2b29ff3104cb3089 -SIZE (jwilm-alacritty-v0.2.9_GH0.tar.gz) = 1024988 +SHA256 (rust/crates/yaml-rust-0.4.3.tar.gz) = 65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d +SIZE (rust/crates/yaml-rust-0.4.3.tar.gz) = 45768 +SHA256 (rust/crates/zip-0.5.2.tar.gz) = c18fc320faf909036e46ac785ea827f72e485304877faf1a3a39538d3714dbc3 +SIZE (rust/crates/zip-0.5.2.tar.gz) = 29522 +SHA256 (jwilm-alacritty-v0.3.0_GH0.tar.gz) = 62f96fa751eb553012dc7e562e62cdf37c6668c8117be31790ce7dc2d4d28a47 +SIZE (jwilm-alacritty-v0.3.0_GH0.tar.gz) = 1332555 diff --git a/x11/alacritty/files/patch-src_event.rs b/x11/alacritty/files/patch-src_event.rs deleted file mode 100644 index baf1415401c..00000000000 --- a/x11/alacritty/files/patch-src_event.rs +++ /dev/null @@ -1,20 +0,0 @@ -Let Alacritty open new instances in the shell's working directory -as long as linprocfs(5) is mounted on /compat/linux/proc. - -https://github.com/jwilm/alacritty/commit/0ec4bd28dadcf476baf6180af7cf93bea9214f19 - ---- src/event.rs.orig 2019-02-11 23:59:21 UTC -+++ src/event.rs -@@ -172,7 +172,11 @@ impl<'a, N: Notify + 'a> input::ActionContext for Acti - - #[cfg(unix)] - let args = { -- if let Ok(path) = fs::read_link(format!("/proc/{}/cwd", unsafe { tty::PID })) { -+ #[cfg(not(target_os = "freebsd"))] -+ let proc_prefix = ""; -+ #[cfg(target_os = "freebsd")] -+ let proc_prefix = "/compat/linux"; -+ if let Ok(path) = fs::read_link(format!("{}/proc/{}/cwd", proc_prefix, unsafe { tty::PID })) { - vec!["--working-directory".into(), path] - } else { - Vec::new() diff --git a/x11/sddm/Makefile b/x11/sddm/Makefile index a34f7728c36..25003a3d395 100644 --- a/x11/sddm/Makefile +++ b/x11/sddm/Makefile @@ -3,7 +3,7 @@ PORTNAME= sddm PORTVERSION= 0.17.0 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11 MAINTAINER= kde@FreeBSD.org @@ -18,9 +18,10 @@ LICENSE_COMB= multi LICENSE_FILE_GPLv2+= ${WRKSRC}/LICENSE LICENSE_FILE_CC-BY-3.0= ${WRKSRC}/LICENSE.CC-BY-3.0 +BUILD_DEPENDS= rst2man.py-${PYTHON_VER}:textproc/py-docutils@${PY_FLAVOR} RUN_DEPENDS= dbus-run-session:devel/dbus -USES= cmake compiler:c++11-lang kde:5 qt:5 +USES= cmake compiler:c++11-lang kde:5 python:2.7,build qt:5 USE_GITHUB= yes USE_KDE= ecm USE_QT= core declarative dbus gui network \ @@ -29,7 +30,9 @@ USE_XORG= xcb CMAKE_ARGS= -DUID_MIN=1000 \ -DUID_MAX=65000 \ - -DCMAKE_INSTALL_SYSCONFDIR:PATH=${LOCALBASE}/etc + -DCMAKE_INSTALL_SYSCONFDIR:PATH=${LOCALBASE}/etc \ + -DBUILD_MAN_PAGES=ON \ + -DRST2MAN_EXECUTABLE=${LOCALBASE}/bin/rst2man.py-${PYTHON_VER} USE_RC_SUBR= sddm SUB_FILES= xinitrc.desktop diff --git a/x11/sddm/pkg-plist b/x11/sddm/pkg-plist index 5e38017dec9..f8773060b68 100644 --- a/x11/sddm/pkg-plist +++ b/x11/sddm/pkg-plist @@ -4,6 +4,10 @@ etc/dbus-1/system.d/org.freedesktop.DisplayManager.conf etc/pam.d/sddm etc/pam.d/sddm-autologin etc/pam.d/sddm-greeter +man/man1/sddm.1.gz +man/man1/sddm-greeter.1.gz +man/man5/sddm.conf.5.gz +man/man5/sddm-state.conf.5.gz @sample etc/sddm.conf.sample %%QT_QMLDIR%%/SddmComponents/Background.qml %%QT_QMLDIR%%/SddmComponents/Button.qml diff --git a/x11/xcb-proto/Makefile b/x11/xcb-proto/Makefile index 25d97a2756e..562c7fbb489 100644 --- a/x11/xcb-proto/Makefile +++ b/x11/xcb-proto/Makefile @@ -3,6 +3,7 @@ PORTNAME= xcb-proto PORTVERSION= 1.13 +PORTREVISION= 1 CATEGORIES= x11 python MASTER_SITES= http://xcb.freedesktop.org/dist/