[package] update lighttpd to 1.4.25 (#6240)
[openwrt/svn-archive/archive.git] / libs / avahi / patches / 010-fix-pkgconfig-file.patch
1 --- a/Makefile.in
2 +++ b/Makefile.in
3 @@ -1,8 +1,8 @@
4 -# Makefile.in generated by automake 1.10.2 from Makefile.am.
5 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
6 # @configure_input@
7
8 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
9 -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
10 +# 2003, 2004, 2005 Free Software Foundation, Inc.
11 # This Makefile.in is free software; the Free Software Foundation
12 # gives unlimited permission to copy and/or distribute it,
13 # with or without modifications, as long as this notice is preserved.
14 @@ -63,11 +63,15 @@
15 #
16 # This is usually added to MOSTLYCLEANFILES.
17
18 +srcdir = @srcdir@
19 +top_srcdir = @top_srcdir@
20 VPATH = @srcdir@
21 pkgdatadir = $(datadir)/@PACKAGE@
22 pkglibdir = $(libdir)/@PACKAGE@
23 pkgincludedir = $(includedir)/@PACKAGE@
24 +top_builddir = .
25 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
26 +INSTALL = @INSTALL@
27 install_sh_DATA = $(install_sh) -c -m 644
28 install_sh_PROGRAM = $(install_sh) -c
29 install_sh_SCRIPT = $(install_sh) -c
30 @@ -82,10 +86,16 @@
31 build_triplet = @build@
32 host_triplet = @host@
33 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
34 - $(srcdir)/Makefile.in $(srcdir)/common/doxygen.mk \
35 - $(srcdir)/config.h.in $(top_srcdir)/configure ABOUT-NLS \
36 - ChangeLog compile config.guess config.rpath config.sub depcomp \
37 - install-sh ltmain.sh missing py-compile
38 + $(srcdir)/Makefile.in $(srcdir)/avahi-client.pc.in \
39 + $(srcdir)/avahi-compat-howl.pc.in \
40 + $(srcdir)/avahi-compat-libdns_sd.pc.in \
41 + $(srcdir)/avahi-core.pc.in $(srcdir)/avahi-glib.pc.in \
42 + $(srcdir)/avahi-gobject.pc.in $(srcdir)/avahi-qt3.pc.in \
43 + $(srcdir)/avahi-qt4.pc.in $(srcdir)/avahi-ui.pc.in \
44 + $(srcdir)/common/doxygen.mk $(srcdir)/config.h.in \
45 + $(top_srcdir)/configure ABOUT-NLS ChangeLog compile \
46 + config.guess config.rpath config.sub depcomp install-sh \
47 + ltmain.sh missing py-compile
48 @HAVE_QT3_TRUE@am__append_1 = \
49 @HAVE_QT3_TRUE@ $(srcdir)/avahi-qt/qt-watch.h
50
51 @@ -146,30 +156,25 @@
52 am__aclocal_m4_deps = $(top_srcdir)/common/acx_pthread.m4 \
53 $(top_srcdir)/common/gcc_stack_protect.m4 \
54 $(top_srcdir)/common/gcc_visibility.m4 \
55 - $(top_srcdir)/common/libtool.m4 \
56 - $(top_srcdir)/common/ltoptions.m4 \
57 - $(top_srcdir)/common/ltsugar.m4 \
58 - $(top_srcdir)/common/ltversion.m4 \
59 - $(top_srcdir)/common/lt~obsolete.m4 \
60 - $(top_srcdir)/common/nls.m4 $(top_srcdir)/common/python.m4 \
61 - $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \
62 - $(top_srcdir)/configure.ac
63 + $(top_srcdir)/common/python.m4 $(top_srcdir)/acinclude.m4 \
64 + $(top_srcdir)/common/doxygen.m4 $(top_srcdir)/configure.ac
65 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
66 $(ACLOCAL_M4)
67 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
68 - configure.lineno config.status.lineno
69 + configure.lineno configure.status.lineno
70 mkinstalldirs = $(install_sh) -d
71 CONFIG_HEADER = config.h
72 -CONFIG_CLEAN_FILES =
73 +CONFIG_CLEAN_FILES = avahi-client.pc avahi-compat-howl.pc \
74 + avahi-compat-libdns_sd.pc avahi-core.pc avahi-glib.pc \
75 + avahi-gobject.pc avahi-qt3.pc avahi-qt4.pc avahi-ui.pc
76 SOURCES =
77 DIST_SOURCES =
78 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
79 html-recursive info-recursive install-data-recursive \
80 - install-dvi-recursive install-exec-recursive \
81 - install-html-recursive install-info-recursive \
82 - install-pdf-recursive install-ps-recursive install-recursive \
83 - installcheck-recursive installdirs-recursive pdf-recursive \
84 - ps-recursive uninstall-recursive
85 + install-exec-recursive install-info-recursive \
86 + install-recursive installcheck-recursive installdirs-recursive \
87 + pdf-recursive ps-recursive uninstall-info-recursive \
88 + uninstall-recursive
89 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
90 am__vpath_adj = case $$p in \
91 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
92 @@ -179,8 +184,6 @@
93 am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
94 pkgconfigDATA_INSTALL = $(INSTALL_DATA)
95 DATA = $(pkgconfig_DATA)
96 -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
97 - distclean-recursive maintainer-clean-recursive
98 ETAGS = etags
99 CTAGS = ctags
100 DIST_SUBDIRS = $(SUBDIRS)
101 @@ -196,7 +199,8 @@
102 distuninstallcheck_listfiles = find . -type f -print
103 distcleancheck_listfiles = find . -type f -print
104 ACLOCAL = @ACLOCAL@
105 -ALL_LINGUAS = @ALL_LINGUAS@
106 +AMDEP_FALSE = @AMDEP_FALSE@
107 +AMDEP_TRUE = @AMDEP_TRUE@
108 AMTAR = @AMTAR@
109 AR = @AR@
110 AUTOCONF = @AUTOCONF@
111 @@ -208,8 +212,8 @@
112 AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@
113 AVAHI_USER = @AVAHI_USER@
114 AWK = @AWK@
115 -CATALOGS = @CATALOGS@
116 -CATOBJEXT = @CATOBJEXT@
117 +BUILD_MANPAGES_FALSE = @BUILD_MANPAGES_FALSE@
118 +BUILD_MANPAGES_TRUE = @BUILD_MANPAGES_TRUE@
119 CC = @CC@
120 CCDEPMODE = @CCDEPMODE@
121 CFLAGS = @CFLAGS@
122 @@ -220,7 +224,6 @@
123 CXXDEPMODE = @CXXDEPMODE@
124 CXXFLAGS = @CXXFLAGS@
125 CYGPATH_W = @CYGPATH_W@
126 -DATADIRNAME = @DATADIRNAME@
127 DBUS_CFLAGS = @DBUS_CFLAGS@
128 DBUS_LIBS = @DBUS_LIBS@
129 DBUS_SYSTEM_BUS_DEFAULT_ADDRESS = @DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@
130 @@ -228,8 +231,28 @@
131 DEFS = @DEFS@
132 DEPDIR = @DEPDIR@
133 DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@
134 -DSYMUTIL = @DSYMUTIL@
135 -DUMPBIN = @DUMPBIN@
136 +DX_COND_chi_FALSE = @DX_COND_chi_FALSE@
137 +DX_COND_chi_TRUE = @DX_COND_chi_TRUE@
138 +DX_COND_chm_FALSE = @DX_COND_chm_FALSE@
139 +DX_COND_chm_TRUE = @DX_COND_chm_TRUE@
140 +DX_COND_doc_FALSE = @DX_COND_doc_FALSE@
141 +DX_COND_doc_TRUE = @DX_COND_doc_TRUE@
142 +DX_COND_dot_FALSE = @DX_COND_dot_FALSE@
143 +DX_COND_dot_TRUE = @DX_COND_dot_TRUE@
144 +DX_COND_html_FALSE = @DX_COND_html_FALSE@
145 +DX_COND_html_TRUE = @DX_COND_html_TRUE@
146 +DX_COND_latex_FALSE = @DX_COND_latex_FALSE@
147 +DX_COND_latex_TRUE = @DX_COND_latex_TRUE@
148 +DX_COND_man_FALSE = @DX_COND_man_FALSE@
149 +DX_COND_man_TRUE = @DX_COND_man_TRUE@
150 +DX_COND_pdf_FALSE = @DX_COND_pdf_FALSE@
151 +DX_COND_pdf_TRUE = @DX_COND_pdf_TRUE@
152 +DX_COND_ps_FALSE = @DX_COND_ps_FALSE@
153 +DX_COND_ps_TRUE = @DX_COND_ps_TRUE@
154 +DX_COND_rtf_FALSE = @DX_COND_rtf_FALSE@
155 +DX_COND_rtf_TRUE = @DX_COND_rtf_TRUE@
156 +DX_COND_xml_FALSE = @DX_COND_xml_FALSE@
157 +DX_COND_xml_TRUE = @DX_COND_xml_TRUE@
158 DX_CONFIG = @DX_CONFIG@
159 DX_DOCDIR = @DX_DOCDIR@
160 DX_DOT = @DX_DOT@
161 @@ -253,38 +276,85 @@
162 DX_PDFLATEX = @DX_PDFLATEX@
163 DX_PERL = @DX_PERL@
164 DX_PROJECT = @DX_PROJECT@
165 +ECHO = @ECHO@
166 ECHO_C = @ECHO_C@
167 ECHO_N = @ECHO_N@
168 ECHO_T = @ECHO_T@
169 EGREP = @EGREP@
170 +ENABLE_AUTOIPD_FALSE = @ENABLE_AUTOIPD_FALSE@
171 +ENABLE_AUTOIPD_TRUE = @ENABLE_AUTOIPD_TRUE@
172 +ENABLE_CHROOT_FALSE = @ENABLE_CHROOT_FALSE@
173 +ENABLE_CHROOT_TRUE = @ENABLE_CHROOT_TRUE@
174 +ENABLE_COMPAT_HOWL_FALSE = @ENABLE_COMPAT_HOWL_FALSE@
175 +ENABLE_COMPAT_HOWL_TRUE = @ENABLE_COMPAT_HOWL_TRUE@
176 +ENABLE_COMPAT_LIBDNS_SD_FALSE = @ENABLE_COMPAT_LIBDNS_SD_FALSE@
177 +ENABLE_COMPAT_LIBDNS_SD_TRUE = @ENABLE_COMPAT_LIBDNS_SD_TRUE@
178 +ENABLE_CORE_DOCS_FALSE = @ENABLE_CORE_DOCS_FALSE@
179 +ENABLE_CORE_DOCS_TRUE = @ENABLE_CORE_DOCS_TRUE@
180 +ENABLE_TESTS_FALSE = @ENABLE_TESTS_FALSE@
181 +ENABLE_TESTS_TRUE = @ENABLE_TESTS_TRUE@
182 EXEEXT = @EXEEXT@
183 -FGREP = @FGREP@
184 +F77 = @F77@
185 +FFLAGS = @FFLAGS@
186 GACUTIL = @GACUTIL@
187 -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
188 GLADE20_CFLAGS = @GLADE20_CFLAGS@
189 GLADE20_LIBS = @GLADE20_LIBS@
190 GLIB20_CFLAGS = @GLIB20_CFLAGS@
191 GLIB20_LIBS = @GLIB20_LIBS@
192 -GMOFILES = @GMOFILES@
193 -GMSGFMT = @GMSGFMT@
194 GOBJECT_CFLAGS = @GOBJECT_CFLAGS@
195 GOBJECT_LIBS = @GOBJECT_LIBS@
196 GREP = @GREP@
197 GTK20_CFLAGS = @GTK20_CFLAGS@
198 GTK20_LIBS = @GTK20_LIBS@
199 +HAVE_DBM_FALSE = @HAVE_DBM_FALSE@
200 +HAVE_DBM_TRUE = @HAVE_DBM_TRUE@
201 +HAVE_DBUS_FALSE = @HAVE_DBUS_FALSE@
202 +HAVE_DBUS_TRUE = @HAVE_DBUS_TRUE@
203 +HAVE_DLOPEN_FALSE = @HAVE_DLOPEN_FALSE@
204 +HAVE_DLOPEN_TRUE = @HAVE_DLOPEN_TRUE@
205 +HAVE_GDBM_FALSE = @HAVE_GDBM_FALSE@
206 +HAVE_GDBM_TRUE = @HAVE_GDBM_TRUE@
207 +HAVE_GLIB_FALSE = @HAVE_GLIB_FALSE@
208 +HAVE_GLIB_TRUE = @HAVE_GLIB_TRUE@
209 +HAVE_GOBJECT_FALSE = @HAVE_GOBJECT_FALSE@
210 +HAVE_GOBJECT_TRUE = @HAVE_GOBJECT_TRUE@
211 +HAVE_GTK_FALSE = @HAVE_GTK_FALSE@
212 +HAVE_GTK_TRUE = @HAVE_GTK_TRUE@
213 +HAVE_INOTIFY_FALSE = @HAVE_INOTIFY_FALSE@
214 +HAVE_INOTIFY_TRUE = @HAVE_INOTIFY_TRUE@
215 +HAVE_KQUEUE_FALSE = @HAVE_KQUEUE_FALSE@
216 +HAVE_KQUEUE_TRUE = @HAVE_KQUEUE_TRUE@
217 +HAVE_LIBDAEMON_FALSE = @HAVE_LIBDAEMON_FALSE@
218 +HAVE_LIBDAEMON_TRUE = @HAVE_LIBDAEMON_TRUE@
219 +HAVE_MONODOC_FALSE = @HAVE_MONODOC_FALSE@
220 +HAVE_MONODOC_TRUE = @HAVE_MONODOC_TRUE@
221 +HAVE_MONO_FALSE = @HAVE_MONO_FALSE@
222 +HAVE_MONO_TRUE = @HAVE_MONO_TRUE@
223 +HAVE_NETLINK_FALSE = @HAVE_NETLINK_FALSE@
224 +HAVE_NETLINK_TRUE = @HAVE_NETLINK_TRUE@
225 +HAVE_PF_ROUTE_FALSE = @HAVE_PF_ROUTE_FALSE@
226 +HAVE_PF_ROUTE_TRUE = @HAVE_PF_ROUTE_TRUE@
227 +HAVE_PYGTK_FALSE = @HAVE_PYGTK_FALSE@
228 +HAVE_PYGTK_TRUE = @HAVE_PYGTK_TRUE@
229 +HAVE_PYTHON_DBUS_FALSE = @HAVE_PYTHON_DBUS_FALSE@
230 +HAVE_PYTHON_DBUS_TRUE = @HAVE_PYTHON_DBUS_TRUE@
231 +HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
232 +HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
233 +HAVE_QT3_FALSE = @HAVE_QT3_FALSE@
234 +HAVE_QT3_TRUE = @HAVE_QT3_TRUE@
235 +HAVE_QT4_FALSE = @HAVE_QT4_FALSE@
236 +HAVE_QT4_TRUE = @HAVE_QT4_TRUE@
237 +HAVE_SYS_FILIO_H_FALSE = @HAVE_SYS_FILIO_H_FALSE@
238 +HAVE_SYS_FILIO_H_TRUE = @HAVE_SYS_FILIO_H_TRUE@
239 +HAVE_SYS_SYSCTL_H_FALSE = @HAVE_SYS_SYSCTL_H_FALSE@
240 +HAVE_SYS_SYSCTL_H_TRUE = @HAVE_SYS_SYSCTL_H_TRUE@
241 +HAVE_XML_FALSE = @HAVE_XML_FALSE@
242 +HAVE_XML_TRUE = @HAVE_XML_TRUE@
243 HOWL_COMPAT_VERSION = @HOWL_COMPAT_VERSION@
244 -INSTALL = @INSTALL@
245 INSTALL_DATA = @INSTALL_DATA@
246 INSTALL_PROGRAM = @INSTALL_PROGRAM@
247 INSTALL_SCRIPT = @INSTALL_SCRIPT@
248 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
249 -INSTOBJEXT = @INSTOBJEXT@
250 -INTLLIBS = @INTLLIBS@
251 -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
252 -INTLTOOL_MERGE = @INTLTOOL_MERGE@
253 -INTLTOOL_PERL = @INTLTOOL_PERL@
254 -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
255 -LD = @LD@
256 LDFLAGS = @LDFLAGS@
257 LIBAVAHI_CLIENT_VERSION_INFO = @LIBAVAHI_CLIENT_VERSION_INFO@
258 LIBAVAHI_COMMON_VERSION_INFO = @LIBAVAHI_COMMON_VERSION_INFO@
259 @@ -301,29 +371,18 @@
260 LIBOBJS = @LIBOBJS@
261 LIBS = @LIBS@
262 LIBTOOL = @LIBTOOL@
263 -LIPO = @LIPO@
264 LN_S = @LN_S@
265 LTLIBOBJS = @LTLIBOBJS@
266 MAKEINFO = @MAKEINFO@
267 MCS = @MCS@
268 MDASSEMBLER = @MDASSEMBLER@
269 -MKDIR_P = @MKDIR_P@
270 -MKINSTALLDIRS = @MKINSTALLDIRS@
271 MOC_QT3 = @MOC_QT3@
272 MOC_QT4 = @MOC_QT4@
273 MONODOCER = @MONODOCER@
274 MONODOC_CFLAGS = @MONODOC_CFLAGS@
275 MONODOC_DIR = @MONODOC_DIR@
276 MONODOC_LIBS = @MONODOC_LIBS@
277 -MSGFMT = @MSGFMT@
278 -MSGFMT_OPTS = @MSGFMT_OPTS@
279 -MSGMERGE = @MSGMERGE@
280 -NM = @NM@
281 -NMEDIT = @NMEDIT@
282 -OBJDUMP = @OBJDUMP@
283 OBJEXT = @OBJEXT@
284 -OTOOL = @OTOOL@
285 -OTOOL64 = @OTOOL64@
286 PACKAGE = @PACKAGE@
287 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
288 PACKAGE_NAME = @PACKAGE_NAME@
289 @@ -333,10 +392,6 @@
290 PACKAGE_VERSION = @PACKAGE_VERSION@
291 PATH_SEPARATOR = @PATH_SEPARATOR@
292 PKG_CONFIG = @PKG_CONFIG@
293 -POFILES = @POFILES@
294 -POSUB = @POSUB@
295 -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
296 -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
297 PTHREAD_CC = @PTHREAD_CC@
298 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
299 PTHREAD_LIBS = @PTHREAD_LIBS@
300 @@ -354,20 +409,42 @@
301 SET_MAKE = @SET_MAKE@
302 SHELL = @SHELL@
303 STRIP = @STRIP@
304 -USE_NLS = @USE_NLS@
305 +TARGET_ARCHLINUX_FALSE = @TARGET_ARCHLINUX_FALSE@
306 +TARGET_ARCHLINUX_TRUE = @TARGET_ARCHLINUX_TRUE@
307 +TARGET_DARWIN_FALSE = @TARGET_DARWIN_FALSE@
308 +TARGET_DARWIN_TRUE = @TARGET_DARWIN_TRUE@
309 +TARGET_DEBIAN_FALSE = @TARGET_DEBIAN_FALSE@
310 +TARGET_DEBIAN_TRUE = @TARGET_DEBIAN_TRUE@
311 +TARGET_FEDORA_FALSE = @TARGET_FEDORA_FALSE@
312 +TARGET_FEDORA_TRUE = @TARGET_FEDORA_TRUE@
313 +TARGET_FREEBSD_FALSE = @TARGET_FREEBSD_FALSE@
314 +TARGET_FREEBSD_TRUE = @TARGET_FREEBSD_TRUE@
315 +TARGET_GENTOO_FALSE = @TARGET_GENTOO_FALSE@
316 +TARGET_GENTOO_TRUE = @TARGET_GENTOO_TRUE@
317 +TARGET_LFS_FALSE = @TARGET_LFS_FALSE@
318 +TARGET_LFS_TRUE = @TARGET_LFS_TRUE@
319 +TARGET_MANDRIVA_FALSE = @TARGET_MANDRIVA_FALSE@
320 +TARGET_MANDRIVA_TRUE = @TARGET_MANDRIVA_TRUE@
321 +TARGET_NETBSD_FALSE = @TARGET_NETBSD_FALSE@
322 +TARGET_NETBSD_TRUE = @TARGET_NETBSD_TRUE@
323 +TARGET_SLACKWARE_FALSE = @TARGET_SLACKWARE_FALSE@
324 +TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@
325 +TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@
326 +TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@
327 +USE_XMLTOMAN_FALSE = @USE_XMLTOMAN_FALSE@
328 +USE_XMLTOMAN_TRUE = @USE_XMLTOMAN_TRUE@
329 VERSION = @VERSION@
330 VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@
331 -XGETTEXT = @XGETTEXT@
332 XML_CFLAGS = @XML_CFLAGS@
333 XML_LIBS = @XML_LIBS@
334 -abs_builddir = @abs_builddir@
335 -abs_srcdir = @abs_srcdir@
336 -abs_top_builddir = @abs_top_builddir@
337 -abs_top_srcdir = @abs_top_srcdir@
338 ac_ct_CC = @ac_ct_CC@
339 ac_ct_CXX = @ac_ct_CXX@
340 -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
341 +ac_ct_F77 = @ac_ct_F77@
342 acx_pthread_config = @acx_pthread_config@
343 +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
344 +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
345 +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
346 +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
347 am__include = @am__include@
348 am__leading_dot = @am__leading_dot@
349 am__quote = @am__quote@
350 @@ -382,7 +459,6 @@
351 build_cpu = @build_cpu@
352 build_os = @build_os@
353 build_vendor = @build_vendor@
354 -builddir = @builddir@
355 datadir = @datadir@
356 datarootdir = @datarootdir@
357 docdir = @docdir@
358 @@ -404,7 +480,6 @@
359 libexecdir = @libexecdir@
360 localedir = @localedir@
361 localstatedir = @localstatedir@
362 -lt_ECHO = @lt_ECHO@
363 mandir = @mandir@
364 mkdir_p = @mkdir_p@
365 oldincludedir = @oldincludedir@
366 @@ -418,12 +493,8 @@
367 pythondir = @pythondir@
368 sbindir = @sbindir@
369 sharedstatedir = @sharedstatedir@
370 -srcdir = @srcdir@
371 sysconfdir = @sysconfdir@
372 target_alias = @target_alias@
373 -top_build_prefix = @top_build_prefix@
374 -top_builddir = @top_builddir@
375 -top_srcdir = @top_srcdir@
376 ACLOCAL_AMFLAGS = -I common
377 @DX_COND_doc_TRUE@@DX_COND_html_TRUE@DX_CLEAN_HTML = @DX_DOCDIR@/html
378 @DX_COND_chm_TRUE@@DX_COND_doc_TRUE@DX_CLEAN_CHM = @DX_DOCDIR@/chm
379 @@ -576,7 +647,7 @@
380 config.h: stamp-h1
381 @if test ! -f $@; then \
382 rm -f stamp-h1; \
383 - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
384 + $(MAKE) stamp-h1; \
385 else :; fi
386
387 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
388 @@ -589,6 +660,24 @@
389
390 distclean-hdr:
391 -rm -f config.h stamp-h1
392 +avahi-client.pc: $(top_builddir)/config.status $(srcdir)/avahi-client.pc.in
393 + cd $(top_builddir) && $(SHELL) ./config.status $@
394 +avahi-compat-howl.pc: $(top_builddir)/config.status $(srcdir)/avahi-compat-howl.pc.in
395 + cd $(top_builddir) && $(SHELL) ./config.status $@
396 +avahi-compat-libdns_sd.pc: $(top_builddir)/config.status $(srcdir)/avahi-compat-libdns_sd.pc.in
397 + cd $(top_builddir) && $(SHELL) ./config.status $@
398 +avahi-core.pc: $(top_builddir)/config.status $(srcdir)/avahi-core.pc.in
399 + cd $(top_builddir) && $(SHELL) ./config.status $@
400 +avahi-glib.pc: $(top_builddir)/config.status $(srcdir)/avahi-glib.pc.in
401 + cd $(top_builddir) && $(SHELL) ./config.status $@
402 +avahi-gobject.pc: $(top_builddir)/config.status $(srcdir)/avahi-gobject.pc.in
403 + cd $(top_builddir) && $(SHELL) ./config.status $@
404 +avahi-qt3.pc: $(top_builddir)/config.status $(srcdir)/avahi-qt3.pc.in
405 + cd $(top_builddir) && $(SHELL) ./config.status $@
406 +avahi-qt4.pc: $(top_builddir)/config.status $(srcdir)/avahi-qt4.pc.in
407 + cd $(top_builddir) && $(SHELL) ./config.status $@
408 +avahi-ui.pc: $(top_builddir)/config.status $(srcdir)/avahi-ui.pc.in
409 + cd $(top_builddir) && $(SHELL) ./config.status $@
410
411 mostlyclean-libtool:
412 -rm -f *.lo
413 @@ -597,10 +686,11 @@
414 -rm -rf .libs _libs
415
416 distclean-libtool:
417 - -rm -f libtool config.lt
418 + -rm -f libtool
419 +uninstall-info-am:
420 install-pkgconfigDATA: $(pkgconfig_DATA)
421 @$(NORMAL_INSTALL)
422 - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
423 + test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
424 @list='$(pkgconfig_DATA)'; for p in $$list; do \
425 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
426 f=$(am__strip_dir) \
427 @@ -647,7 +737,8 @@
428 $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
429 fi; test -z "$$fail"
430
431 -$(RECURSIVE_CLEAN_TARGETS):
432 +mostlyclean-recursive clean-recursive distclean-recursive \
433 +maintainer-clean-recursive:
434 @failcom='exit 1'; \
435 for f in x $$MAKEFLAGS; do \
436 case $$f in \
437 @@ -691,8 +782,8 @@
438 unique=`for i in $$list; do \
439 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
440 done | \
441 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
442 - END { if (nonempty) { for (i in files) print i; }; }'`; \
443 + $(AWK) ' { files[$$0] = 1; } \
444 + END { for (i in files) print i; }'`; \
445 mkid -fID $$unique
446 tags: TAGS
447
448 @@ -717,8 +808,8 @@
449 unique=`for i in $$list; do \
450 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
451 done | \
452 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
453 - END { if (nonempty) { for (i in files) print i; }; }'`; \
454 + $(AWK) ' { files[$$0] = 1; } \
455 + END { for (i in files) print i; }'`; \
456 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
457 test -n "$$unique" || unique=$$empty_fix; \
458 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
459 @@ -728,12 +819,13 @@
460 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
461 $(TAGS_FILES) $(LISP)
462 tags=; \
463 + here=`pwd`; \
464 list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
465 unique=`for i in $$list; do \
466 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
467 done | \
468 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
469 - END { if (nonempty) { for (i in files) print i; }; }'`; \
470 + $(AWK) ' { files[$$0] = 1; } \
471 + END { for (i in files) print i; }'`; \
472 test -z "$(CTAGS_ARGS)$$tags$$unique" \
473 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
474 $$tags $$unique
475 @@ -748,22 +840,24 @@
476
477 distdir: $(DISTFILES)
478 $(am__remove_distdir)
479 - test -d $(distdir) || mkdir $(distdir)
480 - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
481 - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
482 - list='$(DISTFILES)'; \
483 - dist_files=`for file in $$list; do echo $$file; done | \
484 - sed -e "s|^$$srcdirstrip/||;t" \
485 - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
486 - case $$dist_files in \
487 - */*) $(MKDIR_P) `echo "$$dist_files" | \
488 - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
489 - sort -u` ;; \
490 - esac; \
491 - for file in $$dist_files; do \
492 + mkdir $(distdir)
493 + $(mkdir_p) $(distdir)/. $(distdir)/avahi-daemon $(distdir)/common $(distdir)/docs $(distdir)/po
494 + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
495 + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
496 + list='$(DISTFILES)'; for file in $$list; do \
497 + case $$file in \
498 + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
499 + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
500 + esac; \
501 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
502 + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
503 + if test "$$dir" != "$$file" && test "$$dir" != "."; then \
504 + dir="/$$dir"; \
505 + $(mkdir_p) "$(distdir)$$dir"; \
506 + else \
507 + dir=''; \
508 + fi; \
509 if test -d $$d/$$file; then \
510 - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
511 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
512 cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
513 fi; \
514 @@ -777,7 +871,7 @@
515 list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
516 if test "$$subdir" = .; then :; else \
517 test -d "$(distdir)/$$subdir" \
518 - || $(MKDIR_P) "$(distdir)/$$subdir" \
519 + || $(mkdir_p) "$(distdir)/$$subdir" \
520 || exit 1; \
521 distdir=`$(am__cd) $(distdir) && pwd`; \
522 top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
523 @@ -785,8 +879,6 @@
524 $(MAKE) $(AM_MAKEFLAGS) \
525 top_distdir="$$top_distdir" \
526 distdir="$$distdir/$$subdir" \
527 - am__remove_distdir=: \
528 - am__skip_length_check=: \
529 distdir) \
530 || exit 1; \
531 fi; \
532 @@ -797,7 +889,7 @@
533 -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
534 ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
535 ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
536 - ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
537 + ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
538 || chmod -R a+r $(distdir)
539 dist-gzip: distdir
540 tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
541 @@ -807,10 +899,6 @@
542 tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
543 $(am__remove_distdir)
544
545 -dist-lzma: distdir
546 - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
547 - $(am__remove_distdir)
548 -
549 dist-tarZ: distdir
550 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
551 $(am__remove_distdir)
552 @@ -837,8 +925,6 @@
553 GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
554 *.tar.bz2*) \
555 bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
556 - *.tar.lzma*) \
557 - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
558 *.tar.Z*) \
559 uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
560 *.shar.gz*) \
561 @@ -878,7 +964,7 @@
562 $(am__remove_distdir)
563 @(echo "$(distdir) archives ready for distribution: "; \
564 list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
565 - sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
566 + sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
567 distuninstallcheck:
568 @cd $(distuninstallcheck_dir) \
569 && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
570 @@ -903,7 +989,7 @@
571 installdirs: installdirs-recursive
572 installdirs-am:
573 for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
574 - test -z "$$dir" || $(MKDIR_P) "$$dir"; \
575 + test -z "$$dir" || $(mkdir_p) "$$dir"; \
576 done
577 install: install-recursive
578 install-exec: install-exec-recursive
579 @@ -954,20 +1040,12 @@
580
581 install-data-am: install-pkgconfigDATA
582
583 -install-dvi: install-dvi-recursive
584 -
585 install-exec-am:
586
587 -install-html: install-html-recursive
588 -
589 install-info: install-info-recursive
590
591 install-man:
592
593 -install-pdf: install-pdf-recursive
594 -
595 -install-ps: install-ps-recursive
596 -
597 installcheck-am:
598
599 maintainer-clean: maintainer-clean-recursive
600 @@ -988,27 +1066,26 @@
601
602 ps-am:
603
604 -uninstall-am: uninstall-pkgconfigDATA
605 +uninstall-am: uninstall-info-am uninstall-pkgconfigDATA
606
607 -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
608 - install-strip
609 +uninstall-info: uninstall-info-recursive
610
611 -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
612 - all all-am am--refresh check check-am clean clean-generic \
613 - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
614 - dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \
615 - distcheck distclean distclean-generic distclean-hdr \
616 - distclean-libtool distclean-tags distcleancheck distdir \
617 +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
618 + check-am clean clean-generic clean-libtool clean-recursive \
619 + ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
620 + dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
621 + distclean-generic distclean-hdr distclean-libtool \
622 + distclean-recursive distclean-tags distcleancheck distdir \
623 distuninstallcheck dvi dvi-am html html-am info info-am \
624 - install install-am install-data install-data-am install-dvi \
625 - install-dvi-am install-exec install-exec-am install-html \
626 - install-html-am install-info install-info-am install-man \
627 - install-pdf install-pdf-am install-pkgconfigDATA install-ps \
628 - install-ps-am install-strip installcheck installcheck-am \
629 - installdirs installdirs-am maintainer-clean \
630 - maintainer-clean-generic mostlyclean mostlyclean-generic \
631 - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
632 - uninstall uninstall-am uninstall-pkgconfigDATA
633 + install install-am install-data install-data-am install-exec \
634 + install-exec-am install-info install-info-am install-man \
635 + install-pkgconfigDATA install-strip installcheck \
636 + installcheck-am installdirs installdirs-am maintainer-clean \
637 + maintainer-clean-generic maintainer-clean-recursive \
638 + mostlyclean mostlyclean-generic mostlyclean-libtool \
639 + mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
640 + uninstall uninstall-am uninstall-info-am \
641 + uninstall-pkgconfigDATA
642
643
644 @DX_COND_doc_TRUE@@DX_COND_ps_TRUE@doxygen-ps: @DX_DOCDIR@/@PACKAGE@.ps
645 --- a/configure.ac
646 +++ b/configure.ac
647 @@ -1088,6 +1088,15 @@
648 avahi-autoipd/Makefile
649 avahi-ui/Makefile
650 po/Makefile.in
651 +avahi-client.pc
652 +avahi-compat-howl.pc
653 +avahi-compat-libdns_sd.pc
654 +avahi-core.pc
655 +avahi-glib.pc
656 +avahi-gobject.pc
657 +avahi-qt3.pc
658 +avahi-qt4.pc
659 +avahi-ui.pc
660 ])
661 AC_OUTPUT
662