]>
Commit | Line | Data |
---|---|---|
7b0a1b97 JR |
1 | --- coq-8.1pl4/configure~ 2008-10-09 11:40:41.000000000 +0200 |
2 | +++ coq-8.1pl4/configure 2009-02-16 14:03:00.496249846 +0100 | |
3 | @@ -471,13 +471,13 @@ | |
4 | else | |
5 | case $lablgtkdir_spec in | |
6 | no) | |
7 | - if [ -f "${CAMLLIB}/lablgtk2/glib.mli" ]; then | |
8 | + if [ -f "${CAMLLIB}/lablgtk2/glib.cmi" ]; then | |
9 | lablgtkdir=${CAMLLIB}/lablgtk2 | |
10 | - elif [ -f "${CAMLLIB}/site-lib/lablgtk2/glib.mli" ]; then | |
11 | + elif [ -f "${CAMLLIB}/site-lib/lablgtk2/glib.cmi" ]; then | |
12 | lablgtkdir=${CAMLLIB}/site-lib/lablgtk2 | |
13 | fi;; | |
14 | yes) | |
15 | - if [ ! -f "$lablgtkdir/glib.mli" ]; then | |
16 | + if [ ! -f "$lablgtkdir/glib.cmi" ]; then | |
17 | echo "Incorrect LablGtk2 library (glib.mli not found)." | |
18 | echo "Configuration script failed!" | |
19 | exit 1 | |
20 | @@ -486,9 +486,6 @@ | |
21 | if [ "$lablgtkdir" = "" ]; then | |
22 | echo "LablGtk2 not found: CoqIde will not be available." | |
23 | COQIDE=no | |
24 | - elif [ -z "`grep -w convert_with_fallback "$lablgtkdir/glib.mli"`" ]; then | |
25 | - echo "LablGtk2 found but too old: CoqIde will not be available." | |
26 | - COQIDE=no; | |
27 | elif [ "$coqide_spec" = "yes" -a "$COQIDE" = "byte" ]; then | |
28 | echo "LablGtk2 found, bytecode CoqIde will be used as requested." | |
29 | COQIDE=byte | |
30 | @@ -855,11 +852,7 @@ | |
31 | #################################################### | |
32 | ||
33 | if [ ! "$COQIDE" = "no" ]; then | |
34 | - if grep "class view " "$lablgtkdir/gText.mli" | grep -q "\[>" ; then | |
35 | cp -f ide/undo_lablgtk_ge26.mli ide/undo.mli | |
36 | - else | |
37 | - cp -f ide/undo_lablgtk_lt26.mli ide/undo.mli | |
38 | - fi | |
39 | fi | |
40 | ||
41 | ################################################## |