Commit 37bc6ca2 by Phil Edwards

acinclude.m4: Remove trailing whitespace.

2002-12-30  Phil Edwards  <pme@gcc.gnu.org>

	* acinclude.m4:  Remove trailing whitespace.
	(GLIBCPP_ENABLE_CXX_FLAGS):  Fix.
	* aclocal.m4, configure:  Regenerate.

From-SVN: r60631
parent 07fa4878
2002-12-30 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4: Remove trailing whitespace.
(GLIBCPP_ENABLE_CXX_FLAGS): Fix.
* aclocal.m4, configure: Regenerate.
2002-12-29 Phil Edwards <pme@gcc.gnu.org> 2002-12-29 Phil Edwards <pme@gcc.gnu.org>
* include/std/std_bitset.h: Better comments. * include/std/std_bitset.h: Better comments.
......
...@@ -1145,21 +1145,21 @@ dnl If "default flags" is an empty string (or "none"), the effect is ...@@ -1145,21 +1145,21 @@ dnl If "default flags" is an empty string (or "none"), the effect is
dnl the same as --disable or --enable=no. dnl the same as --disable or --enable=no.
AC_DEFUN(GLIBCPP_ENABLE_CXX_FLAGS, [dnl AC_DEFUN(GLIBCPP_ENABLE_CXX_FLAGS, [dnl
define([GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT], ifelse($1,,, $1))dnl define([GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT], ifelse($1,,, $1))dnl
AC_MSG_CHECKING([for extra compiler flags for building])
AC_ARG_ENABLE(cxx_flags, AC_ARG_ENABLE(cxx_flags,
changequote(<<, >>)dnl changequote(<<, >>)dnl
<< --enable-cxx-flags=FLAGS pass compiler FLAGS when building library; << --enable-cxx-flags=FLAGS pass compiler FLAGS when building library;
[default=>>GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT], [default=>>GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT],
changequote([, ])dnl changequote([, ])dnl
enable_cxx_flags='GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT') [case "x$enable_cxx_flags" in
case "x$enable_cxx_flags" in
xyes) xyes)
AC_MSG_ERROR([--enable-cxx-flags needs compiler flags as arguments]) ;; AC_MSG_ERROR([--enable-cxx-flags needs compiler flags as arguments]) ;;
xno | xnone | x) xno | xnone | x)
enable_cxx_flags='' ;; enable_cxx_flags='' ;;
*) *)
enable_cxx_flags="$enableval" ;; enable_cxx_flags="$enableval" ;;
esac esac],
enable_cxx_flags=GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT)
dnl Run through flags (either default or command-line) and set anything dnl Run through flags (either default or command-line) and set anything
dnl extra (e.g., #defines) that must accompany particular g++ options. dnl extra (e.g., #defines) that must accompany particular g++ options.
...@@ -1174,6 +1174,7 @@ if test -n "$enable_cxx_flags"; then ...@@ -1174,6 +1174,7 @@ if test -n "$enable_cxx_flags"; then
done done
fi fi
EXTRA_CXX_FLAGS="$enable_cxx_flags" EXTRA_CXX_FLAGS="$enable_cxx_flags"
AC_MSG_RESULT($EXTRA_CXX_FLAGS)
AC_SUBST(EXTRA_CXX_FLAGS) AC_SUBST(EXTRA_CXX_FLAGS)
]) ])
......
dnl aclocal.m4 generated automatically by aclocal 1.4-p5 dnl aclocal.m4 generated automatically by aclocal 1.4-p6
dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
...@@ -1157,21 +1157,21 @@ dnl If "default flags" is an empty string (or "none"), the effect is ...@@ -1157,21 +1157,21 @@ dnl If "default flags" is an empty string (or "none"), the effect is
dnl the same as --disable or --enable=no. dnl the same as --disable or --enable=no.
AC_DEFUN(GLIBCPP_ENABLE_CXX_FLAGS, [dnl AC_DEFUN(GLIBCPP_ENABLE_CXX_FLAGS, [dnl
define([GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT], ifelse($1,,, $1))dnl define([GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT], ifelse($1,,, $1))dnl
AC_MSG_CHECKING([for extra compiler flags for building])
AC_ARG_ENABLE(cxx_flags, AC_ARG_ENABLE(cxx_flags,
changequote(<<, >>)dnl changequote(<<, >>)dnl
<< --enable-cxx-flags=FLAGS pass compiler FLAGS when building library; << --enable-cxx-flags=FLAGS pass compiler FLAGS when building library;
[default=>>GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT], [default=>>GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT],
changequote([, ])dnl changequote([, ])dnl
enable_cxx_flags='GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT') [case "x$enable_cxx_flags" in
case "x$enable_cxx_flags" in
xyes) xyes)
AC_MSG_ERROR([--enable-cxx-flags needs compiler flags as arguments]) ;; AC_MSG_ERROR([--enable-cxx-flags needs compiler flags as arguments]) ;;
xno | xnone | x) xno | xnone | x)
enable_cxx_flags='' ;; enable_cxx_flags='' ;;
*) *)
enable_cxx_flags="$enableval" ;; enable_cxx_flags="$enableval" ;;
esac esac],
enable_cxx_flags=GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT)
dnl Run through flags (either default or command-line) and set anything dnl Run through flags (either default or command-line) and set anything
dnl extra (e.g., #defines) that must accompany particular g++ options. dnl extra (e.g., #defines) that must accompany particular g++ options.
...@@ -1186,6 +1186,7 @@ if test -n "$enable_cxx_flags"; then ...@@ -1186,6 +1186,7 @@ if test -n "$enable_cxx_flags"; then
done done
fi fi
EXTRA_CXX_FLAGS="$enable_cxx_flags" EXTRA_CXX_FLAGS="$enable_cxx_flags"
AC_MSG_RESULT($EXTRA_CXX_FLAGS)
AC_SUBST(EXTRA_CXX_FLAGS) AC_SUBST(EXTRA_CXX_FLAGS)
]) ])
...@@ -2302,7 +2303,7 @@ AC_MSG_RESULT($enable_symvers) ...@@ -2302,7 +2303,7 @@ AC_MSG_RESULT($enable_symvers)
]) ])
# isc-posix.m4 serial 1 (gettext-0.10.40) # isc-posix.m4 serial 2 (gettext-0.11.2)
dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General dnl General Public License. As a special exception to the GNU General
...@@ -2310,6 +2311,8 @@ dnl Public License, this file may be distributed as part of a program ...@@ -2310,6 +2311,8 @@ dnl Public License, this file may be distributed as part of a program
dnl that contains a configuration script generated by Autoconf, under dnl that contains a configuration script generated by Autoconf, under
dnl the same distribution terms as the rest of that program. dnl the same distribution terms as the rest of that program.
# This file is not needed with autoconf-2.53 and newer. Remove it in 2005.
# This test replaces the one in autoconf. # This test replaces the one in autoconf.
# Currently this macro should have the same name as the autoconf macro # Currently this macro should have the same name as the autoconf macro
# because gettext's gettext.m4 (distributed in the automake package) # because gettext's gettext.m4 (distributed in the automake package)
...@@ -2370,7 +2373,8 @@ dnl Usage: ...@@ -2370,7 +2373,8 @@ dnl Usage:
dnl AM_INIT_AUTOMAKE(package,version, [no-define]) dnl AM_INIT_AUTOMAKE(package,version, [no-define])
AC_DEFUN([AM_INIT_AUTOMAKE], AC_DEFUN([AM_INIT_AUTOMAKE],
[AC_REQUIRE([AC_PROG_INSTALL]) [AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
AC_REQUIRE([AC_PROG_INSTALL])
PACKAGE=[$1] PACKAGE=[$1]
AC_SUBST(PACKAGE) AC_SUBST(PACKAGE)
VERSION=[$2] VERSION=[$2]
...@@ -2386,13 +2390,42 @@ AC_REQUIRE([AM_SANITY_CHECK]) ...@@ -2386,13 +2390,42 @@ AC_REQUIRE([AM_SANITY_CHECK])
AC_REQUIRE([AC_ARG_PROGRAM]) AC_REQUIRE([AC_ARG_PROGRAM])
dnl FIXME This is truly gross. dnl FIXME This is truly gross.
missing_dir=`cd $ac_aux_dir && pwd` missing_dir=`cd $ac_aux_dir && pwd`
AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
AC_REQUIRE([AC_PROG_MAKE_SET])]) AC_REQUIRE([AC_PROG_MAKE_SET])])
# Copyright 2002 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# AM_AUTOMAKE_VERSION(VERSION)
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y.
AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
# Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.4-p6])])
# #
# Check to make sure that the build environment is sane. # Check to make sure that the build environment is sane.
# #
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment