Leave CRYPTO defined by default, use "make CRYPTO=" to turn it off.

git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@427 400ebc74-4327-4243-bc38-086b20814532

diff --git a/Makefile b/Makefile
index df3ef0cbca926743fb5faa477ca5fcc35f8dbbf7..637fc447ee6fb3bb4deea08f1b55ee0e6504f4ba 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,11 @@ CRYPTO=OPENSSL
 LIB_GNUTLS=-lgnutls
 LIB_OPENSSL=-lssl -lcrypto
 CRYPTO_LIB=$(LIB_$(CRYPTO))
+DEF_=-DNO_CRYPTO
+CRYPTO_DEF=$(DEF_$(CRYPTO))
 
-DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\"
+
+DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF)
 OPT=-O2
 CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT)
 LDFLAGS=-Wall $(XLDFLAGS)

diff --git a/librtmp/Makefile b/librtmp/Makefile
index a977273e128957354db2113fbb7a95214fd3535d..776b340da491f8bf0560c7d63d72ae8f685cc105 100644 (file)
--- a/librtmp/Makefile
+++ b/librtmp/Makefile
@@ -7,8 +7,9 @@ LD=$(CROSS_COMPILE)ld
 
 CRYPTO=OPENSSL
 #CRYPTO=GNUTLS
-DEF_OPENSSL=-DCRYPTO -DUSE_OPENSSL
-DEF_GNUTLS=-DCRYPTO -DUSE_GNUTLS
+DEF_OPENSSL=-DUSE_OPENSSL
+DEF_GNUTLS=-DUSE_GNUTLS
+DEF_=-DNO_CRYPTO
 LIB_GNUTLS=-lgnutls
 LIB_OPENSSL=-lssl -lcrypto
 REQ_GNUTLS=gnutls

diff --git a/librtmp/rtmp.h b/librtmp/rtmp.h
index ff68dd6d3b7a99197ed32195d05a4c751cbf79f3..1131943aaed5941033402c549299a39da63f3611 100644 (file)
--- a/librtmp/rtmp.h
+++ b/librtmp/rtmp.h
@@ -24,6 +24,10 @@
  *  http://www.gnu.org/copyleft/lgpl.html
  */
 
+#ifndef NO_CRYPTO
+#define CRYPTO
+#endif
+
 #include <errno.h>
 #include <stdint.h>
 #include <stddef.h>
@@ -146,6 +150,7 @@ extern "C"
     unsigned short socksport;
     unsigned short port;
 
+#ifdef CRYPTO
 #define RTMP_SWF_HASHLEN       32
     void *dh;                  // for encryption
     void *rc4keyIn;
@@ -154,6 +159,7 @@ extern "C"
     uint32_t SWFSize;
     char SWFHash[RTMP_SWF_HASHLEN];
     char SWFVerificationResponse[RTMP_SWF_HASHLEN+10];
+#endif
   } RTMP_LNK;
 
   /* state for read() wrapper */