Репозиторий ALT Linux™ backports/2.4
Последнее обновление: 9 июля 2008 | Пакетов: 497 | Посещений: 1583927
 поиск   регистрация   авторизация 
 
Группа :: Система/Серверы
Пакет: cherokee

 Главная   Изменения   Спек   Патчи   Загрузить   Bugs and FR 

Патч: cherokee-0.4.30-alt-libs.patch

--- cherokee-0.4.30/cherokee/Makefile.am.orig	2006-01-18 20:33:45 +0300
+++ cherokee-0.4.30/cherokee/Makefile.am	2006-02-21 20:00:35 +0300
@@ -567,10 +567,7 @@
 
 libcherokee_base_la_SOURCES = \
 $(avl_src) \
-$(zlib_src) \
 $(dict_src) \
-$(internal_pcre_src) \
-$(internal_getopt_src) \
 $(poll_poll_src) \
 $(poll_epoll_src) \
 $(poll_kqueue_src) \
--- cherokee-0.4.30/cherokee/Makefile.in.orig	2006-01-18 21:58:09 +0300
+++ cherokee-0.4.30/cherokee/Makefile.in	2006-02-21 20:05:49 +0300
@@ -1115,10 +1115,7 @@
 
 libcherokee_base_la_SOURCES = \
 $(avl_src) \
-$(zlib_src) \
 $(dict_src) \
-$(internal_pcre_src) \
-$(internal_getopt_src) \
 $(poll_poll_src) \
 $(poll_epoll_src) \
 $(poll_kqueue_src) \
--- cherokee-0.4.30/cherokee/Makefile.am.orig	2006-02-21 20:08:03 +0300
+++ cherokee-0.4.30/cherokee/Makefile.am	2006-02-21 20:15:44 +0300
@@ -36,14 +36,6 @@
 #
 # External sources
 #
-zlib_src =     \
-zlib/deflate.c \
-zlib/deftree.c \
-zlib/defutil.h \
-zlib/zconf.h   \
-zlib/zlib.h    \
-zlib/zutil.h
-
 dict_src =          \
 dict/dict_generic.h \
 dict/dict_generic.c \
@@ -55,25 +47,6 @@
 avl/avl.h \
 avl/avl.c
 
-pcre_src = \
-pcre/get.c \
-pcre/pcre.h \
-pcre/pcre.c \
-pcre/internal.h \
-pcre/chartables.c \
-pcre/configuration.h
-
-getopt_src =  \
-getopt/getopt.h  \
-getopt/getopt.c  \
-getopt/getopt1.c \
-getopt/gettext.h
-
-
-if !HAVE_GETOPT_LONG
-internal_getopt_src=$(getopt_src)
-endif
-
 #
 # LDFLAGS for libraries
 #
--- cherokee-0.4.30/cherokee/Makefile.in.orig	2006-02-21 20:08:03 +0300
+++ cherokee-0.4.30/cherokee/Makefile.in	2006-02-21 20:15:54 +0300
@@ -722,14 +722,6 @@
 #
 # External sources
 #
-zlib_src = \
-zlib/deflate.c \
-zlib/deftree.c \
-zlib/defutil.h \
-zlib/zconf.h   \
-zlib/zlib.h    \
-zlib/zutil.h
-
 dict_src = \
 dict/dict_generic.h \
 dict/dict_generic.c \
@@ -741,22 +733,6 @@
 avl/avl.h \
 avl/avl.c
 
-pcre_src = \
-pcre/get.c \
-pcre/pcre.h \
-pcre/pcre.c \
-pcre/internal.h \
-pcre/chartables.c \
-pcre/configuration.h
-
-getopt_src = \
-getopt/getopt.h  \
-getopt/getopt.c  \
-getopt/getopt1.c \
-getopt/gettext.h
-
-@HAVE_GETOPT_LONG_FALSE@internal_getopt_src = $(getopt_src)
-
 #
 # LDFLAGS for libraries
 #
--- cherokee-0.4.30/cherokee/encoder_gzip.h.orig	2006-01-07 13:40:41 +0300
+++ cherokee-0.4.30/cherokee/encoder_gzip.h	2006-02-21 21:19:34 +0300
@@ -27,7 +27,7 @@
 
 #include <common-internal.h>
 
-#include "zlib/zlib.h"
+#include "zlib.h"
 #include "module.h"
 #include "encoder.h"
 
--- cherokee-0.4.30/cherokee/Makefile.in.orig	2006-02-21 20:17:07 +0300
+++ cherokee-0.4.30/cherokee/Makefile.in	2006-02-21 21:14:28 +0300
@@ -80,13 +80,9 @@
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 am__libcherokee_base_la_SOURCES_DIST = avl/avl.h avl/avl.c \
-	zlib/deflate.c zlib/deftree.c zlib/defutil.h zlib/zconf.h \
-	zlib/zlib.h zlib/zutil.h dict/dict_generic.h \
+	dict/dict_generic.h dict/dict_private.h \
 	dict/dict_generic.c dict/sp_tree.h dict/sp_tree.c \
-	dict/dict_private.h pcre/get.c pcre/pcre.h pcre/pcre.c \
-	pcre/internal.h pcre/chartables.c pcre/configuration.h \
-	getopt/getopt.h getopt/getopt.c getopt/getopt1.c \
-	getopt/gettext.h fdpoll-poll.c fdpoll-epoll.c fdpoll-kqueue.c \
+	fdpoll-poll.c fdpoll-epoll.c fdpoll-kqueue.c \
 	fdpoll-port.c fdpoll-select.c unix4win32.h unix4win32.c \
 	win32_misc.h win32_misc.c cherokee.h http.h http.c list.h \
 	list_merge_sort.h list_merge_sort.c list_ext.h list_ext.c \
@@ -102,11 +98,7 @@
 	regex.h regex.c resolv_cache.h resolv_cache.c typed_table.h \
 	typed_table.c
 am__objects_1 = avl.lo
-am__objects_2 = deflate.lo deftree.lo
 am__objects_3 = dict_generic.lo sp_tree.lo
-am__objects_4 = get.lo pcre.lo chartables.lo
-@USE_INTERNAL_PCRE_TRUE@am__objects_5 = $(am__objects_4)
-am__objects_6 = getopt.lo getopt1.lo
 @HAVE_GETOPT_LONG_FALSE@am__objects_7 = $(am__objects_6)
 @COMPILE_POLL_TRUE@am__objects_8 = fdpoll-poll.lo
 @COMPILE_EPOLL_TRUE@am__objects_9 = fdpoll-epoll.lo
@@ -1793,20 +1785,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl.lo `test -f 'avl/avl.c' || echo '$(srcdir)/'`avl/avl.c
 
-deflate.lo: zlib/deflate.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT deflate.lo -MD -MP -MF "$(DEPDIR)/deflate.Tpo" -c -o deflate.lo `test -f 'zlib/deflate.c' || echo '$(srcdir)/'`zlib/deflate.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/deflate.Tpo" "$(DEPDIR)/deflate.Plo"; else rm -f "$(DEPDIR)/deflate.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zlib/deflate.c' object='deflate.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o deflate.lo `test -f 'zlib/deflate.c' || echo '$(srcdir)/'`zlib/deflate.c
-
-deftree.lo: zlib/deftree.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT deftree.lo -MD -MP -MF "$(DEPDIR)/deftree.Tpo" -c -o deftree.lo `test -f 'zlib/deftree.c' || echo '$(srcdir)/'`zlib/deftree.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/deftree.Tpo" "$(DEPDIR)/deftree.Plo"; else rm -f "$(DEPDIR)/deftree.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zlib/deftree.c' object='deftree.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o deftree.lo `test -f 'zlib/deftree.c' || echo '$(srcdir)/'`zlib/deftree.c
-
 dict_generic.lo: dict/dict_generic.c
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dict_generic.lo -MD -MP -MF "$(DEPDIR)/dict_generic.Tpo" -c -o dict_generic.lo `test -f 'dict/dict_generic.c' || echo '$(srcdir)/'`dict/dict_generic.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/dict_generic.Tpo" "$(DEPDIR)/dict_generic.Plo"; else rm -f "$(DEPDIR)/dict_generic.Tpo"; exit 1; fi
@@ -1828,34 +1806,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o get.lo `test -f 'pcre/get.c' || echo '$(srcdir)/'`pcre/get.c
 
-pcre.lo: pcre/pcre.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pcre.lo -MD -MP -MF "$(DEPDIR)/pcre.Tpo" -c -o pcre.lo `test -f 'pcre/pcre.c' || echo '$(srcdir)/'`pcre/pcre.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/pcre.Tpo" "$(DEPDIR)/pcre.Plo"; else rm -f "$(DEPDIR)/pcre.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pcre/pcre.c' object='pcre.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pcre.lo `test -f 'pcre/pcre.c' || echo '$(srcdir)/'`pcre/pcre.c
-
-chartables.lo: pcre/chartables.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT chartables.lo -MD -MP -MF "$(DEPDIR)/chartables.Tpo" -c -o chartables.lo `test -f 'pcre/chartables.c' || echo '$(srcdir)/'`pcre/chartables.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/chartables.Tpo" "$(DEPDIR)/chartables.Plo"; else rm -f "$(DEPDIR)/chartables.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pcre/chartables.c' object='chartables.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o chartables.lo `test -f 'pcre/chartables.c' || echo '$(srcdir)/'`pcre/chartables.c
-
-getopt.lo: getopt/getopt.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getopt.lo -MD -MP -MF "$(DEPDIR)/getopt.Tpo" -c -o getopt.lo `test -f 'getopt/getopt.c' || echo '$(srcdir)/'`getopt/getopt.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/getopt.Tpo" "$(DEPDIR)/getopt.Plo"; else rm -f "$(DEPDIR)/getopt.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='getopt/getopt.c' object='getopt.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.lo `test -f 'getopt/getopt.c' || echo '$(srcdir)/'`getopt/getopt.c
-
-getopt1.lo: getopt/getopt1.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getopt1.lo -MD -MP -MF "$(DEPDIR)/getopt1.Tpo" -c -o getopt1.lo `test -f 'getopt/getopt1.c' || echo '$(srcdir)/'`getopt/getopt1.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/getopt1.Tpo" "$(DEPDIR)/getopt1.Plo"; else rm -f "$(DEPDIR)/getopt1.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='getopt/getopt1.c' object='getopt1.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt1.lo `test -f 'getopt/getopt1.c' || echo '$(srcdir)/'`getopt/getopt1.c
-
 libcherokee_server_la-icons_grammar.lo: icons_grammar.c
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcherokee_server_la_CFLAGS) $(CFLAGS) -MT libcherokee_server_la-icons_grammar.lo -MD -MP -MF "$(DEPDIR)/libcherokee_server_la-icons_grammar.Tpo" -c -o libcherokee_server_la-icons_grammar.lo `test -f 'icons_grammar.c' || echo '$(srcdir)/'`icons_grammar.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcherokee_server_la-icons_grammar.Tpo" "$(DEPDIR)/libcherokee_server_la-icons_grammar.Plo"; else rm -f "$(DEPDIR)/libcherokee_server_la-icons_grammar.Tpo"; exit 1; fi
 
design & coding: Vladimir Lettiev aka crux © 2004-2005