s/PACKAGE/OPENLDAP_PACKAGE/

s/VERSION/OPENLDAP_VERSION/
manually define for NT.  Should sort out mechanism for one place
updating of package/version strings.

clients/ud/main.c

@@ -83,7 +83,7 @@ int debug;			/* debug flag */
 int ldebug;			/* library debug flag */
 
 #ifndef HAVE_MKVERSION
-char Version[] = "OpenLDAP UserDirectory (ud)";
+char Version[] = OPENLDAP_PACKAGE " " OPENLDAP_VERSION " UserDirectory (ud)";
 #endif
 
 int

configure.in

@@ -14,9 +14,11 @@ define([AC_CACHE_SAVE], )dnl
 dnl Configure.in for OpenLDAP
 AC_INIT(include/ldap.h)dnl
 AC_CONFIG_AUX_DIR(build)dnl
-AM_INIT_AUTOMAKE(OpenLDAP,[2.0-devel])dnl
+AM_INIT_AUTOMAKE(OpenLDAP,[2.0-devel], [no defines])dnl
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
+AC_DEFINE_UNQUOTED(OPENLDAP_PACKAGE,"$PACKAGE",Package)
+AC_DEFINE_UNQUOTED(OPENLDAP_VERSION,"$VERSION",Version)
 
 dnl We use autoconf features new to 2.13.
 dnl 	aclocal.m4 should be built using aclocal from automake 1.4

include/portable.h.in

@@ -609,11 +609,11 @@
 /* Define if you have the socket library (-lsocket).  */
 #undef HAVE_LIBSOCKET
 
-/* Name of package */
-#undef PACKAGE
+/* Package */
+#undef OPENLDAP_PACKAGE
 
-/* Version number of package */
-#undef VERSION
+/* Version */
+#undef OPENLDAP_VERSION
 
 /* define this if you have mkversion */
 #undef HAVE_MKVERSION

include/portable.h.nt

@@ -18,6 +18,8 @@
 /* --------------------------------------------------- */
 /* begin of MSVC5 specific entries */
 
+#define OPENLDAP_PACKAGE "OpenLDAP"
+#define OPENLDAP_VERSION "-devel"
 #define EXEEXT ".exe"
 
 #if defined( _DEBUG ) && !defined( LDAP_DEBUG )