# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1250739618 0
# Node ID df76369ffde4828044892c6676bd7420ecd19344
# Parent  9fa1de6d508a53ef47d8a8abc4849e4099a38339# Parent  5ff49aa0543965a0eb952c8b10df7dd01543c00a
merge of 'a34b37757cd241377842a2da55e7c7ece45d69dd'
     and 'e4c44c708110388bc6b4646a63b5749285e0e820'

diff -r 5ff49aa05439 -r df76369ffde4 ChangeLog
--- a/ChangeLog	Thu Aug 20 02:15:00 2009 +0000
+++ b/ChangeLog	Thu Aug 20 03:40:18 2009 +0000
@@ -7,6 +7,9 @@
 	* Fix connecting to XMPP domains with no SRV records from Pidgin on
 	  Windows.
 
+	Finch:
+	* Properly detect libpanel on OpenBSD.  (Brad Smith)
+
 version 2.6.1 (08/18/2009):
 	* Fix a crash when some users send you a link in a Yahoo IM
 	* Fix compilation with GTK+ < 2.6.0
diff -r 5ff49aa05439 -r df76369ffde4 configure.ac
--- a/configure.ac	Thu Aug 20 02:15:00 2009 +0000
+++ b/configure.ac	Thu Aug 20 03:40:18 2009 +0000
@@ -632,7 +632,8 @@
 		[ac_ncurses_includes="$withval"], [ac_ncurses_includes=""])
 if test "x$enable_consoleui" = "xyes"; then
 	AC_CHECK_LIB(ncursesw, initscr, [GNT_LIBS="-lncursesw"], [enable_consoleui=no])
-	AC_CHECK_LIB(panelw, update_panels, [GNT_LIBS="$GNT_LIBS -lpanelw"], [enable_consoleui=no])
+	AC_CHECK_LIB(panelw, update_panels, [GNT_LIBS="$GNT_LIBS -lpanelw"],
+	    [enable_consoleui=no], [$GNT_LIBS])
 
 	if test "x$enable_consoleui" = "xyes"; then
 		dnl # Some distros put the headers in ncursesw/, some don't
@@ -675,7 +676,8 @@
 		# ncursesw was not found. Look for plain old ncurses
 		enable_consoleui=yes
 		AC_CHECK_LIB(ncurses, initscr, [GNT_LIBS="-lncurses"], [enable_consoleui=no])
-		AC_CHECK_LIB(panel, update_panels, [GNT_LIBS="$GNT_LIBS -lpanel"], [enable_consoleui=no])
+		AC_CHECK_LIB(panel, update_panels, [GNT_LIBS="$GNT_LIBS -lpanel"],
+		    [enable_consoleui=no], [$GNT_LIBS])
 		AC_DEFINE(NO_WIDECHAR, 1, [Define to 1 if you don't have wide-character support.])
 		if test x"$ac_ncurses_includes" != "x"; then
 			GNT_CFLAGS="-I$ac_ncurses_includes"