blob: 2236f9edacee5a45d0ce95167e7b8203b3668b37 (
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
|
--- configure.orig Tue Nov 4 19:54:04 2003
+++ configure Tue Nov 4 20:12:59 2003
@@ -11731,7 +11731,7 @@
if test "$wxUSE_ZLIB" = "sys" -o "$wxUSE_ZLIB" = "yes" ; then
- if test "$USE_DARWIN" = 1; then
+ if test "$USE_DARWIN" = 1 -o "$USE_FREEBSD" = 1; then
system_zlib_h_ok="yes"
else
echo $ac_n "checking for zlib.h >= 1.1.4""... $ac_c" 1>&6
@@ -16099,6 +16099,13 @@
WX_RESOURCES_MACOSX_DATA="lib${WX_LIBRARY}.${WX_CURRENT}.rsrc"
fi
;;
+
+ *-*-freebsd* )
+ WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}"
+ WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}"
+ WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}"
+ WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
+ ;;
esac
WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
@@ -18679,7 +18686,7 @@
;;
esac
- THREAD_OPTS="$THREAD_OPTS pthread none"
+ THREAD_OPTS=
THREADS_OK=no
for flag in $THREAD_OPTS; do
@@ -18736,6 +18743,8 @@
THREADS_CFLAGS=""
done
+ THREADS_OK=yes
+
if test "x$THREADS_OK" != "xyes"; then
wxUSE_THREADS=no
echo "configure: warning: No thread support on this system... disabled" 1>&2
@@ -18752,7 +18761,6 @@
flag="-D_THREAD_SAFE"
;;
*-freebsd*)
- flag="-D_THREAD_SAFE"
;;
*-hp-hpux* )
flag="-D_REENTRANT"
@@ -19529,21 +19537,6 @@
CODE_GEN_FLAGS="$CODE_GEN_FLAGS -ffunction-sections"
;;
esac
-fi
-
-if test "$wxUSE_OPTIMISE" = "no" ; then
- OPTIMISE=
-else
- if test "$GCC" = yes ; then
- OPTIMISE="-O2"
- case "${host}" in
- i586-*-*|i686-*-* )
- OPTIMISE="${OPTIMISE} "
- ;;
- esac
- else
- OPTIMISE="-O"
- fi
fi
if test "$WXWIN_COMPATIBILITY_2" = "yes"; then
|
