This is the mail archive of the
libstdc++@gcc.gnu.org
mailing list for the libstdc++ project.
[libstdc++] Clean up and comment configury
- From: Phil Edwards <phil at jaj dot com>
- To: libstdc++ at gcc dot gnu dot org, gcc-patches at gcc dot gnu dot org
- Date: Mon, 18 Mar 2002 16:41:03 -0500
- Subject: [libstdc++] Clean up and comment configury
More people are starting to play with using autoconf 2.5x with libstdc++.
This patch does not change anything in the configury, but just makes some
comments dealing with the 2.13->2.5x transition.
In doing so, I cleaned up the spacing in acinclude.m4's most important
macro; it was a PITA to read.
Shouldn't affect any functionality, but checked on i686-linux and
powerpc-eabisim just the same.
2002-03-18 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCPP_CONFIGURE): Make indentation/spacing uniform.
* configure.in: Add comments pointing the way for autoconf 2.5x.
* aclocal.m4, config.h.in, configure: Regenerate.
Index: acinclude.m4
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/acinclude.m4,v
retrieving revision 1.198
diff -u -3 -p -r1.198 acinclude.m4
--- acinclude.m4 2002/03/12 02:41:58 1.198
+++ acinclude.m4 2002/03/18 21:36:08
@@ -12,56 +12,56 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [
*) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
esac], [multilib=yes])dnl
-# When building with srcdir == objdir, links to the source files will
-# be created in directories within the target_subdir. We have to
-# adjust toplevel_srcdir accordingly, so that configure finds
-# install-sh and other auxiliary files that live in the top-level
-# source directory.
-if test "${srcdir}" = "."; then
- if test -z "${with_target_subdir}"; then
- toprel=".."
- else
- if test "${with_target_subdir}" != "."; then
- toprel="${with_multisrctop}../.."
+ # When building with srcdir == objdir, links to the source files will
+ # be created in directories within the target_subdir. We have to
+ # adjust toplevel_srcdir accordingly, so that configure finds
+ # install-sh and other auxiliary files that live in the top-level
+ # source directory.
+ if test "${srcdir}" = "."; then
+ if test -z "${with_target_subdir}"; then
+ toprel=".."
else
- toprel="${with_multisrctop}.."
+ if test "${with_target_subdir}" != "."; then
+ toprel="${with_multisrctop}../.."
+ else
+ toprel="${with_multisrctop}.."
+ fi
fi
+ else
+ toprel=".."
fi
-else
- toprel=".."
-fi
-AC_CONFIG_AUX_DIR(${srcdir}/$toprel)
-toplevel_srcdir=\${top_srcdir}/$toprel
-AC_SUBST(toplevel_srcdir)
-
-# Export build and source directories.
-# These need to be absolute paths, yet at the same time need to
-# canonicalize only relative paths, because then amd will not unmount
-# drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd.
-glibcpp_builddir=`pwd`
-case $srcdir in
-[\\/$]* | ?:[\\/]*) glibcpp_srcdir=${srcdir} ;;
-*) glibcpp_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;;
-esac
-AC_SUBST(glibcpp_builddir)
-AC_SUBST(glibcpp_srcdir)
-
-dnl This is here just to satisfy automake.
-ifelse(not,equal,[AC_CONFIG_AUX_DIR(..)])
-
-AC_PROG_AWK
-# Will set LN_S to either 'ln -s' or 'ln'. With autoconf 2.50+, can also
-# be 'cp -p' if linking isn't available.
-#ac_cv_prog_LN_S='cp -p'
-AC_PROG_LN_S
-
-# We use these options to decide which functions to include.
-AC_ARG_WITH(target-subdir,
-[ --with-target-subdir=SUBDIR
- configuring in a subdirectory])
-AC_ARG_WITH(cross-host,
-[ --with-cross-host=HOST configuring with a cross compiler])
+ AC_CONFIG_AUX_DIR(${srcdir}/$toprel)
+ toplevel_srcdir=\${top_srcdir}/$toprel
+ AC_SUBST(toplevel_srcdir)
+
+ # Export build and source directories.
+ # These need to be absolute paths, yet at the same time need to
+ # canonicalize only relative paths, because then amd will not unmount
+ # drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd.
+ glibcpp_builddir=`pwd`
+ case $srcdir in
+ [\\/$]* | ?:[\\/]*) glibcpp_srcdir=${srcdir} ;;
+ *) glibcpp_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;;
+ esac
+ AC_SUBST(glibcpp_builddir)
+ AC_SUBST(glibcpp_srcdir)
+
+ dnl This is here just to satisfy automake.
+ ifelse(not,equal,[AC_CONFIG_AUX_DIR(..)])
+ AC_PROG_AWK
+ # Will set LN_S to either 'ln -s' or 'ln'. With autoconf 2.5x, can also
+ # be 'cp -p' if linking isn't available.
+ #ac_cv_prog_LN_S='cp -p'
+ AC_PROG_LN_S
+
+ # We use these options to decide which functions to include.
+ AC_ARG_WITH(target-subdir,
+ [ --with-target-subdir=SUBDIR
+ configuring in a subdirectory])
+ AC_ARG_WITH(cross-host,
+ [ --with-cross-host=HOST configuring with a cross compiler])
+
glibcpp_basedir=$srcdir/$toprel/$1/libstdc++-v3
AC_SUBST(glibcpp_basedir)
@@ -72,96 +72,92 @@ AC_ARG_WITH(cross-host,
ifdef([AC_PROG_CXX_G],[],[define([AC_PROG_CXX_G],defn([_AC_PROG_CXX_G]))])
ifdef([AC_PROG_CXX_GNU],[],[define([AC_PROG_CXX_GNU],defn([_AC_PROG_CXX_GNU]))])
-# AC_PROG_CC
+ # AC_PROG_CC
+ # FIXME: We temporarily define our own version of AC_PROG_CC. This is
+ # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We
+ # are probably using a cross compiler, which will not be able to fully
+ # link an executable. This is addressed in later versions of autoconf.
+
+ AC_DEFUN(LIB_AC_PROG_CC,
+ [AC_BEFORE([$0], [AC_PROG_CPP])dnl
+ dnl Fool anybody using AC_PROG_CC.
+ AC_PROVIDE([AC_PROG_CC])
+ AC_CHECK_PROG(CC, gcc, gcc)
+ if test -z "$CC"; then
+ AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
+ test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
+ fi
-# FIXME: We temporarily define our own version of AC_PROG_CC. This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable. This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-dnl Fool anybody using AC_PROG_CC.
-AC_PROVIDE([AC_PROG_CC])
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
- AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
- test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
- GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
- ac_test_CFLAGS="${CFLAGS+set}"
- ac_save_CFLAGS="$CFLAGS"
- CFLAGS=
- AC_PROG_CC_G
- if test "$ac_test_CFLAGS" = set; then
- CFLAGS="$ac_save_CFLAGS"
- elif test $ac_cv_prog_cc_g = yes; then
- CFLAGS="-g -O2"
+ AC_PROG_CC_GNU
+
+ if test $ac_cv_prog_gcc = yes; then
+ GCC=yes
+ dnl Check whether -g works, even if CFLAGS is set, in case the package
+ dnl plays around with CFLAGS (such as to build both debugging and
+ dnl normal versions of a library), tasteless as that idea is.
+ ac_test_CFLAGS="${CFLAGS+set}"
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS=
+ AC_PROG_CC_G
+ if test "$ac_test_CFLAGS" = set; then
+ CFLAGS="$ac_save_CFLAGS"
+ elif test $ac_cv_prog_cc_g = yes; then
+ CFLAGS="-g -O2"
+ else
+ CFLAGS="-O2"
+ fi
else
- CFLAGS="-O2"
+ GCC=
+ test "${CFLAGS+set}" = set || CFLAGS="-g"
fi
-else
- GCC=
- test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-
-# Can't just call these here as g++ requires libstc++ to be built....
-# AC_PROG_CXX
-
-# Likewise for AC_PROG_CXX.
-AC_DEFUN(LIB_AC_PROG_CXX,
-[AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl
-dnl Fool anybody using AC_PROG_CXX.
-AC_PROVIDE([AC_PROG_CXX])
-# Use glibcpp_CXX so that we do not cause CXX to be cached with the
-# flags that come in CXX while configuring libstdc++. They're different
-# from those used for all other target libraries. If CXX is set in
-# the environment, respect that here.
-glibcpp_CXX=$CXX
-AC_CHECK_PROGS(glibcpp_CXX, $CCC c++ g++ gcc CC cxx cc++, gcc)
-AC_SUBST(glibcpp_CXX)
-CXX=$glibcpp_CXX
-test -z "$glibcpp_CXX" && AC_MSG_ERROR([no acceptable c++ found in \$PATH])
-
-AC_PROG_CXX_GNU
-
-if test $ac_cv_prog_gxx = yes; then
- GXX=yes
-dnl Check whether -g works, even if CXXFLAGS is set, in case the package
-dnl plays around with CXXFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
- ac_test_CXXFLAGS="${CXXFLAGS+set}"
- ac_save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS=
- AC_PROG_CXX_G
- if test "$ac_test_CXXFLAGS" = set; then
- CXXFLAGS="$ac_save_CXXFLAGS"
- elif test $ac_cv_prog_cxx_g = yes; then
- CXXFLAGS="-g -O2"
+ ])
+
+ LIB_AC_PROG_CC
+
+ # Likewise for AC_PROG_CXX. We can't just call it directly because g++
+ # will try to link in libstdc++.
+ AC_DEFUN(LIB_AC_PROG_CXX,
+ [AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl
+ dnl Fool anybody using AC_PROG_CXX.
+ AC_PROVIDE([AC_PROG_CXX])
+ # Use glibcpp_CXX so that we do not cause CXX to be cached with the
+ # flags that come in CXX while configuring libstdc++. They're different
+ # from those used for all other target libraries. If CXX is set in
+ # the environment, respect that here.
+ glibcpp_CXX=$CXX
+ AC_CHECK_PROGS(glibcpp_CXX, $CCC c++ g++ gcc CC cxx cc++, gcc)
+ AC_SUBST(glibcpp_CXX)
+ CXX=$glibcpp_CXX
+ test -z "$glibcpp_CXX" && AC_MSG_ERROR([no acceptable c++ found in \$PATH])
+
+ AC_PROG_CXX_GNU
+
+ if test $ac_cv_prog_gxx = yes; then
+ GXX=yes
+ dnl Check whether -g works, even if CXXFLAGS is set, in case the package
+ dnl plays around with CXXFLAGS (such as to build both debugging and
+ dnl normal versions of a library), tasteless as that idea is.
+ ac_test_CXXFLAGS="${CXXFLAGS+set}"
+ ac_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS=
+ AC_PROG_CXX_G
+ if test "$ac_test_CXXFLAGS" = set; then
+ CXXFLAGS="$ac_save_CXXFLAGS"
+ elif test $ac_cv_prog_cxx_g = yes; then
+ CXXFLAGS="-g -O2"
+ else
+ CXXFLAGS="-O2"
+ fi
else
- CXXFLAGS="-O2"
+ GXX=
+ test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
fi
-else
- GXX=
- test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
-fi
-])
+ ])
-LIB_AC_PROG_CXX
+ LIB_AC_PROG_CXX
- # For some reason, gettext needs this.
- AC_ISC_POSIX
+ # For some reason, gettext needs this.
+ AC_ISC_POSIX
AC_CHECK_TOOL(AS, as)
AC_CHECK_TOOL(AR, ar)
@@ -196,7 +192,6 @@ LIB_AC_PROG_CXX
# addition to possibly modifying the same flags, it also sets up symlinks.
GLIBCPP_CHECK_TARGET
- #
])
Index: configure.in
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/configure.in,v
retrieving revision 1.85
diff -u -3 -p -r1.85 configure.in
--- configure.in 2002/03/15 18:16:34 1.85
+++ configure.in 2002/03/18 21:36:08
@@ -1,5 +1,5 @@
# Process this file with autoconf to produce a configure script, like so:
-# aclocal, autoconf, autoheader, automake
+# aclocal && autoconf && autoheader && automake
AC_PREREQ(2.13)
AC_INIT(src/ios.cc)
@@ -14,8 +14,9 @@ libtool_VERSION=4:0:0
AC_SUBST(libtool_VERSION)
# Gets build, host, target, *_vendor, *_cpu, *_os, etc.
-# AC 2.50 sets target_alias iff the user specified --target, but we use it
-# everywhere, so we set it here just to be sure.
+# AC 2.5x sets target_alias iff the user specified --target, but we use it
+# everywhere, so we set it here just to be sure. In AC 2.13
+# AC_CANONICAL_TARGET was known as AC_CANONICAL_SYSTEM.
AC_CANONICAL_SYSTEM
target_alias=${target_alias-$target}
AC_SUBST(target_alias)
@@ -24,7 +25,7 @@ AM_INIT_AUTOMAKE($PACKAGE, $release_VERS
AM_CONFIG_HEADER(config.h)
# Runs configure.host and configure.target, as well as finds CC, CXX
-# and assorted other critical bits. Have to run this before the
+# and assorted other critical bits. Have to run this before the
# GLIBCPP_ENABLE_* macros below.
GLIBCPP_CONFIGURE(.)
@@ -331,6 +332,31 @@ glibcpp_basedir=${glibcpp_basedir}
CC="${CC}"
CXX="${CXX}"
)
+dnl In autoconf 2.5x, AC_OUTPUT is replaced by three AC_ macros:
+dnl AC_CONFIG_FILES(Makefile \
+dnl include/Makefile src/Makefile \
+dnl libmath/Makefile libio/Makefile libsupc++/Makefile \
+dnl po/Makefile testsuite/Makefile mkcheck testsuite_flags)
+dnl AC_CONFIG_COMMANDS([default],
+dnl [if test -n "$CONFIG_FILES"; then
+dnl ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
+dnl grep '^MULTISUBDIR =' Makefile >> src/Makefile
+dnl grep '^MULTISUBDIR =' Makefile >> libsupc++/Makefile
+dnl fi
+dnl chmod +x mkcheck
+dnl chmod +x testsuite_flags
+dnl ],
+dnl srcdir=${srcdir}
+dnl host=${host}
+dnl target=${target}
+dnl with_multisubdir=${with_multisubdir}
+dnl ac_configure_args="${multilib_arg} ${ac_configure_args}"
+dnl CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+dnl glibcpp_basedir=${glibcpp_basedir}
+dnl CC="${CC}"
+dnl CXX="${CXX}"
+dnl )
+dnl AC_OUTPUT
# Sanity checking & User-visible messages.