[patch] Fix configure.ac to use pkg-config v2

file_457530.txt (text/plain), 1.53 KB, created by Livid on 2014-08-07 03:09:47 UTC

Index: htop-1.0.3/configure.ac
===================================================================
--- htop-1.0.3.orig/configure.ac
+++ htop-1.0.3/configure.ac
@@ -89,22 +89,19 @@ fi
 
 AC_ARG_ENABLE(unicode, [AC_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes")
 if test "x$enable_unicode" = xyes; then
-   AC_CHECK_LIB([ncursesw], [refresh], [], [
+   PKG_CHECK_MODULES(NCURSES,[ncursesw], [], [
       missing_libraries="$missing_libraries libncursesw"
       AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.])
    ])
-   AC_CHECK_HEADERS([ncursesw/curses.h],[:],
-      [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
-         [AC_CHECK_HEADERS([ncurses/curses.h],[:],
-            [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
 else
-   AC_CHECK_LIB([ncurses], [refresh], [], [missing_libraries="$missing_libraries libncurses"])
+   PKG_CHECK_MODULES(NCURSES,[ncurses], [], [missing_libraries="$missing_libraries libncurses"])
-   AC_CHECK_HEADERS([curses.h],[:],
-      [AC_CHECK_HEADERS([ncurses/curses.h],[:],
-         [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
-            [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
 fi
 
+LIBS="$LIBS $NCURSES_LIBS"
+CFLAGS="$CFLAGS $NCURSES_CFLAGS"
+
+AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])
+
 if test ! -z "$missing_libraries"; then
   AC_MSG_ERROR([missing libraries: $missing_libraries])
 fi