diff options
| author | Neil Moore <neil@s-z.org> | 2014-07-12 19:43:58 -0400 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2014-07-12 20:56:08 -0400 |
| commit | ac4b98f7f12b67270b0aa685eb4ca1484c20cc8b (patch) | |
| tree | 936a248c07d795199f40e2e5d79ba50023901c8b /crawl-ref/source/util/configure | |
| parent | 758800ef84f60adf6848dbecd55ec8ba8d8dbc6a (diff) | |
| download | crawl-ref-ac4b98f7f12b67270b0aa685eb4ca1484c20cc8b.tar.gz crawl-ref-ac4b98f7f12b67270b0aa685eb4ca1484c20cc8b.zip | |
Avoid conflict with libraries' HAVE_*
Diffstat (limited to 'crawl-ref/source/util/configure')
| -rwxr-xr-x | crawl-ref/source/util/configure | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/crawl-ref/source/util/configure b/crawl-ref/source/util/configure index c720630cbc..bb66104055 100755 --- a/crawl-ref/source/util/configure +++ b/crawl-ref/source/util/configure @@ -1,8 +1,7 @@ #!/bin/sh CXX="$1" -if [ -z "$CXX" ] - then +if [ -z "$CXX" ]; then echo >&2 "CXX not specified" exit 1 fi @@ -17,8 +16,11 @@ int main() } END -$CXX "$@" -c conftest.cc >/dev/null 2>/dev/null && - FDATASYNC="#define HAVE_FDATASYNC" || FDATASYNC="#undef HAVE_FDATASYNC" +if $CXX "$@" -c conftest.cc >/dev/null 2>/dev/null; then + FDATASYNC="#define CRAWL_HAVE_FDATASYNC" +else + FDATASYNC="#undef CRAWL_HAVE_FDATASYNC" +fi rm -f conftest.cc conftest.o cat <<END >conftest.cc @@ -32,8 +34,11 @@ int main() } END -$CXX "$@" -c conftest.cc >/dev/null 2>/dev/null && - STRLCPY="#define HAVE_STRLCPY" || STRLCPY="#undef HAVE_STRLCPY" +if $CXX "$@" -c conftest.cc >/dev/null 2>/dev/null; then + STRLCPY="#define CRAWL_HAVE_STRLCPY" +else + STRLCPY="#undef CRAWL_HAVE_STRLCPY" +fi rm -f conftest.cc conftest.o cat <<END >config.h |