]>
Commit | Line | Data |
---|---|---|
78270eaf JB |
1 | --- blt2.4u/aclocal.m4.orig Wed Jan 12 21:15:36 2000 |
2 | +++ blt2.4u/aclocal.m4 Tue Mar 4 20:24:37 2003 | |
3 | @@ -12,10 +12,6 @@ | |
4 | cat > conftest.$ac_ext <<EOF | |
5 | [#]line __oline__ "configure" | |
6 | #include "confdefs.h" | |
7 | -ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus | |
8 | -extern "C" void exit(int); | |
9 | -#endif | |
10 | -])dnl | |
11 | [$2] | |
12 | EOF | |
13 | eval $ac_link | |
14 | --- blt2.4u/configure.in.orig Fri Jun 23 02:40:05 2000 | |
15 | +++ blt2.4u/configure.in Tue Mar 4 20:32:04 2003 | |
16 | @@ -58,6 +58,9 @@ | |
17 | AC_ARG_WITH(gnu_ld, [ --with-gnu-ld Use GNU linker], | |
18 | blt_with_gnu_ld="yes") | |
19 | ||
20 | +AC_PROG_CC | |
21 | +AC_PROG_CPP | |
22 | +AC_PROG_EGREP | |
23 | AC_CANONICAL_SYSTEM | |
24 | ||
25 | # ----------------------------------------------------------------------- | |
26 | @@ -87,29 +90,9 @@ | |
27 | # 4. default to cc | |
28 | # | |
29 | ||
30 | -AC_MSG_CHECKING([which C compiler]) | |
31 | -if test "x${blt_with_cc}" != "x" ; then | |
32 | - CC=${blt_with_cc} | |
33 | - unset ac_cv_prog_CPP | |
34 | - unset ac_cv_prog_CC | |
35 | -elif test "x${BLT_ENV_CC}" != "x" ; then | |
36 | - unset ac_cv_prog_CPP | |
37 | - unset ac_cv_prog_CC | |
38 | -elif test "x${blt_cv_prog_cc}" != "x" ; then | |
39 | - CC=${blt_cv_prog_cc} | |
40 | - unset ac_cv_prog_CC | |
41 | -else | |
42 | - AC_PROG_CC | |
43 | -fi | |
44 | -if test "x${CC}" = "x" ; then | |
45 | - CC=cc | |
46 | -fi | |
47 | -AC_MSG_RESULT([$CC]) | |
48 | ||
49 | unset blt_cv_prog_cc | |
50 | AC_CACHE_VAL(blt_cv_prog_cc, blt_cv_prog_cc=$CC) | |
51 | -AC_SUBST(CC) | |
52 | -AC_PROG_CPP | |
53 | if test "x${GCC}" != "x" ; then | |
54 | BLT_HAVE_GCC="yes" | |
55 | else |