]>
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 | |
d5588c95 | 14 | --- blt2.4z/configure.in.orig 2002-10-04 07:33:23.000000000 +0200 |
15 | +++ blt2.4z/configure.in 2005-07-23 19:08:32.000000000 +0200 | |
16 | @@ -65,6 +65,9 @@ | |
78270eaf JB |
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 | |
d5588c95 | 24 | AC_PREFIX_PROGRAM(wish) |
78270eaf | 25 | |
d5588c95 | 26 | @@ -95,24 +98,6 @@ |
78270eaf JB |
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 | |
d5588c95 | 47 | - |
48 | case $target in | |
49 | *-*-cygwin*|*-*-mingw*) | |
50 | if test "${blt_enable_cygwin}" = "no" ; then | |
51 | @@ -121,12 +106,8 @@ | |
52 | ;; | |
53 | esac | |
78270eaf | 54 | |
d5588c95 | 55 | -AC_MSG_RESULT([$CC]) |
56 | - | |
78270eaf JB |
57 | unset blt_cv_prog_cc |
58 | AC_CACHE_VAL(blt_cv_prog_cc, blt_cv_prog_cc=$CC) | |
59 | -AC_SUBST(CC) | |
60 | -AC_PROG_CPP | |
61 | if test "x${GCC}" != "x" ; then | |
d5588c95 | 62 | blt_have_gcc="yes" |
78270eaf | 63 | else |