Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-23 07:43:03 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8 from jin-eld/fix-configure-for-winblows

Browse Source 
Fix configure script for mingw32
This commit is contained in:
stal 2013-08-24 12:53:12 -07:00
commit c628517474
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configure.ac
View File

@ -113,7 +113,7 @@ AC_CHECK_FUNCS(
PKG_PROG_PKG_CONFIG PKG_PROG_PKG_CONFIG
if test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG"; then
if test "$WIN32" != "xyes"; then if test "x$WIN32" != "xyes"; then
PKG_CHECK_MODULES([NCURSES], [ncursesw], PKG_CHECK_MODULES([NCURSES], [ncursesw],
[ [
NCURSES_FOUND="yes" NCURSES_FOUND="yes"
@ -132,7 +132,7 @@ else
AC_MSG_WARN([pkg-config was not found on your sytem]) AC_MSG_WARN([pkg-config was not found on your sytem])
fi fi
if (test "x$NCURSES_FOUND" = "xno") && (test "$WIN32" != "xyes"); then if (test "x$NCURSES_FOUND" = "xno") && (test "x$WIN32" != "xyes"); then
AC_PATH_PROG([CURSES_CONFIG], [ncursesw5-config], [no]) AC_PATH_PROG([CURSES_CONFIG], [ncursesw5-config], [no])
if test "x$CURSES_CONFIG" != "xno"; then if test "x$CURSES_CONFIG" != "xno"; then
AC_MSG_CHECKING(ncurses cflags) AC_MSG_CHECKING(ncurses cflags)
@ -150,7 +150,8 @@ if (test "x$NCURSES_FOUND" = "xno") && (test "$WIN32" != "xyes"); then
fi fi
fi fi
if (test "x$NCURSES_FOUND" = "xno") && (test "$WIN32" != "xyes"); then if (test "x$NCURSES_FOUND" = "xno") && (test "x$WIN32" != "xyes"); then
unset ac_cv_path_CURSES_CONFIG
AC_PATH_PROG([CURSES_CONFIG], [ncursesw5.4-config], [no]) AC_PATH_PROG([CURSES_CONFIG], [ncursesw5.4-config], [no])
if test "x$CURSES_CONFIG" != "xno"; then if test "x$CURSES_CONFIG" != "xno"; then
AC_MSG_CHECKING(ncurses cflags) AC_MSG_CHECKING(ncurses cflags)
@ -168,7 +169,8 @@ if (test "x$NCURSES_FOUND" = "xno") && (test "$WIN32" != "xyes"); then
fi fi
fi fi
if (test "x$NCURSES_FOUND" = "xno") && (test "$WIN32" != "xyes"); then if (test "x$NCURSES_FOUND" = "xno") && (test "x$WIN32" != "xyes"); then
unset ac_cv_path_CURSES_CONFIG
AC_PATH_PROG([CURSES_CONFIG], [ncurses5-config], [no]) AC_PATH_PROG([CURSES_CONFIG], [ncurses5-config], [no])
if test "x$CURSES_CONFIG" != "xno"; then if test "x$CURSES_CONFIG" != "xno"; then
AC_MSG_CHECKING(ncurses cflags) AC_MSG_CHECKING(ncurses cflags)
@ -185,7 +187,8 @@ if (test "x$NCURSES_FOUND" = "xno") && (test "$WIN32" != "xyes"); then
fi fi
fi fi
if (test "x$NCURSES_FOUND" = "xno") && (test "$WIN32" != "xyes"); then if (test "x$NCURSES_FOUND" = "xno") && (test "x$WIN32" != "xyes"); then
unset ac_cv_path_CURSES_CONFIG
AC_PATH_PROG([CURSES_CONFIG], [ncurses5.4-config], [no]) AC_PATH_PROG([CURSES_CONFIG], [ncurses5.4-config], [no])
if test "x$CURSES_CONFIG" != "xno"; then if test "x$CURSES_CONFIG" != "xno"; then
AC_MSG_CHECKING(ncurses cflags) AC_MSG_CHECKING(ncurses cflags)
@ -346,6 +349,9 @@ if test "x$LIBTOXCORE_FOUND" = "xno"; then
], ],
[ [
AC_MSG_ERROR([required library toxcore was not found on your system]) AC_MSG_ERROR([required library toxcore was not found on your system])
],
[
$WINSOCK2_LIBS
] ]
) )
else else
@ -354,6 +360,9 @@ if test "x$LIBTOXCORE_FOUND" = "xno"; then
[], [],
[ [
AC_MSG_ERROR([required library toxcore was not found on your system]) AC_MSG_ERROR([required library toxcore was not found on your system])
],
[
$WINSOCK2_LIBS
] ]
) )
fi fi