[Pkg-utopia-commits] r810 - in packages/unstable/avahi/debian: .
patches
Sjoerd Simons
sjoerd at costa.debian.org
Fri May 5 08:48:54 UTC 2006
Author: sjoerd
Date: 2006-05-05 08:48:16 +0000 (Fri, 05 May 2006)
New Revision: 810
Removed:
packages/unstable/avahi/debian/patches/02_pthread_flags.patch
packages/unstable/avahi/debian/patches/03_cmsg_too_large.patch
packages/unstable/avahi/debian/patches/04_initscript_log_end_msg.patch
packages/unstable/avahi/debian/patches/05_empty_service_directory.patch
packages/unstable/avahi/debian/patches/07_avahi-sharp_missing_lock.patch
packages/unstable/avahi/debian/patches/99_autotools.patch
Modified:
packages/unstable/avahi/debian/changelog
Log:
Prepare new upstream release
Modified: packages/unstable/avahi/debian/changelog
===================================================================
--- packages/unstable/avahi/debian/changelog 2006-05-01 22:24:55 UTC (rev 809)
+++ packages/unstable/avahi/debian/changelog 2006-05-05 08:48:16 UTC (rev 810)
@@ -1,8 +1,17 @@
-avahi (0.6.9-9) UNRELEASED; urgency=low
+avahi (0.6.10-0.1) UNRELEASED; urgency=low
[ Sjoerd Simons ]
+ * New upstream release
* Don't build-depend on libcap-dev on hurd, kfreebsd-* and netbsd-i386 archs
(Closes: #360596)
+ * Dropped patches that have been applied upstream:
+ + debian/patches/02_pthread_flags.patch
+ + debian/patches/03_cmsg_too_large.patch
+ + debian/patches/04_initscript_log_end_msg.patch
+ + debian/patches/05_empty_service_directory.patch
+ + debian/patches/07_avahi-sharp_missing_lock.patch
+ * debian/patches/99_autotools.patch
+ + Not needed anymore
[ Sebastian Dröge ]
* debian/patches/07_avahi-sharp_missing_lock.patch (SVN rev 1188):
@@ -14,7 +23,7 @@
+ Adjust the location of the .dll in the pkg-config file for the new CLI
policy.
- -- Sebastian Dröge <slomo at ubuntu.com> Tue, 18 Apr 2006 16:12:29 +0200
+ -- Sjoerd Simons <sjoerd at debian.org> Fri, 5 May 2006 10:32:00 +0200
avahi (0.6.9-8) unstable; urgency=medium
Deleted: packages/unstable/avahi/debian/patches/02_pthread_flags.patch
===================================================================
--- packages/unstable/avahi/debian/patches/02_pthread_flags.patch 2006-05-01 22:24:55 UTC (rev 809)
+++ packages/unstable/avahi/debian/patches/02_pthread_flags.patch 2006-05-05 08:48:16 UTC (rev 810)
@@ -1,124 +0,0 @@
-Index: common/acx_pthread.m4
-===================================================================
---- common/acx_pthread.m4 (revision 1175)
-+++ common/acx_pthread.m4 (working copy)
-@@ -45,7 +45,11 @@
- dnl @author Steven G. Johnson <stevenj at alum.mit.edu>
- dnl @version 2005-06-15
- dnl @license GPLWithACException
-+dnl
-+dnl Checks for GCC shared/pthread inconsistency based on work by
-+dnl Marcin Owsiany <marcin at owsiany.pl>
-
-+
- AC_DEFUN([ACX_PTHREAD], [
- AC_REQUIRE([AC_CANONICAL_HOST])
- AC_LANG_SAVE
-@@ -218,6 +222,107 @@
-
- # More AIX lossage: must compile with cc_r
- AC_CHECK_PROG(PTHREAD_CC, cc_r, cc_r, ${CC})
-+
-+ # The next part tries to detect GCC inconsistency with -shared on some
-+ # architectures and systems. The problem is that in certain
-+ # configurations, when -shared is specified, GCC "forgets" to
-+ # internally use various flags which are still necessary.
-+
-+ # First, check whether caller wants us to skip -shared checks
-+ # this is useful
-+ AC_MSG_CHECKING([whether to check for GCC pthread/shared inconsistencies])
-+ if test x"$3" = x1; then
-+ AC_MSG_RESULT([no])
-+ else
-+ AC_MSG_RESULT([yes])
-+
-+ # In order not to create several levels of indentation, we test
-+ # the value of "$ok" until we find out the cure or run out of
-+ # ideas.
-+ ok="no"
-+
-+ #
-+ # Prepare the flags
-+ #
-+ save_CFLAGS="$CFLAGS"
-+ save_LIBS="$LIBS"
-+ save_CC="$CC"
-+ # Try with the flags determined by the earlier checks.
-+ #
-+ # -Wl,-z,defs forces link-time symbol resolution, so that the
-+ # linking checks with -shared actually have any value
-+ #
-+ # FIXME: -fPIC is required for -shared on many architectures,
-+ # so we specify it here, but the right way would probably be to
-+ # properly detect whether it is actually required.
-+ CFLAGS="-shared -fPIC -Wl,-z,defs $CFLAGS $PTHREAD_CFLAGS"
-+ LIBS="$PTHREAD_LIBS $LIBS"
-+ CC="$PTHREAD_CC"
-+
-+ AC_MSG_CHECKING([whether -pthread is sufficient with -shared])
-+ AC_TRY_LINK([#include <pthread.h>],
-+ [pthread_t th; pthread_join(th, 0);
-+ pthread_attr_init(0); pthread_cleanup_push(0, 0);
-+ pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
-+ [ok=yes])
-+
-+ if test "x$ok" = xyes; then
-+ AC_MSG_RESULT([yes])
-+ else
-+ AC_MSG_RESULT([no])
-+ fi
-+
-+ #
-+ # Linux gcc on some architectures such as mips/mipsel forgets
-+ # about -lpthread
-+ #
-+ if test x"$ok" = xno; then
-+ AC_MSG_CHECKING([whether -lpthread fixes that])
-+ LIBS="-lpthread $PTHREAD_LIBS $save_LIBS"
-+ AC_TRY_LINK([#include <pthread.h>],
-+ [pthread_t th; pthread_join(th, 0);
-+ pthread_attr_init(0); pthread_cleanup_push(0, 0);
-+ pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
-+ [ok=yes])
-+
-+ if test "x$ok" = xyes; then
-+ AC_MSG_RESULT([yes])
-+ PTHREAD_LIBS="-lpthread $PTHREAD_LIBS"
-+ else
-+ AC_MSG_RESULT([no])
-+ fi
-+ fi
-+ #
-+ # FreeBSD 4.10 gcc forgets to use -lc_r instead of -lc
-+ #
-+ if test x"$ok" = xno; then
-+ AC_MSG_CHECKING([whether -lc_r fixes that])
-+ LIBS="-lc_r $PTHREAD_LIBS $save_LIBS"
-+ AC_TRY_LINK([#include <pthread.h>],
-+ [pthread_t th; pthread_join(th, 0);
-+ pthread_attr_init(0); pthread_cleanup_push(0, 0);
-+ pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
-+ [ok=yes])
-+
-+ if test "x$ok" = xyes; then
-+ AC_MSG_RESULT([yes])
-+ PTHREAD_LIBS="-lc_r $PTHREAD_LIBS"
-+ else
-+ AC_MSG_RESULT([no])
-+ fi
-+ fi
-+ if test x"$ok" = xno; then
-+ # OK, we have run out of ideas
-+ AC_MSG_WARN([Impossible to determine how to use pthreads with shared libraries])
-+
-+ # so it's not safe to assume that we may use pthreads
-+ acx_pthread_ok=no
-+ fi
-+
-+ CFLAGS="$save_CFLAGS"
-+ LIBS="$save_LIBS"
-+ CC="$save_CC"
-+ fi
- else
- PTHREAD_CC="$CC"
- fi
Deleted: packages/unstable/avahi/debian/patches/03_cmsg_too_large.patch
===================================================================
--- packages/unstable/avahi/debian/patches/03_cmsg_too_large.patch 2006-05-01 22:24:55 UTC (rev 809)
+++ packages/unstable/avahi/debian/patches/03_cmsg_too_large.patch 2006-05-05 08:48:16 UTC (rev 810)
@@ -1,31 +0,0 @@
-Index: avahi-core/socket.c
-===================================================================
---- avahi-core/socket.c (revision 1177)
-+++ avahi-core/socket.c (working copy)
-@@ -513,7 +513,7 @@
- pkti->ipi_spec_dst.s_addr = src_address->address;
-
- msg.msg_control = cmsg_data;
-- msg.msg_controllen = sizeof(cmsg_data);
-+ msg.msg_controllen = CMSG_SPACE(sizeof(struct in_pktinfo));
- }
- #elif defined(IP_SENDSRCADDR)
- if (src_address) {
-@@ -529,7 +529,7 @@
- addr->s_addr = src_address->address;
-
- msg.msg_control = cmsg_data;
-- msg.msg_controllen = sizeof(cmsg_data);
-+ msg.msg_controllen = CMSG_SPACE(sizeof(struct in_addr));
- }
- #elif defined(IP_MULTICAST_IF)
- {
-@@ -592,7 +592,7 @@
- memcpy(&pkti->ipi6_addr, src_address->address, sizeof(src_address->address));
-
- msg.msg_control = cmsg_data;
-- msg.msg_controllen = sizeof(cmsg_data);
-+ msg.msg_controllen = CMSG_SPACE(sizeof(struct in6_pktinfo));
- } else {
- msg.msg_control = NULL;
- msg.msg_controllen = 0;
Deleted: packages/unstable/avahi/debian/patches/04_initscript_log_end_msg.patch
===================================================================
--- packages/unstable/avahi/debian/patches/04_initscript_log_end_msg.patch 2006-05-01 22:24:55 UTC (rev 809)
+++ packages/unstable/avahi/debian/patches/04_initscript_log_end_msg.patch 2006-05-05 08:48:16 UTC (rev 810)
@@ -1,44 +0,0 @@
---- initscript/debian/avahi-daemon.in.old 2006-03-22 00:57:22.145098912 +0100
-+++ initscript/debian/avahi-daemon.in 2006-03-22 00:57:35.576057096 +0100
-@@ -93,8 +93,7 @@
- d_start() {
- modprobe capability >/dev/null 2>&1 || true
-
-- $DAEMON -c
-- [ $? = 0 ] && exit 0
-+ $DAEMON -c && return 0
-
- if [ -s /etc/localtime ]; then
- if [ ! -d /etc/avahi/etc ]; then
-@@ -110,28 +109,21 @@
- # Function that stops the daemon/service.
- #
- d_stop() {
-- $DAEMON -c
-- [ $? != 0 ] && exit 0
--
-- $DAEMON -k
-+ $DAEMON -c && $DAEMON -k
- }
-
- #
- # Function that reload the config file for the daemon/service.
- #
- d_reload() {
-- $DAEMON -c
-- [ $? != 0 ] && exit 0
--
-- $DAEMON -r
-+ $DAEMON -c && $DAEMON -r
- }
-
- #
- # Function that check the status of the daemon/service.
- #
- d_status() {
-- $DAEMON -c
-- [ $? = 0 ] && echo "$DESC is running" || echo "$DESC is not running"
-+ $DAEMON -c && echo "$DESC is running" || echo "$DESC is not running"
- }
-
- case "$1" in
Deleted: packages/unstable/avahi/debian/patches/05_empty_service_directory.patch
===================================================================
--- packages/unstable/avahi/debian/patches/05_empty_service_directory.patch 2006-05-01 22:24:55 UTC (rev 809)
+++ packages/unstable/avahi/debian/patches/05_empty_service_directory.patch 2006-05-05 08:48:16 UTC (rev 810)
@@ -1,32 +0,0 @@
-Index: trunk/avahi-daemon/static-services.c
-===================================================================
---- trunk/avahi-daemon/static-services.c (revision 1162)
-+++ trunk/avahi-daemon/static-services.c (revision 1179)
-@@ -656,4 +656,5 @@
- StaticServiceGroup *g, *n;
- glob_t globbuf;
-+ int globret;
- char **p;
-
-@@ -682,6 +683,18 @@
-
- memset(&globbuf, 0, sizeof(globbuf));
-- if (glob(in_chroot ? "/services/*.service" : AVAHI_SERVICE_DIR "/*.service", GLOB_ERR, NULL, &globbuf) != 0)
-- avahi_log_error("Failed to read service directory.");
-+ if ((globret = glob(in_chroot ? "/services/*.service" : AVAHI_SERVICE_DIR "/*.service", GLOB_ERR, NULL, &globbuf)) != 0)
-+ switch (globret) {
-+ case GLOB_NOSPACE:
-+ avahi_log_error("Not enough memory to read service directory.");
-+ break;
-+
-+ case GLOB_ABORTED:
-+ avahi_log_error("Failed to read %s.", AVAHI_SERVICE_DIR);
-+ break;
-+
-+ case GLOB_NOMATCH:
-+ avahi_log_info("No service found in %s.", AVAHI_SERVICE_DIR);
-+ break;
-+ }
- else {
- for (p = globbuf.gl_pathv; *p; p++)
-
Deleted: packages/unstable/avahi/debian/patches/07_avahi-sharp_missing_lock.patch
===================================================================
--- packages/unstable/avahi/debian/patches/07_avahi-sharp_missing_lock.patch 2006-05-01 22:24:55 UTC (rev 809)
+++ packages/unstable/avahi/debian/patches/07_avahi-sharp_missing_lock.patch 2006-05-05 08:48:16 UTC (rev 810)
@@ -1,18 +0,0 @@
---- trunk/avahi-sharp/EntryGroup.cs (revision 1021)
-+++ trunk/avahi-sharp/EntryGroup.cs (revision 1188)
-@@ -237,9 +237,13 @@
- string domain, string host, UInt16 port, IntPtr list)
- {
-- int ret = avahi_entry_group_add_service_strlst (handle, iface, proto, flags,
-+ int ret;
-+
-+ lock (client) {
-+ ret = avahi_entry_group_add_service_strlst (handle, iface, proto, flags,
- Utility.StringToBytes (name),
- Utility.StringToBytes (type),
- Utility.StringToBytes (domain),
- Utility.StringToBytes (host), port, list);
-+ }
-
- avahi_string_list_free (list);
-
Deleted: packages/unstable/avahi/debian/patches/99_autotools.patch
===================================================================
--- packages/unstable/avahi/debian/patches/99_autotools.patch 2006-05-01 22:24:55 UTC (rev 809)
+++ packages/unstable/avahi/debian/patches/99_autotools.patch 2006-05-05 08:48:16 UTC (rev 810)
@@ -1,1026 +0,0 @@
-diff -Naur avahi-0.6.9.old/aclocal.m4 avahi-0.6.9/aclocal.m4
---- avahi-0.6.9.old/aclocal.m4 2006-03-22 19:53:24.000000000 +0100
-+++ avahi-0.6.9/aclocal.m4 2006-03-22 19:53:48.000000000 +0100
-@@ -13,7 +13,7 @@
-
- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-
--# serial 48 Debian 1.5.22-2 AC_PROG_LIBTOOL
-+# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
-
-
- # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -1397,18 +1397,6 @@
- dynamic_linker=no
- ;;
-
--kfreebsd*-gnu)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=no
-- hardcode_into_libs=yes
-- dynamic_linker='GNU ld.so'
-- ;;
--
- freebsd* | dragonfly*)
- # DragonFly does not have aout. When/if they implement a new
- # versioning mechanism, adjust this.
-@@ -1564,7 +1552,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux* | k*bsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -1605,18 +1593,6 @@
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
--knetbsd*-gnu)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=no
-- hardcode_into_libs=yes
-- dynamic_linker='GNU ld.so'
-- ;;
--
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -2322,7 +2298,7 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
--freebsd* | kfreebsd*-gnu | dragonfly*)
-+freebsd* | dragonfly*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- case $host_cpu in
- i*86 )
-@@ -2376,11 +2352,11 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux* | k*bsd*-gnu)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
--netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-+netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
- else
-@@ -3128,7 +3104,7 @@
- freebsd-elf*)
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- ;;
-- freebsd* | kfreebsd*-gnu | dragonfly*)
-+ freebsd* | dragonfly*)
- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
- # conventions
- _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -3287,7 +3263,7 @@
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
-- linux*)
-+ linux* | k*bsd*-gnu)
- case $cc_basename in
- KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -3389,7 +3365,7 @@
- ;;
- esac
- ;;
-- netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
- wlarc=
-@@ -4654,7 +4630,7 @@
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
- ;;
--linux*)
-+linux* | k*bsd*-gnu)
- if test "$host_cpu" = ia64; then
- symcode='[[ABCDGIRSTW]]'
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-@@ -4927,7 +4903,7 @@
- ;;
- esac
- ;;
-- freebsd* | kfreebsd*-gnu | dragonfly*)
-+ freebsd* | dragonfly*)
- # FreeBSD uses GNU C++
- ;;
- hpux9* | hpux10* | hpux11*)
-@@ -4970,7 +4946,7 @@
- ;;
- esac
- ;;
-- linux*)
-+ linux* | k*bsd*-gnu)
- case $cc_basename in
- KCC*)
- # KAI C++ Compiler
-@@ -5013,7 +4989,7 @@
- ;;
- esac
- ;;
-- netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-+ netbsd* | netbsdelf*-gnu)
- ;;
- osf3* | osf4* | osf5*)
- case $cc_basename in
-@@ -5224,7 +5200,7 @@
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
-- linux*)
-+ linux* | k*bsd*-gnu)
- case $cc_basename in
- icc* | ecc*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-@@ -5365,10 +5341,7 @@
- cygwin* | mingw*)
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
-- kfreebsd*-gnu)
-- _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-- ;;
-- linux*)
-+ linux* | k*bsd*-gnu)
- _LT_AC_TAGVAR(link_all_deplibs, $1)=no
- ;;
- *)
-@@ -5541,7 +5514,7 @@
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
-- linux*)
-+ linux* | k*bsd*-gnu)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_addflag=
- case $cc_basename,$host_cpu in
-@@ -5573,7 +5546,7 @@
- fi
- ;;
-
-- netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
-@@ -5909,15 +5882,6 @@
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
--
-- # GNU/kFreeBSD uses gcc -shared to do shared libraries.
-- kfreebsd*-gnu)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-- ;;
-
- hpux9*)
- if test "$GCC" = yes; then
-@@ -6014,7 +5978,7 @@
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
-- netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-diff -Naur avahi-0.6.9.old/configure avahi-0.6.9/configure
---- avahi-0.6.9.old/configure 2006-03-22 19:53:24.000000000 +0100
-+++ avahi-0.6.9/configure 2006-03-22 19:53:59.000000000 +0100
-@@ -4524,7 +4524,7 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
--freebsd* | kfreebsd*-gnu | dragonfly*)
-+freebsd* | dragonfly*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- case $host_cpu in
- i*86 )
-@@ -4578,11 +4578,11 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux* | k*bsd*-gnu)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
--netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-+netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
- else
-@@ -5897,7 +5897,7 @@
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
- ;;
--linux*)
-+linux* | k*bsd*-gnu)
- if test "$host_cpu" = ia64; then
- symcode='[ABCDGIRSTW]'
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-@@ -6817,7 +6817,7 @@
- lt_prog_compiler_static='-Bstatic'
- ;;
-
-- linux*)
-+ linux* | k*bsd*-gnu)
- case $cc_basename in
- icc* | ecc*)
- lt_prog_compiler_wl='-Wl,'
-@@ -7256,7 +7256,7 @@
- archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
-- linux*)
-+ linux* | k*bsd*-gnu)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_addflag=
- case $cc_basename,$host_cpu in
-@@ -7288,7 +7288,7 @@
- fi
- ;;
-
-- netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
-@@ -7725,15 +7725,6 @@
- hardcode_shlibpath_var=no
- ;;
-
-- # GNU/kFreeBSD uses gcc -shared to do shared libraries.
-- kfreebsd*-gnu)
-- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-- hardcode_libdir_flag_spec='-R$libdir'
-- hardcode_direct=yes
-- hardcode_shlibpath_var=no
-- link_all_deplibs=no
-- ;;
--
- hpux9*)
- if test "$GCC" = yes; then
- archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-@@ -7829,7 +7820,7 @@
- link_all_deplibs=yes
- ;;
-
-- netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-@@ -8319,18 +8310,6 @@
- dynamic_linker=no
- ;;
-
--kfreebsd*-gnu)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=no
-- hardcode_into_libs=yes
-- dynamic_linker='GNU ld.so'
-- ;;
--
- freebsd* | dragonfly*)
- # DragonFly does not have aout. When/if they implement a new
- # versioning mechanism, adjust this.
-@@ -8486,7 +8465,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux* | k*bsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -8527,18 +8506,6 @@
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
--knetbsd*-gnu)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=no
-- hardcode_into_libs=yes
-- dynamic_linker='GNU ld.so'
-- ;;
--
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -9385,7 +9352,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 9388 "configure"
-+#line 9355 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -9485,7 +9452,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 9488 "configure"
-+#line 9455 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -10800,7 +10767,7 @@
- freebsd-elf*)
- archive_cmds_need_lc_CXX=no
- ;;
-- freebsd* | kfreebsd*-gnu | dragonfly*)
-+ freebsd* | dragonfly*)
- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
- # conventions
- ld_shlibs_CXX=yes
-@@ -10959,7 +10926,7 @@
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator_CXX=:
- ;;
-- linux*)
-+ linux* | k*bsd*-gnu)
- case $cc_basename in
- KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -11061,7 +11028,7 @@
- ;;
- esac
- ;;
-- netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
- wlarc=
-@@ -11628,7 +11595,7 @@
- ;;
- esac
- ;;
-- freebsd* | kfreebsd*-gnu | dragonfly*)
-+ freebsd* | dragonfly*)
- # FreeBSD uses GNU C++
- ;;
- hpux9* | hpux10* | hpux11*)
-@@ -11671,7 +11638,7 @@
- ;;
- esac
- ;;
-- linux*)
-+ linux* | k*bsd*-gnu)
- case $cc_basename in
- KCC*)
- # KAI C++ Compiler
-@@ -11714,7 +11681,7 @@
- ;;
- esac
- ;;
-- netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-+ netbsd* | netbsdelf*-gnu)
- ;;
- osf3* | osf4* | osf5*)
- case $cc_basename in
-@@ -11823,11 +11790,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:11826: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11793: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:11830: \$? = $ac_status" >&5
-+ echo "$as_me:11797: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -11927,11 +11894,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:11930: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11897: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:11934: \$? = $ac_status" >&5
-+ echo "$as_me:11901: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -11999,10 +11966,7 @@
- cygwin* | mingw*)
- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
-- kfreebsd*-gnu)
-- link_all_deplibs_CXX=no
-- ;;
-- linux*)
-+ linux* | k*bsd*-gnu)
- link_all_deplibs_CXX=no
- ;;
- *)
-@@ -12284,18 +12248,6 @@
- dynamic_linker=no
- ;;
-
--kfreebsd*-gnu)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=no
-- hardcode_into_libs=yes
-- dynamic_linker='GNU ld.so'
-- ;;
--
- freebsd* | dragonfly*)
- # DragonFly does not have aout. When/if they implement a new
- # versioning mechanism, adjust this.
-@@ -12451,7 +12403,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux* | k*bsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -12492,18 +12444,6 @@
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
--knetbsd*-gnu)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=no
-- hardcode_into_libs=yes
-- dynamic_linker='GNU ld.so'
-- ;;
--
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -13409,7 +13349,7 @@
- lt_prog_compiler_static_F77='-Bstatic'
- ;;
-
-- linux*)
-+ linux* | k*bsd*-gnu)
- case $cc_basename in
- icc* | ecc*)
- lt_prog_compiler_wl_F77='-Wl,'
-@@ -13515,11 +13455,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13518: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13458: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:13522: \$? = $ac_status" >&5
-+ echo "$as_me:13462: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -13619,11 +13559,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13622: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13562: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:13626: \$? = $ac_status" >&5
-+ echo "$as_me:13566: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -13848,7 +13788,7 @@
- archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
-- linux*)
-+ linux* | k*bsd*-gnu)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_addflag=
- case $cc_basename,$host_cpu in
-@@ -13880,7 +13820,7 @@
- fi
- ;;
-
-- netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
-@@ -14297,15 +14237,6 @@
- hardcode_shlibpath_var_F77=no
- ;;
-
-- # GNU/kFreeBSD uses gcc -shared to do shared libraries.
-- kfreebsd*-gnu)
-- archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-- hardcode_libdir_flag_spec_F77='-R$libdir'
-- hardcode_direct_F77=yes
-- hardcode_shlibpath_var_F77=no
-- link_all_deplibs_F77=no
-- ;;
--
- hpux9*)
- if test "$GCC" = yes; then
- archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-@@ -14401,7 +14332,7 @@
- link_all_deplibs_F77=yes
- ;;
-
-- netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-@@ -14891,18 +14822,6 @@
- dynamic_linker=no
- ;;
-
--kfreebsd*-gnu)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=no
-- hardcode_into_libs=yes
-- dynamic_linker='GNU ld.so'
-- ;;
--
- freebsd* | dragonfly*)
- # DragonFly does not have aout. When/if they implement a new
- # versioning mechanism, adjust this.
-@@ -15058,7 +14977,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux* | k*bsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -15099,18 +15018,6 @@
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
--knetbsd*-gnu)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=no
-- hardcode_into_libs=yes
-- dynamic_linker='GNU ld.so'
-- ;;
--
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -15842,11 +15749,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:15845: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15752: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:15849: \$? = $ac_status" >&5
-+ echo "$as_me:15756: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -16004,7 +15911,7 @@
- lt_prog_compiler_static_GCJ='-Bstatic'
- ;;
-
-- linux*)
-+ linux* | k*bsd*-gnu)
- case $cc_basename in
- icc* | ecc*)
- lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -16110,11 +16017,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16113: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16020: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:16117: \$? = $ac_status" >&5
-+ echo "$as_me:16024: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -16214,11 +16121,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16217: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16124: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:16221: \$? = $ac_status" >&5
-+ echo "$as_me:16128: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -16443,7 +16350,7 @@
- archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
-- linux*)
-+ linux* | k*bsd*-gnu)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_addflag=
- case $cc_basename,$host_cpu in
-@@ -16475,7 +16382,7 @@
- fi
- ;;
-
-- netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
-@@ -16912,15 +16819,6 @@
- hardcode_shlibpath_var_GCJ=no
- ;;
-
-- # GNU/kFreeBSD uses gcc -shared to do shared libraries.
-- kfreebsd*-gnu)
-- archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-- hardcode_libdir_flag_spec_GCJ='-R$libdir'
-- hardcode_direct_GCJ=yes
-- hardcode_shlibpath_var_GCJ=no
-- link_all_deplibs_GCJ=no
-- ;;
--
- hpux9*)
- if test "$GCC" = yes; then
- archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-@@ -17016,7 +16914,7 @@
- link_all_deplibs_GCJ=yes
- ;;
-
-- netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-@@ -17506,18 +17404,6 @@
- dynamic_linker=no
- ;;
-
--kfreebsd*-gnu)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=no
-- hardcode_into_libs=yes
-- dynamic_linker='GNU ld.so'
-- ;;
--
- freebsd* | dragonfly*)
- # DragonFly does not have aout. When/if they implement a new
- # versioning mechanism, adjust this.
-@@ -17673,7 +17559,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux* | k*bsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -17714,18 +17600,6 @@
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
--knetbsd*-gnu)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=no
-- hardcode_into_libs=yes
-- dynamic_linker='GNU ld.so'
-- ;;
--
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -19295,6 +19169,243 @@
- echo "${ECHO_T}no" >&6
- fi
-
-+
-+ # The next part tries to detect GCC inconsistency with -shared on some
-+ # architectures and systems. The problem is that in certain
-+ # configurations, when -shared is specified, GCC "forgets" to
-+ # internally use various flags which are still necessary.
-+
-+ # First, check whether caller wants us to skip -shared checks
-+ # this is useful
-+ echo "$as_me:$LINENO: checking whether to check for GCC pthread/shared inconsistencies" >&5
-+echo $ECHO_N "checking whether to check for GCC pthread/shared inconsistencies... $ECHO_C" >&6
-+ if test x"" = x1; then
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ else
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+
-+ # In order not to create several levels of indentation, we test
-+ # the value of "$ok" until we find out the cure or run out of
-+ # ideas.
-+ ok="no"
-+
-+ #
-+ # Prepare the flags
-+ #
-+ save_CFLAGS="$CFLAGS"
-+ save_LIBS="$LIBS"
-+ save_CC="$CC"
-+ # Try with the flags determined by the earlier checks.
-+ #
-+ # -Wl,-z,defs forces link-time symbol resolution, so that the
-+ # linking checks with -shared actually have any value
-+ #
-+ # FIXME: -fPIC is required for -shared on many architectures,
-+ # so we specify it here, but the right way would probably be to
-+ # properly detect whether it is actually required.
-+ CFLAGS="-shared -fPIC -Wl,-z,defs $CFLAGS $PTHREAD_CFLAGS"
-+ LIBS="$PTHREAD_LIBS $LIBS"
-+ CC="$PTHREAD_CC"
-+
-+ echo "$as_me:$LINENO: checking whether -pthread is sufficient with -shared" >&5
-+echo $ECHO_N "checking whether -pthread is sufficient with -shared... $ECHO_C" >&6
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <pthread.h>
-+int
-+main ()
-+{
-+pthread_t th; pthread_join(th, 0);
-+ pthread_attr_init(0); pthread_cleanup_push(0, 0);
-+ pthread_create(0,0,0,0); pthread_cleanup_pop(0);
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ok=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+
-+ if test "x$ok" = xyes; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ fi
-+
-+ #
-+ # Linux gcc on some architectures such as mips/mipsel forgets
-+ # about -lpthread
-+ #
-+ if test x"$ok" = xno; then
-+ echo "$as_me:$LINENO: checking whether -lpthread fixes that" >&5
-+echo $ECHO_N "checking whether -lpthread fixes that... $ECHO_C" >&6
-+ LIBS="-lpthread $PTHREAD_LIBS $save_LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <pthread.h>
-+int
-+main ()
-+{
-+pthread_t th; pthread_join(th, 0);
-+ pthread_attr_init(0); pthread_cleanup_push(0, 0);
-+ pthread_create(0,0,0,0); pthread_cleanup_pop(0);
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ok=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+
-+ if test "x$ok" = xyes; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ PTHREAD_LIBS="-lpthread $PTHREAD_LIBS"
-+ else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ fi
-+ fi
-+ #
-+ # FreeBSD 4.10 gcc forgets to use -lc_r instead of -lc
-+ #
-+ if test x"$ok" = xno; then
-+ echo "$as_me:$LINENO: checking whether -lc_r fixes that" >&5
-+echo $ECHO_N "checking whether -lc_r fixes that... $ECHO_C" >&6
-+ LIBS="-lc_r $PTHREAD_LIBS $save_LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <pthread.h>
-+int
-+main ()
-+{
-+pthread_t th; pthread_join(th, 0);
-+ pthread_attr_init(0); pthread_cleanup_push(0, 0);
-+ pthread_create(0,0,0,0); pthread_cleanup_pop(0);
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ok=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+
-+ if test "x$ok" = xyes; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ PTHREAD_LIBS="-lc_r $PTHREAD_LIBS"
-+ else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ fi
-+ fi
-+ if test x"$ok" = xno; then
-+ # OK, we have run out of ideas
-+ { echo "$as_me:$LINENO: WARNING: Impossible to determine how to use pthreads with shared libraries" >&5
-+echo "$as_me: WARNING: Impossible to determine how to use pthreads with shared libraries" >&2;}
-+
-+ # so it's not safe to assume that we may use pthreads
-+ acx_pthread_ok=no
-+ fi
-+
-+ CFLAGS="$save_CFLAGS"
-+ LIBS="$save_LIBS"
-+ CC="$save_CC"
-+ fi
- else
- PTHREAD_CC="$CC"
- fi
-diff -Naur avahi-0.6.9.old/ltmain.sh avahi-0.6.9/ltmain.sh
---- avahi-0.6.9.old/ltmain.sh 2006-03-22 19:53:23.000000000 +0100
-+++ avahi-0.6.9/ltmain.sh 2006-03-11 19:49:04.000000000 +0100
-@@ -43,7 +43,7 @@
-
- PROGRAM=ltmain.sh
- PACKAGE=libtool
--VERSION="1.5.22 Debian 1.5.22-2"
-+VERSION="1.5.22 Debian 1.5.22-4"
- TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-
- # See if we are running on zsh, and set the options which allow our
More information about the Pkg-utopia-commits
mailing list