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
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
|
$NetBSD: patch-at,v 1.21 2011/03/29 13:45:02 adam Exp $
--- configure.orig 2010-07-28 13:18:22.000000000 +0000
+++ configure
@@ -328,6 +328,8 @@ case "$bytecc,$host" in
gcc*)
bytecccompopts="-fno-defer-pop $gcc_warnings";;
esac
+bytecccompopts="$bytecccompopts $CFLAGS"
+bytecclinkopts="$bytecclinkopts $LDFLAGS"
# Configure compiler to use in further tests
@@ -520,7 +520,7 @@ if test $withsharedlibs = "yes"; then
mksharedlib="$flexlink"
mkmaindll="$flexlink -maindll"
shared_libraries_supported=true;;
- *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*)
+ *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*|*-*-dragonfly)
sharedcccompopts="-fPIC"
mksharedlib="$bytecc -shared"
bytecclinkopts="$bytecclinkopts -Wl,-E"
@@ -620,7 +620,7 @@ if test $withsharedlibs = "yes"; then
i[3456]86-*-linux*) natdynlink=true;;
x86_64-*-linux*) natdynlink=true;;
i[3456]86-*-darwin10.*)
- if test $arch64 == true; then
+ if test $arch64 = true; then
natdynlink=true
fi;;
i[3456]86-*-darwin[89]*) natdynlink=true;;
@@ -653,12 +653,13 @@ case "$host" in
alpha*-*-netbsd*) arch=alpha; system=netbsd;;
alpha*-*-openbsd*) arch=alpha; system=openbsd;;
sparc*-*-sunos4.*) arch=sparc; system=sunos;;
- sparc*-*-solaris2.*) arch=sparc; system=solaris;;
+ sparc*-*-solaris2*) arch=sparc; system=solaris;;
sparc*-*-*bsd*) arch=sparc; system=bsd;;
sparc*-*-linux*) arch=sparc; system=linux;;
sparc*-*-gnu*) arch=sparc; system=gnu;;
i[3456]86-*-linux*) arch=i386; system=linux_`sh ./runtest elf.c`;;
i[3456]86-*-*bsd*) arch=i386; system=bsd_`sh ./runtest elf.c`;;
+ i[3456]86-*-dragonfly*) arch=i386; system=bsd_`sh ./runtest elf.c`;;
i[3456]86-*-nextstep*) arch=i386; system=nextstep;;
i[3456]86-*-solaris*) if $arch64; then
arch=amd64; system=solaris
@@ -667,6 +668,7 @@ case "$host" in
fi;;
i[3456]86-*-beos*) arch=i386; system=beos;;
i[3456]86-*-cygwin*) arch=i386; system=cygwin;;
+ i[3456]86-*-interix3*) arch=i386; system=interix3;;
i[3456]86-*-darwin*) if $arch64; then
arch=amd64; system=macosx
else
@@ -683,6 +685,7 @@ case "$host" in
powerpc-*-rhapsody*) arch=power; model=ppc; system=rhapsody;;
powerpc-*-darwin*) arch=power; system=rhapsody
if $arch64; then model=ppc64; else model=ppc; fi;;
+ arm*-*-netbsd*) arch=arm; system=netbsd;;
arm*-*-linux*) arch=arm; system=linux;;
arm*-*-gnu*) arch=arm; system=gnu;;
ia64-*-linux*) arch=ia64; system=linux;;
@@ -693,7 +696,9 @@ case "$host" in
x86_64-*-freebsd*) arch=amd64; system=freebsd;;
x86_64-*-netbsd*) arch=amd64; system=netbsd;;
x86_64-*-openbsd*) arch=amd64; system=openbsd;;
+ x86_64-*-solaris*) arch=amd64; system=solaris;;
x86_64-*-darwin9.5) arch=amd64; system=macosx;;
+ x86_64-*-darwin1[0-9]*) arch=amd64; system=macosx;;
esac
# Some platforms exist both in 32-bit and 64-bit variants, not distinguished
@@ -794,6 +799,7 @@ case "$arch,$model,$system" in
case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
amd64,*,linux) profiling='prof';;
amd64,*,gnu) profiling='prof';;
+ power,*,bsd) profiling='prof';;
*) profiling='noprof';;
esac
@@ -1198,6 +1204,8 @@ if test "$pthread_wanted" = "yes"; then
pthread_caml_link="-cclib -lpthread -cclib -lposix4";;
*-*-freebsd*) pthread_link="-pthread"
pthread_caml_link="-cclib -pthread";;
+ *-*-dragonfly*) pthread_link="-pthread"
+ pthread_caml_link="-cclib -pthread";;
*-*-openbsd*) pthread_link="-pthread"
pthread_caml_link="-cclib -pthread";;
*) pthread_link="-lpthread"
@@ -1249,6 +1257,7 @@ fi
x11_include="not found"
x11_link="not found"
+if test "$disable_x11" != "yes"; then
for dir in \
$x11_include_dir \
\
@@ -1301,6 +1310,7 @@ do
break
fi
done
+fi
if test "$x11_include" = "not found"; then
x11_try_lib_dir=''
@@ -1395,31 +1405,8 @@ dbm_include="not found"
dbm_link="not found"
use_gdbm_ndbm=no
-for dir in /usr/include /usr/include/db1 /usr/include/gdbm; do
- if test -f $dir/ndbm.h; then
- dbm_include=$dir
- if sh ./hasgot dbm_open; then
- dbm_link=""
- elif sh ./hasgot -lndbm dbm_open; then
- dbm_link="-lndbm"
- elif sh ./hasgot -ldb1 dbm_open; then
- dbm_link="-ldb1"
- elif sh ./hasgot -lgdbm dbm_open; then
- dbm_link="-lgdbm"
- elif sh ./hasgot -lgdbm_compat -lgdbm dbm_open; then
- dbm_link="-lgdbm_compat -lgdbm"
- fi
- break
- fi
- if test -f $dir/gdbm-ndbm.h; then
- dbm_include=$dir
- use_gdbm_ndbm=yes
- if sh ./hasgot -lgdbm_compat -lgdbm dbm_open; then
- dbm_link="-lgdbm_compat -lgdbm"
- fi
- break
- fi
-done
+dbm_include=/usr/include
+dbm_link=${BDB_LIBS}
if test "$dbm_include" = "not found" || test "$dbm_link" = "not found"; then
echo "NDBM not found, the \"dbm\" library will not be supported."
else
@@ -1429,8 +1416,8 @@ else
else
dbm_include="-I$dbm_include"
fi
- if test "$use_gdbm_ndbm" = "yes"; then
- echo "#define DBM_USES_GDBM_NDBM" >> s.h
+ if test ${BDB_BUILTIN} = "yes"; then
+ echo "#define DBM_USES_DB" >> s.h
fi
otherlibraries="$otherlibraries dbm"
fi
|
