blob: 0aa90973793a97faca2a55d4fbc293afbb58df6e (
plain)
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
|
Index: ocaml-3.10.0/configure
===================================================================
--- ocaml-3.10.0.orig/configure
+++ ocaml-3.10.0/configure
@@ -31,6 +31,8 @@ x11_include_dir=''
x11_lib_dir=''
tk_wanted=yes
pthread_wanted=yes
+graph_wanted=yes
+dbm_wanted=yes
tk_defs=''
tk_libs=''
tk_x11=yes
@@ -87,6 +89,10 @@ while : ; do
;; # Ignored for backward compatibility
-no-pthread*|--no-pthread*)
pthread_wanted=no;;
+ -no-dbm|--no-dbm)
+ dbm_wanted=no;;
+ -no-graph|--no-graph)
+ graph_wanted=no;;
-no-tk|--no-tk)
tk_wanted=no;;
-tkdefs*|--tkdefs*)
@@ -1233,7 +1239,7 @@ do
done
-if test "$x11_include" = "not found" || test "$x11_link" = "not found"
+if test "$x11_include" = "not found" || test "$x11_link" = "not found" || test "$graph_wanted" = "no"
then
echo "X11 not found, the \"graph\" library will not be supported."
x11_include=""
@@ -1281,7 +1287,7 @@ for dir in /usr/include /usr/include/db1
break
fi
done
-if test "$dbm_include" = "not found" || test "$dbm_link" = "not found"; then
+if test "$dbm_include" = "not found" || test "$dbm_link" = "not found" || test "$dbm_wanted" = "no"; then
echo "NDBM not found, the \"dbm\" library will not be supported."
else
echo "NDBM found (in $dbm_include)"
@@ -1546,7 +1552,7 @@ echo " $otherlibraries"
echo "Configuration for the \"num\" library:"
echo " target architecture ...... $bng_arch (asm level $bng_asm_level)"
-if test "$x11_include" != "not found" && test "$x11_lib" != "not found"; then
+if test "$x11_include" != "not found" && test "$x11_lib" != "not found" && test "$graph_wanted" != "no"; then
echo "Configuration for the \"graph\" library:"
echo " options for compiling .... $x11_include"
echo " options for linking ...... $x11_link"
|
GitWeb
