Commit b1385a15 authored by Guillaume Melquiond's avatar Guillaume Melquiond

Fix incorrect detection of lablgtksourceview2 when ocamlfind is in use.

The old code was assuming that, if lablgtk2 and ocamlfind were installed,
lablgtksourceview2 was installed too. The new code explicitly checks for
both libraries.

Presumably, it won't work correctly if someone has decided to install
lablgtksourceview2 in a different location from lablgtk2, but it wouldn't
have worked with the previous version either, so it isn't a regression.
parent 978a8df0
...@@ -302,14 +302,24 @@ if test "$enable_ide" = yes ; then ...@@ -302,14 +302,24 @@ if test "$enable_ide" = yes ; then
LABLGTK2LIB="+lablgtk2" LABLGTK2LIB="+lablgtk2"
AC_CHECK_FILE($OCAMLLIB/lablgtk2/lablgtk.cma,,enable_ide=no) AC_CHECK_FILE($OCAMLLIB/lablgtk2/lablgtk.cma,,enable_ide=no)
if test "$enable_ide" = no; then if test "$enable_ide" = no; then
AC_MSG_WARN(Lib lablgtk2 not found, IDE disabled.) AC_MSG_WARN(Lib lablgtk2 not found, IDE disabled.)
reason_ide=" (lablgtk2 not found)" reason_ide=" (lablgtk2 not found)"
else fi
AC_CHECK_FILE($OCAMLLIB/lablgtk2/lablgtksourceview2.cma,,enable_ide=no) fi
if test "$enable_ide" = no; then fi
AC_MSG_WARN(Lib lablgtksourceview2 not found, IDE disabled.)
reason_ide=" (lablgtksourceview2 not found)" # checking for lablgtksourceview2
fi if test "$enable_ide" = yes ; then
if test "$USEOCAMLFIND" = yes; then
LABLGTKSV2LIB=$(ocamlfind query lablgtksourceview2)
fi
if test -n "$LABLGTKSV2LIB";then
echo "ocamlfind found lablgtksourceview2 in $LABLGTKSV2LIB"
else
AC_CHECK_FILE($OCAMLLIB/lablgtk2/lablgtksourceview2.cma,,enable_ide=no)
if test "$enable_ide" = no; then
AC_MSG_WARN(Lib lablgtksourceview2 not found, IDE disabled.)
reason_ide=" (lablgtksourceview2 not found)"
fi fi
fi fi
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment