bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

ansi-c++-opt: exploit new autoconf feature


From: Bruno Haible
Subject: ansi-c++-opt: exploit new autoconf feature
Date: Sat, 31 Jul 2010 23:35:03 +0200
User-agent: KMail/1.9.9

The ansi-c++-opt can make use of the recently released Autoconf 2.66 / 2.67.


2010-07-31  Bruno Haible  <address@hidden>

        ansi-c++-opt: Provide option --enable-c++/--disable-c++ when possible.
        * m4/ansi-c++.m4 (gl_CXX_CHOICE): In Autoconf 2.66 or newer, provide
        option --enable/disable-c++ instead of --enable/disable-cxx.

--- m4/ansi-c++.m4.orig Sat Jul 31 23:32:05 2010
+++ m4/ansi-c++.m4      Sat Jul 31 23:29:49 2010
@@ -1,4 +1,4 @@
-# ansi-c++.m4 serial 5
+# ansi-c++.m4 serial 6
 dnl Copyright (C) 2002-2003, 2005, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -15,17 +15,26 @@
 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.
-  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])])
+  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])
 ])



reply via email to

[Prev in Thread] Current Thread [Next in Thread]