picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

2002-10-19 Art Haas <ahaas@neosoft.com>

Browse source 
* configure.in: Replace AC_CONFIG_HEADER with AC_CONFIG_HEADERS,
	add AC_HELP_STRING to all AC_ARG_WITH and AC_ARG_ENABLE macros,
	add autoconf quotes to the AC_CONFIG_AUX_DIR macro.
	* configure: Regenerated.
This commit is contained in:
Roland McGrath 2002-10-20 00:21:33 +00:00
parent a1ceed7aa2
commit 6b7f618334
3 changed files with 167 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2002-10-19 Art Haas <ahaas@neosoft.com>
* configure.in: Replace AC_CONFIG_HEADER with AC_CONFIG_HEADERS,
add AC_HELP_STRING to all AC_ARG_WITH and AC_ARG_ENABLE macros,
add autoconf quotes to the AC_CONFIG_AUX_DIR macro.
* configure: Regenerated.
2002-10-19 Roland McGrath <roland@redhat.com> 2002-10-19 Roland McGrath <roland@redhat.com>
* configure.in: Call AC_CONFIG_SUBDIRS with empty argument * configure.in: Call AC_CONFIG_SUBDIRS with empty argument

64
configure vendored
View file

@ -846,42 +846,45 @@ if test -n "$ac_init_help"; then
Optional Features: Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--disable-sanity-checks really do not use threads (should not be used --disable-sanity-checks really do not use threads (should not be used except
except in special situations) default=yes in special situations) [default=yes]
--enable-shared build shared library default=yes if GNU ld & ELF --enable-shared build shared library [default=yes if GNU ld &
--enable-profile build profiled library default=yes ELF]
--enable-omitfp build undebuggable optimized library default=no --enable-profile build profiled library [default=yes]
--enable-bounded build with runtime bounds checking default=no --enable-omitfp build undebuggable optimized library
--disable-versioning do not include versioning information in the [default=no]
library objects default=yes if supported --enable-bounded build with runtime bounds checking
--enable-oldest-abi=ABI configure the oldest ABI supported e.g. 2.2 [default=no]
default=glibc default --disable-versioning do not include versioning information in the library
--enable-add-ons=DIR1,DIR2... objects [default=yes if supported]
configure and build add-ons in DIR1,DIR2,... --enable-oldest-abi=ABI configure the oldest ABI supported [e.g. 2.2]
search for add-ons if no parameter given [default=glibc default]
--enable-add-ons[=DIRS...]
configure and build add-ons in DIR1,DIR2,... search
for add-ons if no parameter given
--disable-hidden-plt do not hide internal function calls to avoid PLT --disable-hidden-plt do not hide internal function calls to avoid PLT
--enable-static-nss build static NSS modules default=no --enable-static-nss build static NSS modules [default=no]
--disable-force-install don't force installation of files from this package, --disable-force-install don't force installation of files from this package,
even if they are older than the installed files even if they are older than the installed files
--enable-kernel=VERSION compile for compatibility with kernel not older --enable-kernel=VERSION compile for compatibility with kernel not older than
than VERSION VERSION
--enable-all-warnings enable all useful warnings gcc can issue --enable-all-warnings enable all useful warnings gcc can issue
Optional Packages: Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-gmp=DIRECTORY find GMP source code in DIRECTORY (not needed) --with-gmp=DIRECTORY find GMP source code in DIRECTORY (not needed)
--with-gd=DIR find libgd include dir and library with prefix DIR --with-gd=DIR find libgd include dir and library with prefix DIR
--with-gd-include=DIR find libgd include files in DIR --with-gd-include=DIR find libgd include files in DIR
--with-gd-lib=DIR find libgd library files in DIR --with-gd-lib=DIR find libgd library files in DIR
--with-fp if using floating-point hardware default=yes --with-fp if using floating-point hardware [default=yes]
--with-binutils=PATH specify location of binutils (as and ld) --with-binutils=PATH specify location of binutils (as and ld)
--with-elf if using the ELF object format --with-elf if using the ELF object format
--with-xcoff if using the XCOFF object format --with-xcoff if using the XCOFF object format
--without-cvs if CVS should not be used --without-cvs if CVS should not be used
--with-headers=PATH location of system headers to use --with-headers=PATH location of system headers to use (for example
e.g. /usr/src/linux/include /usr/src/linux/include) [default=compiler
default=compiler default default]
--with-tls enable support for TLS --with-tls enable support for TLS
--without-__thread do not use TLS features even when supporting them --without-__thread do not use TLS features even when supporting them
@ -1318,7 +1321,8 @@ config_vars=
# Check whether --with-gmp or --without-gmp was given. # Check whether --with-gmp or --without-gmp was given.
if test "${with_gmp+set}" = set; then if test "${with_gmp+set}" = set; then
withval="$with_gmp" withval="$with_gmp"
case "$with_gmp" in
case "$with_gmp" in
yes) { { echo "$as_me:$LINENO: error: --with-gmp requires an argument; use --with-gmp=DIRECTORY" >&5 yes) { { echo "$as_me:$LINENO: error: --with-gmp requires an argument; use --with-gmp=DIRECTORY" >&5
echo "$as_me: error: --with-gmp requires an argument; use --with-gmp=DIRECTORY" >&2;} echo "$as_me: error: --with-gmp requires an argument; use --with-gmp=DIRECTORY" >&2;}
{ (exit 1); exit 1; }; } ;; { (exit 1); exit 1; }; } ;;
@ -4880,7 +4884,7 @@ if test "${libc_cv_asm_underscores+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4883 "configure" #line 4887 "configure"
#include "confdefs.h" #include "confdefs.h"
void underscore_test(void) { void underscore_test(void) {
return; } return; }
@ -5177,7 +5181,7 @@ if test "${libc_cv_gcc_dwarf2_unwind_info+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
cat > conftest.c <<EOF cat > conftest.c <<EOF
#line 5180 "configure" #line 5184 "configure"
static char *__EH_FRAME_BEGIN__; static char *__EH_FRAME_BEGIN__;
_start () _start ()
{ {
@ -5276,7 +5280,7 @@ if test "${libc_cv_gcc_builtin_expect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
cat > conftest.c <<EOF cat > conftest.c <<EOF
#line 5279 "configure" #line 5283 "configure"
int foo (int a) int foo (int a)
{ {
a = __builtin_expect (a, 10); a = __builtin_expect (a, 10);
@ -5344,7 +5348,7 @@ if test "${libc_cv_gcc_subtract_local_labels+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
cat > conftest.c <<EOF cat > conftest.c <<EOF
#line 5347 "configure" #line 5351 "configure"
int foo (int a) int foo (int a)
{ {
static const int ar[] = { &&l1 - &&l1, &&l2 - &&l1 }; static const int ar[] = { &&l1 - &&l1, &&l2 - &&l1 };

212
configure.in
View file

@ -3,26 +3,28 @@ AC_REVISION([$CVSid$])
AC_PREREQ(2.53)dnl dnl Minimum Autoconf version required. AC_PREREQ(2.53)dnl dnl Minimum Autoconf version required.
AC_INIT([GNU C Library], [(see version.h)], [glibc]) AC_INIT([GNU C Library], [(see version.h)], [glibc])
AC_CONFIG_SRCDIR([include/features.h]) AC_CONFIG_SRCDIR([include/features.h])
AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(scripts) AC_CONFIG_AUX_DIR([scripts])
# This will get text that should go into config.make. # This will get text that should go into config.make.
config_vars= config_vars=
# Check for a --with-gmp argument and set gmp-srcdir in config.make. # Check for a --with-gmp argument and set gmp-srcdir in config.make.
AC_ARG_WITH(gmp, dnl AC_ARG_WITH([gmp],
--with-gmp=DIRECTORY find GMP source code in DIRECTORY (not needed), AC_HELP_STRING([--with-gmp=DIRECTORY],
[dnl [find GMP source code in DIRECTORY (not needed)]),
[
case "$with_gmp" in case "$with_gmp" in
yes) AC_MSG_ERROR(--with-gmp requires an argument; use --with-gmp=DIRECTORY) ;; yes) AC_MSG_ERROR([--with-gmp requires an argument; use --with-gmp=DIRECTORY]) ;;
''|no) ;; ''|no) ;;
*) config_vars="$config_vars *) config_vars="$config_vars
gmp-srcdir = $withval" ;; gmp-srcdir = $withval" ;;
esac esac
]) ])
# Check for a --with-gd argument and set libgd-LDFLAGS in config.make. # Check for a --with-gd argument and set libgd-LDFLAGS in config.make.
AC_ARG_WITH(gd, dnl AC_ARG_WITH([gd],
--with-gd=DIR find libgd include dir and library with prefix DIR, AC_HELP_STRING([--with-gd=DIR],
[find libgd include dir and library with prefix DIR]),
[dnl [dnl
case "$with_gd" in case "$with_gd" in
yes|''|no) ;; yes|''|no) ;;
@ -30,16 +32,18 @@ yes|''|no) ;;
libgd_ldflags="-L$withval/lib" ;; libgd_ldflags="-L$withval/lib" ;;
esac esac
]) ])
AC_ARG_WITH(gd-include, dnl AC_ARG_WITH([gd-include],
--with-gd-include=DIR find libgd include files in DIR, AC_HELP_STRING([--with-gd-include=DIR],
[find libgd include files in DIR]),
[dnl [dnl
case "$with_gd_include" in case "$with_gd_include" in
''|no) ;; ''|no) ;;
*) libgd_include="-I$withval" ;; *) libgd_include="-I$withval" ;;
esac esac
]) ])
AC_ARG_WITH(gd-lib, dnl AC_ARG_WITH([gd-lib],
--with-gd-lib=DIR find libgd library files in DIR, AC_HELP_STRING([--with-gd-lib=DIR],
[find libgd library files in DIR]),
[dnl [dnl
case "$with_gd_lib" in case "$with_gd_lib" in
''|no) ;; ''|no) ;;
@ -57,22 +61,32 @@ libgd-LDFLAGS = $libgd_ldflags"
fi fi
dnl Arguments to specify presence of other packages/features. dnl Arguments to specify presence of other packages/features.
AC_ARG_WITH(fp, dnl AC_ARG_WITH([fp],
[ --with-fp if using floating-point hardware [default=yes]], AC_HELP_STRING([--with-fp],
with_fp=$withval, with_fp=yes) [if using floating-point hardware @<:@default=yes@:>@]),
[with_fp=$withval],
[with_fp=yes])
AC_SUBST(with_fp) AC_SUBST(with_fp)
AC_ARG_WITH(binutils, dnl AC_ARG_WITH([binutils],
--with-binutils=PATH specify location of binutils (as and ld), AC_HELP_STRING([--with-binutils=PATH],
path_binutils=$withval, path_binutils='') [specify location of binutils (as and ld)]),
AC_ARG_WITH(elf, dnl [path_binutils=$withval],
--with-elf if using the ELF object format, [path_binutils=''])
elf=$withval, elf=no) AC_ARG_WITH([elf],
AC_ARG_WITH(xcoff, dnl AC_HELP_STRING([--with-elf],
--with-xcoff if using the XCOFF object format, [if using the ELF object format]),
xcoff=$withval, xcoff=no) [elf=$withval],
AC_ARG_WITH(cvs, dnl [elf=no])
[ --without-cvs if CVS should not be used], AC_ARG_WITH([xcoff],
with_cvs=$withval, with_cvs=yes) AC_HELP_STRING([--with-xcoff],
[if using the XCOFF object format]),
[xcoff=$withval],
[xcoff=no])
AC_ARG_WITH([cvs],
AC_HELP_STRING([--without-cvs],
[if CVS should not be used]),
[with_cvs=$withval],
[with_cvs=yes])
if test "$with_cvs" = yes; then if test "$with_cvs" = yes; then
if test -d $srcdir/CVS && grep :pserver: $srcdir/CVS/Root > /dev/null if test -d $srcdir/CVS && grep :pserver: $srcdir/CVS/Root > /dev/null
then then
@ -81,46 +95,61 @@ if test "$with_cvs" = yes; then
fi fi
AC_SUBST(with_cvs) AC_SUBST(with_cvs)
AC_ARG_WITH(headers, dnl AC_ARG_WITH([headers],
[ --with-headers=PATH location of system headers to use AC_HELP_STRING([--with-headers=PATH],
[e.g. /usr/src/linux/include] [location of system headers to use
[default=compiler default]], (for example /usr/src/linux/include)
sysheaders=$withval, sysheaders='') @<:@default=compiler default@:>@]),
[sysheaders=$withval],
[sysheaders=''])
AC_ARG_ENABLE(sanity-checks, dnl AC_ARG_ENABLE([sanity-checks],
[ --disable-sanity-checks really do not use threads (should not be used AC_HELP_STRING([--disable-sanity-checks],
except in special situations) [default=yes]], [really do not use threads (should not be used except in special situations) @<:@default=yes@:>@]),
enable_sanity=$enableval, enable_sanity=yes) [enable_sanity=$enableval],
[enable_sanity=yes])
dnl Arguments to enable or disable building the static, shared, profiled, dnl Arguments to enable or disable building the static, shared, profiled,
dnl and -fomit-frame-pointer libraries. dnl and -fomit-frame-pointer libraries.
dnl I've disabled this for now since we cannot build glibc without static dnl I've disabled this for now since we cannot build glibc without static
dnl libraries built in the moment. dnl libraries built in the moment.
dnl AC_ARG_ENABLE(static, dnl dnl AC_ARG_ENABLE([static],
dnl [ --enable-static build static library [default=yes]], dnl AC_HELP_STRING([--enable-static],
dnl static=$enableval, static=yes) dnl [build static library @<:@default=yes@:>@]),
dnl [static=$enableval],
dnl [static=yes])
static=yes static=yes
AC_ARG_ENABLE(shared, dnl AC_ARG_ENABLE([shared],
[ --enable-shared build shared library [default=yes if GNU ld & ELF]], AC_HELP_STRING([--enable-shared],
shared=$enableval, shared=default) [build shared library @<:@default=yes if GNU ld & ELF@:>@]),
AC_ARG_ENABLE(profile, dnl [shared=$enableval],
[ --enable-profile build profiled library [default=yes]], [shared=default])
profile=$enableval, profile=yes) AC_ARG_ENABLE([profile],
AC_ARG_ENABLE(omitfp, dnl AC_HELP_STRING([--enable-profile],
[ --enable-omitfp build undebuggable optimized library [default=no]], [build profiled library @<:@default=yes@:>@]),
omitfp=$enableval, omitfp=no) [profile=$enableval],
AC_ARG_ENABLE(bounded, dnl [profile=yes])
[ --enable-bounded build with runtime bounds checking [default=no]], AC_ARG_ENABLE([omitfp],
bounded=$enableval, bounded=no) AC_HELP_STRING([--enable-omitfp],
AC_ARG_ENABLE(versioning, dnl [build undebuggable optimized library @<:@default=no@:>@]),
[ --disable-versioning do not include versioning information in the [omitfp=$enableval],
library objects [default=yes if supported]], [omitfp=no])
enable_versioning=$enableval, enable_versioning=yes) AC_ARG_ENABLE([bounded],
AC_HELP_STRING([--enable-bounded],
[build with runtime bounds checking @<:@default=no@:>@]),
[bounded=$enableval],
[bounded=no])
AC_ARG_ENABLE([versioning],
AC_HELP_STRING([--disable-versioning],
[do not include versioning information in the library objects @<:@default=yes if supported@:>@]),
[enable_versioning=$enableval],
[enable_versioning=yes])
AC_ARG_ENABLE(oldest-abi, dnl AC_ARG_ENABLE([oldest-abi],
[ --enable-oldest-abi=ABI configure the oldest ABI supported [e.g. 2.2] AC_HELP_STRING([--enable-oldest-abi=ABI],
[default=glibc default]], [configure the oldest ABI supported @<:@e.g. 2.2@:>@ @<:@default=glibc default@:>@]),
oldest_abi=$enableval, oldest_abi=no) [oldest_abi=$enableval],
[oldest_abi=no])
if test "$oldest_abi" = yes || test "$oldest_abi" = no; then if test "$oldest_abi" = yes || test "$oldest_abi" = no; then
oldest_abi=default oldest_abi=default
else else
@ -129,10 +158,9 @@ fi
AC_SUBST(oldest_abi) AC_SUBST(oldest_abi)
dnl Generic infrastructure for drop-in additions to libc. dnl Generic infrastructure for drop-in additions to libc.
AC_ARG_ENABLE(add-ons, dnl AC_ARG_ENABLE([add-ons],
[ --enable-add-ons[=DIR1,DIR2]... AC_HELP_STRING([--enable-add-ons@<:@=DIRS...@:>@],
configure and build add-ons in DIR1,DIR2,... [configure and build add-ons in DIR1,DIR2,... search for add-ons if no parameter given]),
search for add-ons if no parameter given],
[case "$enableval" in [case "$enableval" in
yes) add_ons=`cd $srcdir && echo */configure | sed -e 's!/configure!!g'` yes) add_ons=`cd $srcdir && echo */configure | sed -e 's!/configure!!g'`
test "$add_ons" = "*" && add_ons= ;; test "$add_ons" = "*" && add_ons= ;;
@ -142,17 +170,23 @@ AC_ARG_ENABLE(add-ons, dnl
dnl Let the user avoid using TLS. Don't know why but... dnl Let the user avoid using TLS. Don't know why but...
dnl XXX For now we disable support by default. dnl XXX For now we disable support by default.
AC_ARG_WITH(tls, dnl AC_ARG_WITH([tls],
[ --with-tls enable support for TLS], AC_HELP_STRING([--with-tls],
usetls=$withval, usetls=no) [enable support for TLS]),
[usetls=$withval],
[usetls=no])
AC_ARG_WITH(__thread, dnl AC_ARG_WITH([__thread],
[ --without-__thread do not use TLS features even when supporting them], AC_HELP_STRING([--without-__thread],
use__thread=$withval, use__thread=yes) [do not use TLS features even when supporting them]),
[use__thread=$withval],
[use__thread=yes])
AC_ARG_ENABLE(hidden-plt, dnl AC_ARG_ENABLE([hidden-plt],
[ --disable-hidden-plt do not hide internal function calls to avoid PLT], AC_HELP_STRING([--disable-hidden-plt],
hidden=$enableval, hidden=yes) [do not hide internal function calls to avoid PLT]),
[hidden=$enableval],
[hidden=yes])
if test "x$hidden" = xno; then if test "x$hidden" = xno; then
AC_DEFINE(NO_HIDDEN) AC_DEFINE(NO_HIDDEN)
fi fi
@ -191,27 +225,31 @@ fi
dnl On some platforms we cannot use dynamic loading. We must provide dnl On some platforms we cannot use dynamic loading. We must provide
dnl static NSS modules. dnl static NSS modules.
AC_ARG_ENABLE(static-nss, dnl AC_ARG_ENABLE([static-nss],
[ --enable-static-nss build static NSS modules [default=no]], AC_HELP_STRING([--enable-static-nss],
static_nss=$enableval, static_nss=no) [build static NSS modules @<:@default=no@:>@]),
[static_nss=$enableval],
[static_nss=no])
dnl Enable static NSS also if we build no shared objects. dnl Enable static NSS also if we build no shared objects.
if test x"$static_nss" = xyes || test x"$shared" = xno; then if test x"$static_nss" = xyes || test x"$shared" = xno; then
static_nss=yes static_nss=yes
AC_DEFINE(DO_STATIC_NSS) AC_DEFINE(DO_STATIC_NSS)
fi fi
AC_ARG_ENABLE(force-install, AC_ARG_ENABLE([force-install],
[ --disable-force-install don't force installation of files from this package, AC_HELP_STRING([--disable-force-install],
even if they are older than the installed files], [don't force installation of files from this package, even if they are older than the installed files]),
force_install=$enableval, force_install=yes) [force_install=$enableval],
[force_install=yes])
AC_SUBST(force_install) AC_SUBST(force_install)
dnl On some platforms we allow dropping compatibility with all kernel dnl On some platforms we allow dropping compatibility with all kernel
dnl versions. dnl versions.
AC_ARG_ENABLE(kernel, AC_ARG_ENABLE([kernel],
[ --enable-kernel=VERSION compile for compatibility with kernel not older AC_HELP_STRING([--enable-kernel=VERSION],
than VERSION], [compile for compatibility with kernel not older than VERSION]),
minimum_kernel=$enableval) [minimum_kernel=$enableval],
[])
dnl Prevent unreasonable values. dnl Prevent unreasonable values.
if test "$minimum_kernel" = yes || test "$minimum_kernel" = no; then if test "$minimum_kernel" = yes || test "$minimum_kernel" = no; then
# Better nothing than this. # Better nothing than this.
@ -225,9 +263,11 @@ fi
dnl For the development we sometimes want gcc to issue even more warnings. dnl For the development we sometimes want gcc to issue even more warnings.
dnl This is not the default since many of the extra warnings are not dnl This is not the default since many of the extra warnings are not
dnl appropriate. dnl appropriate.
AC_ARG_ENABLE(all-warnings, AC_ARG_ENABLE([all-warnings],
[ --enable-all-warnings enable all useful warnings gcc can issue], AC_HELP_STRING([--enable-all-warnings],
all_warnings=$enableval) [enable all useful warnings gcc can issue]),
[all_warnings=$enableval],
[])
AC_SUBST(all_warnings) AC_SUBST(all_warnings)
AC_CANONICAL_HOST AC_CANONICAL_HOST