diff options
| author | pme <pme@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-08-11 05:26:58 +0000 |
|---|---|---|
| committer | pme <pme@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-08-11 05:26:58 +0000 |
| commit | f4a06a6475524cae0f273b21a70901a34db5a045 (patch) | |
| tree | 29ff5c230dbd89f1c114d76ca8a6081f99f60749 /libstdc++-v3/aclocal.m4 | |
| parent | ca71f89bb288a715d19226e38d516806d8923291 (diff) | |
| download | gcc-f4a06a6475524cae0f273b21a70901a34db5a045.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@70318 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/aclocal.m4')
| -rw-r--r-- | libstdc++-v3/aclocal.m4 | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4 index 27aed6a1195..d37136d7f2d 100644 --- a/libstdc++-v3/aclocal.m4 +++ b/libstdc++-v3/aclocal.m4 @@ -119,6 +119,7 @@ AC_DEFUN(GLIBCXX_CONFIGURE, [ # # -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. + m4_define([ac_cv_prog_CXX],[glibcxx_cv_prog_CXX]) m4_rename([_AC_ARG_VAR_PRECIOUS],[glibcxx_PRECIOUS]) m4_define([_AC_ARG_VAR_PRECIOUS],[]) @@ -696,10 +697,10 @@ AC_DEFUN(GLIBCXX_EXPORT_INSTALL_INFO, [ # and header files if --enable-version-specific-runtime-libs option # is selected. 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 - glibcxx_toolexecdir='$libdir/gcc-lib/$host_alias' - glibcxx_toolexeclibdir='$toolexecdir/'$gcc_version'$(MULTISUBDIR)' + glibcxx_toolexecdir='${libdir}/gcc-lib/${host_alias}' + glibcxx_toolexeclibdir='${toolexecdir}/'$gcc_version'$(MULTISUBDIR)' fi # Calculate glibcxx_toolexecdir, glibcxx_toolexeclibdir @@ -707,13 +708,13 @@ AC_DEFUN(GLIBCXX_EXPORT_INSTALL_INFO, [ if test x"$glibcxx_toolexecdir" = x"no"; then if test -n "$with_cross_host" && test x"$with_cross_host" != x"no"; then - glibcxx_toolexecdir='$(exec_prefix)/$(host_alias)' - glibcxx_toolexeclibdir='$(toolexecdir)/lib' + glibcxx_toolexecdir='${exec_prefix}/${host_alias}' + glibcxx_toolexeclibdir='${toolexecdir}/lib' else - glibcxx_toolexecdir='$(libdir)/gcc-lib/$(host_alias)' - glibcxx_toolexeclibdir='$(libdir)' + glibcxx_toolexecdir='${libdir}/gcc-lib/${host_alias}' + glibcxx_toolexeclibdir='${libdir}' fi - multi_os_directory=`$CC -print-multi-os-directory` + multi_os_directory=`$CXX -print-multi-os-directory` case $multi_os_directory in .) ;; # Avoid trailing /. *) glibcxx_toolexeclibdir=$glibcxx_toolexeclibdir/$multi_os_directory ;; @@ -1554,7 +1555,7 @@ dnl _GLIBCXX_SUPPORTS_WEAK dnl AC_DEFUN(GLIBCXX_ENABLE_THREADS, [ 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]) if test $target_thread_file != single; then |