diff options
Diffstat (limited to 'app-admin/lsyncd')
-rw-r--r-- | app-admin/lsyncd/ChangeLog | 8 | ||||
-rw-r--r-- | app-admin/lsyncd/files/lsyncd-1.33-libxml2.patch | 62 |
2 files changed, 6 insertions, 64 deletions
diff --git a/app-admin/lsyncd/ChangeLog b/app-admin/lsyncd/ChangeLog index 76846abdb054..2f1310138498 100644 --- a/app-admin/lsyncd/ChangeLog +++ b/app-admin/lsyncd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/lsyncd -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/lsyncd/ChangeLog,v 1.9 2010/12/19 08:14:04 jlec Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/lsyncd/ChangeLog,v 1.10 2011/03/01 19:43:55 idl0r Exp $ + + 01 Mar 2011; Christian Ruppert <idl0r@gentoo.org> + -files/lsyncd-1.33-libxml2.patch: + Remove unused patch *lsyncd-2.0.0 (19 Dec 2010) diff --git a/app-admin/lsyncd/files/lsyncd-1.33-libxml2.patch b/app-admin/lsyncd/files/lsyncd-1.33-libxml2.patch deleted file mode 100644 index b233cbfa2869..000000000000 --- a/app-admin/lsyncd/files/lsyncd-1.33-libxml2.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- configure.in -+++ configure.in -@@ -3,25 +3,24 @@ - m4_define(LSYNCD_VERSION,1.26) - AM_INIT_AUTOMAKE(LSYNCD_PACKAGE,LSYNCD_VERSION) - --AC_ARG_ENABLE([xml_config], --[ --enable-xml-config Lsyncd is able to parse lsyncd.conf files (default: enabled)], --[case "${enableval}" in -- yes) xml_config=true ;; -- no) xml_config=false ;; -- *) AC_MSG_ERROR([bad value ${enableval} for --enable-xml-config]) ;; --esac],[xml_config=true]) --AM_CONDITIONAL(XML_CONFIG,[test x$xml_config = xtrue]) -- --#if test x$xml_config = xtrue; then --#AM_PATH_XML2(2.5.0,,AC_MSG_ERROR([*** Libxml is required if you do not --disable-xml-config])) --#fi -- - AM_MAINTAINER_MODE - - AC_PROG_CC -+AM_PROG_CC_C_O - AC_PROG_INSTALL - AC_CHECK_HEADERS([sys/inotify.h]) - -+AC_MSG_CHECKING([checking whether to use libxml2]) -+AC_ARG_ENABLE([xml], -+ [ --enable-xml Lsyncd is able to parse lsyncd.conf files], -+ [enable_xml=$enableval], -+ [enable_xml="no"]) -+AC_MSG_RESULT($enable_xml) -+if test "$enable_xml" = "yes"; then -+ AC_DEFINE(XML_CONFIG) -+ AM_PATH_XML2(2.4.0) -+fi -+ - AC_CONFIG_HEADERS([config.h]) - - AC_OUTPUT(Makefile) ---- Makefile.am -+++ Makefile.am -@@ -1,6 +1,8 @@ - ## Makefile.am -- Process this file with automake to produce Makefile.in - bin_PROGRAMS = lsyncd - lsyncd_SOURCES = lsyncd.c -+lsyncd_CPPFLAGS = $(XML_CPPFLAGS) -+lsyncd_LDADD = $(XML_LIBS) - TESTS = tests/help.sh \ - tests/directorymv.sh \ - tests/directorycpr.sh \ -@@ -33,10 +35,3 @@ - $(XP) -o $@ $(DB2MAN) $< - - AM_CFLAGS=-Wall --AM_LDFLAGS= --if XML_CONFIG --DEFS+=-DXML_CONFIG --AM_CFLAGS += `xml2-config --cflags` --AM_LDFLAGS += `xml2-config --libs` --endif -- |