~z-man/armagetronad/0.4-armagetronad-v2sty-unified

Viewing changes to configure.ac

Committer: z-man
Date: 2016-12-04 12:19:15 UTC
Revision ID: z-man-20161204121915-ze2jebwium92d48f

Merging branch 0.2.8 from revision 10882 to 10884:
------------------------------------------------------------------------
r10884 | bazaaarmagetron | 2016-12-04 13:13:22 +0100 (So, 04 Dez 2016) | 2 lines

Manuel Moos: Trying different C++ standard options: First 11, then 14, then 17, then the preliminary 0x.

------------------------------------------------------------------------

files modified:
configure.ac

Show diffs side-by-side

added added

removed removed

configure.ac

503

test $DEBUGLEVEL -ge 5 && CXXFLAGS="$CXXFLAGS -DMEM_DEB"

504

505

dnl oddly, this macro needs to be called once unconditionally, or automake borks up.

506

dnl pick C++11 standard if we can

506

507

AX_CXXFLAGS_GCC_OPTION(-std=c++11)

508

if test -z "`echo $CXXFLAGS | grep "\-std="`"; then

509

dnl maybe it is the future and c++11 is deprecated? C++14 should work, too

510

AX_CXXFLAGS_GCC_OPTION(-std=c++14)

511

if test -z "`echo $CXXFLAGS | grep "\-std="`"; then

512

dnl still nothing? Maybe this one:

513

AX_CXXFLAGS_GCC_OPTION(-std=c++17)

514

if test -z "`echo $CXXFLAGS | grep "\-std="`"; then

515

dnl last call: pre-c++11 standard. Works on mingw, so why not here?

516

AX_CXXFLAGS_GCC_OPTION(-std=c++0x)

517

518

519

520

521

dnl

522

dnl dnl maybe it is the future and c++11 is deprecated? C++14 should work, too

523

dnl AX_CXXFLAGS_GCC_OPTION(-std=c++14z,[],[],[

524

dnl dnl still nothing? Maybe this one:

525

dnl AX_CXXFLAGS_GCC_OPTION(-std=c++17z,[],[],[

526

dnl dnl last call: pre-c++11 standard. Works on mingw, so why not here?

527

dnl AX_CXXFLAGS_GCC_OPTION(-std=c++0x)

528

dnl ])

529

dnl ])

530

dnl])

531

507

532

508

533

if test $CODELEVEL -ge 1; then

509

534

CXXFLAGS="$CXXFLAGS -Wall"

Older »