ChangeLogTag:Thu May 18 16:37:46 UTC 2006 Steve Huston <shuston@riverace.com>

3 files changed, 23 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 65276e9cb4c..86cc37e7d72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -116,6 +116,22 @@ Thu May 18 17:33:57 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
           ACE_HAS_SOCKLEN_T.  Fixes configuration on OpenBSD.  Thanks to
           Vladimir Panov <gbr at voidland dot org> for reporting this bug.
 
+Thu May 18 16:37:46 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * configure.ac: Set a ACE_VERSION_NAME variable with the version
+          string (canonical major.minor.beta), which may include a fix kit id.
+
+        * bin/MakeProjectCreator/config/acedefaults.mpb: Change am_version from
+          libtool's -version-info format (current:revision:age) to the ACE
+          release number format (major.minor.beta) and rename it am_release.
+          This is intended for use with the libtool's -release option and will
+          result in library names that correspond to the ACE kit number.
+          The -version-info option uses interface numbers meant to indicate a
+          series of public API numbers. However, with ACE, things change
+          pretty often. Rather than try to come up with a way of managing
+          interface numbers, just use the release numbering that users know
+          and are used to.
+
 Thu May 18 15:15:16 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
         * bin/tao_orb_tests.lst:
diff --git a/bin/MakeProjectCreator/config/acedefaults.mpb b/bin/MakeProjectCreator/config/acedefaults.mpb
index e6f5fc5f01f..59f8ca9657f 100644
--- a/bin/MakeProjectCreator/config/acedefaults.mpb
+++ b/bin/MakeProjectCreator/config/acedefaults.mpb
@@ -14,7 +14,7 @@ project: zlib, zzip, ipv6 {
   }
 
   specific(automake) {
-    am_version = @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
+    am_release = @ACE_VERSION_NAME@
     includes += $(ACE_BUILDDIR)
   }
 
diff --git a/configure.ac b/configure.ac
index 1cd4ea64195..59d11ca908b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,10 +148,12 @@ IFS="$ace_save_ifs"
 ACE_MAJOR=$2
 ACE_MINOR=$3
 ACE_BETA=$4
+ACE_VERSION_NAME=ACE_VERSION
 
 AC_SUBST([ACE_MAJOR])
 AC_SUBST([ACE_MINOR])
 AC_SUBST([ACE_BETA])
+AC_SUBST([ACE_VERSION_NAME])
 
 dnl Do the usual install settings; don't forget to include a
 dnl `install-sh' script, in case there is no BSD compatible `install'
@@ -3949,9 +3951,9 @@ ACE_CHECK_LACKS_FUNCS(socketpair)
 
 AC_CHECK_FUNC([strptime],
   [
-   AC_DEFINE([ACE_HAS_STRPTIME])
-   dnl Check if _XOPEN_SOURCE macro is needed to make the strptime()
-   dnl prototype visible.
+   dnl strptime() is available, but its prototype is not always visible to
+   dnl the compiler. Check if _XOPEN_SOURCE macro is needed to make the
+   dnl strptime() prototype visible.
    ACE_CACHE_CHECK([for strptime prototype],
      [ace_cv_lib_has_strptime_prototype],
      [
@@ -3970,7 +3972,7 @@ AC_CHECK_FUNC([strptime],
      ],,[AC_DEFINE([ACE_LACKS_STRPTIME_PROTOTYPE])])
   ],
   [
-   AC_DEFINE([ACE_LACKS_NATIVE_STRPTIME])
+   AC_DEFINE([ACE_LACKS_STRPTIME])
   ])
 
 if test "$ac_cv_type_wchar_t" = yes; then