]>
Commit | Line | Data |
---|---|---|
0e25a3c5 ZU |
1 | --- pidgin-2.7.0-orig/configure.ac 2010-05-14 10:50:13.801960582 +0200 |
2 | +++ pidgin-2.7.0/configure.ac 2010-05-14 10:50:47.245498821 +0200 | |
3 | @@ -143,8 +143,8 @@ | |
a4f9bce9 | 4 | dnl Check for inet_aton |
be9750be | 5 | AC_CHECK_FUNC(inet_aton, , [AC_CHECK_LIB(resolv, inet_aton, , |
0e25a3c5 | 6 | [AC_MSG_ERROR([inet_aton not found])])]) |
be9750be | 7 | -AC_CHECK_LIB(resolv, __res_query) |
a4f9bce9 | 8 | -AC_CHECK_LIB(nsl, gethostent) |
be9750be | 9 | +AC_CHECK_FUNC(resolv, ,[AC_CHECK_LIB(resolv, __res_query)]) |
a4f9bce9 | 10 | +AC_CHECK_FUNC(gethostent, , [AC_CHECK_LIB(nsl, gethostent)]) |
be9750be | 11 | AC_CHECK_FUNC(socket, , |
0e25a3c5 | 12 | [AC_CHECK_LIB(socket, socket, , [AC_MSG_ERROR([socket not found])])]) |
a4f9bce9 | 13 | dnl If all goes well, by this point the previous two checks will have |
1a9c7e58 JB |
14 | @@ -1098,6 +1098,7 @@ |
15 | PKG_CHECK_MODULES(LIBGADU, [libgadu >= 1.12.0], [have_libgadu=yes], [have_libgadu=no]) | |
16 | ||
17 | if test "x$have_libgadu" = "xyes"; then | |
18 | + save_LIBS="$LIBS" | |
19 | AC_CHECK_LIB(gadu, gg_is_gpl_compliant, , [ | |
20 | LIBGADU_LIBS="" | |
21 | LIBGADU_CFLAGS="" | |
22 | @@ -1112,6 +1113,7 @@ | |
23 | Falling back to using our own copy of libgadu. | |
24 | ]) | |
25 | ]) | |
26 | + LIBS="$save_LIBS" | |
27 | fi | |
28 | ||
29 | AM_CONDITIONAL(HAVE_LIBGADU, test "x$have_libgadu" = "xyes") |