* Make shared libs work on AIX

* DO not use #ifdef unix
* Fix dependencies for library

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9950 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog
index 1df0f30d5ed2fd57b985848cfedea217354e30b3..c10aa1075c86c86316855c6ae315ffe2cad19659 100644 (file)
--- a/src/lib/des425/ChangeLog
+++ b/src/lib/des425/ChangeLog
@@ -1,3 +1,12 @@
+Sat Feb 22 01:07:34 1997  Sam Hartman  <hartmans@tertius.mit.edu>
+
+       * read_passwd.c: Don't base definitions on unix being defined.
+
+
+Fri Feb 21 19:11:33 1997  Sam Hartman  <hartmans@mit.edu>
+
+       * Makefile.in (SHLIB_EXPLIBS): Depend on -lcrypto
+
 Sun Feb 16 23:29:09 1997  Richard Basch  <basch@lehman.com>
 
        * pcbc_encrypt.c: Export des_pcbc_encrypt (win16/win32)

diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in
index 2e370d1a79e3862748ff1aa7cd5fc088c71f286b..5e8c4ec73a1c38b8c37c638e3cebb55a2f0dc5fb 100644 (file)
--- a/src/lib/des425/Makefile.in
+++ b/src/lib/des425/Makefile.in
@@ -16,7 +16,7 @@ RELDIR=des425
 SHLIB_EXPDEPS = \
        $(TOPLIBD)/libcrypto$(SHLIBEXT) \
        $(TOPLIBD)/libkrb5$(SHLIBEXT)
-SHLIB_EXPLIBS=-lkrb5 -lcom_err 
+SHLIB_EXPLIBS=-lkrb5 -lcom_err -lcrypto
 SHLIB_DIRS=-L$(TOPLIBD)
 SHLIB_RDIRS=$(KRB5_LIBDIR)
 

diff --git a/src/lib/des425/read_passwd.c b/src/lib/des425/read_passwd.c
index 968c986007378b390c63f17a7a4f7c4896c8d874..bb3c2465c9b0231bebd1cd44b6518f31ca991ea3 100644 (file)
--- a/src/lib/des425/read_passwd.c
+++ b/src/lib/des425/read_passwd.c
@@ -27,7 +27,7 @@
  * echoing.
  */
 
-#if defined(unix)
+#if !defined(_MSDOS)&&!defined(_WIN32)
 
 #include "des.h"
 #include <stdio.h>
@@ -184,4 +184,4 @@ des_read_password/*_v4_compat_crock*/(k,prompt,verify)
 /*
  * These are all just dummy functions to make the rest of the library happy...
  */
-#endif /* unix */
+#endif /* _WINDOWS */