Attachment #215857 for bug #276506




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)

Lines 1-6 Link Here

(-)lsyncd-1.26.orig/Makefile.am (-7 / +2 lines)
1	## Makefile.am -- Process this file with automake to produce Makefile.in	1	## Makefile.am -- Process this file with automake to produce Makefile.in
2	bin_PROGRAMS = lsyncd	2	bin_PROGRAMS = lsyncd
3	lsyncd_SOURCES = lsyncd.c	3	lsyncd_SOURCES = lsyncd.c
		4	lsyncd_CPPFLAGS = $(XML_CPPFLAGS)
		5	lsyncd_LDADD = $(XML_LIBS)
4	TESTS = tests/help.sh \	6	TESTS = tests/help.sh \
5	tests/directorymv.sh \	7	tests/directorymv.sh \
6	tests/directorycpr.sh \	8	tests/directorycpr.sh \
Lines 33-42 Link Here
33	$(XP) -o $@ $(DB2MAN) $<	35	$(XP) -o $@ $(DB2MAN) $<
34		36
35	AM_CFLAGS=-Wall	37	AM_CFLAGS=-Wall
36	AM_LDFLAGS=
37	if XML_CONFIG
38	DEFS+=-DXML_CONFIG
39	AM_CFLAGS += `xml2-config --cflags`
40	AM_LDFLAGS += `xml2-config --libs`
41	endif
42

Return to bug 276506

Lines 3-27 Link Here

(-)lsyncd-1.26.orig/configure.in (-13 / +12 lines)
3	m4_define(LSYNCD_VERSION,1.26)	3	m4_define(LSYNCD_VERSION,1.26)
4	AM_INIT_AUTOMAKE(LSYNCD_PACKAGE,LSYNCD_VERSION)	4	AM_INIT_AUTOMAKE(LSYNCD_PACKAGE,LSYNCD_VERSION)
5		5
6	AC_ARG_ENABLE([xml_config],
7	[ --enable-xml-config Lsyncd is able to parse lsyncd.conf files (default: enabled)],
8	[case "${enableval}" in
9	yes) xml_config=true ;;
10	no) xml_config=false ;;
11	*) AC_MSG_ERROR([bad value ${enableval} for --enable-xml-config]) ;;
12	esac],[xml_config=true])
13	AM_CONDITIONAL(XML_CONFIG,[test x$xml_config = xtrue])
14
15	#if test x$xml_config = xtrue; then
16	#AM_PATH_XML2(2.5.0,,AC_MSG_ERROR([*** Libxml is required if you do not --disable-xml-config]))
17	#fi
18
19	AM_MAINTAINER_MODE	6	AM_MAINTAINER_MODE
20		7
21	AC_PROG_CC	8	AC_PROG_CC
		9	AM_PROG_CC_C_O
22	AC_PROG_INSTALL	10	AC_PROG_INSTALL
23	AC_CHECK_HEADERS([sys/inotify.h])	11	AC_CHECK_HEADERS([sys/inotify.h])
24		12
		13	AC_MSG_CHECKING([checking whether to use libxml2])
		14	AC_ARG_ENABLE([xml],
		15	[ --enable-xml Lsyncd is able to parse lsyncd.conf files],
		16	[enable_xml=$enableval],
		17	[enable_xml="no"])
		18	AC_MSG_RESULT($enable_xml)
		19	if test "$enable_xml" = "yes"; then
		20	AC_DEFINE(XML_CONFIG)
		21	AM_PATH_XML2(2.4.0)
		22	fi
		23
25	AC_CONFIG_HEADERS([config.h])	24	AC_CONFIG_HEADERS([config.h])
26		25
27	AC_OUTPUT(Makefile)	26	AC_OUTPUT(Makefile)