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
81bc6159
Commit
81bc6159
authored
13 years ago
by
Ralf Mueller
Browse files
Options
Downloads
Patches
Plain Diff
Added full support for nc-config execution from foreign directories
parent
60126f42
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
aclocal.m4
+2
-2
2 additions, 2 deletions
aclocal.m4
configure
+302
-331
302 additions, 331 deletions
configure
m4/acx_options.m4
+2
-1
2 additions, 1 deletion
m4/acx_options.m4
with
306 additions
and
334 deletions
aclocal.m4
+
2
−
2
View file @
81bc6159
...
...
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.6
8
],,
[m4_warning([this file was generated for autoconf 2.6
8
.
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.6
6
],,
[m4_warning([this file was generated for autoconf 2.6
6
.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
...
...
This diff is collapsed.
Click to expand it.
configure
+
302
−
331
View file @
81bc6159
This diff is collapsed.
Click to expand it.
m4/acx_options.m4
+
2
−
1
View file @
81bc6159
...
...
@@ -155,7 +155,8 @@ AC_ARG_WITH([netcdf],
AC_SUBST([NETCDF_LDFLAGS],[" -L$NETCDF_ROOT/lib -lnetcdf"])
AC_SUBST([NETCDF_INCLUDE],[" -I$NETCDF_ROOT/include"])
AC_MSG_CHECKING([nc-config script])
AC_CHECK_PROG(NC_CONFIG,nc-config,nc-config)
AC_CHECK_PROG(NC_CONFIG,nc-config,[$NETCDF_ROOT/bin/nc-config],,["$NETCDF_ROOT/bin"])
AS_ECHO([$NC_CONFIG])
AS_IF([test "x$NC_CONFIG" != "x"],
[AC_MSG_RESULT([found])
AC_MSG_CHECKING([netcdf's nc2 support])
...
...
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