]> granicus.if.org Git - rtmpdump/commitdiff
zlib dependency is only when CRYPTO is enabled
authorhyc <hyc@400ebc74-4327-4243-bc38-086b20814532>
Wed, 30 Jun 2010 22:34:59 +0000 (22:34 +0000)
committerhyc <hyc@400ebc74-4327-4243-bc38-086b20814532>
Wed, 30 Jun 2010 22:34:59 +0000 (22:34 +0000)
git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@536 400ebc74-4327-4243-bc38-086b20814532

Makefile
librtmp/hashswf.c

index 7470eb45ae491b2f2b51c53801299c0a98b7705a..c7767b4ae11a04973fbbaf1482975fc52b225cd1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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=
index 06d2bbb08aad87405e6d9f704a6ebfde49bc3865..277f21c010dd9bb3625252e03c26c47f1b26c370 100644 (file)
 extern void RTMP_TLS_Init();
 extern TLS_CTX RTMP_TLS_ctx;
 
-#endif /* CRYPTO */
-
 #include <zlib.h>
 
+#endif /* CRYPTO */
+
 #define        AGENT   "Mozilla/5.0"
 
 HTTPResult