Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 636566
Collapse All | Expand All

(-)htop-2.0.2/configure.ac (-16 / +11 lines)
Lines 184-212 m4_define([HTOP_CHECK_LIB], Link Here
184
])
184
])
185
185
186
AC_ARG_ENABLE(unicode, [AS_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes")
186
AC_ARG_ENABLE(unicode, [AS_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes")
187
PKG_PROG_PKG_CONFIG
187
if test "x$enable_unicode" = xyes; then
188
if test "x$enable_unicode" = xyes; then
188
   HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config",
189
   PKG_CHECK_MODULES([NCURSESW], [ncursesw], [AC_DEFINE([HAVE_LIBNCURSESW], 1, [The library is present.])
189
    HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config",
190
      LIBS="$NCURSESW_LIBS $LIBS" ],
190
     HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config",
191
      [missing_libraries="$missing_libraries libncursesw"
191
      HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW],
192
       AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.])]
192
       HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW],
193
   )
193
        HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW],
194
      missing_libraries="$missing_libraries libncursesw"
195
      AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.])
196
   ))))))
197
194
198
   AC_CHECK_HEADERS([ncursesw/curses.h],[:],
195
   AC_CHECK_HEADERS([ncursesw/curses.h],[:],
199
      [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
196
      [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
200
         [AC_CHECK_HEADERS([ncurses/curses.h],[:],
197
         [AC_CHECK_HEADERS([ncurses/curses.h],[:],
201
            [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
198
            [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
202
else
199
else
203
   HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config",
200
   PKG_CHECK_MODULES([NCURSES], [ncurses], [AC_DEFINE([HAVE_LIBNCURSES], 1, [The library is present.])
204
    HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config",
201
      LIBS="$NCURSES_LIBS $LIBS" ],
205
     HTOP_CHECK_LIB([ncurses6],  [refresh], [HAVE_LIBNCURSES],
202
      [missing_libraries="$missing_libraries libncurses"]
206
      HTOP_CHECK_LIB([ncurses],  [refresh], [HAVE_LIBNCURSES],
203
   )
207
      missing_libraries="$missing_libraries libncurses"
204
208
   ))))
209
   
210
   AC_CHECK_HEADERS([curses.h],[:],
205
   AC_CHECK_HEADERS([curses.h],[:],
211
      [AC_CHECK_HEADERS([ncurses/curses.h],[:],
206
      [AC_CHECK_HEADERS([ncurses/curses.h],[:],
212
         [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
207
         [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],

Return to bug 636566