[reSIProcate] [Patch] Problems with SSL_LOCATION in Makefile

[Max Bowsher <maxb@xxxxxxx>]

There are two problems relating to SSL_LOCATION in the resiprocate 1.4.1
Makefile:
 - There are still some literal mentions of "contrib/openssl", though it
   no longer exists.
 - There are rules to try to run make in the $(SSL_LOCATION) directory,
   even though it is supposed to be valid to leave SSL_LOCATION blank to
   use the system installation of OpenSSL.

Here is a patch:

--- a/Makefile  Mon Nov 24 00:15:52 2008 +0000
+++ b/Makefile  Mon Nov 24 00:20:04 2008 +0000
@@ -149,13 +149,18 @@
 srtp: configure_srtp
        cd contrib/srtp && $(MAKE)

-contrib/openssl/Makefile:
+ifdef SSL_LOCATION
+$(SSL_LOCATION)/Makefile:
        cd $(SSL_LOCATION) && ./Configure linux-generic32 --openssldir=/usr 
enable-tlsext ${CONFIGURE_ARGS} && $(MAKE) depend

-configure_dtls-srtp-openssl: contrib/openssl/Makefile
+configure_dtls-srtp-openssl: $(SSL_LOCATION)/Makefile

 dtls-srtp-openssl: configure_dtls-srtp-openssl
        cd $(SSL_LOCATION) && $(MAKE)
+else
+configure_dtls-srtp-openssl:
+dtls-srtp-openssl:
+endif

 tfmcontrib: cppunit netxx



Max.

Attachment: signature.asc
Description: OpenPGP digital signature