X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=m4%2Fansi-c%2B%2B.m4;h=8319dd38367f87cf7ab7aedb1cf97fbb4968aab7;hb=931b01b091932a1f796c23379ea32abb68bd5895;hp=d6352ee75872b1edb989ad0d4a7fe1f00145ffbe;hpb=7be93f2d05131d061bd4790ae33c8d50f50010d7;p=platform%2Fupstream%2Fm4.git diff --git a/m4/ansi-c++.m4 b/m4/ansi-c++.m4 index d6352ee..8319dd3 100644 --- a/m4/ansi-c++.m4 +++ b/m4/ansi-c++.m4 @@ -1,5 +1,5 @@ -# ansi-c++.m4 serial 7 -dnl Copyright (C) 2002-2003, 2005, 2010-2011 Free Software Foundation, Inc. +# ansi-c++.m4 serial 9 +dnl Copyright (C) 2002-2003, 2005, 2010-2013 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -41,7 +41,7 @@ AC_DEFUN([gl_CXX_CHOICE], # gl_PROG_ANSI_CXX([ANSICXX_VARIABLE], [ANSICXX_CONDITIONAL]) # Sets ANSICXX_VARIABLE to the name of a sufficiently ANSI C++ compliant -# compiler, or to ":" if none is found. +# compiler, or to "no" if none is found. # Defines the Automake condition ANSICXX_CONDITIONAL to true if such a compiler # was found, or to false if not. @@ -51,7 +51,7 @@ AC_DEFUN([gl_PROG_ANSI_CXX], m4_if([$1], [CXX], [], [gl_save_CXX="$CXX"]) if test "$CXX_CHOICE" = no; then - CXX=":" + CXX=no fi if test -z "$CXX"; then if test -n "$CCC"; then @@ -62,7 +62,7 @@ AC_DEFUN([gl_PROG_ANSI_CXX], [:]) fi fi - if test "$CXX" != ":"; then + if test "$CXX" != no; then dnl Use a modified version of AC_PROG_CXX_WORKS that does not exit dnl upon failure. AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works]) @@ -84,7 +84,7 @@ AC_DEFUN([gl_PROG_ANSI_CXX], AC_LANG_POP([C++]) AC_MSG_RESULT([$gl_cv_prog_ansicxx_works]) if test $gl_cv_prog_ansicxx_works = no; then - CXX=: + CXX=no else dnl Test for namespaces. dnl We don't bother supporting pre-ANSI-C++ compilers. @@ -105,7 +105,7 @@ EOF AC_LANG_POP([C++]) AC_MSG_RESULT([$gl_cv_prog_ansicxx_namespaces]) if test $gl_cv_prog_ansicxx_namespaces = no; then - CXX=: + CXX=no fi fi fi @@ -114,13 +114,13 @@ EOF CXX="$gl_save_CXX"]) AC_SUBST([$1]) - AM_CONDITIONAL([$2], [test "$$1" != ":"]) + AM_CONDITIONAL([$2], [test "$$1" != no]) - if test "$$1" != ":"; then + if test "$$1" != no; then dnl This macro invocation resolves an automake error: dnl /usr/local/share/automake-1.11/am/depend2.am: am__fastdepCXX does not appear in AM_CONDITIONAL - dnl /usr/local/share/automake-1.11/am/depend2.am: The usual way to define `am__fastdepCXX' is to add `AC_PROG_CXX' - dnl /usr/local/share/automake-1.11/am/depend2.am: to `configure.ac' and run `aclocal' and `autoconf' again. + dnl /usr/local/share/automake-1.11/am/depend2.am: The usual way to define 'am__fastdepCXX' is to add 'AC_PROG_CXX' + dnl /usr/local/share/automake-1.11/am/depend2.am: to 'configure.ac' and run 'aclocal' and 'autoconf' again. _AM_DEPENDENCIES([CXX]) else AM_CONDITIONAL([am__fastdepCXX], [false])