Commit Diff

Commit:
d3f1e38b5d5c7188a56b8b08d472ff8683c10e15
From:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
portable: curses: improve detection When checking for ncurses, don't clobber previous checks for libpanel.
Actions:
Patch | Tree
commit - 7ef51333b72702bfc0ec3a9ea6ea950ec7cdf7a8
commit + d3f1e38b5d5c7188a56b8b08d472ff8683c10e15
blob - 4bfc141b94ab3b2406e8c52721c2b2973397b0b3
blob + d1dfccf0c74953cb001757a0816d89a67e813c77
--- configure.ac
+++ configure.ac
@@ -728,30 +728,41 @@ AC_LINK_IFELSE([AC_LANG_SOURCE(
 PKG_CHECK_MODULES(
 	LIBPANELW,
 	panelw,
+	LIBPANELW_LIBS="$LIBPANELW_LIBS"
 	found_panel=yes,
 	found_panel=no
 )
 
+if test "x$found_panel" = "xno"; then
 PKG_CHECK_MODULES(
 	LIBPANELW,
 	gnupanelw,
-	found_panel=yes,
+	[
+		LIBPANELW_LIBS="$LIBPANELW_LIBS"
+		found_panel=yes
+	],
 	found_panel=no
 )
+fi
 
+if test "x$found_panel" = "xno"; then
 PKG_CHECK_MODULES(
 	LIBPANELW,
 	panel,
-	found_panel=yes,
+	[
+		LIBPANELW_LIBS="$LIBPANELW_LIBS"
+		found_panel=yes
+	],
 	found_panel=no
 )
+fi
+
 if test "x$found_panel" = "xno"; then
 	AC_CHECK_LIB(panelw, update_panels, [],
 		AC_MSG_ERROR([ "*** panelw not found for ncurses. ***"]),
 		[-lncurses]
 	)
 
-	LIBPANELW_LIBS="-lpanelw"
 fi
 
 PKG_CHECK_MODULES(
@@ -796,7 +807,7 @@ else
 		found_curses=no)
 	if test "x$found_curses" = xyes; then
 		libncurses_CFLAGS="$LIBPANELW_CFLAGS $LIBPANEL_CFLAGS"
-		libncurses_LIBS="$LIBPANELW_LIBS -lncursesw"
+		libncurses_LIBS="$LIBPANELW_LIBS -lncursesw -lpanelw"
 		AC_SUBST(libncurses_CFLAGS)
 		AC_SUBST(libncurses_LIBS)
 		AC_DEFINE([HAVE_CURSES_H], [1], [Curses_h])