[rtmpdump] r427 - in trunk: Makefile librtmp/Makefile librtmp/rtmp.h

[hyc]

Author: hyc
Date: Wed Apr 14 18:07:19 2010
New Revision: 427

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

Modified:
   trunk/Makefile
   trunk/librtmp/Makefile
   trunk/librtmp/rtmp.h

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Sun Apr 11 07:04:18 2010	(r426)
+++ trunk/Makefile	Wed Apr 14 18:07:19 2010	(r427)
@@ -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)

Modified: trunk/librtmp/Makefile
==============================================================================
--- trunk/librtmp/Makefile	Sun Apr 11 07:04:18 2010	(r426)
+++ trunk/librtmp/Makefile	Wed Apr 14 18:07:19 2010	(r427)
@@ -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

Modified: trunk/librtmp/rtmp.h
==============================================================================
--- trunk/librtmp/rtmp.h	Sun Apr 11 07:04:18 2010	(r426)
+++ trunk/librtmp/rtmp.h	Wed Apr 14 18:07:19 2010	(r427)
@@ -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 */