From: Jan Rękorajski <baggins@pld-linux.org>
Date: Mon, 16 Feb 2009 13:06:42 +0000 (+0000)
Subject: - work around stupid detection of lablgtk2
X-Git-Tag: auto/th/coq-8_3pl1-1~17
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fcoq.git;a=commitdiff_plain;h=7b0a1b97a11f588b734f71421c3bed97ef0db0f7

- work around stupid detection of lablgtk2

Changed files:
    coq-lablgtk2.patch -> 1.1
---

diff --git a/coq-lablgtk2.patch b/coq-lablgtk2.patch
new file mode 100644
index 0000000..dcfc397
--- /dev/null
+++ b/coq-lablgtk2.patch
@@ -0,0 +1,41 @@
+--- coq-8.1pl4/configure~	2008-10-09 11:40:41.000000000 +0200
++++ coq-8.1pl4/configure	2009-02-16 14:03:00.496249846 +0100
+@@ -471,13 +471,13 @@
+ else
+     case $lablgtkdir_spec in
+ 	no) 
+-	    if [ -f "${CAMLLIB}/lablgtk2/glib.mli" ]; then
++	    if [ -f "${CAMLLIB}/lablgtk2/glib.cmi" ]; then
+ 		lablgtkdir=${CAMLLIB}/lablgtk2
+-	    elif [ -f "${CAMLLIB}/site-lib/lablgtk2/glib.mli" ]; then
++	    elif [ -f "${CAMLLIB}/site-lib/lablgtk2/glib.cmi" ]; then
+ 		lablgtkdir=${CAMLLIB}/site-lib/lablgtk2
+ 	    fi;;
+ 	yes)
+-	    if [ ! -f "$lablgtkdir/glib.mli" ]; then
++	    if [ ! -f "$lablgtkdir/glib.cmi" ]; then
+ 		echo "Incorrect LablGtk2 library (glib.mli not found)."
+ 		echo "Configuration script failed!"
+ 		exit 1
+@@ -486,9 +486,6 @@
+     if [ "$lablgtkdir" = "" ]; then
+ 	echo "LablGtk2 not found: CoqIde will not be available."
+ 	COQIDE=no
+-    elif [ -z "`grep -w convert_with_fallback "$lablgtkdir/glib.mli"`" ]; then
+-	echo "LablGtk2 found but too old: CoqIde will not be available."
+-	COQIDE=no;
+     elif [ "$coqide_spec" = "yes" -a "$COQIDE" = "byte" ]; then 
+ 	echo "LablGtk2 found, bytecode CoqIde will be used as requested."
+ 	COQIDE=byte
+@@ -855,11 +852,7 @@
+ ####################################################
+ 
+ if [ ! "$COQIDE" = "no" ]; then 
+-    if grep "class view " "$lablgtkdir/gText.mli" | grep -q "\[>" ; then
+ 	cp -f ide/undo_lablgtk_ge26.mli ide/undo.mli
+-    else
+-	cp -f ide/undo_lablgtk_lt26.mli ide/undo.mli
+-    fi
+ fi  
+ 
+ ##################################################