Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
frama-c
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pub
frama-c
Commits
5e0aca88
Commit
5e0aca88
authored
6 years ago
by
Virgile Prevosto
Browse files
Options
Downloads
Patches
Plain Diff
[configure] Check lablgtk2on3 configuration
parent
c1ba9864
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
configure.in
+4
-3
4 additions, 3 deletions
configure.in
share/Makefile.config.in
+7
-1
7 additions, 1 deletion
share/Makefile.config.in
with
11 additions
and
4 deletions
configure.in
+
4
−
3
View file @
5e0aca88
...
@@ -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_
requir
e_external(gui,gnomecanvas)
plugin_
us
e_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],
...
...
This diff is collapsed.
Click to expand it.
share/Makefile.config.in
+
7
−
1
View file @
5e0aca88
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment