OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR libstdc++/4143 (--disable == --enable for version-specific-runtime-libs)

Browse Source 
2001-08-27  Phil Edwards  <pme@sources.redhat.com>

	PR libstdc++/4143
	* acinclude.m4 (GLIBCPP_EXPORT_INSTALL_INFO):  Handle enable/disable
	correctly for version-specific-runtime-libs.
	* aclocal.m4:  Regenerate.
	* configure:  Regenerate.

From-SVN: r45206
This commit is contained in:
Phil Edwards 2001-08-27 19:40:02 +00:00
parent 90d925d3b2
commit b969a5d7d1
4 changed files with 1011 additions and 976 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,11 @@
2001-08-27 Phil Edwards <pme@sources.redhat.com>
PR libstdc++/4143
* acinclude.m4 (GLIBCPP_EXPORT_INSTALL_INFO): Handle enable/disable
correctly for version-specific-runtime-libs.
* aclocal.m4: Regenerate.
* configure: Regenerate.
2001-08-24 Loren J. Rittle <ljrittle@acm.org> 2001-08-24 Loren J. Rittle <ljrittle@acm.org>
* config/cpu/i386/bits/limits.h (__glibcpp_long_double_bits): Only * config/cpu/i386/bits/limits.h (__glibcpp_long_double_bits): Only

38
libstdc++-v3/acinclude.m4
View File

@ -1683,24 +1683,32 @@ AC_MSG_RESULT($gxx_include_dir)
AC_MSG_CHECKING([for --enable-version-specific-runtime-libs]) AC_MSG_CHECKING([for --enable-version-specific-runtime-libs])
AC_ARG_ENABLE(version-specific-runtime-libs, AC_ARG_ENABLE(version-specific-runtime-libs,
[ --enable-version-specific-runtime-libs Specify that runtime libraries should be installed in a compiler-specific directory ], [ --enable-version-specific-runtime-libs Specify that runtime libraries should be installed in a compiler-specific directory ],
[ version_specific_libs=yes [case "$enableval" in
# Need the gcc compiler version to know where to install libraries yes) version_specific_libs=yes ;;
# and header files if --enable-version-specific-runtime-libs option no) version_specific_libs=no ;;
# is selected. *) AC_MSG_ERROR([Unknown argument to enable/disable version-specific libs]);;
changequote(,)dnl esac],
gcc_version_trigger=${srcdir}/../gcc/version.c version_specific_libs=no)dnl
gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^\"]*\)\".*/\1/'` # Option set, now we can test it.
gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/'${gcc_version}/include/g++
glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
changequote([,])dnl
],version_specific_libs=no)
AC_MSG_RESULT($version_specific_libs) AC_MSG_RESULT($version_specific_libs)
if test $version_specific_libs = yes; then
# Need the gcc compiler version to know where to install libraries
# and header files if --enable-version-specific-runtime-libs option
# is selected.
changequote(,)dnl
gcc_version_trigger=${srcdir}/../gcc/version.c
gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^\"]*\)\".*/\1/'`
gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/'${gcc_version}/include/g++
glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
changequote([,])dnl
fi
# Default case for install directory for include files. # Default case for install directory for include files.
if test x"$version_specific_libs" = x"no" \ if test $version_specific_libs = no &&
&& test x"$gxx_include_dir" = x"no"; then test $gxx_include_dir = no; then
gxx_include_dir='$(prefix)'/include/g++-${libstdcxx_interface} gxx_include_dir='$(prefix)'/include/g++-${libstdcxx_interface}
fi fi

68
libstdc++-v3/aclocal.m4 vendored
View File

@ -1695,24 +1695,32 @@ AC_MSG_RESULT($gxx_include_dir)
AC_MSG_CHECKING([for --enable-version-specific-runtime-libs]) AC_MSG_CHECKING([for --enable-version-specific-runtime-libs])
AC_ARG_ENABLE(version-specific-runtime-libs, AC_ARG_ENABLE(version-specific-runtime-libs,
[ --enable-version-specific-runtime-libs Specify that runtime libraries should be installed in a compiler-specific directory ], [ --enable-version-specific-runtime-libs Specify that runtime libraries should be installed in a compiler-specific directory ],
[ version_specific_libs=yes [case "$enableval" in
# Need the gcc compiler version to know where to install libraries yes) version_specific_libs=yes ;;
# and header files if --enable-version-specific-runtime-libs option no) version_specific_libs=no ;;
# is selected. *) AC_MSG_ERROR([Unknown argument to enable/disable version-specific libs]);;
changequote(,)dnl esac],
gcc_version_trigger=${srcdir}/../gcc/version.c version_specific_libs=no)dnl
gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^\"]*\)\".*/\1/'` # Option set, now we can test it.
gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/'${gcc_version}/include/g++
glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
changequote([,])dnl
],version_specific_libs=no)
AC_MSG_RESULT($version_specific_libs) AC_MSG_RESULT($version_specific_libs)
if test $version_specific_libs = yes; then
# Need the gcc compiler version to know where to install libraries
# and header files if --enable-version-specific-runtime-libs option
# is selected.
changequote(,)dnl
gcc_version_trigger=${srcdir}/../gcc/version.c
gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^\"]*\)\".*/\1/'`
gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/'${gcc_version}/include/g++
glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
changequote([,])dnl
fi
# Default case for install directory for include files. # Default case for install directory for include files.
if test x"$version_specific_libs" = x"no" \ if test $version_specific_libs = no &&
&& test x"$gxx_include_dir" = x"no"; then test $gxx_include_dir = no; then
gxx_include_dir='$(prefix)'/include/g++-${libstdcxx_interface} gxx_include_dir='$(prefix)'/include/g++-${libstdcxx_interface}
fi fi
@ -1951,12 +1959,12 @@ fi])
# Macro to add for using GNU gettext. # Macro to add for using GNU gettext.
# Ulrich Drepper <drepper@cygnus.com>, 1995. # Ulrich Drepper <drepper@cygnus.com>, 1995.
# #
# This file can be copied and used freely without restrictions. It can # 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 # 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. # but which still want to provide support for the GNU gettext functionality.
# Please note that the actual code is *not* freely available. # Please note that the actual code is *not* freely available.
# serial 5 # serial 3
AC_DEFUN(AM_WITH_NLS, AC_DEFUN(AM_WITH_NLS,
[AC_MSG_CHECKING([whether NLS is requested]) [AC_MSG_CHECKING([whether NLS is requested])
@ -1998,10 +2006,9 @@ AC_DEFUN(AM_WITH_NLS,
AC_CHECK_LIB(intl, bindtextdomain, AC_CHECK_LIB(intl, bindtextdomain,
[AC_CACHE_CHECK([for gettext in libintl], [AC_CACHE_CHECK([for gettext in libintl],
gt_cv_func_gettext_libintl, gt_cv_func_gettext_libintl,
[AC_CHECK_LIB(intl, gettext, [AC_TRY_LINK([], [return (int) gettext ("")],
gt_cv_func_gettext_libintl=yes, gt_cv_func_gettext_libintl=yes,
gt_cv_func_gettext_libintl=no)], gt_cv_func_gettext_libintl=no)])])
gt_cv_func_gettext_libintl=no)])
fi fi
if test "$gt_cv_func_gettext_libc" = "yes" \ if test "$gt_cv_func_gettext_libc" = "yes" \
@ -2095,7 +2102,7 @@ AC_DEFUN(AM_WITH_NLS,
: ; : ;
else else
AC_MSG_RESULT( AC_MSG_RESULT(
[found xgettext program is not GNU xgettext; ignore it]) [found xgettext programs is not GNU xgettext; ignore it])
XGETTEXT=":" XGETTEXT=":"
fi fi
fi fi
@ -2107,12 +2114,6 @@ AC_DEFUN(AM_WITH_NLS,
nls_cv_header_intl=intl/libintl.h nls_cv_header_intl=intl/libintl.h
nls_cv_header_libgt=intl/libgettext.h nls_cv_header_libgt=intl/libgettext.h
fi fi
AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
AC_OUTPUT_COMMANDS(
[case "$CONFIG_FILES" in *po/Makefile.in*)
sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
esac])
# If this is used in GNU gettext we have to set USE_NLS to `yes' # If this is used in GNU gettext we have to set USE_NLS to `yes'
# because some of the sources are only built for this goal. # because some of the sources are only built for this goal.
@ -2157,9 +2158,9 @@ AC_DEFUN(AM_GNU_GETTEXT,
AC_REQUIRE([AC_FUNC_MMAP])dnl AC_REQUIRE([AC_FUNC_MMAP])dnl
AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \ AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
unistd.h sys/param.h]) unistd.h values.h sys/param.h])
AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \ AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
strdup __argz_count __argz_stringify __argz_next]) __argz_count __argz_stringify __argz_next])
if test "${ac_cv_func_stpcpy+set}" != "set"; then if test "${ac_cv_func_stpcpy+set}" != "set"; then
AC_CHECK_FUNCS(stpcpy) AC_CHECK_FUNCS(stpcpy)
@ -2267,7 +2268,7 @@ strdup __argz_count __argz_stringify __argz_next])
# Search path for a program which passes the given test. # Search path for a program which passes the given test.
# Ulrich Drepper <drepper@cygnus.com>, 1996. # Ulrich Drepper <drepper@cygnus.com>, 1996.
# #
# This file can be copied and used freely without restrictions. It can # 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 # 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. # but which still want to provide support for the GNU gettext functionality.
# Please note that the actual code is *not* freely available. # Please note that the actual code is *not* freely available.
@ -2315,7 +2316,7 @@ AC_SUBST($1)dnl
# Check whether LC_MESSAGES is available in <locale.h>. # Check whether LC_MESSAGES is available in <locale.h>.
# Ulrich Drepper <drepper@cygnus.com>, 1995. # Ulrich Drepper <drepper@cygnus.com>, 1995.
# #
# This file can be copied and used freely without restrictions. It can # 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 # 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. # but which still want to provide support for the GNU gettext functionality.
# Please note that the actual code is *not* freely available. # Please note that the actual code is *not* freely available.
@ -2328,7 +2329,8 @@ AC_DEFUN(AM_LC_MESSAGES,
[AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
if test $am_cv_val_LC_MESSAGES = yes; then if test $am_cv_val_LC_MESSAGES = yes; then
AC_DEFINE(HAVE_LC_MESSAGES) AC_DEFINE(HAVE_LC_MESSAGES, 1,
[Define if your locale.h file contains LC_MESSAGES.])
fi fi
fi]) fi])

1873
libstdc++-v3/configure vendored
View File

File diff suppressed because it is too large Load Diff