[rtmpdump] r536 - in trunk: Makefile librtmp/hashswf.c

[hyc]

Author: hyc
Date: Thu Jul  1 00:34:59 2010
New Revision: 536

Log:
zlib dependency is only when CRYPTO is enabled

Modified:
   trunk/Makefile
   trunk/librtmp/hashswf.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Wed Jun 30 23:38:21 2010	(r535)
+++ trunk/Makefile	Thu Jul  1 00:34:59 2010	(r536)
@@ -11,9 +11,10 @@ SYS=posix
 CRYPTO=OPENSSL
 #CRYPTO=POLARSSL
 #CRYPTO=GNUTLS
-LIB_GNUTLS=-lgnutls -lgcrypt
-LIB_OPENSSL=-lssl -lcrypto
-LIB_POLARSSL=-lpolarssl
+LIBZ=-lz
+LIB_GNUTLS=-lgnutls -lgcrypt $(LIBZ)
+LIB_OPENSSL=-lssl -lcrypto$ (LIBZ)
+LIB_POLARSSL=-lpolarssl $(LIBZ)
 CRYPTO_LIB=$(LIB_$(CRYPTO))
 DEF_=-DNO_CRYPTO
 CRYPTO_DEF=$(DEF_$(CRYPTO))
@@ -33,7 +34,7 @@ MANDIR=$(DESTDIR)$(mandir)
 
 LIBS_posix=
 LIBS_mingw=-lws2_32 -lwinmm -lgdi32
-LIBS=$(CRYPTO_LIB) -lz $(LIBS_$(SYS)) $(XLIBS)
+LIBS=$(CRYPTO_LIB) $(LIBS_$(SYS)) $(XLIBS)
 
 THREADLIB_posix=-lpthread
 THREADLIB_mingw=

Modified: trunk/librtmp/hashswf.c
==============================================================================
--- trunk/librtmp/hashswf.c	Wed Jun 30 23:38:21 2010	(r535)
+++ trunk/librtmp/hashswf.c	Thu Jul  1 00:34:59 2010	(r536)
@@ -66,10 +66,10 @@
 extern void RTMP_TLS_Init();
 extern TLS_CTX RTMP_TLS_ctx;
 
-#endif /* CRYPTO */
-
 #include <zlib.h>
 
+#endif /* CRYPTO */
+
 #define	AGENT	"Mozilla/5.0"
 
 HTTPResult