Skip to content

R
riscv-gcc-1
Commit fbe057bb by Phil Edwards
Options

acinclude.m4: Properly quote variable which will be expanded inside makefiles. 

2003-08-11  Phil Edwards  <pme@gcc.gnu.org>

	* acinclude.m4:  Properly quote variable which will be expanded
	inside makefiles.  Use CXX instead of CC to extract compiler info.
	* configure.ac (AC_INIT):  Use the new 4-arg form to finally get the
	correct form in PACKAGE.
	* aclocal.m4, configure:  Regenerate.

From-SVN: r70318
parent 0235f855
Showing with 65 additions and 64 deletions
libstdc++-v3/ChangeLog
2003-08-11 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4: Properly quote variable which will be expanded
inside makefiles. Use CXX instead of CC to extract compiler info.
* configure.ac (AC_INIT): Use the new 4-arg form to finally get the
correct form in PACKAGE.
* aclocal.m4, configure: Regenerate.
2003-08-08 Benjamin Kosnik <bkoz@redhat.com> 2003-08-08 Benjamin Kosnik <bkoz@redhat.com>
* testsuite/Makefile.am (check-abi): Change libstdc++-v3 to libstdc++. * testsuite/Makefile.am (check-abi): Change libstdc++-v3 to libstdc++.
......
libstdc++-v3/acinclude.m4
...@@ -106,6 +106,7 @@ AC_DEFUN(GLIBCXX_CONFIGURE, [ ...@@ -106,6 +106,7 @@ AC_DEFUN(GLIBCXX_CONFIGURE, [
# #
# -fno-builtin must be present here so that a non-conflicting form of # -fno-builtin must be present here so that a non-conflicting form of
# std::exit can be guessed by AC_PROG_CXX, and used in later tests. # std::exit can be guessed by AC_PROG_CXX, and used in later tests.
m4_define([ac_cv_prog_CXX],[glibcxx_cv_prog_CXX]) m4_define([ac_cv_prog_CXX],[glibcxx_cv_prog_CXX])
m4_rename([_AC_ARG_VAR_PRECIOUS],[glibcxx_PRECIOUS]) m4_rename([_AC_ARG_VAR_PRECIOUS],[glibcxx_PRECIOUS])
m4_define([_AC_ARG_VAR_PRECIOUS],[]) m4_define([_AC_ARG_VAR_PRECIOUS],[])
...@@ -683,10 +684,10 @@ AC_DEFUN(GLIBCXX_EXPORT_INSTALL_INFO, [ ...@@ -683,10 +684,10 @@ AC_DEFUN(GLIBCXX_EXPORT_INSTALL_INFO, [
# and header files if --enable-version-specific-runtime-libs option # and header files if --enable-version-specific-runtime-libs option
# is selected. # is selected.
if test x"$gxx_include_dir" = x"no"; then if test x"$gxx_include_dir" = x"no"; then
gxx_include_dir='$libdir/gcc-lib/$host_alias/'$gcc_version/include/c++ gxx_include_dir='${libdir}/gcc-lib/${host_alias}/'$gcc_version/include/c++
fi fi
glibcxx_toolexecdir='$libdir/gcc-lib/$host_alias' glibcxx_toolexecdir='${libdir}/gcc-lib/${host_alias}'
glibcxx_toolexeclibdir='$toolexecdir/'$gcc_version'$(MULTISUBDIR)' glibcxx_toolexeclibdir='${toolexecdir}/'$gcc_version'$(MULTISUBDIR)'
fi fi
# Calculate glibcxx_toolexecdir, glibcxx_toolexeclibdir # Calculate glibcxx_toolexecdir, glibcxx_toolexeclibdir
...@@ -694,13 +695,13 @@ AC_DEFUN(GLIBCXX_EXPORT_INSTALL_INFO, [ ...@@ -694,13 +695,13 @@ AC_DEFUN(GLIBCXX_EXPORT_INSTALL_INFO, [
if test x"$glibcxx_toolexecdir" = x"no"; then if test x"$glibcxx_toolexecdir" = x"no"; then
if test -n "$with_cross_host" && if test -n "$with_cross_host" &&
test x"$with_cross_host" != x"no"; then test x"$with_cross_host" != x"no"; then
glibcxx_toolexecdir='$(exec_prefix)/$(host_alias)' glibcxx_toolexecdir='${exec_prefix}/${host_alias}'
glibcxx_toolexeclibdir='$(toolexecdir)/lib' glibcxx_toolexeclibdir='${toolexecdir}/lib'
else else
glibcxx_toolexecdir='$(libdir)/gcc-lib/$(host_alias)' glibcxx_toolexecdir='${libdir}/gcc-lib/${host_alias}'
glibcxx_toolexeclibdir='$(libdir)' glibcxx_toolexeclibdir='${libdir}'
fi fi
multi_os_directory=`$CC -print-multi-os-directory` multi_os_directory=`$CXX -print-multi-os-directory`
case $multi_os_directory in case $multi_os_directory in
.) ;; # Avoid trailing /. .) ;; # Avoid trailing /.
*) glibcxx_toolexeclibdir=$glibcxx_toolexeclibdir/$multi_os_directory ;; *) glibcxx_toolexeclibdir=$glibcxx_toolexeclibdir/$multi_os_directory ;;
...@@ -1541,7 +1542,7 @@ dnl _GLIBCXX_SUPPORTS_WEAK ...@@ -1541,7 +1542,7 @@ dnl _GLIBCXX_SUPPORTS_WEAK
dnl dnl
AC_DEFUN(GLIBCXX_ENABLE_THREADS, [ AC_DEFUN(GLIBCXX_ENABLE_THREADS, [
AC_MSG_CHECKING([for thread model used by GCC]) AC_MSG_CHECKING([for thread model used by GCC])
target_thread_file=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'` target_thread_file=`$CXX -v 2>&1 | sed -n 's/^Thread model: //p'`
AC_MSG_RESULT([$target_thread_file]) AC_MSG_RESULT([$target_thread_file])
if test $target_thread_file != single; then if test $target_thread_file != single; then
......
libstdc++-v3/aclocal.m4
...@@ -119,6 +119,7 @@ AC_DEFUN(GLIBCXX_CONFIGURE, [ ...@@ -119,6 +119,7 @@ AC_DEFUN(GLIBCXX_CONFIGURE, [
# #
# -fno-builtin must be present here so that a non-conflicting form of # -fno-builtin must be present here so that a non-conflicting form of
# std::exit can be guessed by AC_PROG_CXX, and used in later tests. # std::exit can be guessed by AC_PROG_CXX, and used in later tests.
m4_define([ac_cv_prog_CXX],[glibcxx_cv_prog_CXX]) m4_define([ac_cv_prog_CXX],[glibcxx_cv_prog_CXX])
m4_rename([_AC_ARG_VAR_PRECIOUS],[glibcxx_PRECIOUS]) m4_rename([_AC_ARG_VAR_PRECIOUS],[glibcxx_PRECIOUS])
m4_define([_AC_ARG_VAR_PRECIOUS],[]) m4_define([_AC_ARG_VAR_PRECIOUS],[])
...@@ -696,10 +697,10 @@ AC_DEFUN(GLIBCXX_EXPORT_INSTALL_INFO, [ ...@@ -696,10 +697,10 @@ AC_DEFUN(GLIBCXX_EXPORT_INSTALL_INFO, [
# and header files if --enable-version-specific-runtime-libs option # and header files if --enable-version-specific-runtime-libs option
# is selected. # is selected.
if test x"$gxx_include_dir" = x"no"; then if test x"$gxx_include_dir" = x"no"; then
gxx_include_dir='$libdir/gcc-lib/$host_alias/'$gcc_version/include/c++ gxx_include_dir='${libdir}/gcc-lib/${host_alias}/'$gcc_version/include/c++
fi fi
glibcxx_toolexecdir='$libdir/gcc-lib/$host_alias' glibcxx_toolexecdir='${libdir}/gcc-lib/${host_alias}'
glibcxx_toolexeclibdir='$toolexecdir/'$gcc_version'$(MULTISUBDIR)' glibcxx_toolexeclibdir='${toolexecdir}/'$gcc_version'$(MULTISUBDIR)'
fi fi
# Calculate glibcxx_toolexecdir, glibcxx_toolexeclibdir # Calculate glibcxx_toolexecdir, glibcxx_toolexeclibdir
...@@ -707,13 +708,13 @@ AC_DEFUN(GLIBCXX_EXPORT_INSTALL_INFO, [ ...@@ -707,13 +708,13 @@ AC_DEFUN(GLIBCXX_EXPORT_INSTALL_INFO, [
if test x"$glibcxx_toolexecdir" = x"no"; then if test x"$glibcxx_toolexecdir" = x"no"; then
if test -n "$with_cross_host" && if test -n "$with_cross_host" &&
test x"$with_cross_host" != x"no"; then test x"$with_cross_host" != x"no"; then
glibcxx_toolexecdir='$(exec_prefix)/$(host_alias)' glibcxx_toolexecdir='${exec_prefix}/${host_alias}'
glibcxx_toolexeclibdir='$(toolexecdir)/lib' glibcxx_toolexeclibdir='${toolexecdir}/lib'
else else
glibcxx_toolexecdir='$(libdir)/gcc-lib/$(host_alias)' glibcxx_toolexecdir='${libdir}/gcc-lib/${host_alias}'
glibcxx_toolexeclibdir='$(libdir)' glibcxx_toolexeclibdir='${libdir}'
fi fi
multi_os_directory=`$CC -print-multi-os-directory` multi_os_directory=`$CXX -print-multi-os-directory`
case $multi_os_directory in case $multi_os_directory in
.) ;; # Avoid trailing /. .) ;; # Avoid trailing /.
*) glibcxx_toolexeclibdir=$glibcxx_toolexeclibdir/$multi_os_directory ;; *) glibcxx_toolexeclibdir=$glibcxx_toolexeclibdir/$multi_os_directory ;;
...@@ -1554,7 +1555,7 @@ dnl _GLIBCXX_SUPPORTS_WEAK ...@@ -1554,7 +1555,7 @@ dnl _GLIBCXX_SUPPORTS_WEAK
dnl dnl
AC_DEFUN(GLIBCXX_ENABLE_THREADS, [ AC_DEFUN(GLIBCXX_ENABLE_THREADS, [
AC_MSG_CHECKING([for thread model used by GCC]) AC_MSG_CHECKING([for thread model used by GCC])
target_thread_file=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'` target_thread_file=`$CXX -v 2>&1 | sed -n 's/^Thread model: //p'`
AC_MSG_RESULT([$target_thread_file]) AC_MSG_RESULT([$target_thread_file])
if test $target_thread_file != single; then if test $target_thread_file != single; then
......
libstdc++-v3/configure.ac
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# aclocal && autoconf && autoheader && automake # aclocal && autoconf && autoheader && automake
AC_PREREQ(2.57) AC_PREREQ(2.57)
AC_INIT(libstdc++, version-unused) AC_INIT(package-unused, version-unused,, libstdc++)
AC_CONFIG_SRCDIR(src/ios.cc) AC_CONFIG_SRCDIR(src/ios.cc)
AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(config.h)
...@@ -44,17 +44,13 @@ target_alias=${target_alias-$host_alias} ...@@ -44,17 +44,13 @@ target_alias=${target_alias-$host_alias}
# 1.x: minimum required version # 1.x: minimum required version
# no-define: PACKAGE and VERSION will not be #define'd in config.h (a bunch # no-define: PACKAGE and VERSION will not be #define'd in config.h (a bunch
# of other PACKAGE_* variables will, however, and there's nothing # of other PACKAGE_* variables will, however, and there's nothing
# we can do about that) # we can do about that; they come from AC_INIT).
# foreign: we don't follow the normal rules for GNU packages (no COPYING # foreign: we don't follow the normal rules for GNU packages (no COPYING
# file in the top srcdir, etc, etc), so stop complaining. # file in the top srcdir, etc, etc), so stop complaining.
# no-dependencies: turns off auto dependency generation (just for now) # no-dependencies: turns off auto dependency generation (just for now)
# -Wall: turns on all automake warnings # -Wall: turns on all automake warnings
AM_INIT_AUTOMAKE([1.7.6 no-define foreign no-dependencies -Wall]) AM_INIT_AUTOMAKE([1.7.6 no-define foreign no-dependencies -Wall])
# AM_INIT_AUTOMAKE sets this to the "smashed" format. Calling the library
# "libstdc--" causes remarkable amounts of breakage. Thanks, automake.
PACKAGE='libstdc++'
# Runs configure.host, finds CC, CXX, and assorted other critical bits. Sets # Runs configure.host, finds CC, CXX, and assorted other critical bits. Sets
# up critical shell variables. # up critical shell variables.
GLIBCXX_CONFIGURE GLIBCXX_CONFIGURE
...@@ -332,4 +328,3 @@ AC_CONFIG_COMMANDS([default], ...@@ -332,4 +328,3 @@ AC_CONFIG_COMMANDS([default],
dnl And this actually makes things happen: dnl And this actually makes things happen:
AC_OUTPUT AC_OUTPUT
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