git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Phil Edwards 2003-08-11 05:26:58 +00:00
parent 0235f85590
commit fbe057bb8b
5 changed files with 65 additions and 64 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 @@
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++.

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

@ -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, [
# 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, [
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
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

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

@ -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, [
# 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, [
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
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

74
libstdc++-v3/configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.57 for libstdc++ version-unused. # Generated by GNU Autoconf 2.57 for package-unused version-unused.
# #
# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc. # Free Software Foundation, Inc.
@ -264,10 +264,10 @@ SHELL=${CONFIG_SHELL-/bin/sh}
: ${ac_max_here_lines=38} : ${ac_max_here_lines=38}
# Identity of this package. # Identity of this package.
PACKAGE_NAME='libstdc++' PACKAGE_NAME='package-unused'
PACKAGE_TARNAME='libstdc--' PACKAGE_TARNAME='libstdc++'
PACKAGE_VERSION='version-unused' PACKAGE_VERSION='version-unused'
PACKAGE_STRING='libstdc++ version-unused' PACKAGE_STRING='package-unused version-unused'
PACKAGE_BUGREPORT='' PACKAGE_BUGREPORT=''
ac_unique_file="src/ios.cc" ac_unique_file="src/ios.cc"
@ -781,7 +781,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures libstdc++ version-unused to adapt to many kinds of systems. \`configure' configures package-unused version-unused to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -848,7 +848,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of libstdc++ version-unused:";; short | recursive ) echo "Configuration of package-unused version-unused:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -988,7 +988,7 @@ fi
test -n "$ac_init_help" && exit 0 test -n "$ac_init_help" && exit 0
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
libstdc++ configure version-unused package-unused configure version-unused
generated by GNU Autoconf 2.57 generated by GNU Autoconf 2.57
Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@ -1003,7 +1003,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by libstdc++ $as_me version-unused, which was It was created by package-unused $as_me version-unused, which was
generated by GNU Autoconf 2.57. Invocation command line was generated by GNU Autoconf 2.57. Invocation command line was
$ $0 $@ $ $0 $@
@ -1180,7 +1180,7 @@ _ASBOX
echo "$as_me: caught signal $ac_signal" echo "$as_me: caught signal $ac_signal"
echo "$as_me: exit $exit_status" echo "$as_me: exit $exit_status"
} >&5 } >&5
rm -f core core.* *.core && rm -f core *.core &&
rm -rf conftest* confdefs* conf$$* $ac_clean_files && rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
exit $exit_status exit $exit_status
' 0 ' 0
@ -1561,7 +1561,7 @@ 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)
@ -1813,7 +1813,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='libstdc--' PACKAGE='libstdc++'
VERSION='version-unused' VERSION='version-unused'
@ -1932,10 +1932,6 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
# 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.
@ -2863,6 +2859,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
save_CXXFLAGS="$CXXFLAGS" save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS -fno-builtin" CXXFLAGS="$CXXFLAGS -fno-builtin"
ac_ext=cc ac_ext=cc
@ -4288,7 +4285,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
case $host in case $host in
*-*-irix6*) *-*-irix6*)
# Find out which ABI we are using. # Find out which ABI we are using.
echo '#line 4291 "configure"' > conftest.$ac_ext echo '#line 4288 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5 (eval $ac_compile) 2>&5
ac_status=$? ac_status=$?
@ -4857,7 +4854,7 @@ fi;
# #
# Fake what AC_TRY_COMPILE does. XXX Look at redoing this new-style. # Fake what AC_TRY_COMPILE does. XXX Look at redoing this new-style.
cat > conftest.$ac_ext << EOF cat > conftest.$ac_ext << EOF
#line 4860 "configure" #line 4857 "configure"
struct S { ~S(); }; struct S { ~S(); };
void bar(); void bar();
void foo() void foo()
@ -5457,7 +5454,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status ) ( exit $ac_status )
ac_cv_header_stdc=no ac_cv_header_stdc=no
fi fi
rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi fi
fi fi
fi fi
@ -5648,7 +5645,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status ) ( exit $ac_status )
enable_clocale_flag=generic enable_clocale_flag=generic
fi fi
rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi fi
fi fi
@ -7342,7 +7339,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
echo "$as_me:$LINENO: checking for thread model used by GCC" >&5 echo "$as_me:$LINENO: checking for thread model used by GCC" >&5
echo $ECHO_N "checking for thread model used by GCC... $ECHO_C" >&6 echo $ECHO_N "checking for thread model used by GCC... $ECHO_C" >&6
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'`
echo "$as_me:$LINENO: result: $target_thread_file" >&5 echo "$as_me:$LINENO: result: $target_thread_file" >&5
echo "${ECHO_T}$target_thread_file" >&6 echo "${ECHO_T}$target_thread_file" >&6
@ -7907,7 +7904,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status ) ( exit $ac_status )
ac_sectionLDflags=no ac_sectionLDflags=no
fi fi
rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi fi
if test "$ac_test_CFLAGS" = set; then if test "$ac_test_CFLAGS" = set; then
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
@ -9911,7 +9908,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status ) ( exit $ac_status )
ac_sectionLDflags=no ac_sectionLDflags=no
fi fi
rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi fi
if test "$ac_test_CFLAGS" = set; then if test "$ac_test_CFLAGS" = set; then
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
@ -11784,7 +11781,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status ) ( exit $ac_status )
ac_sectionLDflags=no ac_sectionLDflags=no
fi fi
rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi fi
if test "$ac_test_CFLAGS" = set; then if test "$ac_test_CFLAGS" = set; then
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
@ -13666,7 +13663,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status ) ( exit $ac_status )
ac_sectionLDflags=no ac_sectionLDflags=no
fi fi
rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi fi
if test "$ac_test_CFLAGS" = set; then if test "$ac_test_CFLAGS" = set; then
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
@ -15495,7 +15492,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status ) ( exit $ac_status )
ac_sectionLDflags=no ac_sectionLDflags=no
fi fi
rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi fi
if test "$ac_test_CFLAGS" = set; then if test "$ac_test_CFLAGS" = set; then
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
@ -17223,7 +17220,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status ) ( exit $ac_status )
ac_sectionLDflags=no ac_sectionLDflags=no
fi fi
rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi fi
if test "$ac_test_CFLAGS" = set; then if test "$ac_test_CFLAGS" = set; then
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
@ -19445,7 +19442,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status ) ( exit $ac_status )
ac_sectionLDflags=no ac_sectionLDflags=no
fi fi
rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi fi
if test "$ac_test_CFLAGS" = set; then if test "$ac_test_CFLAGS" = set; then
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
@ -38306,7 +38303,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status ) ( exit $ac_status )
ac_cv_func_mmap_fixed_mapped=no ac_cv_func_mmap_fixed_mapped=no
fi fi
rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi fi
fi fi
echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
@ -39224,10 +39221,10 @@ echo "${ECHO_T}$version_specific_libs" >&6
# 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
@ -39235,13 +39232,13 @@ echo "${ECHO_T}$version_specific_libs" >&6
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 ;;
@ -39746,7 +39743,7 @@ _ASBOX
} >&5 } >&5
cat >&5 <<_CSEOF cat >&5 <<_CSEOF
This file was extended by libstdc++ $as_me version-unused, which was This file was extended by package-unused $as_me version-unused, which was
generated by GNU Autoconf 2.57. Invocation command line was generated by GNU Autoconf 2.57. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -39809,7 +39806,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\ ac_cs_version="\\
libstdc++ config.status version-unused package-unused config.status version-unused
configured by $0, generated by GNU Autoconf 2.57, configured by $0, generated by GNU Autoconf 2.57,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@ -40733,4 +40730,3 @@ if test "$no_create" != yes; then
$ac_cs_success || { (exit 1); exit 1; } $ac_cs_success || { (exit 1); exit 1; }
fi fi

9
libstdc++-v3/configure.ac
View File

@ -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}
# 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],
dnl And this actually makes things happen: dnl And this actually makes things happen:
AC_OUTPUT AC_OUTPUT