blob: fcf14b0e3aa855c369a8b0d3450998247ea68796 (
plain) (
blame)
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
|
$FreeBSD$
--- ../ecos/host/libcdl/configure.orig Wed Feb 12 18:22:31 2003
+++ ../ecos/host/libcdl/configure Tue Mar 27 19:35:42 2007
@@ -1534,7 +1534,7 @@
if test "${GCC}" = "yes" ; then
ecos_CFLAGS="${ecos_CFLAGS} -pipe -Wall -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs"
- ecos_CXXFLAGS="${ecos_CXXFLAGS} -pipe -Wall -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Woverloaded-virtual"
+ ecos_CXXFLAGS="${ecos_CXXFLAGS} -pipe -Wall -Wpointer-arith -Wcast-qual -Woverloaded-virtual"
elif test "${MSVC}" = "yes" ; then
ecos_CFLAGS="${ecos_CFLAGS} -nologo -W3"
ecos_CXXFLAGS="${ecos_CXXFLAGS} -nologo -W3 -GR -GX"
@@ -1968,64 +1968,6 @@
{ echo "configure: error: ${tclconfig}/tclConfig.sh does not define TCL_LIB_SPEC" 1>&2; exit 1; }
fi
ecos_LIBS="${ecos_LIBS} ${TCL_LIB_SPEC}"
-
- possibles=`echo ${possibles} | sed -e 's,tcl,tk,g'`
-
- tkconfig=""
- for i in ${possibles}; do
- if test -r "$i/"tkConfig.sh""; then
- tkconfig=$i
- break
- fi
- done
-
- if test \! -r "${tkconfig}/tkConfig.sh" ; then
- { echo "configure: error: unable to locate Tk config file tkConfig.sh" 1>&2; exit 1; }
- else
- . ${tkconfig}/tkConfig.sh
- if test -z "${TK_INC_DIR}" ; then
- if test "${TK_PREFIX}" = "/usr" ; then
- ecos_tk_includes="${TK_XINCLUDES}"
- else
- ecos_tk_includes="-I${TK_PREFIX}/include ${TK_XINCLUDES}"
- fi
- else
- ecos_tk_includes="-I${TK_INC_DIR} ${TK_XINCLUDES}"
- fi
-
- if test -z "${TK_LIB_SPEC}" -a "${with_tcl_version+set}" = set ; then
-
- libtk=""
- for i in ${possibles}; do
- if test -r "$i/"libtk${with_tcl_version}.a""; then
- libtk=$i
- break
- fi
- done
-
- if test -r "${libtk}/libtk${with_tcl_version}.a" ; then
- TK_LIB_SPEC="-L${libtk} -ltk${with_tcl_version}"
- fi
- fi
- if test -z "${TK_LIB_SPEC}" ; then
-
- libtk=""
- for i in ${possibles}; do
- if test -r "$i/"libtk.a""; then
- libtk=$i
- break
- fi
- done
-
- if test -r "${libtk}/libtk.a" ; then
- TK_LIB_SPEC="-L${libtk} -ltk"
- fi
- fi
- if test -z "${TK_LIB_SPEC}" ; then
- { echo "configure: error: ${tkconfig}/tkConfig.sh does not define TK_LIB_SPEC" 1>&2; exit 1; }
- fi
- ecos_tk_libs="${TK_LIB_SPEC} ${TK_LIBS}"
- fi
fi
fi
|
