1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
diff -Naur HippoDraw-1.21.3.old/config/m4/bnv_have_qt.m4 HippoDraw-1.21.3/config/m4/bnv_have_qt.m4
--- HippoDraw-1.21.3.old/config/m4/bnv_have_qt.m4 2006-12-08 14:15:35.000000000 -0500
+++ HippoDraw-1.21.3/config/m4/bnv_have_qt.m4 2009-12-15 18:15:24.000000000 -0500
@@ -438,8 +438,8 @@
bnv_save_CXXFLAGS="$CXXFLAGS"
echo "Saved cxxflgs"
CXXFLAGS="-I$bnv_qt_include_dir"
- AC_TRY_LINK([#include <$qt_direct_test_header>],
- $qt_direct_test_main,
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <$qt_direct_test_header>]],
+ [[$qt_direct_test_main]])],
[
# Success.
# We can link with no special library directory.
@@ -460,8 +460,8 @@
echo "Non-critical error, please neglect the above." >&AC_FD_CC
bnv_qt_lib=qt-gl
LIBS="-l$bnv_qt_lib"
- AC_TRY_LINK([#include <$qt_direct_test_header>],
- $qt_direct_test_main,
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <$qt_direct_test_header>]],
+ [[$qt_direct_test_main]])],
[
# Success.
# We can link with no special library directory.
@@ -496,14 +496,12 @@
done
# Try with that one
LIBS="-l$bnv_qt_libS"
- AC_TRY_LINK([#include <$qt_direct_test_header>],
- $qt_direct_test_main,
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <$qt_direct_test_header>]],
+ [[$qt_direct_test_main]])],
[
# Success.
# We can link with no special library directory.
bnv_qt_lib_dir=
- ], [
- # Leave bnv_qt_lib_dir defined
])
])
])
|
GitWeb
