Mercurial > pidgin.yaz
comparison configure.ac @ 13746:ae1849182c8f
[gaim-migrate @ 16157]
Make our configure.ac autodetect Avahi's Howl compatibility
library, and fallback to using Howl if Avahi isn't installed.
Also fixed specifying a lib directory for Howl.
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Mon, 08 May 2006 04:32:21 +0000 |
parents | 889ad72bc16e |
children | 463259ea22ff |
comparison
equal
deleted
inserted
replaced
13745:fcb3f77df50d | 13746:ae1849182c8f |
---|---|
192 AC_ARG_WITH(howl-includes, [AC_HELP_STRING([--with-howl-includes=DIR], [compile the Bonjour plugin against the Howl includes in DIR])], [ac_howl_includes="$withval"], [ac_howl_includes="no"]) | 192 AC_ARG_WITH(howl-includes, [AC_HELP_STRING([--with-howl-includes=DIR], [compile the Bonjour plugin against the Howl includes in DIR])], [ac_howl_includes="$withval"], [ac_howl_includes="no"]) |
193 AC_ARG_WITH(howl-libs, [AC_HELP_STRING([--with-howl-libs=DIR], [compile the Bonjour plugin against the Howl libs in DIR])], [ac_howl_libs="$withval"], [ac_howl_libs="no"]) | 193 AC_ARG_WITH(howl-libs, [AC_HELP_STRING([--with-howl-libs=DIR], [compile the Bonjour plugin against the Howl libs in DIR])], [ac_howl_libs="$withval"], [ac_howl_libs="no"]) |
194 HOWL_CFLAGS="" | 194 HOWL_CFLAGS="" |
195 HOWL_LIBS="" | 195 HOWL_LIBS="" |
196 | 196 |
197 dnl Attempt to autodetect Howl | 197 dnl Attempt to autodetect avahi-compat-howl |
198 dnl TODO Check avahi-compat-howl!!! | 198 PKG_CHECK_MODULES(HOWL, avahi-compat-howl, [ |
199 PKG_CHECK_MODULES(HOWL, howl, [ | |
200 howlincludes="yes" | 199 howlincludes="yes" |
201 howllibs="yes" | 200 howllibs="yes" |
202 ], [ | 201 ], [ |
203 AC_MSG_RESULT(no) | 202 AC_MSG_RESULT(no) |
204 howlincludes="no" | 203 howlincludes="no" |
205 howllibs="no" | 204 howllibs="no" |
206 ]) | 205 ]) |
207 | 206 |
207 dnl Attempt to autodetect Howl | |
208 if test "x$howlincludes" = "xno"; then | |
209 PKG_CHECK_MODULES(HOWL, howl, [ | |
210 howlincludes="yes" | |
211 howllibs="yes" | |
212 ], [ | |
213 AC_MSG_RESULT(no) | |
214 howlincludes="no" | |
215 howllibs="no" | |
216 ]) | |
217 fi | |
218 | |
208 dnl Override HOWL_CFLAGS if the user specified an include dir | 219 dnl Override HOWL_CFLAGS if the user specified an include dir |
209 if test "$ac_howl_includes" != "no"; then | 220 if test "$ac_howl_includes" != "no"; then |
210 HOWL_CFLAGS="-I$ac_howl_includes" | 221 HOWL_CFLAGS="-I$ac_howl_includes" |
211 fi | 222 fi |
212 CPPFLAGS_save="$CPPFLAGS" | 223 CPPFLAGS_save="$CPPFLAGS" |
214 AC_CHECK_HEADER(howl.h, [howlincludes=yes], [howlincludes=no]) | 225 AC_CHECK_HEADER(howl.h, [howlincludes=yes], [howlincludes=no]) |
215 CPPFLAGS="$CPPFLAGS_save" | 226 CPPFLAGS="$CPPFLAGS_save" |
216 | 227 |
217 dnl Override HOWL_LIBS if the user specified a libs dir | 228 dnl Override HOWL_LIBS if the user specified a libs dir |
218 if test "$ac_howl_libs" != "no"; then | 229 if test "$ac_howl_libs" != "no"; then |
219 HOWL_LIBS="-L$ac_howl_libs" | 230 HOWL_LIBS="-L$ac_howl_libs -lhowl" |
220 fi | 231 fi |
221 AC_CHECK_LIB(howl, sw_discovery_init, [howllibs=yes], [howllibs=no], $HOWL_LIBS) | 232 AC_CHECK_LIB(howl, sw_discovery_init, [howllibs=yes], [howllibs=no], $HOWL_LIBS) |
222 | 233 |
223 AC_SUBST(HOWL_CFLAGS) | 234 AC_SUBST(HOWL_CFLAGS) |
224 AC_SUBST(HOWL_LIBS) | 235 AC_SUBST(HOWL_LIBS) |