blob: e7c62b5de7f3b116943ac4d561bb9cbdb411b873 (
plain)
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
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
aclocal.m4 | 6 +++---
configure.in | 38 +++-----------------------------------
2 files changed, 6 insertions(+), 38 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4
index 7441d3d..b86a6b2 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -11,11 +11,11 @@ if test "$cross_compiling" = yes; then
else
cat > conftest.$ac_ext <<EOF
[#]line __oline__ "configure"
-#include "confdefs.h"
-ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
+[#include "confdefs.h"
+#ifdef __cplusplus
extern "C" void exit(int);
#endif
-])dnl
+]dnl
[$2]
EOF
eval $ac_link
diff --git a/configure.in b/configure.in
index adde26d..b57eaa9 100644
--- a/configure.in
+++ b/configure.in
@@ -83,35 +83,9 @@ PWD=`pwd`
#
# -----------------------------------------------------------------------
-BLT_ENV_CC=$CC
-
-#
-# CC search order
-#
-# 1. command line (--with-cc)
-# 2. environment variable ($CC)
-# 3. cached variable ($blt_cv_prog_cc)
-# 4. check for program (AC_PROG_CC)
-# 4. default to cc
-#
-
-AC_MSG_CHECKING([which C compiler])
-if test "x${blt_with_cc}" != "x" ; then
- CC=${blt_with_cc}
- unset ac_cv_prog_CPP
- unset ac_cv_prog_CC
-elif test "x${BLT_ENV_CC}" != "x" ; then
- unset ac_cv_prog_CPP
- unset ac_cv_prog_CC
-elif test "x${blt_cv_prog_cc}" != "x" ; then
- CC=${blt_cv_prog_cc}
- unset ac_cv_prog_CC
-else
- AC_PROG_CC
-fi
-if test "x${CC}" = "x" ; then
- CC=cc
-fi
+AC_PROG_CC
+AC_PROG_CPP
+AC_PROG_EGREP
case $target in
*-*-cygwin*|*-*-mingw*)
@@ -121,12 +95,6 @@ case $target in
;;
esac
-AC_MSG_RESULT([$CC])
-
-unset blt_cv_prog_cc
-AC_CACHE_VAL(blt_cv_prog_cc, blt_cv_prog_cc=$CC)
-AC_SUBST(CC)
-AC_PROG_CPP
if test "x${GCC}" != "x" ; then
blt_have_gcc="yes"
else
|
GitWeb