From ad4e8388f31379aa615aa4751754cafc0b0a4c59 Mon Sep 17 00:00:00 2001
From: Virgile Prevosto <virgile.prevosto@m4x.org>
Date: Thu, 3 Jan 2019 15:03:02 +0100
Subject: [PATCH] [lablgtk3] configure now targets new opam package lablgtk3
---
Makefile | 2 +-
configure.in | 23 ++++++++++++++++-------
share/Makefile.config.in | 6 +++---
3 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
index e39c957906a..ab4b93aea0e 100644
--- a/Makefile
+++ b/Makefile
@@ -681,7 +681,7 @@ WTOOLKIT= \
wutil widget wbox wfile wpane wpalette wtext wtable
SOURCEVIEWCOMPAT:=
-ifeq ($(strip $(GTKSOURCEVIEW)),lablgtk2.sourceview3)
+ifeq ($(strip $(GTKSOURCEVIEW)),lablgtk3.sourceview3)
SOURCEVIEWCOMPAT:=GSourceView2
src/plugins/gui/GSourceView2.ml: src/plugins/gui/GSourceView2.ml.in
diff --git a/configure.in b/configure.in
index 55790f4fa1e..a7e178ff285 100644
--- a/configure.in
+++ b/configure.in
@@ -924,14 +924,22 @@ new_section "configure tools and libraries used by some plug-ins"
REQUIRE_LABLGTK="$REQUIRE_LABLGTK$REQUIRE_GNOMECANVAS"
USE_LABLGTK="$USE_LABLGTK$USE_GNOMECANVAS"
- LABLGTK_PATH=`ocamlfind query lablgtk2 | tr -d '\\r\\n'`
- if test "$LABLGTK_PATH" = "" -o "$LABLGTK_PATH" -ef "$OCAMLLIB/lablgtk2" ; then
- echo "Ocamlfind -> using +lablgtk2.($LABLGTK_PATH,$OCAMLLIB/lablgtk2)"
- LABLGTK_PATH=+lablgtk2
- LABLGTKPATH_FOR_CONFIGURE=$OCAMLLIB/lablgtk2
+ LABLGTK_PATH=`ocamlfind query lablgtk3 | tr -d '\\r\\n'`
+ if test "$LABLGTK_PATH" = ""; then
+ LABLGTK_VERSION=2
+ LABLGTK_PATH=`ocamlfind query lablgtk2 | tr -d '\\r\\n'`
+ if test "$LABLGTK_PATH" = "" -o "$LABLGTK_PATH" -ef "$OCAMLLIB/lablgtk2" ; then
+ echo "Ocamlfind -> using +lablgtk2.($LABLGTK_PATH,$OCAMLLIB/lablgtk2)"
+ LABLGTK_PATH=+lablgtk2
+ LABLGTKPATH_FOR_CONFIGURE=$OCAMLLIB/lablgtk2
+ else
+ echo "Ocamlfind -> using $LABLGTK_PATH"
+ LABLGTKPATH_FOR_CONFIGURE=$LABLGTK_PATH
+ fi;
else
- echo "Ocamlfind -> using $LABLGTK_PATH"
- LABLGTKPATH_FOR_CONFIGURE=$LABLGTK_PATH
+ LABLGTK_VERSION=3
+ echo "ocamlfind -> using $LABLGTK_PATH"
+ LABLGTKPATH_FOR_CONFIGURE=$LABLGTK_PATH;
fi
configure_library([GTKSOURCEVIEW],
@@ -992,6 +1000,7 @@ AC_SUBST(HAS_YOJSON)
AC_SUBST(HAS_APRON)
AC_SUBST(HAS_MPFR)
AC_SUBST(HAS_LANDMARKS)
+AC_SUBST(LABLGTK_VERSION)
AC_SUBST(OCAMLBEST)
AC_SUBST(OCAMLVERSION)
AC_SUBST(OCAMLLIB)
diff --git a/share/Makefile.config.in b/share/Makefile.config.in
index 5a27e4975e6..3b3bb7b71ae 100644
--- a/share/Makefile.config.in
+++ b/share/Makefile.config.in
@@ -102,12 +102,12 @@ DEVELOPMENT ?=@DEVELOPMENT@
HAS_LABLGTK ?=@HAS_LABLGTK@
HAS_LABLGTK_CUSTOM_MODEL ?=@HAS_LABLGTK@
LABLGTK_PATH ?=@LABLGTK_PATH@
-
+LABLGTK ?= lablgtk@LABLGTK_VERSION@
# lablgtksourceview
HAS_GTKSOURCEVIEW ?=@HAS_GTKSOURCEVIEW@
GTKSOURCEVIEW:=\
- $(patsubst lablgtk%,lablgtk2.%,$(basename $(notdir @GTKSOURCEVIEW@)))
+ $(patsubst lablgtk%,$(LABLGTK).%,$(basename $(notdir @GTKSOURCEVIEW@)))
# lablgnomecanvas
HAS_GNOMECANVAS ?=@HAS_GNOMECANVAS@
@@ -193,7 +193,7 @@ LIBRARY_NAMES += yojson
endif
ifneq ($(ENABLE_GUI),no)
- LIBRARY_NAMES_GUI = lablgtk2 $(GTKSOURCEVIEW)
+ LIBRARY_NAMES_GUI = $(LABLGTK) $(GTKSOURCEVIEW)
ifeq ($(HAS_GNOMECANVAS),yes)
LIBRARY_NAMES_GUI+=lablgtk2.gnomecanvas
endif
--
GitLab