Have to use AC_LANG_SOURCE whenever doing a compile/link test.
Török Edvin authored on 2011/04/14 18:43:24... | ... |
@@ -148,7 +148,7 @@ dnl bb #1971 - doesn't work with older libstdc++ version at link/runtime |
148 | 148 |
AC_MSG_CHECKING([for working libstdc++]) |
149 | 149 |
AC_LANG_PUSH([C++]) |
150 | 150 |
AC_RUN_IFELSE( |
151 |
- AC_LANG_SOURCE([[ |
|
151 |
+ [AC_LANG_SOURCE([ |
|
152 | 152 |
#include <iostream> |
153 | 153 |
int main() |
154 | 154 |
{ |
... | ... |
@@ -156,10 +156,10 @@ AC_RUN_IFELSE( |
156 | 156 |
std::cout << "test"; |
157 | 157 |
return 0; |
158 | 158 |
} |
159 |
- ]]),[AC_MSG_RESULT([yes])], |
|
159 |
+ ])],[AC_MSG_RESULT([yes])], |
|
160 | 160 |
[AC_MSG_FAILURE([failed])], |
161 | 161 |
[AC_LINK_IFELSE( |
162 |
- AC_LANG_SOURCE([[ |
|
162 |
+ [AC_LANG_SOURCE([ |
|
163 | 163 |
#include <iostream> |
164 | 164 |
int main() |
165 | 165 |
{ |
... | ... |
@@ -167,7 +167,7 @@ AC_RUN_IFELSE( |
167 | 167 |
std::cout << "test"; |
168 | 168 |
return 0; |
169 | 169 |
} |
170 |
- ]]), [AC_MSG_RESULT([yes])], |
|
170 |
+ ])], [AC_MSG_RESULT([yes])], |
|
171 | 171 |
[AC_MSG_FAILURE([failed])] |
172 | 172 |
)]) |
173 | 173 |
AC_LANG_POP([C++]) |
... | ... |
@@ -815,7 +815,7 @@ AC_DEFUN([AC_LIB_FIND], |
815 | 815 |
AS_IF([test "$have_header" = "yes"],[ |
816 | 816 |
LIBS="$LIBS $LIB[]NAME" |
817 | 817 |
AC_MSG_CHECKING([linking with $1]) |
818 |
- AC_LINK_IFELSE([$3],[ |
|
818 |
+ AC_LINK_IFELSE([AC_LANG_SOURCE([$3])],[ |
|
819 | 819 |
ac_cv_findlib_[]NAME[]_libs="$LIB[]NAME" |
820 | 820 |
ac_cv_findlib_[]NAME[]_ltlibs="$LTLIB[]NAME" |
821 | 821 |
ac_cv_findlib_[]NAME[]_inc="$INC[]NAME" |
... | ... |
@@ -18,13 +18,13 @@ if test $want_dns = yes; then |
18 | 18 |
[ |
19 | 19 |
AC_CACHE_CHECK([for dn_expand in std libs], [ac_cv_have_lresolv_std], [ |
20 | 20 |
ac_cv_have_lresolv_std='no' |
21 |
- AC_LINK_IFELSE([ |
|
21 |
+ AC_LINK_IFELSE([AC_LANG_SOURCE([ |
|
22 | 22 |
#include <sys/types.h> |
23 | 23 |
#include <netinet/in.h> |
24 | 24 |
#include <arpa/nameser.h> |
25 | 25 |
#include <resolv.h> |
26 | 26 |
int main() { return (long)dn_expand; } |
27 |
- ], |
|
27 |
+ ])], |
|
28 | 28 |
[ |
29 | 29 |
ac_cv_have_lresolv_std='yes' |
30 | 30 |
ac_cv_have_lresolv='' |
... | ... |
@@ -35,13 +35,13 @@ int main() { return (long)dn_expand; } |
35 | 35 |
LIBS=-lresolv |
36 | 36 |
AC_CACHE_CHECK([for dn_expand in -lresolv], [ac_cv_have_lresolv_lresolv], [ |
37 | 37 |
ac_cv_have_lresolv_lresolv='yes' |
38 |
- AC_LINK_IFELSE([ |
|
38 |
+ AC_LINK_IFELSE([AC_LANG_SOURCE([ |
|
39 | 39 |
#include <sys/types.h> |
40 | 40 |
#include <netinet/in.h> |
41 | 41 |
#include <arpa/nameser.h> |
42 | 42 |
#include <resolv.h> |
43 | 43 |
int main() { return (long)dn_expand; } |
44 |
- ], |
|
44 |
+ ])], |
|
45 | 45 |
[ |
46 | 46 |
ac_cv_have_lresolv_lresolv='yes' |
47 | 47 |
ac_cv_have_lresolv=' -lresolv' |