| 1 |
vapier 12/04/27 22:53:37 |
| 2 |
|
| 3 |
Added: tntnet-2.0-zlib-minizip.patch |
| 4 |
Log: |
| 5 |
Use minizip from new zlib. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: tntnet-2.0-zlib-minizip.patch |
| 16 |
=================================================================== |
| 17 |
--- a/configure.in |
| 18 |
+++ b/configure.in |
| 19 |
@@ -18,6 +18,7 @@ |
| 20 |
|
| 21 |
AC_PROG_CXX |
| 22 |
AC_PROG_LIBTOOL |
| 23 |
+PKG_PROG_PKG_CONFIG |
| 24 |
|
| 25 |
AC_LANG(C++) |
| 26 |
ACX_PTHREAD |
| 27 |
@@ -25,6 +26,12 @@ |
| 28 |
AC_CHECK_HEADER([zlib.h], , AC_MSG_ERROR([zlib not found])) |
| 29 |
AC_CHECK_HEADER([cxxtools/net/tcpsocket.h], , AC_MSG_ERROR([cxxtools headers not found])) |
| 30 |
|
| 31 |
+PKG_CHECK_MODULES([MINIZIP], [minizip], |
| 32 |
+ [HAVE_MINIZIP=true], [HAVE_MINIZIP=false]) |
| 33 |
+AC_SUBST([MINIZIP_CFLAGS]) |
| 34 |
+AC_SUBST([MINIZIP_LIBS]) |
| 35 |
+AM_CONDITIONAL([HAVE_MINIZIP], [test $HAVE_MINIZIP = true]) |
| 36 |
+ |
| 37 |
AC_ARG_WITH([epoll], |
| 38 |
AS_HELP_STRING([--with-epoll=yes|no|probe], [use epoll]), |
| 39 |
[epoll_option=$withval], |
| 40 |
--- a/framework/common/Makefile.am |
| 41 |
+++ b/framework/common/Makefile.am |
| 42 |
@@ -23,7 +23,6 @@ libtntnet_la_SOURCES = \ |
| 43 |
httpparser.cpp \ |
| 44 |
httprequest.cpp \ |
| 45 |
httpreply.cpp \ |
| 46 |
- ioapi.c \ |
| 47 |
job.cpp \ |
| 48 |
langlib.cpp \ |
| 49 |
listener.cpp \ |
| 50 |
@@ -41,16 +40,13 @@ libtntnet_la_SOURCES = \ |
| 51 |
stringlessignorecase.cpp \ |
| 52 |
tntconfig.cpp \ |
| 53 |
tntnet.cpp \ |
| 54 |
- unzip.c \ |
| 55 |
unzipfile.cpp \ |
| 56 |
urlescostream.cpp \ |
| 57 |
urlmapper.cpp \ |
| 58 |
util.cpp \ |
| 59 |
worker.cpp \ |
| 60 |
zdata.cpp \ |
| 61 |
- crypt.h \ |
| 62 |
- ioapi.h \ |
| 63 |
- unzip.h |
| 64 |
+ crypt.h |
| 65 |
|
| 66 |
nobase_include_HEADERS = \ |
| 67 |
tnt/applicationunlocker.h \ |
| 68 |
@@ -145,3 +141,13 @@ noinst_HEADERS += \ |
| 69 |
tnt/stressjob.h |
| 70 |
endif |
| 71 |
|
| 72 |
+if HAVE_MINIZIP |
| 73 |
+libtntnet_la_CXXFLAGS += $(MINIZIP_CFLAGS) |
| 74 |
+libtntnet_la_LDFLAGS += $(MINIZIP_LIBS) |
| 75 |
+else |
| 76 |
+libtntnet_la_SOURCES += \ |
| 77 |
+ ioapi.c \ |
| 78 |
+ ioapi.h \ |
| 79 |
+ unzip.c \ |
| 80 |
+ unzip.h |
| 81 |
+endif |
Archives