changeset 28015:9fa1de6d508a

Properly detect libpanel by including ncurses libs in linking test. Patch from Brad "brad0" Smith. Closes #9972.
author Paul Aurich <paul@darkrain42.org>
date Thu, 20 Aug 2009 03:40:09 +0000
parents cf533027c3be
children df76369ffde4
files ChangeLog configure.ac
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Aug 19 22:42:11 2009 +0000
+++ b/ChangeLog	Thu Aug 20 03:40:09 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
--- a/configure.ac	Wed Aug 19 22:42:11 2009 +0000
+++ b/configure.ac	Thu Aug 20 03:40:09 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"