coq-lablgtk2.patch

   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 @@ -634,7 +634,7 @@
   4              # Beware of the final \r in Win32
   5              lablgtkdirtmp="$(ocamlfind query lablgtk2 2> /dev/null | tr -d '\r')"
   6              if [ "$lablgtkdirtmp" != "" ]; then
   7 -                if [ -f "$lablgtkdirtmp/glib.cmi" -a -f "$lablgtkdirtmp/glib.mli" ]; then
   8 +                if [ -f "$lablgtkdirtmp/glib.cmi" -o -f "$lablgtkdirtmp/glib.mli" ]; then
   9                      lablgtkdirfoundmsg="LabelGtk2 found by ocamlfind"
  10                      lablgtkdir=$lablgtkdirtmp
  11                      LABLGTKLIB=$lablgtkdir # Pour le message utilisateur
  12 @@ -652,7 +652,7 @@
  13                  echo "$lablgtkdir is not a valid directory."
  14                 echo "Configuration script failed!"
  15                 exit 1
  16 -           elif [ -f "$lablgtkdir/glib.cmi" -a -f "$lablgtkdir/glib.mli" ]; then
  17 +           elif [ -f "$lablgtkdir/glib.cmi" -o -f "$lablgtkdir/glib.mli" ]; then
  18                  lablgtkdirfoundmsg="LablGtk2 directory found"
  19                  LABLGTKLIB=$lablgtkdir # Pour le message utilisateur
  20              else
  21 @@ -664,9 +664,6 @@
  22      if [ "$lablgtkdir" = "" ]; then
  23         echo "LablGtk2 not found: CoqIde will not be available."
  24         COQIDE=no
  25 -    elif [ -z "`grep -w convert_with_fallback "$lablgtkdir/glib.mli"`" ]; then
  26 -       echo "$lablgtkdirfoundmsg but too old: CoqIde will not be available."
  27 -       COQIDE=no;
  28      elif [ "$coqide_spec" = "yes" -a "$COQIDE" = "byte" ]; then
  29         echo "$lablgtkdirfoundmsg, bytecode CoqIde will be used as requested."
  30         COQIDE=byte
  31 @@ -855,15 +852,7 @@
  32  ####################################################
  33
  34  if [ ! "$COQIDE" = "no" ]; then
  35 -    if grep "class view " "$lablgtkdir/gText.mli" | grep -q "\[>" ; then
  36 -       if grep -q "?accepts_tab:bool" "$lablgtkdir/gText.mli" ; then
  37          cp -f ide/undo_lablgtk_ge212.mli ide/undo.mli
  38 -       else
  39 -       cp -f ide/undo_lablgtk_ge26.mli ide/undo.mli
  40 -       fi
  41 -    else
  42 -       cp -f ide/undo_lablgtk_lt26.mli ide/undo.mli
  43 -    fi
  44  fi
  45
  46  ##################################################