Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
libcdi
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
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
mpim-sw
libcdi
Commits
e1c16018
Commit
e1c16018
authored
2 years ago
by
Sergey Kosukhin
Browse files
Options
Downloads
Patches
Plain Diff
Fix silent configuration.
parent
af9b5943
Branches
cdi-1.8.x
No related tags found
1 merge request
!24
Backport: Fix silent configuration
Pipeline
#28822
passed
2 years ago
Stage: external
Changes
3
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
configure
+2
-2
2 additions, 2 deletions
configure
configure.ac
+1
-1
1 addition, 1 deletion
configure.ac
m4/acx_options.m4
+1
-1
1 addition, 1 deletion
m4/acx_options.m4
with
4 additions
and
4 deletions
configure
+
2
−
2
View file @
e1c16018
...
...
@@ -28585,7 +28585,7 @@ ac_compile="$ac_pwd/libtool --mode=compile --tag=CC $ac_compile"
LIBS="$PTHREAD_LIBS $LIBS"
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
CC="$PTHREAD_CC"
$as_echo "CC:$CC CFLAGS:$CFLAGS LIBS:$LIBS" ;; #(
$as_echo "CC:$CC CFLAGS:$CFLAGS LIBS:$LIBS"
>&6
;; #(
*) :
THREADS_ROOT=$with_threads
LDFLAGS="-L$THREADS_ROOT/lib $LDFLAGS"
...
...
@@ -35788,7 +35788,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: CDI is configured with the following options:" >&5
$as_echo "$as_me: CDI is configured with the following options:" >&6;}
cat cdi.settings
cat cdi.settings
>&6
{ $as_echo "$as_me:${as_lineno-$LINENO}:
This diff is collapsed.
Click to expand it.
configure.ac
+
1
−
1
View file @
e1c16018
...
...
@@ -742,7 +742,7 @@ AC_CONFIG_FILES([
AC_OUTPUT
AC_MSG_NOTICE([CDI is configured with the following options:])
cat cdi.settings
cat cdi.settings
>&AS_MESSAGE_FD
AC_MSG_NOTICE([
...
...
This diff is collapsed.
Click to expand it.
m4/acx_options.m4
+
1
−
1
View file @
e1c16018
...
...
@@ -16,7 +16,7 @@ AS_CASE([$with_threads],
LIBS="$PTHREAD_LIBS $LIBS"
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
CC="$PTHREAD_CC"
AS_ECHO(["CC:$CC CFLAGS:$CFLAGS LIBS:$LIBS"])],
AS_ECHO(["CC:$CC CFLAGS:$CFLAGS LIBS:$LIBS"])
>&AS_MESSAGE_FD
],
[*],[THREADS_ROOT=$with_threads
LDFLAGS="-L$THREADS_ROOT/lib $LDFLAGS"
CPPFLAGS="-I$THREADS_ROOT/include $CPPFLAGS "
...
...
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