Commit abb9c24b authored by MARCHE Claude's avatar MARCHE Claude

Use gtk3 in priority over gtk2

parent ad0217fa
......@@ -513,53 +513,55 @@ if test "$found_menhirlib" = no; then
AC_MSG_ERROR([Library menhirLib not found.])
fi
# checking for lablgtk2
# checking for lablgtk3
if test "$enable_ide" != yes ; then
reason_ide=" (disabled by user)"
else
DIR=
if test "$USEOCAMLFIND" = yes; then
DIR=$(ocamlfind query lablgtk2)
DIR=$(ocamlfind query lablgtk3)
if test -n "$DIR"; then
echo "ocamlfind found lablgtk2 in $DIR"
echo "ocamlfind found lablgtk3 in $DIR"
LABLGTKINCLUDE="-I $DIR"
fi
fi
if test -z "$DIR"; then
LABLGTKINCLUDE="-I +lablgtk2"
DIR="$OCAMLLIB/lablgtk2"
LABLGTKINCLUDE="-I +lablgtk3"
DIR="$OCAMLLIB/lablgtk3"
AC_CHECK_FILE($DIR/lablgtk.cma,,enable_ide=no)
fi
AC_CHECK_FILE($DIR/gtkButton.cmi,,enable_ide=no)
if test "$enable_ide" = yes; then
GTKVERSION=2
GTKVERSION=3
reason_ide=" (gtk3)"
else
AC_MSG_WARN([Lib lablgtk2 not found, trying lablgtk3.])
AC_MSG_WARN([Lib lablgtk3 not found, trying lablgtk2.])
enable_ide=retry
fi
fi
# checking for lablgtk3
# checking for lablgtk2
if test "$enable_ide" = retry; then
enable_ide=yes
DIR=
if test "$USEOCAMLFIND" = yes; then
DIR=$(ocamlfind query lablgtk3)
DIR=$(ocamlfind query lablgtk2)
if test -n "$DIR"; then
echo "ocamlfind found lablgtk3 in $DIR"
echo "ocamlfind found lablgtk2 in $DIR"
LABLGTKINCLUDE="-I $DIR"
fi
fi
if test -z "$DIR"; then
LABLGTKINCLUDE="-I +lablgtk3"
DIR="$OCAMLLIB/lablgtk3"
LABLGTKINCLUDE="-I +lablgtk2"
DIR="$OCAMLLIB/lablgtk2"
AC_CHECK_FILE($DIR/lablgtk.cma,,enable_ide=no)
fi
AC_CHECK_FILE($DIR/gtkButton.cmi,,enable_ide=no)
if test "$enable_ide" = yes; then
GTKVERSION=3
GTKVERSION=2
reason_ide=" (gtk2)"
else
AC_MSG_WARN([Lib lablgtk3 not found, IDE disabled.])
AC_MSG_WARN([Lib lablgtk2 not found, IDE disabled.])
reason_ide=" (lablgtk2/3 not found)"
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