From: Ian Beckwith <ianb@erislabs.net>
Date: Thu, 23 Jun 2011 23:39:02 +0000 (+0100)
Subject: makefile patch
X-Git-Url: http://erislabs.net/gitweb/?p=ckermit.git;a=commitdiff_plain;h=refs%2Fheads%2Fmakefile

makefile patch
---

diff --git a/debian/rules b/debian/rules
index 86269e4..b6fc62d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,8 @@ else
 endif
 
 MAKEOPTS=-f makefile DESTDIR=\"$(BUILDDIR)\" BINDIR=/usr/bin MANDIR=/usr/share/man/man1 INFODIR=/usr/share/doc/ckermit KFLAGS='$(CFLAGS)' LNKFLAGS="-lsocks -lutil -Wl,-z,defs -Wl,--as-needed"
-MAKETARGET=linux+krb5+openssl+zlib+shadow+pam
+MAKETARGET=linux+openssl
+#MAKETARGET=linux+krb5+openssl+zlib+shadow+pam
 
 configure: configure-stamp
 configure-stamp:
diff --git a/makefile b/makefile
index b89778d..a82dbae 100644
--- a/makefile
+++ b/makefile
@@ -6180,13 +6180,16 @@ linux+ssl linux+openssl:
 	esac; \
 	HAVE_DES=''; \
 	DES_LIB=''; \
-	if ls /usr/lib/libdes* > /dev/null 2> /dev/null || \
-	   ls $(SSLLIB)/libdes* > /dev/null 2> /dev/null; then \
+	echo '#include <stdio.h>'       >  testdes.c ; \
+	echo '#include <openssl/des.h>' >> testdes.c ; \
+	echo 'int main(void) { DES_key_sched(NULL,NULL); return 0; }' >> testdes.c; \
+	if $(CC) -o testdes.out testdes.c -ldes425 ; then \
 	      DES_LIB='-ldes425'; \
 	      HAVE_DES='-DCK_DES -DLIBDES'; \
               echo "HAVE DES"; \
            else echo "NO DES"; \
 	fi; \
+	rm -f testdes.c testdes.out; \
 	$(MAKE) linux KTARGET=$${KTARGET:-$(@)} "CC = gcc" "CC2 = gcc" \
 	"KFLAGS= -DCK_AUTHENTICATION -DCK_ENCRYPTION -DCK_CAST $$HAVE_DES \
 	-DCK_SSL -DCK_PAM -DZLIB -DCK_SHADOW $$OPENSSLOPTION $(SSLINC) \