From af9fe0d178763a426fd233ae05deec25edd352ac Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Wed, 24 May 2000 22:48:03 +0000 Subject: [PATCH] m4: Remove. 2000-05-24 Benjamin Kosnik * m4: Remove. * m4/lc_message.m4: Merge into acinclude.m4. * m4/mathfcts.m4: Same. * m4/stringfcts.m4: Same. * acinclude.m4: Add here. * configure: Regnerate. From-SVN: r34146 --- libstdc++-v3/ChangeLog | 11 +++- libstdc++-v3/acinclude.m4 | 53 +++++++++++++++++++ libstdc++-v3/aclocal.m4 | 105 +++++++++++++++++++------------------- 3 files changed, 115 insertions(+), 54 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4629441d31d1..c1f6caac30a1 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,10 +1,17 @@ 2000-05-24 Benjamin Kosnik + * m4: Remove. + * m4/lc_message.m4: Merge into acinclude.m4. + * m4/mathfcts.m4: Same. + * m4/stringfcts.m4: Same. + * acinclude.m4: Add here. + * configure: Regnerate. + * acinclude.m4 (GLIBCPP_CHECK_COMPILER_VERSION): Remove OPTLEVEL. Add FMTFLAGS. * aclocal.m4: Regenerate. - * src/Makefile.am (AC_CXXFLAGS): Take out OPTLEVEL, as this is has - been disabled due to higher-level makefiles running amuck over + * src/Makefile.am (AC_CXXFLAGS): Take out OPTLEVEL, as this has + been disabled due to higher-level Makefiles running amuck over this bit, and add in FMTFLAGS so that formatting is clear. * src/Makefile.in: Regenerate. * configure: Regenerate. diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index e7cc305ad6e1..ac738c8da9a9 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -1007,3 +1007,56 @@ AC_SUBST(SHADOW_INCLUDES) ]) +# Check whether LC_MESSAGES is available in . +# Ulrich Drepper , 1995. +# +# This file file be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +# serial 1 + +AC_DEFUN(AC_LC_MESSAGES, + [if test $ac_cv_header_locale_h = yes; then + AC_CACHE_CHECK([for LC_MESSAGES], ac_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include ], [return LC_MESSAGES], + ac_cv_val_LC_MESSAGES=yes, ac_cv_val_LC_MESSAGES=no)]) + if test $ac_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES) + fi + fi]) + + +# Check for functions in math library. +# Ulrich Drepper , 1998. +# +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +# serial 1 + +dnl AC_REPLACE_MATHFUNCS(FUNCTION...) +AC_DEFUN(AC_REPLACE_MATHFUNCS, +[AC_CHECK_FUNCS([$1], , [LIBMATHOBJS="$LIBMATHOBJS ${ac_func}.lo"]) +AC_SUBST(LIBMATHOBJS)dnl +]) + + +# Check for string functions. +# Ulrich Drepper , 1998. +# +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +# serial 1 + +dnl AC_REPLACE_STRINGFUNCS(FUNCTION...) +AC_DEFUN(AC_REPLACE_STRINGFUNCS, +[AC_CHECK_FUNCS([$1], , [LIBSTRINGOBJS="$LIBSTRINGOBJS ${ac_func}.lo"]) +AC_SUBST(LIBSTRINGOBJS)dnl +]) diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4 index 867e62fa31a5..c8655b1a37e3 100644 --- a/libstdc++-v3/aclocal.m4 +++ b/libstdc++-v3/aclocal.m4 @@ -1019,6 +1019,59 @@ AC_SUBST(SHADOW_INCLUDES) ]) +# Check whether LC_MESSAGES is available in . +# Ulrich Drepper , 1995. +# +# This file file be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +# serial 1 + +AC_DEFUN(AC_LC_MESSAGES, + [if test $ac_cv_header_locale_h = yes; then + AC_CACHE_CHECK([for LC_MESSAGES], ac_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include ], [return LC_MESSAGES], + ac_cv_val_LC_MESSAGES=yes, ac_cv_val_LC_MESSAGES=no)]) + if test $ac_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES) + fi + fi]) + + +# Check for functions in math library. +# Ulrich Drepper , 1998. +# +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +# serial 1 + +dnl AC_REPLACE_MATHFUNCS(FUNCTION...) +AC_DEFUN(AC_REPLACE_MATHFUNCS, +[AC_CHECK_FUNCS([$1], , [LIBMATHOBJS="$LIBMATHOBJS ${ac_func}.lo"]) +AC_SUBST(LIBMATHOBJS)dnl +]) + + +# Check for string functions. +# Ulrich Drepper , 1998. +# +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +# serial 1 + +dnl AC_REPLACE_STRINGFUNCS(FUNCTION...) +AC_DEFUN(AC_REPLACE_STRINGFUNCS, +[AC_CHECK_FUNCS([$1], , [LIBSTRINGOBJS="$LIBSTRINGOBJS ${ac_func}.lo"]) +AC_SUBST(LIBSTRINGOBJS)dnl +]) # Do all the work for Automake. This macro actually does too much -- # some checks are only needed if your package does certain things. @@ -1145,38 +1198,6 @@ else $1_FALSE= fi]) -# Check for functions in math library. -# Ulrich Drepper , 1998. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. - -# serial 1 - -dnl AC_REPLACE_MATHFUNCS(FUNCTION...) -AC_DEFUN(AC_REPLACE_MATHFUNCS, -[AC_CHECK_FUNCS([$1], , [LIBMATHOBJS="$LIBMATHOBJS ${ac_func}.lo"]) -AC_SUBST(LIBMATHOBJS)dnl -]) - -# Check for string functions. -# Ulrich Drepper , 1998. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. - -# serial 1 - -dnl AC_REPLACE_STRINGFUNCS(FUNCTION...) -AC_DEFUN(AC_REPLACE_STRINGFUNCS, -[AC_CHECK_FUNCS([$1], , [LIBSTRINGOBJS="$LIBSTRINGOBJS ${ac_func}.lo"]) -AC_SUBST(LIBSTRINGOBJS)dnl -]) - # serial 40 AC_PROG_LIBTOOL AC_DEFUN(AC_PROG_LIBTOOL, @@ -1609,23 +1630,3 @@ for am_file in <<$1>>; do done<<>>dnl>>) changequote([,]))]) -# Check whether LC_MESSAGES is available in . -# Ulrich Drepper , 1995. -# -# This file file be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. - -# serial 1 - -AC_DEFUN(AC_LC_MESSAGES, - [if test $ac_cv_header_locale_h = yes; then - AC_CACHE_CHECK([for LC_MESSAGES], ac_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], - ac_cv_val_LC_MESSAGES=yes, ac_cv_val_LC_MESSAGES=no)]) - if test $ac_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES) - fi - fi]) - -- 2.43.5