[Gaim-commits] SF.net SVN: gaim: [16157] trunk/configure.ac

[<the...@us...>]

Revision: 16157
Author:   thekingant
Date:     2006-05-07 21:32:21 -0700 (Sun, 07 May 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16157&view=rev

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/configure.ac
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-05-08 04:02:50 UTC (rev 16156)
+++ trunk/configure.ac	2006-05-08 04:32:21 UTC (rev 16157)
@@ -194,9 +194,8 @@
 HOWL_CFLAGS=""
 HOWL_LIBS=""
 
-dnl Attempt to autodetect Howl
-dnl TODO Check avahi-compat-howl!!!
-PKG_CHECK_MODULES(HOWL, howl, [
+dnl Attempt to autodetect avahi-compat-howl
+PKG_CHECK_MODULES(HOWL, avahi-compat-howl, [
 		howlincludes="yes"
 		howllibs="yes"
 	], [
@@ -205,6 +204,18 @@
 		howllibs="no"
 	])
 
+dnl Attempt to autodetect Howl
+if test "x$howlincludes" = "xno"; then
+	PKG_CHECK_MODULES(HOWL, howl, [
+			howlincludes="yes"
+			howllibs="yes"
+		], [
+			AC_MSG_RESULT(no)
+			howlincludes="no"
+			howllibs="no"
+		])
+fi
+
 dnl Override HOWL_CFLAGS if the user specified an include dir
 if test "$ac_howl_includes" != "no"; then
 	HOWL_CFLAGS="-I$ac_howl_includes"
@@ -216,7 +227,7 @@
 
 dnl Override HOWL_LIBS if the user specified a libs dir
 if test "$ac_howl_libs" != "no"; then
-	HOWL_LIBS="-L$ac_howl_libs"
+	HOWL_LIBS="-L$ac_howl_libs -lhowl"
 fi
 AC_CHECK_LIB(howl, sw_discovery_init, [howllibs=yes], [howllibs=no], $HOWL_LIBS)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.