← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/kdelibs/oneiric

« back to all changes in this revision

Viewing changes to .pc/27_kdnssd_avahi.diff/dnssd/configure.in.in

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-10-15 19:20:42 UTC
  • mfrom: (1.1.19 sid)
  • Revision ID: james.westby@ubuntu.com-20101015192042-jv1fhj33n4f5b398
Tags: 4:3.5.10.dfsg.1-5ubuntu1
* Merge from Debian unstable. Remaining Ubuntu changes:
  - make sure control and control.in are in sync
  - --with-distribution="Kubuntu (`lsb_release --codename --short`)
    $(DEB_VERSION)"
  - binary-install/kdelibs-data installs aboutkde-kubuntu.png.uu and
    cr*-device-system.png.uu
  - don't build-dep on libgamin-dev, libfam-dev
  - stop kdelibs4-dev depending on gamin/fam
  - don't install .svgz icons, docs or all_languages in kdelibs-data.install
  - rosetta support in rules common-install-prehook-impl:: [and
    common-post-build-arch:: ?] and include debian/kubuntu-desktop-i18n/
  - build-dep on: gettext-kde, kdesdk-scripts, lsb-release, base-files, sudo
  - cdbs build-dep 0.4.41ubuntu2
  - kdelibs4-dev depends on gettext-kde, kdesdk-scripts
  - copy debian/icons over
  - Make kdelibs4c2a depend on launchpad-integration, sudo.  Recommends on
    xdg-user-dirs
  - Remove 19_debianize_useragent.diff (changed to
    kubuntu_19_debianize_useragent.diff) s/Debian/Kubuntu
  - remove kdelibs4c2a depends on menu-xdg
  - include kubuntu_01_kdepot.diff and kde.pot in debian/patches/common
  - use a local copy of kde.mk without the common-install-prehook-impl::
    rule; edit debian-qt-kde.mk to include debian/cdbs/kde.mk
  - build with --with-sudo-kdesu-backend and build-dep on sudo and make
    kdelibs4c2a depend on sudo
  - kdelibs-data.install : Add nzb mimetype
  - Make kdelibs4-dev replace more recent kdelibs4c2a for overlapping files
  - remove /usr/bin/preparetips, arts files and ksvntopng from
    kdelibs4-dev.install
  - Drop the package kdelibs4-doc completely. It contained API documentation
    which is now obsolete, but still available via api.kde.org.
  - make sure control and control.in are in sync
  - in debian/rule remove .pot files outside .po directory
  - 97_automake_cleanup.diff becomes kubuntu_97_automake_cleanup.diff
  - Remove libarts1-dev from build-depends and kdelibs4-dev depends from
    control.in
* Drop kubuntu_98_fix_khc_invocation.diff, replaced by
  68_support_khelpcenter4.diff
* Drop kubuntu_97_automake_cleanup.diff, replaced by 97_automake_cleanup.diff
* Re-add security_05_XMLHttpRequest_vulnerability.diff which has been
  accidentally dropped
* Fix FTBFS, in debian/rules:
  - Add -Wl,--add-needed to LDFLAGS
  - Disable parallel building

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/27_kdnssd_avahi.diff/dnssd/configure.in.in
 
1
#MIN_CONFIG
 
2
 
 
3
AC_ARG_ENABLE(dnssd, [  --disable-dnssd     don't require libdns_sd (browsing and publishing DNS-SD services will not be possible) ],  with_dnssd=$enableval, with_dnssd=yes)
 
4
if test "$with_dnssd" = "yes"; then
 
5
AC_MSG_CHECKING(for DNS-SD support)
 
6
save_dnssdtest_LIBS="$LIBS"
 
7
save_dnssdtest_LDFLAGS="$LDFLAGS"
 
8
save_dnssdtest_CPPFLAGS="$CPPFLAGS"
 
9
LDFLAGS="$all_libraries $LDFLAGS"
 
10
CPPFLAGS="$CPPFLAGS $all_includes"
 
11
case $host_os in
 
12
  darwin*) LIBS="" ;;
 
13
  *) LIBS="-ldns_sd" ;;
 
14
esac
 
15
have_libdns_sd="no"
 
16
AC_TRY_LINK(    [
 
17
                        #include <dns_sd.h>
 
18
                ],[
 
19
                        DNSServiceRefDeallocate( (DNSServiceRef) 0);
 
20
                        TXTRecordDeallocate( (TXTRecordRef*) 0);
 
21
                ],[
 
22
                        AC_DEFINE(HAVE_DNSSD,1,[Define if dns-sd is available])
 
23
                        case $host_os in
 
24
                                darwin*) LIB_DNSSD="" ;;
 
25
                                *) LIB_DNSSD="-ldns_sd" ;;
 
26
                        esac
 
27
                        have_libdns_sd="yes"
 
28
                        AC_MSG_RESULT(yes)
 
29
                ],[
 
30
                        AC_MSG_RESULT(no)
 
31
                        LIB_DNSSD=""
 
32
])
 
33
CPPFLAGS=$save_dnssdtest_CPPFLAGS
 
34
LDFLAGS=$save_dnssdtest_LDFLAGS
 
35
LIBS=$save_dnssdtest_LIBS
 
36
fi
 
37
AC_SUBST(LIB_DNSSD)
 
38
AM_CONDITIONAL(HAVE_DNSSD, test "$have_libdns_sd" = "yes")