summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSam Hartman <hartmans@mit.edu>1997-02-22 08:01:39 +0000
committerSam Hartman <hartmans@mit.edu>1997-02-22 08:01:39 +0000
commitf07def722179704ea01ecb410118a31d7939fb19 (patch)
treec292bf0d2b428a34f4305e4a2c643f5f08078c20 /src
parent971424e6b844ee70802768823ccdaa4e15278b1c (diff)
downloadkrb5-f07def722179704ea01ecb410118a31d7939fb19.tar.gz
krb5-f07def722179704ea01ecb410118a31d7939fb19.tar.xz
krb5-f07def722179704ea01ecb410118a31d7939fb19.zip
* 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
Diffstat (limited to 'src')
-rw-r--r--src/lib/des425/ChangeLog9
-rw-r--r--src/lib/des425/Makefile.in2
-rw-r--r--src/lib/des425/read_passwd.c4
3 files changed, 12 insertions, 3 deletions
diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog
index 1df0f30d5..c10aa1075 100644
--- 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 2e370d1a7..5e8c4ec73 100644
--- 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 968c98600..bb3c2465c 100644
--- 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 */