aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Ncurses include libs before wget_wch check

Browse Source
This commit is contained in:
James Booth 2014-03-08 23:57:50 +00:00
parent 2b3d645147
commit 768df4d736
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
configure.ac
View File

@ -94,22 +94,23 @@ PKG_CHECK_MODULES([ncursesw], [ncursesw],
[AC_MSG_ERROR([ncurses is required for profanity])])])])]) [AC_MSG_ERROR([ncurses is required for profanity])])])])])
AM_CPPFLAGS="$AM_CPPFLAGS $NCURSES_CFLAGS" AM_CPPFLAGS="$AM_CPPFLAGS $NCURSES_CFLAGS"
LIBS="$LIBS $NCURSES_LIBS" LIBS="$LIBS $NCURSES_LIBS"
AS_IF([test "x$PLATFORM" = xosx], [LIBS="$LIBS -lncurses -lcurl"])
### Check wide characters support in ncurses library ### Check wide characters support in ncurses library
###CFLAGS_RESTORE="$CFLAGS" CFLAGS_RESTORE="$CFLAGS"
###CFLAGS="$CFLAGS $NCURSES_CFLAGS" CFLAGS="$CFLAGS $NCURSES_CFLAGS"
###AC_CACHE_CHECK([for wget_wch support in $NCURSES], ncurses_cv_wget_wch, AC_CACHE_CHECK([for wget_wch support in $NCURSES], ncurses_cv_wget_wch,
### [AC_LINK_IFELSE([AC_LANG_SOURCE([ [AC_LINK_IFELSE([AC_LANG_SOURCE([
### #include <ncurses.h> #include <ncurses.h>
### int main() { int main() {
### (void)wget_wch(NULL, NULL); (void)wget_wch(NULL, NULL);
### return 0; return 0;
### } }
### ])], ])],
### [ncurses_cv_wget_wch=yes], [ncurses_cv_wget_wch=yes],
### [ncurses_cv_wget_wch=no]) [ncurses_cv_wget_wch=no])
### ]) ])
###CFLAGS="$CFLAGS_RESTORE" CFLAGS="$CFLAGS_RESTORE"
###AS_IF([test "x$ncurses_cv_wget_wch" != xyes], ###AS_IF([test "x$ncurses_cv_wget_wch" != xyes],
### [AC_MSG_ERROR([ncurses does not support wide characters])]) ### [AC_MSG_ERROR([ncurses does not support wide characters])])
@ -206,8 +207,6 @@ AS_IF([test "x$PACKAGE_STATUS" = xdevelopment],
AM_CPPFLAGS="$AM_CPPFLAGS $glib_CFLAGS $curl_CFLAGS $libnotify_CFLAGS" AM_CPPFLAGS="$AM_CPPFLAGS $glib_CFLAGS $curl_CFLAGS $libnotify_CFLAGS"
LIBS="$LIBS $glib_LIBS $curl_LIBS $libnotify_LIBS" LIBS="$LIBS $glib_LIBS $curl_LIBS $libnotify_LIBS"
AS_IF([test "x$PLATFORM" = xosx], [LIBS="$LIBS -lncurses -lcurl"])
AC_SUBST(AM_CFLAGS) AC_SUBST(AM_CFLAGS)
AC_SUBST(AM_CPPFLAGS) AC_SUBST(AM_CPPFLAGS)