-# ansi-c++.m4 serial 3
-dnl Copyright (C) 2002-2003, 2005, 2010 Free Software Foundation, Inc.
+# ansi-c++.m4 serial 7
+dnl Copyright (C) 2002-2003, 2005, 2010-2011 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.
dnl From Bruno Haible.
# Sets CXX_CHOICE to 'yes' or 'no', depending on the preferred use of C++.
+# The default is 'yes'. If the configure.ac contains a definition of the
+# macro gl_CXX_CHOICE_DEFAULT_NO, then the default is 'no'. In both cases,
+# the user can change the value by passing the option --disable-cxx or
+# --enable-cxx, respectively.
AC_DEFUN([gl_CXX_CHOICE],
[
AC_MSG_CHECKING([whether to use C++])
- dnl It would be so nice if plus signs were supported in AC_ARG_ENABLE.
- dnl Feature request submitted on 2010-03-13.
- AC_ARG_ENABLE([cxx],
- [ --disable-cxx do not build C++ sources],
- [CXX_CHOICE="$enableval"],
- [CXX_CHOICE=yes])
+ dnl Plus signs are supported in AC_ARG_ENABLE starting with autoconf-2.66.
+ m4_version_prereq([2.66],
+ [m4_ifdef([gl_CXX_CHOICE_DEFAULT_NO],
+ [AC_ARG_ENABLE([c++],
+ [ --enable-c++ also build C++ sources],
+ [CXX_CHOICE="$enableval"],
+ [CXX_CHOICE=no])],
+ [AC_ARG_ENABLE([c++],
+ [ --disable-c++ do not build C++ sources],
+ [CXX_CHOICE="$enableval"],
+ [CXX_CHOICE=yes])])],
+ [m4_ifdef([gl_CXX_CHOICE_DEFAULT_NO],
+ [AC_ARG_ENABLE([cxx],
+ [ --enable-cxx also build C++ sources],
+ [CXX_CHOICE="$enableval"],
+ [CXX_CHOICE=no])],
+ [AC_ARG_ENABLE([cxx],
+ [ --disable-cxx do not build C++ sources],
+ [CXX_CHOICE="$enableval"],
+ [CXX_CHOICE=yes])])])
AC_MSG_RESULT([$CXX_CHOICE])
AC_SUBST([CXX_CHOICE])
])
if test -n "$CCC"; then
CXX="$CCC"
else
- AC_CHECK_PROGS([CXX], [g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC], [:])
+ AC_CHECK_TOOLS([CXX],
+ [g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC],
+ [:])
fi
fi
if test "$CXX" != ":"; then
AM_CONDITIONAL([$2], [test "$$1" != ":"])
- 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.
- _AM_DEPENDENCIES([CXX])
+ if test "$$1" != ":"; 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.
+ _AM_DEPENDENCIES([CXX])
+ else
+ AM_CONDITIONAL([am__fastdepCXX], [false])
+ fi
])