| 1 |
ssuominen 10/06/29 15:49:10 |
| 2 |
|
| 3 |
Added: lsyncd-1.33-libxml2.patch |
| 4 |
Log: |
| 5 |
Fix building with -Wl,--as-needed wrt #276506 by Kacper Kowalik. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-admin/lsyncd/files/lsyncd-1.33-libxml2.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/lsyncd/files/lsyncd-1.33-libxml2.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/lsyncd/files/lsyncd-1.33-libxml2.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: lsyncd-1.33-libxml2.patch |
| 15 |
=================================================================== |
| 16 |
--- configure.in |
| 17 |
+++ configure.in |
| 18 |
@@ -3,25 +3,24 @@ |
| 19 |
m4_define(LSYNCD_VERSION,1.26) |
| 20 |
AM_INIT_AUTOMAKE(LSYNCD_PACKAGE,LSYNCD_VERSION) |
| 21 |
|
| 22 |
-AC_ARG_ENABLE([xml_config], |
| 23 |
-[ --enable-xml-config Lsyncd is able to parse lsyncd.conf files (default: enabled)], |
| 24 |
-[case "${enableval}" in |
| 25 |
- yes) xml_config=true ;; |
| 26 |
- no) xml_config=false ;; |
| 27 |
- *) AC_MSG_ERROR([bad value ${enableval} for --enable-xml-config]) ;; |
| 28 |
-esac],[xml_config=true]) |
| 29 |
-AM_CONDITIONAL(XML_CONFIG,[test x$xml_config = xtrue]) |
| 30 |
- |
| 31 |
-#if test x$xml_config = xtrue; then |
| 32 |
-#AM_PATH_XML2(2.5.0,,AC_MSG_ERROR([*** Libxml is required if you do not --disable-xml-config])) |
| 33 |
-#fi |
| 34 |
- |
| 35 |
AM_MAINTAINER_MODE |
| 36 |
|
| 37 |
AC_PROG_CC |
| 38 |
+AM_PROG_CC_C_O |
| 39 |
AC_PROG_INSTALL |
| 40 |
AC_CHECK_HEADERS([sys/inotify.h]) |
| 41 |
|
| 42 |
+AC_MSG_CHECKING([checking whether to use libxml2]) |
| 43 |
+AC_ARG_ENABLE([xml], |
| 44 |
+ [ --enable-xml Lsyncd is able to parse lsyncd.conf files], |
| 45 |
+ [enable_xml=$enableval], |
| 46 |
+ [enable_xml="no"]) |
| 47 |
+AC_MSG_RESULT($enable_xml) |
| 48 |
+if test "$enable_xml" = "yes"; then |
| 49 |
+ AC_DEFINE(XML_CONFIG) |
| 50 |
+ AM_PATH_XML2(2.4.0) |
| 51 |
+fi |
| 52 |
+ |
| 53 |
AC_CONFIG_HEADERS([config.h]) |
| 54 |
|
| 55 |
AC_OUTPUT(Makefile) |
| 56 |
--- Makefile.am |
| 57 |
+++ Makefile.am |
| 58 |
@@ -1,6 +1,8 @@ |
| 59 |
## Makefile.am -- Process this file with automake to produce Makefile.in |
| 60 |
bin_PROGRAMS = lsyncd |
| 61 |
lsyncd_SOURCES = lsyncd.c |
| 62 |
+lsyncd_CPPFLAGS = $(XML_CPPFLAGS) |
| 63 |
+lsyncd_LDADD = $(XML_LIBS) |
| 64 |
TESTS = tests/help.sh \ |
| 65 |
tests/directorymv.sh \ |
| 66 |
tests/directorycpr.sh \ |
| 67 |
@@ -33,10 +35,3 @@ |
| 68 |
$(XP) -o $@ $(DB2MAN) $< |
| 69 |
|
| 70 |
AM_CFLAGS=-Wall |
| 71 |
-AM_LDFLAGS= |
| 72 |
-if XML_CONFIG |
| 73 |
-DEFS+=-DXML_CONFIG |
| 74 |
-AM_CFLAGS += `xml2-config --cflags` |
| 75 |
-AM_LDFLAGS += `xml2-config --libs` |
| 76 |
-endif |
| 77 |
- |
Archives