Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-common
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
Core Modules
dune-common
Commits
6765120b
Commit
6765120b
authored
11 years ago
by
Markus Blatt
Browse files
Options
Downloads
Patches
Plain Diff
Allow passing additional libs to DUNE_CHECK_MODULES.
parent
3cc3284e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
m4/dune.m4
+3
-3
3 additions, 3 deletions
m4/dune.m4
with
3 additions
and
3 deletions
m4/dune.m4
+
3
−
3
View file @
6765120b
...
...
@@ -299,7 +299,7 @@ AC_DEFUN([DUNE_CHECK_MODULES],[
ac_save_LIBS="$LIBS"
ac_save_LDFLAGS="$LDFLAGS"
CPPFLAGS=""
LIBS=""
LIBS="
$4
"
# if DUNE_LDFLAGS have a pre-assigned value (e.g. -all-static),
# also store it in DUNE_LDFLAGS_TMP to be consistent with DUNE_LDFLAGS
...
...
@@ -380,9 +380,9 @@ AC_DEFUN([DUNE_CHECK_MODULES],[
_DUNE_MODULE[]_VERSION="`grep Version $_DUNE_MODULE[]_SRCDIR/dune.module | sed -e 's/^Version: *//'`" 2>/dev/null
AS_IF([test -f "$_DUNE_MODULE[]_LIBDIR[]/lib[]_dune_lib[].la"], [
# local modules is linked directly via the .la file
_dune_cm_LIBS="$_DUNE_MODULE[]_LIBDIR[]/lib[]_dune_lib[].la"],[
_dune_cm_LIBS="$_DUNE_MODULE[]_LIBDIR[]/lib[]_dune_lib[].la
$LIBS
"],[
# No libtool file. This indicates a module build with CMake. Fall back to direct linking
_dune_cm_LIBS="-L$_DUNE_MODULE[]_LIBDIR[]/ -l[]_dune_lib[]"
_dune_cm_LIBS="-L$_DUNE_MODULE[]_LIBDIR[]/ -l[]_dune_lib[]
$LIBS
"
])
])
# set expanded module path
...
...
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