diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-02-26 21:53:52 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-02-26 21:53:52 -0500 |
commit | 7275399e96c64abc852c3746aa58d10bee8a5a44 (patch) | |
tree | a798ae34656585ec83f390dac95382ccc303919c /~mtjm/cups-usblp/cups-avahi-1-config.patch | |
parent | 4bfc44a83c098d0f6d731b855541140fac36b8aa (diff) | |
parent | 31763e92611731c859ccbe4e97019afabb5ef91e (diff) | |
download | abslibre-7275399e96c64abc852c3746aa58d10bee8a5a44.tar.gz abslibre-7275399e96c64abc852c3746aa58d10bee8a5a44.tar.bz2 abslibre-7275399e96c64abc852c3746aa58d10bee8a5a44.zip |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/abslibre
Diffstat (limited to '~mtjm/cups-usblp/cups-avahi-1-config.patch')
-rw-r--r-- | ~mtjm/cups-usblp/cups-avahi-1-config.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/~mtjm/cups-usblp/cups-avahi-1-config.patch b/~mtjm/cups-usblp/cups-avahi-1-config.patch new file mode 100644 index 000000000..663eb39df --- /dev/null +++ b/~mtjm/cups-usblp/cups-avahi-1-config.patch @@ -0,0 +1,42 @@ +diff -up cups-1.5.0/config.h.in.avahi-1-config cups-1.5.0/config.h.in +--- cups-1.5.0/config.h.in.avahi-1-config 2011-06-16 21:12:16.000000000 +0100 ++++ cups-1.5.0/config.h.in 2011-08-05 15:04:09.535759988 +0100 +@@ -390,6 +390,13 @@ + + + /* ++ * Do we have Avahi for DNS Service Discovery? ++ */ ++ ++#undef HAVE_AVAHI ++ ++ ++/* + * Do we have <sys/ioctl.h>? + */ + +diff -up cups-1.5.0/config-scripts/cups-dnssd.m4.avahi-1-config cups-1.5.0/config-scripts/cups-dnssd.m4 +--- cups-1.5.0/config-scripts/cups-dnssd.m4.avahi-1-config 2011-05-12 06:21:56.000000000 +0100 ++++ cups-1.5.0/config-scripts/cups-dnssd.m4 2011-08-05 15:04:09.525760307 +0100 +@@ -23,6 +23,21 @@ AC_ARG_WITH(dnssd-includes, [ --with-dn + DNSSDLIBS="" + DNSSD_BACKEND="" + ++AC_ARG_ENABLE(avahi, [ --enable-avahi turn on DNS Service Discovery support, default=no], ++ [if test x$enable_avahi = xyes; then ++ AC_MSG_CHECKING(for Avahi) ++ if $PKGCONFIG --exists avahi-client; then ++ AC_MSG_RESULT(yes) ++ CFLAGS="$CFLAGS `$PKGCONFIG --cflags avahi-client`" ++ DNSSDLIBS="`$PKGCONFIG --libs avahi-client`" ++ DNSSD_BACKEND="dnssd" ++ AC_DEFINE(HAVE_AVAHI) ++ enable_dnssd=no ++ else ++ AC_MSG_RESULT(no) ++ fi ++ fi]) ++ + if test x$enable_dnssd != xno; then + AC_CHECK_HEADER(dns_sd.h, [ + case "$uname" in |