* java/util/Properties.java: Re-merged from Classpath.

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / configure.in

diff --git a/libstdc++-v3/configure.in b/libstdc++-v3/configure.in
index 99d013a..00bb59f 100644 (file)
--- a/libstdc++-v3/configure.in
+++ b/libstdc++-v3/configure.in
@@ -5,12 +5,13 @@ AC_PREREQ(2.13)
 AC_INIT(src/ios.cc)
 
 PACKAGE=libstdc++
-MAJOR_VERSION=3
-MINOR_VERSION=1
-MICRO_VERSION=0
-VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
 AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
+# For typical GNU versioning info, format is MAJOR.MINOR.MICRO
+release_VERSION=3.1.0
+AC_SUBST(release_VERSION)
+# For libtool versioning info, format is CURRENT:REVISION:AGE
+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
@@ -19,7 +20,7 @@ AC_CANONICAL_SYSTEM
 target_alias=${target_alias-$target}
 AC_SUBST(target_alias)
 
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+AM_INIT_AUTOMAKE($PACKAGE, $release_VERSION)
 AM_CONFIG_HEADER(config.h)
 
 # Runs configure.host and configure.target, as well as finds CC, CXX
@@ -71,8 +72,8 @@ if test -n "$with_cross_host" || test x"$build" != x"$host"; then
        # Construct linux crosses by hand, eliminating bits that need ld...
         # Check for available headers.
         AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h \
-       machine/endian.h machine/param.h sys/machine.h fp.h locale.h \
-       float.h inttypes.h])
+       machine/endian.h machine/param.h sys/machine.h sys/types.h \
+       fp.h locale.h float.h inttypes.h])
 
        # GLIBCPP_CHECK_COMPILER_FEATURES
        SECTION_FLAGS='-ffunction-sections -fdata-sections'
@@ -248,7 +249,7 @@ AC_SUBST(LIBSUPCXX_PICFLAGS)
 AC_OUTPUT(Makefile \
     include/Makefile src/Makefile \
     libmath/Makefile libio/Makefile libsupc++/Makefile \
-    po/Makefile intl/Makefile testsuite/Makefile mkcheck testsuite_flags,
+    po/Makefile testsuite/Makefile mkcheck testsuite_flags,
 [if test -n "$CONFIG_FILES"; then
   ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
   grep '^MULTISUBDIR =' Makefile >> src/Makefile