Skip to content
Snippets Groups Projects
Commit 5e0aca88 authored by Virgile Prevosto's avatar Virgile Prevosto
Browse files

[configure] Check lablgtk2on3 configuration

parent c1ba9864
No related branches found
No related tags found
No related merge requests found
...@@ -741,7 +741,7 @@ plugin_require(from_analysis,callgraph) ...@@ -741,7 +741,7 @@ plugin_require(from_analysis,callgraph)
check_plugin(gui,src/plugins/gui,[support for gui],yes) check_plugin(gui,src/plugins/gui,[support for gui],yes)
plugin_require_external(gui,lablgtk) plugin_require_external(gui,lablgtk)
plugin_require_external(gui,gnomecanvas) plugin_use_external(gui,gnomecanvas)
plugin_require_external(gui,gtksourceview) plugin_require_external(gui,gtksourceview)
plugin_use_external(gui,dot) plugin_use_external(gui,dot)
...@@ -935,8 +935,9 @@ USE_LABLGTK="$USE_LABLGTK$USE_GNOMECANVAS" ...@@ -935,8 +935,9 @@ USE_LABLGTK="$USE_LABLGTK$USE_GNOMECANVAS"
fi fi
configure_library([GTKSOURCEVIEW], configure_library([GTKSOURCEVIEW],
[$LABLGTKPATH_FOR_CONFIGURE/lablgtksourceview2.$LIB_SUFFIX], [$LABLGTKPATH_FOR_CONFIGURE/lablgtksourceview2.$LIB_SUFFIX,
[lablgtksourceview2.$LIB_SUFFIX not found], $LABLGTKPATH_FOR_CONFIGURE/lablgtksourceview3.$LIB_SUFFIX],
[lablgtksourceview not found],
no) no)
configure_library([GNOMECANVAS], configure_library([GNOMECANVAS],
......
...@@ -106,6 +106,9 @@ LABLGTK_PATH ?=@LABLGTK_PATH@ ...@@ -106,6 +106,9 @@ LABLGTK_PATH ?=@LABLGTK_PATH@
# lablgtksourceview # lablgtksourceview
HAS_GTKSOURCEVIEW ?=@HAS_GTKSOURCEVIEW@ HAS_GTKSOURCEVIEW ?=@HAS_GTKSOURCEVIEW@
GTKSOURCEVIEW:=\
$(patsubst lablgtk%,lablgtk2.%,$(basename $(notdir @GTKSOURCEVIEW@)))
# lablgnomecanvas # lablgnomecanvas
HAS_GNOMECANVAS ?=@HAS_GNOMECANVAS@ HAS_GNOMECANVAS ?=@HAS_GNOMECANVAS@
...@@ -190,7 +193,10 @@ LIBRARY_NAMES += yojson ...@@ -190,7 +193,10 @@ LIBRARY_NAMES += yojson
endif endif
ifneq ($(ENABLE_GUI),no) ifneq ($(ENABLE_GUI),no)
LIBRARY_NAMES_GUI = lablgtk2 lablgtk2.gnomecanvas lablgtk2.sourceview2 LIBRARY_NAMES_GUI = lablgtk2 $(GTKSOURCEVIEW)
ifeq ($(HAS_GNOMECANVAS),yes)
LIBRARY_NAMES_GUI+=lablgtk2.gnomecanvas
endif
else else
LIBRARY_NAMES_GUI = LIBRARY_NAMES_GUI =
endif endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment