From a0d1964bf842b26bdca949011191ddd70c1feac7 Mon Sep 17 00:00:00 2001
From: Tom Yu <tlyu@mit.edu>
Date: Wed, 15 Dec 2004 20:38:44 +0000
Subject: [PATCH] pullup from trunk

ticket: 2808
version_fixed: 1.4

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@16941 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/config/ChangeLog         | 5 +++++
 src/config/win-pre.in        | 5 ++++-
 src/lib/.cvsignore           | 2 +-
 src/lib/ChangeLog            | 4 ++++
 src/lib/Makefile.in          | 4 ++--
 src/util/support/ChangeLog   | 4 ++++
 src/util/support/Makefile.in | 4 ++--
 src/windows/ChangeLog        | 4 ++++
 src/windows/version.rc       | 2 +-
 9 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index 7fb47f937..0fbaf7fc8 100644
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-15  Jeffrey Altman <jaltman@mit.edu>
+
+        * win-pre.in; optionally build debug symbols for release builds
+                      and rename krb5support_32.dll to k5sprt32.dll
+
 2004-11-19  Tom Yu  <tlyu@mit.edu>
 
 	* pre.in (KRB5_INCSUBDIRS): Add KRB5_INCDIR/gssrpc.
diff --git a/src/config/win-pre.in b/src/config/win-pre.in
index 37f22fd2b..85c646cf6 100644
--- a/src/config/win-pre.in
+++ b/src/config/win-pre.in
@@ -142,6 +142,9 @@ LOPTS=-nologo -incremental:no
 # CCOPTS2 was for non-DLL compiles (EXEs, for example)
 #
 !ifdef NODEBUG
+!ifdef DEBUG_SYMBOL
+CCOPTS=/ZI $(CCOPTS)
+!endif
 CCOPTS=/Os /MD $(CCOPTS)
 LOPTS=$(LOPTS)
 !else
@@ -170,7 +173,7 @@ CLIB=$(BUILDTOP)\lib\$(OUTPRE)comerr32.lib
 PLIB=$(BUILDTOP)\lib\$(OUTPRE)xpprof32.lib
 KLIB=$(BUILDTOP)\lib\$(OUTPRE)krb5_32.lib
 K4LIB=$(BUILDTOP)\lib\$(OUTPRE)krb4_32.lib
-SLIB=$(BUILDTOP)\lib\$(OUTPRE)krb5support_32.lib
+SLIB=$(BUILDTOP)\lib\$(OUTPRE)k5sprt32.lib
 GLIB=$(BUILDTOP)\lib\$(OUTPRE)gssapi32.lib
 WLIB=
 
diff --git a/src/lib/.cvsignore b/src/lib/.cvsignore
index 31ed3b099..2a089b44b 100644
--- a/src/lib/.cvsignore
+++ b/src/lib/.cvsignore
@@ -1 +1 @@
-krb5support32.def
+k5sprt32.def
diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index d8ddd1970..c6ad89242 100644
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-15  Jeffrey Altman <jaltman@mit.edu>
+
+        *.cvsignore, Makefile.in: rename krb5support32.def to k5sprt32.def
+
 2004-09-24  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in (RCFLAGS): Add -I$(SRCTOP) to get patchlevel.h.
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 909fadcb6..67867c777 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -28,7 +28,7 @@ clean-windows::
 ##MIT##MITLIBS=$(VS_LIB)
 ##MIT##MITFLAGS=-I$(VS_INC) /DVERSERV=1
 
-SLIBS = $(BUILDTOP)\util\support\$(OUTPRE)krb5support_32.lib
+SLIBS = $(BUILDTOP)\util\support\$(OUTPRE)k5sprt32.lib
 CLIBS = $(BUILDTOP)\util\et\$(OUTPRE)comerr.lib
 PLIBS = $(BUILDTOP)\util\profile\$(OUTPRE)profile.lib
 KLIBS = krb5\$(OUTPRE)krb5.lib crypto\$(OUTPRE)crypto.lib \
@@ -37,7 +37,7 @@ KLIBS = krb5\$(OUTPRE)krb5.lib crypto\$(OUTPRE)crypto.lib \
 GLIBS = gssapi\$(OUTPRE)gssapi.lib
 K4LIBS = krb4\$(OUTPRE)krb4.lib
 
-SDEF = krb5support32.def
+SDEF = k5sprt32.def
 CDEF = comerr32.def
 PDEF = xpprof32.def
 KDEF = krb5_32.def
diff --git a/src/util/support/ChangeLog b/src/util/support/ChangeLog
index 2ee4dd930..5db19b86e 100644
--- a/src/util/support/ChangeLog
+++ b/src/util/support/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-15  Jeffrey Altman <jaltman@mit.edu>
+
+        * Makefile.in: rename krb5support_32.dll to k5sprt32.dll
+
 2004-10-25  Ken Raeburn  <raeburn@mit.edu>
 
 	* libkrb5support.exports: Export krb5int_fac, _lock_fac,
diff --git a/src/util/support/Makefile.in b/src/util/support/Makefile.in
index 034bade41..af3648a10 100644
--- a/src/util/support/Makefile.in
+++ b/src/util/support/Makefile.in
@@ -5,9 +5,9 @@ BUILDTOP=$(REL)..$(S)..
 RELDIR=../util/support
 
 ##DOS##BUILDTOP = ..\..
-##DOS##LIBNAME=$(OUTPRE)krb5support_32.lib
+##DOS##LIBNAME=$(OUTPRE)k5sprt32.lib
 ##DOS##XTRA=
-##DOS##OBJFILE=$(OUTPRE)krb5support_32.lst
+##DOS##OBJFILE=$(OUTPRE)k5sprt32.lst
 
 SED = sed
 
diff --git a/src/windows/ChangeLog b/src/windows/ChangeLog
index e2f888f35..c1165b6f3 100644
--- a/src/windows/ChangeLog
+++ b/src/windows/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-15  Jeffrey Altman <jaltman@mit.edu>
+   
+         * version.rc: rename krb5support.dll to k5sprt32.dll
+
 2004-09-30  Jeffrey Altman <jaltman@mit.edu>
 
         * version.rc: Add pismere condition resource strings
diff --git a/src/windows/version.rc b/src/windows/version.rc
index c1b50f295..05dba755d 100644
--- a/src/windows/version.rc
+++ b/src/windows/version.rc
@@ -59,7 +59,7 @@
 #if !defined(_WIN32)
 #error not win32??
 #else
-#define K5_ORIGINAL_NAME "krb5support32.dll\0"
+#define K5_ORIGINAL_NAME "k5sprt32.dll\0"
 #endif
 #endif /* support */
 
-- 
2.26.2