projects / packages / cups.git / blame
| Commit | Line | Data |
|---|---|---|
| ec7a81b2 JR |
1 | diff -up cups-1.5.2/config.h.in.avahi-1-config cups-1.5.2/config.h.in |
| 2 | --- cups-1.5.2/config.h.in.avahi-1-config 2011-06-16 21:12:16.000000000 +0100 | |
| 3 | +++ cups-1.5.2/config.h.in 2012-03-14 15:04:51.365347165 +0000 | |
| d07e62b1 ER |
4 | @@ -390,6 +390,13 @@ |
| 5 | ||
| 6 | ||
| 7 | /* | |
| 8 | + * Do we have Avahi for DNS Service Discovery? | |
| 9 | + */ | |
| 10 | + | |
| 11 | +#undef HAVE_AVAHI | |
| 12 | + | |
| 13 | + | |
| 14 | +/* | |
| 15 | * Do we have <sys/ioctl.h>? | |
| 16 | */ | |
| 17 | ||
| ec7a81b2 JR |
18 | diff -up cups-1.5.2/config-scripts/cups-dnssd.m4.avahi-1-config cups-1.5.2/config-scripts/cups-dnssd.m4 |
| 19 | --- cups-1.5.2/config-scripts/cups-dnssd.m4.avahi-1-config 2011-05-12 06:21:56.000000000 +0100 | |
| 20 | +++ cups-1.5.2/config-scripts/cups-dnssd.m4 2012-03-14 15:04:51.365347165 +0000 | |
| d07e62b1 ER |
21 | @@ -23,6 +23,21 @@ AC_ARG_WITH(dnssd-includes, [ --with-dn |
| 22 | DNSSDLIBS="" | |
| 23 | DNSSD_BACKEND="" | |
| 24 | ||
| 25 | +AC_ARG_ENABLE(avahi, [ --enable-avahi turn on DNS Service Discovery support, default=no], | |
| 26 | + [if test x$enable_avahi = xyes; then | |
| 27 | + AC_MSG_CHECKING(for Avahi) | |
| 28 | + if $PKGCONFIG --exists avahi-client; then | |
| 29 | + AC_MSG_RESULT(yes) | |
| 30 | + CFLAGS="$CFLAGS `$PKGCONFIG --cflags avahi-client`" | |
| 31 | + DNSSDLIBS="`$PKGCONFIG --libs avahi-client`" | |
| 32 | + DNSSD_BACKEND="dnssd" | |
| 33 | + AC_DEFINE(HAVE_AVAHI) | |
| 34 | + enable_dnssd=no | |
| 35 | + else | |
| 36 | + AC_MSG_RESULT(no) | |
| 37 | + fi | |
| 38 | + fi]) | |
| 39 | + | |
| 40 | if test x$enable_dnssd != xno; then | |
| 41 | AC_CHECK_HEADER(dns_sd.h, [ | |
| 42 | case "$uname" in |