Skip to content

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

acinclude.m4 (GLIBCPP_CONFIGURE): Make indentation/spacing uniform. 

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.

From-SVN: r51007
parent 6a4ed6c8
Showing with 467 additions and 621 deletions
libstdc++-v3/ChangeLog
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.
2002-03-15 Philipp Thomas <pthomas@suse.de> 2002-03-15 Philipp Thomas <pthomas@suse.de>
* include/backward/hash_map.h: hash, hashtable, hash_map and * include/backward/hash_map.h: hash, hashtable, hash_map and
......
libstdc++-v3/acinclude.m4
...@@ -12,55 +12,55 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [ ...@@ -12,55 +12,55 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [
*) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;; *) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
esac], [multilib=yes])dnl esac], [multilib=yes])dnl
# When building with srcdir == objdir, links to the source files will # When building with srcdir == objdir, links to the source files will
# be created in directories within the target_subdir. We have to # be created in directories within the target_subdir. We have to
# adjust toplevel_srcdir accordingly, so that configure finds # adjust toplevel_srcdir accordingly, so that configure finds
# install-sh and other auxiliary files that live in the top-level # install-sh and other auxiliary files that live in the top-level
# source directory. # source directory.
if test "${srcdir}" = "."; then if test "${srcdir}" = "."; then
if test -z "${with_target_subdir}"; then if test -z "${with_target_subdir}"; then
toprel=".." toprel=".."
else
if test "${with_target_subdir}" != "."; then
toprel="${with_multisrctop}../.."
else else
toprel="${with_multisrctop}.." if test "${with_target_subdir}" != "."; then
toprel="${with_multisrctop}../.."
else
toprel="${with_multisrctop}.."
fi
fi fi
else
toprel=".."
fi fi
else AC_CONFIG_AUX_DIR(${srcdir}/$toprel)
toprel=".." toplevel_srcdir=\${top_srcdir}/$toprel
fi AC_SUBST(toplevel_srcdir)
AC_CONFIG_AUX_DIR(${srcdir}/$toprel)
toplevel_srcdir=\${top_srcdir}/$toprel # Export build and source directories.
AC_SUBST(toplevel_srcdir) # These need to be absolute paths, yet at the same time need to
# canonicalize only relative paths, because then amd will not unmount
# Export build and source directories. # drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd.
# These need to be absolute paths, yet at the same time need to glibcpp_builddir=`pwd`
# canonicalize only relative paths, because then amd will not unmount case $srcdir in
# drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd. [\\/$]* | ?:[\\/]*) glibcpp_srcdir=${srcdir} ;;
glibcpp_builddir=`pwd` *) glibcpp_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;;
case $srcdir in esac
[\\/$]* | ?:[\\/]*) glibcpp_srcdir=${srcdir} ;; AC_SUBST(glibcpp_builddir)
*) glibcpp_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;; AC_SUBST(glibcpp_srcdir)
esac
AC_SUBST(glibcpp_builddir)
AC_SUBST(glibcpp_srcdir)
dnl This is here just to satisfy automake. dnl This is here just to satisfy automake.
ifelse(not,equal,[AC_CONFIG_AUX_DIR(..)]) ifelse(not,equal,[AC_CONFIG_AUX_DIR(..)])
AC_PROG_AWK AC_PROG_AWK
# Will set LN_S to either 'ln -s' or 'ln'. With autoconf 2.50+, can also # Will set LN_S to either 'ln -s' or 'ln'. With autoconf 2.5x, can also
# be 'cp -p' if linking isn't available. # be 'cp -p' if linking isn't available.
#ac_cv_prog_LN_S='cp -p' #ac_cv_prog_LN_S='cp -p'
AC_PROG_LN_S AC_PROG_LN_S
# We use these options to decide which functions to include. # We use these options to decide which functions to include.
AC_ARG_WITH(target-subdir, AC_ARG_WITH(target-subdir,
[ --with-target-subdir=SUBDIR [ --with-target-subdir=SUBDIR
configuring in a subdirectory]) configuring in a subdirectory])
AC_ARG_WITH(cross-host, AC_ARG_WITH(cross-host,
[ --with-cross-host=HOST configuring with a cross compiler]) [ --with-cross-host=HOST configuring with a cross compiler])
glibcpp_basedir=$srcdir/$toprel/$1/libstdc++-v3 glibcpp_basedir=$srcdir/$toprel/$1/libstdc++-v3
AC_SUBST(glibcpp_basedir) AC_SUBST(glibcpp_basedir)
...@@ -72,96 +72,92 @@ AC_ARG_WITH(cross-host, ...@@ -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_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]))]) 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
# 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
# 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
# are probably using a cross compiler, which will not be able to fully # link an executable. This is addressed in later versions of autoconf.
# link an executable. This should really be fixed in autoconf
# itself. AC_DEFUN(LIB_AC_PROG_CC,
[AC_BEFORE([$0], [AC_PROG_CPP])dnl
AC_DEFUN(LIB_AC_PROG_CC, dnl Fool anybody using AC_PROG_CC.
[AC_BEFORE([$0], [AC_PROG_CPP])dnl AC_PROVIDE([AC_PROG_CC])
dnl Fool anybody using AC_PROG_CC. AC_CHECK_PROG(CC, gcc, gcc)
AC_PROVIDE([AC_PROG_CC]) if test -z "$CC"; then
AC_CHECK_PROG(CC, gcc, gcc) AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
if test -z "$CC"; then test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc) fi
test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
fi AC_PROG_CC_GNU
AC_PROG_CC_GNU if test $ac_cv_prog_gcc = yes; then
GCC=yes
if test $ac_cv_prog_gcc = yes; then dnl Check whether -g works, even if CFLAGS is set, in case the package
GCC=yes dnl plays around with CFLAGS (such as to build both debugging and
dnl Check whether -g works, even if CFLAGS is set, in case the package dnl normal versions of a library), tasteless as that idea is.
dnl plays around with CFLAGS (such as to build both debugging and ac_test_CFLAGS="${CFLAGS+set}"
dnl normal versions of a library), tasteless as that idea is. ac_save_CFLAGS="$CFLAGS"
ac_test_CFLAGS="${CFLAGS+set}" CFLAGS=
ac_save_CFLAGS="$CFLAGS" AC_PROG_CC_G
CFLAGS= if test "$ac_test_CFLAGS" = set; then
AC_PROG_CC_G CFLAGS="$ac_save_CFLAGS"
if test "$ac_test_CFLAGS" = set; then elif test $ac_cv_prog_cc_g = yes; then
CFLAGS="$ac_save_CFLAGS" CFLAGS="-g -O2"
elif test $ac_cv_prog_cc_g = yes; then else
CFLAGS="-g -O2" CFLAGS="-O2"
fi
else else
CFLAGS="-O2" GCC=
test "${CFLAGS+set}" = set || CFLAGS="-g"
fi fi
else ])
GCC=
test "${CFLAGS+set}" = set || CFLAGS="-g"
fi
])
LIB_AC_PROG_CC LIB_AC_PROG_CC
# Can't just call these here as g++ requires libstc++ to be built.... # Likewise for AC_PROG_CXX. We can't just call it directly because g++
# AC_PROG_CXX # will try to link in libstdc++.
AC_DEFUN(LIB_AC_PROG_CXX,
# Likewise for AC_PROG_CXX. [AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl
AC_DEFUN(LIB_AC_PROG_CXX, dnl Fool anybody using AC_PROG_CXX.
[AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl AC_PROVIDE([AC_PROG_CXX])
dnl Fool anybody using AC_PROG_CXX. # Use glibcpp_CXX so that we do not cause CXX to be cached with the
AC_PROVIDE([AC_PROG_CXX]) # flags that come in CXX while configuring libstdc++. They're different
# Use glibcpp_CXX so that we do not cause CXX to be cached with the # from those used for all other target libraries. If CXX is set in
# flags that come in CXX while configuring libstdc++. They're different # the environment, respect that here.
# from those used for all other target libraries. If CXX is set in glibcpp_CXX=$CXX
# the environment, respect that here. AC_CHECK_PROGS(glibcpp_CXX, $CCC c++ g++ gcc CC cxx cc++, gcc)
glibcpp_CXX=$CXX AC_SUBST(glibcpp_CXX)
AC_CHECK_PROGS(glibcpp_CXX, $CCC c++ g++ gcc CC cxx cc++, gcc) CXX=$glibcpp_CXX
AC_SUBST(glibcpp_CXX) test -z "$glibcpp_CXX" && AC_MSG_ERROR([no acceptable c++ found in \$PATH])
CXX=$glibcpp_CXX
test -z "$glibcpp_CXX" && AC_MSG_ERROR([no acceptable c++ found in \$PATH]) AC_PROG_CXX_GNU
AC_PROG_CXX_GNU if test $ac_cv_prog_gxx = yes; then
GXX=yes
if test $ac_cv_prog_gxx = yes; then dnl Check whether -g works, even if CXXFLAGS is set, in case the package
GXX=yes dnl plays around with CXXFLAGS (such as to build both debugging and
dnl Check whether -g works, even if CXXFLAGS is set, in case the package dnl normal versions of a library), tasteless as that idea is.
dnl plays around with CXXFLAGS (such as to build both debugging and ac_test_CXXFLAGS="${CXXFLAGS+set}"
dnl normal versions of a library), tasteless as that idea is. ac_save_CXXFLAGS="$CXXFLAGS"
ac_test_CXXFLAGS="${CXXFLAGS+set}" CXXFLAGS=
ac_save_CXXFLAGS="$CXXFLAGS" AC_PROG_CXX_G
CXXFLAGS= if test "$ac_test_CXXFLAGS" = set; then
AC_PROG_CXX_G CXXFLAGS="$ac_save_CXXFLAGS"
if test "$ac_test_CXXFLAGS" = set; then elif test $ac_cv_prog_cxx_g = yes; then
CXXFLAGS="$ac_save_CXXFLAGS" CXXFLAGS="-g -O2"
elif test $ac_cv_prog_cxx_g = yes; then else
CXXFLAGS="-g -O2" CXXFLAGS="-O2"
fi
else else
CXXFLAGS="-O2" GXX=
test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
fi fi
else ])
GXX=
test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
fi
])
LIB_AC_PROG_CXX LIB_AC_PROG_CXX
# For some reason, gettext needs this. # For some reason, gettext needs this.
AC_ISC_POSIX AC_ISC_POSIX
AC_CHECK_TOOL(AS, as) AC_CHECK_TOOL(AS, as)
AC_CHECK_TOOL(AR, ar) AC_CHECK_TOOL(AR, ar)
...@@ -196,7 +192,6 @@ LIB_AC_PROG_CXX ...@@ -196,7 +192,6 @@ LIB_AC_PROG_CXX
# addition to possibly modifying the same flags, it also sets up symlinks. # addition to possibly modifying the same flags, it also sets up symlinks.
GLIBCPP_CHECK_TARGET GLIBCPP_CHECK_TARGET
#
]) ])
......
libstdc++-v3/aclocal.m4
dnl aclocal.m4 generated automatically by aclocal 1.4-p5 dnl aclocal.m4 generated automatically by aclocal 1.4
dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved. dnl with or without modifications, as long as this notice is preserved.
...@@ -24,55 +24,55 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [ ...@@ -24,55 +24,55 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [
*) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;; *) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
esac], [multilib=yes])dnl esac], [multilib=yes])dnl
# When building with srcdir == objdir, links to the source files will # When building with srcdir == objdir, links to the source files will
# be created in directories within the target_subdir. We have to # be created in directories within the target_subdir. We have to
# adjust toplevel_srcdir accordingly, so that configure finds # adjust toplevel_srcdir accordingly, so that configure finds
# install-sh and other auxiliary files that live in the top-level # install-sh and other auxiliary files that live in the top-level
# source directory. # source directory.
if test "${srcdir}" = "."; then if test "${srcdir}" = "."; then
if test -z "${with_target_subdir}"; then if test -z "${with_target_subdir}"; then
toprel=".." toprel=".."
else
if test "${with_target_subdir}" != "."; then
toprel="${with_multisrctop}../.."
else else
toprel="${with_multisrctop}.." if test "${with_target_subdir}" != "."; then
toprel="${with_multisrctop}../.."
else
toprel="${with_multisrctop}.."
fi
fi fi
else
toprel=".."
fi fi
else AC_CONFIG_AUX_DIR(${srcdir}/$toprel)
toprel=".." toplevel_srcdir=\${top_srcdir}/$toprel
fi AC_SUBST(toplevel_srcdir)
AC_CONFIG_AUX_DIR(${srcdir}/$toprel)
toplevel_srcdir=\${top_srcdir}/$toprel # Export build and source directories.
AC_SUBST(toplevel_srcdir) # These need to be absolute paths, yet at the same time need to
# canonicalize only relative paths, because then amd will not unmount
# Export build and source directories. # drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd.
# These need to be absolute paths, yet at the same time need to glibcpp_builddir=`pwd`
# canonicalize only relative paths, because then amd will not unmount case $srcdir in
# drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd. [\\/$]* | ?:[\\/]*) glibcpp_srcdir=${srcdir} ;;
glibcpp_builddir=`pwd` *) glibcpp_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;;
case $srcdir in esac
[\\/$]* | ?:[\\/]*) glibcpp_srcdir=${srcdir} ;; AC_SUBST(glibcpp_builddir)
*) glibcpp_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;; AC_SUBST(glibcpp_srcdir)
esac
AC_SUBST(glibcpp_builddir)
AC_SUBST(glibcpp_srcdir)
dnl This is here just to satisfy automake. dnl This is here just to satisfy automake.
ifelse(not,equal,[AC_CONFIG_AUX_DIR(..)]) ifelse(not,equal,[AC_CONFIG_AUX_DIR(..)])
AC_PROG_AWK AC_PROG_AWK
# Will set LN_S to either 'ln -s' or 'ln'. With autoconf 2.50+, can also # Will set LN_S to either 'ln -s' or 'ln'. With autoconf 2.5x, can also
# be 'cp -p' if linking isn't available. # be 'cp -p' if linking isn't available.
#ac_cv_prog_LN_S='cp -p' #ac_cv_prog_LN_S='cp -p'
AC_PROG_LN_S AC_PROG_LN_S
# We use these options to decide which functions to include. # We use these options to decide which functions to include.
AC_ARG_WITH(target-subdir, AC_ARG_WITH(target-subdir,
[ --with-target-subdir=SUBDIR [ --with-target-subdir=SUBDIR
configuring in a subdirectory]) configuring in a subdirectory])
AC_ARG_WITH(cross-host, AC_ARG_WITH(cross-host,
[ --with-cross-host=HOST configuring with a cross compiler]) [ --with-cross-host=HOST configuring with a cross compiler])
glibcpp_basedir=$srcdir/$toprel/$1/libstdc++-v3 glibcpp_basedir=$srcdir/$toprel/$1/libstdc++-v3
AC_SUBST(glibcpp_basedir) AC_SUBST(glibcpp_basedir)
...@@ -84,96 +84,92 @@ AC_ARG_WITH(cross-host, ...@@ -84,96 +84,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_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]))]) 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
# 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
# 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
# are probably using a cross compiler, which will not be able to fully # link an executable. This is addressed in later versions of autoconf.
# link an executable. This should really be fixed in autoconf
# itself. AC_DEFUN(LIB_AC_PROG_CC,
[AC_BEFORE([$0], [AC_PROG_CPP])dnl
AC_DEFUN(LIB_AC_PROG_CC, dnl Fool anybody using AC_PROG_CC.
[AC_BEFORE([$0], [AC_PROG_CPP])dnl AC_PROVIDE([AC_PROG_CC])
dnl Fool anybody using AC_PROG_CC. AC_CHECK_PROG(CC, gcc, gcc)
AC_PROVIDE([AC_PROG_CC]) if test -z "$CC"; then
AC_CHECK_PROG(CC, gcc, gcc) AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
if test -z "$CC"; then test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc) fi
test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
fi AC_PROG_CC_GNU
AC_PROG_CC_GNU if test $ac_cv_prog_gcc = yes; then
GCC=yes
if test $ac_cv_prog_gcc = yes; then dnl Check whether -g works, even if CFLAGS is set, in case the package
GCC=yes dnl plays around with CFLAGS (such as to build both debugging and
dnl Check whether -g works, even if CFLAGS is set, in case the package dnl normal versions of a library), tasteless as that idea is.
dnl plays around with CFLAGS (such as to build both debugging and ac_test_CFLAGS="${CFLAGS+set}"
dnl normal versions of a library), tasteless as that idea is. ac_save_CFLAGS="$CFLAGS"
ac_test_CFLAGS="${CFLAGS+set}" CFLAGS=
ac_save_CFLAGS="$CFLAGS" AC_PROG_CC_G
CFLAGS= if test "$ac_test_CFLAGS" = set; then
AC_PROG_CC_G CFLAGS="$ac_save_CFLAGS"
if test "$ac_test_CFLAGS" = set; then elif test $ac_cv_prog_cc_g = yes; then
CFLAGS="$ac_save_CFLAGS" CFLAGS="-g -O2"
elif test $ac_cv_prog_cc_g = yes; then else
CFLAGS="-g -O2" CFLAGS="-O2"
fi
else else
CFLAGS="-O2" GCC=
test "${CFLAGS+set}" = set || CFLAGS="-g"
fi fi
else ])
GCC=
test "${CFLAGS+set}" = set || CFLAGS="-g"
fi
])
LIB_AC_PROG_CC LIB_AC_PROG_CC
# Can't just call these here as g++ requires libstc++ to be built.... # Likewise for AC_PROG_CXX. We can't just call it directly because g++
# AC_PROG_CXX # will try to link in libstdc++.
AC_DEFUN(LIB_AC_PROG_CXX,
# Likewise for AC_PROG_CXX. [AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl
AC_DEFUN(LIB_AC_PROG_CXX, dnl Fool anybody using AC_PROG_CXX.
[AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl AC_PROVIDE([AC_PROG_CXX])
dnl Fool anybody using AC_PROG_CXX. # Use glibcpp_CXX so that we do not cause CXX to be cached with the
AC_PROVIDE([AC_PROG_CXX]) # flags that come in CXX while configuring libstdc++. They're different
# Use glibcpp_CXX so that we do not cause CXX to be cached with the # from those used for all other target libraries. If CXX is set in
# flags that come in CXX while configuring libstdc++. They're different # the environment, respect that here.
# from those used for all other target libraries. If CXX is set in glibcpp_CXX=$CXX
# the environment, respect that here. AC_CHECK_PROGS(glibcpp_CXX, $CCC c++ g++ gcc CC cxx cc++, gcc)
glibcpp_CXX=$CXX AC_SUBST(glibcpp_CXX)
AC_CHECK_PROGS(glibcpp_CXX, $CCC c++ g++ gcc CC cxx cc++, gcc) CXX=$glibcpp_CXX
AC_SUBST(glibcpp_CXX) test -z "$glibcpp_CXX" && AC_MSG_ERROR([no acceptable c++ found in \$PATH])
CXX=$glibcpp_CXX
test -z "$glibcpp_CXX" && AC_MSG_ERROR([no acceptable c++ found in \$PATH]) AC_PROG_CXX_GNU
AC_PROG_CXX_GNU if test $ac_cv_prog_gxx = yes; then
GXX=yes
if test $ac_cv_prog_gxx = yes; then dnl Check whether -g works, even if CXXFLAGS is set, in case the package
GXX=yes dnl plays around with CXXFLAGS (such as to build both debugging and
dnl Check whether -g works, even if CXXFLAGS is set, in case the package dnl normal versions of a library), tasteless as that idea is.
dnl plays around with CXXFLAGS (such as to build both debugging and ac_test_CXXFLAGS="${CXXFLAGS+set}"
dnl normal versions of a library), tasteless as that idea is. ac_save_CXXFLAGS="$CXXFLAGS"
ac_test_CXXFLAGS="${CXXFLAGS+set}" CXXFLAGS=
ac_save_CXXFLAGS="$CXXFLAGS" AC_PROG_CXX_G
CXXFLAGS= if test "$ac_test_CXXFLAGS" = set; then
AC_PROG_CXX_G CXXFLAGS="$ac_save_CXXFLAGS"
if test "$ac_test_CXXFLAGS" = set; then elif test $ac_cv_prog_cxx_g = yes; then
CXXFLAGS="$ac_save_CXXFLAGS" CXXFLAGS="-g -O2"
elif test $ac_cv_prog_cxx_g = yes; then else
CXXFLAGS="-g -O2" CXXFLAGS="-O2"
fi
else else
CXXFLAGS="-O2" GXX=
test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
fi fi
else ])
GXX=
test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
fi
])
LIB_AC_PROG_CXX LIB_AC_PROG_CXX
# For some reason, gettext needs this. # For some reason, gettext needs this.
AC_ISC_POSIX AC_ISC_POSIX
AC_CHECK_TOOL(AS, as) AC_CHECK_TOOL(AS, as)
AC_CHECK_TOOL(AR, ar) AC_CHECK_TOOL(AR, ar)
...@@ -208,7 +204,6 @@ LIB_AC_PROG_CXX ...@@ -208,7 +204,6 @@ LIB_AC_PROG_CXX
# addition to possibly modifying the same flags, it also sets up symlinks. # addition to possibly modifying the same flags, it also sets up symlinks.
GLIBCPP_CHECK_TARGET GLIBCPP_CHECK_TARGET
#
]) ])
...@@ -2139,30 +2134,12 @@ AC_MSG_RESULT($enable_symvers) ...@@ -2139,30 +2134,12 @@ AC_MSG_RESULT($enable_symvers)
]) ])
#serial 1
# This test replaces the one in autoconf.
# Currently this macro should have the same name as the autoconf macro
# because gettext's gettext.m4 (distributed in the automake package)
# still uses it. Otherwise, the use in gettext.m4 makes autoheader
# give these diagnostics:
# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
undefine([AC_ISC_POSIX])
AC_DEFUN([AC_ISC_POSIX],
[
dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
]
)
# Add --enable-maintainer-mode option to configure. # Add --enable-maintainer-mode option to configure.
# From Jim Meyering # From Jim Meyering
# serial 1 # serial 1
AC_DEFUN([AM_MAINTAINER_MODE], AC_DEFUN(AM_MAINTAINER_MODE,
[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
dnl maintainer-mode is disabled by default dnl maintainer-mode is disabled by default
AC_ARG_ENABLE(maintainer-mode, AC_ARG_ENABLE(maintainer-mode,
...@@ -2179,7 +2156,7 @@ AC_DEFUN([AM_MAINTAINER_MODE], ...@@ -2179,7 +2156,7 @@ AC_DEFUN([AM_MAINTAINER_MODE],
# Define a conditional. # Define a conditional.
AC_DEFUN([AM_CONDITIONAL], AC_DEFUN(AM_CONDITIONAL,
[AC_SUBST($1_TRUE) [AC_SUBST($1_TRUE)
AC_SUBST($1_FALSE) AC_SUBST($1_FALSE)
if $2; then if $2; then
...@@ -2193,42 +2170,14 @@ fi]) ...@@ -2193,42 +2170,14 @@ 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 9 # serial 3
dnl Usage: AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR]). AC_DEFUN(AM_WITH_NLS,
dnl If TOOLSYMBOL is specified and is 'use-libtool', then a libtool library
dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static,
dnl depending on --{enable,disable}-{shared,static} and on the presence of
dnl AM-DISABLE-SHARED). Otherwise, a static library
dnl $(top_builddir)/intl/libintl.a will be created.
dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
dnl implementations (in libc or libintl) without the ngettext() function
dnl will be ignored.
dnl LIBDIR is used to find the intl libraries. If empty,
dnl the value `$(top_builddir)/intl/' is used.
dnl
dnl The result of the configuration is one of three cases:
dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
dnl and used.
dnl Catalog format: GNU --> install in $(datadir)
dnl Catalog extension: .mo after installation, .gmo in source tree
dnl 2) GNU gettext has been found in the system's C library.
dnl Catalog format: GNU --> install in $(datadir)
dnl Catalog extension: .mo after installation, .gmo in source tree
dnl 3) No internationalization, always use English msgid.
dnl Catalog format: none
dnl Catalog extension: none
dnl The use of .gmo is historical (it was needed to avoid overwriting the
dnl GNU format catalogs when building on a platform with an X/Open gettext),
dnl but we keep it in order not to force irrelevant filename changes on the
dnl maintainers.
dnl
AC_DEFUN([AM_WITH_NLS],
[AC_MSG_CHECKING([whether NLS is requested]) [AC_MSG_CHECKING([whether NLS is requested])
dnl Default is enabled NLS dnl Default is enabled NLS
AC_ARG_ENABLE(nls, AC_ARG_ENABLE(nls,
...@@ -2237,15 +2186,11 @@ AC_DEFUN([AM_WITH_NLS], ...@@ -2237,15 +2186,11 @@ AC_DEFUN([AM_WITH_NLS],
AC_MSG_RESULT($USE_NLS) AC_MSG_RESULT($USE_NLS)
AC_SUBST(USE_NLS) AC_SUBST(USE_NLS)
BUILD_INCLUDED_LIBINTL=no
USE_INCLUDED_LIBINTL=no USE_INCLUDED_LIBINTL=no
INTLLIBS=
dnl If we use NLS figure out what method dnl If we use NLS figure out what method
if test "$USE_NLS" = "yes"; then if test "$USE_NLS" = "yes"; then
AC_DEFINE(ENABLE_NLS, 1, AC_DEFINE(ENABLE_NLS)
[Define to 1 if translation of program messages to the user's native language
is requested.])
AC_MSG_CHECKING([whether included gettext is requested]) AC_MSG_CHECKING([whether included gettext is requested])
AC_ARG_WITH(included-gettext, AC_ARG_WITH(included-gettext,
[ --with-included-gettext use the GNU gettext library included here], [ --with-included-gettext use the GNU gettext library included here],
...@@ -2256,74 +2201,85 @@ AC_DEFUN([AM_WITH_NLS], ...@@ -2256,74 +2201,85 @@ AC_DEFUN([AM_WITH_NLS],
nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
if test "$nls_cv_force_use_gnu_gettext" != "yes"; then if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
dnl User does not insist on using GNU NLS library. Figure out what dnl User does not insist on using GNU NLS library. Figure out what
dnl to use. If GNU gettext is available we use this. Else we have dnl to use. If gettext or catgets are available (in this order) we
dnl to fall back to GNU NLS library. dnl use this. Else we have to fall back to GNU NLS library.
dnl catgets is only used if permitted by option --with-catgets.
nls_cv_header_intl=
nls_cv_header_libgt=
CATOBJEXT=NONE CATOBJEXT=NONE
dnl Add a version number to the cache macros.
define(gt_cv_func_gnugettext_libc, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libc])
define(gt_cv_func_gnugettext_libintl, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libintl])
AC_CHECK_HEADER(libintl.h, AC_CHECK_HEADER(libintl.h,
[AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc, [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
[AC_TRY_LINK([#include <libintl.h> [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
extern int _nl_msg_cat_cntr;], gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
[bindtextdomain ("", "");
return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr], if test "$gt_cv_func_gettext_libc" != "yes"; then
gt_cv_func_gnugettext_libc=yes, AC_CHECK_LIB(intl, bindtextdomain,
gt_cv_func_gnugettext_libc=no)]) [AC_CACHE_CHECK([for gettext in libintl],
gt_cv_func_gettext_libintl,
if test "$gt_cv_func_gnugettext_libc" != "yes"; then [AC_TRY_LINK([], [return (int) gettext ("")],
AC_CACHE_CHECK([for GNU gettext in libintl], gt_cv_func_gettext_libintl=yes,
gt_cv_func_gnugettext_libintl, gt_cv_func_gettext_libintl=no)])])
[gt_save_LIBS="$LIBS"
LIBS="$LIBS -lintl $LIBICONV"
AC_TRY_LINK([#include <libintl.h>
extern int _nl_msg_cat_cntr;],
[bindtextdomain ("", "");
return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
gt_cv_func_gnugettext_libintl=yes,
gt_cv_func_gnugettext_libintl=no)
LIBS="$gt_save_LIBS"])
fi fi
dnl If an already present or preinstalled GNU gettext() is found, if test "$gt_cv_func_gettext_libc" = "yes" \
dnl use it. But if this macro is used in GNU gettext, and GNU || test "$gt_cv_func_gettext_libintl" = "yes"; then
dnl gettext is already preinstalled in libintl, we update this AC_DEFINE(HAVE_GETTEXT)
dnl libintl. (Cf. the install rule in intl/Makefile.in.) AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
if test "$gt_cv_func_gnugettext_libc" = "yes" \ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
|| { test "$gt_cv_func_gnugettext_libintl" = "yes" \ if test "$MSGFMT" != "no"; then
&& test "$PACKAGE" != gettext; }; then AC_CHECK_FUNCS(dcgettext)
AC_DEFINE(HAVE_GETTEXT, 1, AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
[Define if the GNU gettext() function is already present or preinstalled.]) AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
if test "$gt_cv_func_gnugettext_libintl" = "yes"; then AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
dnl If iconv() is in a separate libiconv library, then anyone return _nl_msg_cat_cntr],
dnl linking with libintl{.a,.so} also needs to link with [CATOBJEXT=.gmo
dnl libiconv. DATADIRNAME=share],
INTLLIBS="-lintl $LIBICONV" [CATOBJEXT=.mo
fi DATADIRNAME=lib])
INSTOBJEXT=.mo
gt_save_LIBS="$LIBS" fi
LIBS="$LIBS $INTLLIBS" fi
AC_CHECK_FUNCS(dcgettext)
LIBS="$gt_save_LIBS"
AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
if test "$MSGFMT" != "no"; then
AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
fi
AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
CATOBJEXT=.gmo
fi
]) ])
if test "$CATOBJEXT" = "NONE"; then if test "$CATOBJEXT" = "NONE"; then
dnl GNU gettext is not found in the C library. AC_MSG_CHECKING([whether catgets can be used])
AC_ARG_WITH(catgets,
[ --with-catgets use catgets functions if available],
nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
AC_MSG_RESULT($nls_cv_use_catgets)
if test "$nls_cv_use_catgets" = "yes"; then
dnl No gettext in C library. Try catgets next.
AC_CHECK_LIB(i, main)
AC_CHECK_FUNC(catgets,
[AC_DEFINE(HAVE_CATGETS)
INTLOBJS="\$(CATOBJS)"
AC_PATH_PROG(GENCAT, gencat, no)dnl
if test "$GENCAT" != "no"; then
AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
if test "$GMSGFMT" = "no"; then
AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
fi
AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
USE_INCLUDED_LIBINTL=yes
CATOBJEXT=.cat
INSTOBJEXT=.cat
DATADIRNAME=lib
INTLDEPS='$(top_builddir)/intl/libintl.a'
INTLLIBS=$INTLDEPS
LIBS=`echo $LIBS | sed -e 's/-lintl//'`
nls_cv_header_intl=intl/libintl.h
nls_cv_header_libgt=intl/libgettext.h
fi])
fi
fi
if test "$CATOBJEXT" = "NONE"; then
dnl Neither gettext nor catgets in included in the C library.
dnl Fall back on GNU gettext library. dnl Fall back on GNU gettext library.
nls_cv_use_gnu_gettext=yes nls_cv_use_gnu_gettext=yes
fi fi
...@@ -2338,11 +2294,15 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "" ...@@ -2338,11 +2294,15 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", ""
AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
AC_SUBST(MSGFMT) AC_SUBST(MSGFMT)
BUILD_INCLUDED_LIBINTL=yes
USE_INCLUDED_LIBINTL=yes USE_INCLUDED_LIBINTL=yes
CATOBJEXT=.gmo CATOBJEXT=.gmo
INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV" INSTOBJEXT=.mo
LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` DATADIRNAME=share
INTLDEPS='$(top_builddir)/intl/libintl.a'
INTLLIBS=$INTLDEPS
LIBS=`echo $LIBS | sed -e 's/-lintl//'`
nls_cv_header_intl=intl/libintl.h
nls_cv_header_libgt=intl/libgettext.h
fi fi
dnl Test whether we really found GNU xgettext. dnl Test whether we really found GNU xgettext.
...@@ -2353,78 +2313,24 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "" ...@@ -2353,78 +2313,24 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", ""
: ; : ;
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
dnl We need to process the po/ directory. # We need to process the po/ directory.
POSUB=po POSUB=po
else
DATADIRNAME=share
nls_cv_header_intl=intl/libintl.h
nls_cv_header_libgt=intl/libgettext.h
fi fi
AC_OUTPUT_COMMANDS(
[for ac_file in $CONFIG_FILES; do
# Support "outfile[:infile[:infile...]]"
case "$ac_file" in
*:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
esac
# PO directories have a Makefile.in generated from Makefile.in.in.
case "$ac_file" in */Makefile.in)
# Adjust a relative srcdir.
ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
case "$ac_given_srcdir" in
.) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
/*) top_srcdir="$ac_given_srcdir" ;;
*) top_srcdir="$ac_dots$ac_given_srcdir" ;;
esac
if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
rm -f "$ac_dir/POTFILES"
echo creating "$ac_dir/POTFILES"
sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES"
echo creating "$ac_dir/Makefile"
sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
fi
;;
esac
done])
dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL # If this is used in GNU gettext we have to set USE_NLS to `yes'
dnl to 'yes' because some of the testsuite requires it. # because some of the sources are only built for this goal.
if test "$PACKAGE" = gettext; then if test "$PACKAGE" = gettext; then
BUILD_INCLUDED_LIBINTL=yes USE_NLS=yes
fi USE_INCLUDED_LIBINTL=yes
dnl intl/plural.c is generated from intl/plural.y. It requires bison,
dnl because plural.y uses bison specific features. It requires at least
dnl bison-1.26 because earlier versions generate a plural.c that doesn't
dnl compile.
dnl bison is only needed for the maintainer (who touches plural.y). But in
dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
dnl the rule in general Makefile. Now, some people carelessly touch the
dnl files or have a broken "make" program, hence the plural.c rule will
dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
dnl present or too old.
AC_CHECK_PROGS([INTLBISON], [bison])
if test -z "$INTLBISON"; then
ac_verc_fail=yes
else
dnl Found it, now check the version.
AC_MSG_CHECKING([version of bison])
changequote(<<,>>)dnl
ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \([0-9]*\.[0-9.]*\).*$/\1/p'`
case $ac_prog_version in
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
changequote([,])dnl
ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
esac
AC_MSG_RESULT([$ac_prog_version])
fi
if test $ac_verc_fail = yes; then
INTLBISON=:
fi fi
dnl These rules are solely for the distribution goal. While doing this dnl These rules are solely for the distribution goal. While doing this
...@@ -2436,38 +2342,22 @@ changequote([,])dnl ...@@ -2436,38 +2342,22 @@ changequote([,])dnl
done done
dnl Make all variables we use known to autoconf. dnl Make all variables we use known to autoconf.
AC_SUBST(BUILD_INCLUDED_LIBINTL)
AC_SUBST(USE_INCLUDED_LIBINTL) AC_SUBST(USE_INCLUDED_LIBINTL)
AC_SUBST(CATALOGS) AC_SUBST(CATALOGS)
AC_SUBST(CATOBJEXT) AC_SUBST(CATOBJEXT)
AC_SUBST(DATADIRNAME)
AC_SUBST(GMOFILES) AC_SUBST(GMOFILES)
AC_SUBST(INSTOBJEXT)
AC_SUBST(INTLDEPS)
AC_SUBST(INTLLIBS) AC_SUBST(INTLLIBS)
AC_SUBST(INTLOBJS) AC_SUBST(INTLOBJS)
AC_SUBST(POFILES) AC_SUBST(POFILES)
AC_SUBST(POSUB) AC_SUBST(POSUB)
dnl For backward compatibility. Some configure.ins may be using this.
nls_cv_header_intl=
nls_cv_header_libgt=
dnl For backward compatibility. Some Makefiles may be using this.
DATADIRNAME=share
AC_SUBST(DATADIRNAME)
dnl For backward compatibility. Some Makefiles may be using this.
INSTOBJEXT=.mo
AC_SUBST(INSTOBJEXT)
dnl For backward compatibility. Some Makefiles may be using this.
GENCAT=gencat
AC_SUBST(GENCAT)
]) ])
dnl Usage: Just like AM_WITH_NLS, which see. AC_DEFUN(AM_GNU_GETTEXT,
AC_DEFUN([AM_GNU_GETTEXT],
[AC_REQUIRE([AC_PROG_MAKE_SET])dnl [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_PROG_RANLIB])dnl AC_REQUIRE([AC_PROG_RANLIB])dnl
AC_REQUIRE([AC_ISC_POSIX])dnl AC_REQUIRE([AC_ISC_POSIX])dnl
AC_REQUIRE([AC_HEADER_STDC])dnl AC_REQUIRE([AC_HEADER_STDC])dnl
...@@ -2477,18 +2367,21 @@ AC_DEFUN([AM_GNU_GETTEXT], ...@@ -2477,18 +2367,21 @@ AC_DEFUN([AM_GNU_GETTEXT],
AC_REQUIRE([AC_TYPE_SIZE_T])dnl AC_REQUIRE([AC_TYPE_SIZE_T])dnl
AC_REQUIRE([AC_FUNC_ALLOCA])dnl AC_REQUIRE([AC_FUNC_ALLOCA])dnl
AC_REQUIRE([AC_FUNC_MMAP])dnl AC_REQUIRE([AC_FUNC_MMAP])dnl
AC_REQUIRE([jm_GLIBC21])dnl
AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
stdlib.h string.h unistd.h sys/param.h]) unistd.h values.h sys/param.h])
AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getcwd getegid geteuid \ AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ __argz_count __argz_stringify __argz_next])
strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
if test "${ac_cv_func_stpcpy+set}" != "set"; then
AC_CHECK_FUNCS(stpcpy)
fi
if test "${ac_cv_func_stpcpy}" = "yes"; then
AC_DEFINE(HAVE_STPCPY)
fi
AM_ICONV
AM_LANGINFO_CODESET
AM_LC_MESSAGES AM_LC_MESSAGES
AM_WITH_NLS([$1],[$2],[$3]) AM_WITH_NLS
if test "x$CATOBJEXT" != "x"; then if test "x$CATOBJEXT" != "x"; then
if test "x$ALL_LINGUAS" = "x"; then if test "x$ALL_LINGUAS" = "x"; then
...@@ -2496,21 +2389,10 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) ...@@ -2496,21 +2389,10 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
else else
AC_MSG_CHECKING(for catalogs to be installed) AC_MSG_CHECKING(for catalogs to be installed)
NEW_LINGUAS= NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do for lang in ${LINGUAS=$ALL_LINGUAS}; do
useit=no case "$ALL_LINGUAS" in
for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
# Use the presentlang catalog if desiredlang is esac
# a. equal to presentlang, or
# b. a variant of presentlang (because in this case,
# presentlang can be used as a fallback for messages
# which are not translated in the desiredlang catalog).
case "$desiredlang" in
"$presentlang"*) useit=yes;;
esac
done
if test $useit = yes; then
NEW_LINGUAS="$NEW_LINGUAS $presentlang"
fi
done done
LINGUAS=$NEW_LINGUAS LINGUAS=$NEW_LINGUAS
AC_MSG_RESULT($LINGUAS) AC_MSG_RESULT($LINGUAS)
...@@ -2522,8 +2404,47 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) ...@@ -2522,8 +2404,47 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
fi fi
fi fi
dnl The reference to <locale.h> in the installed <libintl.h> file
dnl must be resolved because we cannot expect the users of this
dnl to define HAVE_LOCALE_H.
if test $ac_cv_header_locale_h = yes; then
INCLUDE_LOCALE_H="#include <locale.h>"
else
INCLUDE_LOCALE_H="\
/* The system does not provide the header <locale.h>. Take care yourself. */"
fi
AC_SUBST(INCLUDE_LOCALE_H)
dnl Determine which catalog format we have (if any is needed)
dnl For now we know about two different formats:
dnl Linux libc-5 and the normal X/Open format
test -d intl || mkdir intl
if test "$CATOBJEXT" = ".cat"; then
AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
dnl Transform the SED scripts while copying because some dumb SEDs
dnl cannot handle comments.
sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
fi
dnl po2tbl.sed is always needed.
sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
$srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
dnl In the intl/Makefile.in we have a special dependency which makes
dnl only sense for gettext. We comment this out for non-gettext
dnl packages.
if test "$PACKAGE" = "gettext"; then
GT_NO="#NO#"
GT_YES=
else
GT_NO=
GT_YES="#YES#"
fi
AC_SUBST(GT_NO)
AC_SUBST(GT_YES)
dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
dnl find the mkinstalldirs script in another subdir but $(top_srcdir). dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
dnl Try to locate is. dnl Try to locate is.
MKINSTALLDIRS= MKINSTALLDIRS=
if test -n "$ac_aux_dir"; then if test -n "$ac_aux_dir"; then
...@@ -2534,15 +2455,31 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) ...@@ -2534,15 +2455,31 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
fi fi
AC_SUBST(MKINSTALLDIRS) AC_SUBST(MKINSTALLDIRS)
dnl Enable libtool support if the surrounding package wishes it. dnl *** For now the libtool support in intl/Makefile is not for real.
INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], []) l=
AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) AC_SUBST(l)
dnl Generate list of files to be processed by xgettext which will
dnl be included in po/Makefile.
test -d po || mkdir po
if test "x$srcdir" != "x."; then
if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
posrcprefix="$srcdir/"
else
posrcprefix="../$srcdir/"
fi
else
posrcprefix="../"
fi
rm -f po/POTFILES
sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
< $srcdir/po/POTFILES.in > po/POTFILES
]) ])
# 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.
...@@ -2551,7 +2488,7 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) ...@@ -2551,7 +2488,7 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
AC_DEFUN([AM_PATH_PROG_WITH_TEST], AC_DEFUN(AM_PATH_PROG_WITH_TEST,
[# Extract the first word of "$2", so it can be a program name with args. [# Extract the first word of "$2", so it can be a program name with args.
set dummy $2; ac_word=[$]2 set dummy $2; ac_word=[$]2
AC_MSG_CHECKING([for $ac_word]) AC_MSG_CHECKING([for $ac_word])
...@@ -2587,139 +2524,24 @@ fi ...@@ -2587,139 +2524,24 @@ fi
AC_SUBST($1)dnl AC_SUBST($1)dnl
]) ])
#serial 2
# Test for the GNU C Library, version 2.1 or newer.
# From Bruno Haible.
AC_DEFUN([jm_GLIBC21],
[
AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
ac_cv_gnu_library_2_1,
[AC_EGREP_CPP([Lucky GNU user],
[
#include <features.h>
#ifdef __GNU_LIBRARY__
#if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
Lucky GNU user
#endif
#endif
],
ac_cv_gnu_library_2_1=yes,
ac_cv_gnu_library_2_1=no)
]
)
AC_SUBST(GLIBC21)
GLIBC21="$ac_cv_gnu_library_2_1"
]
)
#serial AM2
dnl From Bruno Haible.
AC_DEFUN([AM_ICONV],
[
dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
dnl those with the standalone portable GNU libiconv installed).
AC_ARG_WITH([libiconv-prefix],
[ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib], [
for dir in `echo "$withval" | tr : ' '`; do
if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
done
])
AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
am_cv_func_iconv="no, consider installing GNU libiconv"
am_cv_lib_iconv=no
AC_TRY_LINK([#include <stdlib.h>
#include <iconv.h>],
[iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
iconv_close(cd);],
am_cv_func_iconv=yes)
if test "$am_cv_func_iconv" != yes; then
am_save_LIBS="$LIBS"
LIBS="$LIBS -liconv"
AC_TRY_LINK([#include <stdlib.h>
#include <iconv.h>],
[iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
iconv_close(cd);],
am_cv_lib_iconv=yes
am_cv_func_iconv=yes)
LIBS="$am_save_LIBS"
fi
])
if test "$am_cv_func_iconv" = yes; then
AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
AC_MSG_CHECKING([for iconv declaration])
AC_CACHE_VAL(am_cv_proto_iconv, [
AC_TRY_COMPILE([
#include <stdlib.h>
#include <iconv.h>
extern
#ifdef __cplusplus
"C"
#endif
#if defined(__STDC__) || defined(__cplusplus)
size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
#else
size_t iconv();
#endif
], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
AC_MSG_RESULT([$]{ac_t:-
}[$]am_cv_proto_iconv)
AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
[Define as const if the declaration of iconv() needs const.])
fi
LIBICONV=
if test "$am_cv_lib_iconv" = yes; then
LIBICONV="-liconv"
fi
AC_SUBST(LIBICONV)
])
#serial AM1
dnl From Bruno Haible.
AC_DEFUN([AM_LANGINFO_CODESET],
[
AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
[AC_TRY_LINK([#include <langinfo.h>],
[char* cs = nl_langinfo(CODESET);],
am_cv_langinfo_codeset=yes,
am_cv_langinfo_codeset=no)
])
if test $am_cv_langinfo_codeset = yes; then
AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
[Define if you have <langinfo.h> and nl_langinfo(CODESET).])
fi
])
# 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.
# serial 2 # serial 1
AC_DEFUN([AM_LC_MESSAGES], AC_DEFUN(AM_LC_MESSAGES,
[if test $ac_cv_header_locale_h = yes; then [if test $ac_cv_header_locale_h = yes; then
AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_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, 1, AC_DEFINE(HAVE_LC_MESSAGES, 1,
[Define if your <locale.h> file defines LC_MESSAGES.]) [Define if your locale.h file contains LC_MESSAGES.])
fi fi
fi]) fi])
...@@ -2732,7 +2554,7 @@ AC_DEFUN([AM_LC_MESSAGES], ...@@ -2732,7 +2554,7 @@ AC_DEFUN([AM_LC_MESSAGES],
dnl Usage: dnl Usage:
dnl AM_INIT_AUTOMAKE(package,version, [no-define]) dnl AM_INIT_AUTOMAKE(package,version, [no-define])
AC_DEFUN([AM_INIT_AUTOMAKE], AC_DEFUN(AM_INIT_AUTOMAKE,
[AC_REQUIRE([AC_PROG_INSTALL]) [AC_REQUIRE([AC_PROG_INSTALL])
PACKAGE=[$1] PACKAGE=[$1]
AC_SUBST(PACKAGE) AC_SUBST(PACKAGE)
...@@ -2760,7 +2582,7 @@ AC_REQUIRE([AC_PROG_MAKE_SET])]) ...@@ -2760,7 +2582,7 @@ AC_REQUIRE([AC_PROG_MAKE_SET])])
# Check to make sure that the build environment is sane. # Check to make sure that the build environment is sane.
# #
AC_DEFUN([AM_SANITY_CHECK], AC_DEFUN(AM_SANITY_CHECK,
[AC_MSG_CHECKING([whether build environment is sane]) [AC_MSG_CHECKING([whether build environment is sane])
# Just in case # Just in case
sleep 1 sleep 1
...@@ -2801,7 +2623,7 @@ AC_MSG_RESULT(yes)]) ...@@ -2801,7 +2623,7 @@ AC_MSG_RESULT(yes)])
dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
dnl The program must properly implement --version. dnl The program must properly implement --version.
AC_DEFUN([AM_MISSING_PROG], AC_DEFUN(AM_MISSING_PROG,
[AC_MSG_CHECKING(for working $2) [AC_MSG_CHECKING(for working $2)
# Run test in a subshell; some versions of sh will print an error if # Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected. # an executable is not found, even if stderr is redirected.
...@@ -2817,7 +2639,7 @@ AC_SUBST($1)]) ...@@ -2817,7 +2639,7 @@ AC_SUBST($1)])
# Like AC_CONFIG_HEADER, but automatically create stamp file. # Like AC_CONFIG_HEADER, but automatically create stamp file.
AC_DEFUN([AM_CONFIG_HEADER], AC_DEFUN(AM_CONFIG_HEADER,
[AC_PREREQ([2.12]) [AC_PREREQ([2.12])
AC_CONFIG_HEADER([$1]) AC_CONFIG_HEADER([$1])
dnl When config.status generates a header, we must update the stamp-h file. dnl When config.status generates a header, we must update the stamp-h file.
......
libstdc++-v3/config.h.in
...@@ -3,6 +3,9 @@ ...@@ -3,6 +3,9 @@
/* Define if you have a working `mmap' system call. */ /* Define if you have a working `mmap' system call. */
#undef HAVE_MMAP #undef HAVE_MMAP
/* Define if you need to in order for stat and other things to work. */
#undef _POSIX_SOURCE
// Define if GCC supports weak symbols. // Define if GCC supports weak symbols.
#undef _GLIBCPP_SUPPORTS_WEAK #undef _GLIBCPP_SUPPORTS_WEAK
...@@ -699,9 +702,6 @@ ...@@ -699,9 +702,6 @@
/* Define if you have the <nan.h> header file. */ /* Define if you have the <nan.h> header file. */
#undef HAVE_NAN_H #undef HAVE_NAN_H
/* Define if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define if you have the <sys/isa_defs.h> header file. */ /* Define if you have the <sys/isa_defs.h> header file. */
#undef HAVE_SYS_ISA_DEFS_H #undef HAVE_SYS_ISA_DEFS_H
...@@ -711,9 +711,6 @@ ...@@ -711,9 +711,6 @@
/* Define if you have the <sys/resource.h> header file. */ /* Define if you have the <sys/resource.h> header file. */
#undef HAVE_SYS_RESOURCE_H #undef HAVE_SYS_RESOURCE_H
/* Define if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define if you have the <sys/types.h> header file. */ /* Define if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H #undef HAVE_SYS_TYPES_H
......
libstdc++-v3/configure
This source diff could not be displayed because it is too large. You can view the blob instead.
libstdc++-v3/configure.in
# Process this file with autoconf to produce a configure script, like so: # 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_PREREQ(2.13)
AC_INIT(src/ios.cc) AC_INIT(src/ios.cc)
...@@ -14,8 +14,9 @@ libtool_VERSION=4:0:0 ...@@ -14,8 +14,9 @@ libtool_VERSION=4:0:0
AC_SUBST(libtool_VERSION) AC_SUBST(libtool_VERSION)
# Gets build, host, target, *_vendor, *_cpu, *_os, etc. # Gets build, host, target, *_vendor, *_cpu, *_os, etc.
# AC 2.50 sets target_alias iff the user specified --target, but we use it # 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. # 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 AC_CANONICAL_SYSTEM
target_alias=${target_alias-$target} target_alias=${target_alias-$target}
AC_SUBST(target_alias) AC_SUBST(target_alias)
...@@ -24,7 +25,7 @@ AM_INIT_AUTOMAKE($PACKAGE, $release_VERSION) ...@@ -24,7 +25,7 @@ AM_INIT_AUTOMAKE($PACKAGE, $release_VERSION)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
# Runs configure.host and configure.target, as well as finds CC, CXX # 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_ENABLE_* macros below.
GLIBCPP_CONFIGURE(.) GLIBCPP_CONFIGURE(.)
...@@ -331,6 +332,31 @@ glibcpp_basedir=${glibcpp_basedir} ...@@ -331,6 +332,31 @@ glibcpp_basedir=${glibcpp_basedir}
CC="${CC}" CC="${CC}"
CXX="${CXX}" 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. # Sanity checking & User-visible messages.
......
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