]>
Commit | Line | Data |
---|---|---|
9059db17 | 1 | --- pilot-link/configure.in~ Mon Jul 31 02:18:39 2000 |
2 | +++ pilot-link/configure.in Sat Nov 24 09:57:31 2001 | |
3 | @@ -13,9 +13,9 @@ | |
4 | ||
5 | dnl Checks for programs. | |
6 | AC_PROG_CC | |
7 | +AC_PROG_CXX | |
8 | AC_PROG_INSTALL | |
9 | AM_PROG_LIBTOOL | |
10 | -AC_PROG_RANLIB | |
11 | AC_PROG_YACC | |
12 | ||
13 | WITHTCL="WITHOUTTCL" | |
14 | @@ -25,57 +25,6 @@ | |
15 | WITHPYTHON="WITHOUTPYTHON" | |
16 | WITHJAVA="WITHOUTJAVA" | |
17 | ||
18 | -AC_ARG_WITH(cpp, [ --with-cpp[=c++ compiler] use C++ [default=yes]]) | |
19 | - | |
20 | -if test "x$with_cpp" = "xno"; then | |
21 | - CXX= | |
22 | - ac_cv_prog_cxx_works=no | |
23 | -else | |
24 | - | |
25 | -if test "x$with_cpp" = "xyes"; then | |
26 | - with_cpp="" | |
27 | -fi | |
28 | - | |
29 | -if test "x$with_cpp" = "x"; then | |
30 | - AC_CHECK_PROGS(CXX,$CCC c++ g++ gcc CC cxx cc++, gcc) | |
31 | -else | |
32 | - CXX=$with_cpp | |
33 | -fi | |
34 | - | |
35 | -AC_LANG_SAVE | |
36 | -AC_LANG_CPLUSPLUS | |
37 | -AC_CACHE_CHECK([whether C++ compiler ($CXX $CXFLAGS $LDFLAGS) works], | |
38 | - ac_cv_prog_cxx_works, | |
39 | -[AC_TRY_COMPILE([#include <stdio.h>], [class a { public: int b; a(void); }; | |
40 | -a b; ], | |
41 | - ac_cv_prog_cxx_works=yes,ac_cv_prog_cxx_works=no)]) | |
42 | -AC_LANG_RESTORE | |
43 | - | |
44 | -AC_PROG_CXX_GNU | |
45 | - | |
46 | -if test $ac_cv_prog_gxx = yes; then | |
47 | - GXX=yes | |
48 | -dnl Check whether -g works, even if CXXFLAGS is set, in case the package | |
49 | -dnl plays around with CXXFLAGS (such as to build both debugging and | |
50 | -dnl normal versions of a library), tasteless as that idea is. | |
51 | - ac_test_CXXFLAGS="${CXXFLAGS+set}" | |
52 | - ac_save_CXXFLAGS="$CXXFLAGS" | |
53 | - CXXFLAGS= | |
54 | - AC_PROG_CXX_G | |
55 | - if test "$ac_test_CXXFLAGS" = set; then | |
56 | - CXXFLAGS="$ac_save_CXXFLAGS" | |
57 | - elif test $ac_cv_prog_cxx_g = yes; then | |
58 | - CXXFLAGS="-g -O2" | |
59 | - else | |
60 | - CXXFLAGS="-O2" | |
61 | - fi | |
62 | -else | |
63 | - GXX= | |
64 | - test "${CXXFLAGS+set}" = set || CXXFLAGS="-g" | |
65 | -fi | |
66 | - | |
67 | -fi | |
68 | - | |
69 | ccexecs='' | |
70 | cclib='' | |
71 | libcclib='' | |
72 | @@ -84,7 +33,7 @@ | |
73 | SUBMAKE_COMM_CC='-true' | |
74 | EXT='' | |
75 | CXXLIBS='' | |
76 | -if test $ac_cv_prog_cxx_works = yes; then | |
77 | +if test "x$ac_cv_prog_cxx_works" = "xyes"; then | |
78 | ccexecs='$(CCEXECS)' | |
79 | cclib='libpicc.a' | |
80 | libcclib='libcc/libpicc.a' | |
81 | @@ -116,14 +65,6 @@ | |
82 | dnl Checks for libraries. | |
83 | ||
84 | ||
85 | -if test $ac_cv_prog_cxx_works = yes; then | |
86 | - AC_LANG_SAVE | |
87 | - AC_LANG_CPLUSPLUS | |
88 | - if test $ac_cv_prog_gxx = yes; then | |
89 | - AC_CHECK_LIB(g++, main, CXXLIBS="$CXXLIBS -lg++") | |
90 | - fi | |
91 | - AC_LANG_RESTORE | |
92 | -fi | |
93 | AC_CHECK_LIB(m, ldexp, LIBS="$LIBS -lm") | |
94 | AC_CHECK_LIB(PW, alloca, LIBS="$LIBS -lPW") | |
95 | ||
96 | @@ -185,11 +126,6 @@ | |
97 | if test "$tcl_checkSocket" = 1; then | |
98 | AC_CHECK_LIB(socket, main, LIBS="$LIBS -lsocket", tcl_checkBoth=1) | |
99 | fi | |
100 | -if test "$tcl_checkBoth" = 1; then | |
101 | - tk_oldLibs=$LIBS | |
102 | - LIBS="$LIBS -lsocket -lnsl" | |
103 | - AC_CHECK_FUNC(accept, tcl_checkNsl=0, [LIBS=$tk_oldLibs]) | |
104 | -fi | |
105 | AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"])) | |
106 | AC_CHECK_LIB(inet, main, [LIBS="$LIBS -linet"]) | |
107 | ||
108 | @@ -203,7 +139,7 @@ | |
109 | [AC_TRY_COMPILE([#include <termios.h>], [int main(void) { | |
110 | struct termios t;t.c_ispeed=t.c_ospeed=0;}], | |
111 | ac_cv_termios_cspeed=yes,ac_cv_termios_cspeed=no)]) | |
112 | -if test $ac_cv_termios_cspeed = yes; then | |
113 | +if test "x$ac_cv_termios_cspeed" = "xyes"; then | |
114 | AC_DEFINE(TERMIOS_CSPEED) | |
115 | fi | |
116 | ||
117 | @@ -559,7 +495,7 @@ | |
118 | ||
119 | AC_CONFIG_HEADER(include/pi-config.h include/pi-sockaddr.h) | |
120 | ||
121 | -if test $ac_cv_prog_cxx_works = yes; then | |
122 | +if test "x$ac_cv_prog_cxx_works" = "xyes"; then | |
123 | cc_m='libcc/Makefile' | |
124 | fi | |
125 |