diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-12-02 13:20:02 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2019-12-02 13:20:02 +0100 |
| commit | e59e2b2951706c3d8ba9374ceb567499f064daf9 (patch) | |
| tree | 2498401ece9f31484b22ae48417d8577531be0be /configure.ac | |
| parent | ac2bc721d84f3c6c214212e41808a45fa792c6e8 (diff) | |
| parent | 3e85c57a6cbf46d5f0fe8a89b368a43abd26daba (diff) | |
Merge branch 'pkg-config-static' of https://github.com/matthewbauer/nix
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 8e38f2b8e..9dd0acd86 100644 --- a/configure.ac +++ b/configure.ac @@ -156,6 +156,18 @@ if test "x$GCC_ATOMIC_BUILTINS_NEED_LIBATOMIC" = xyes; then LIBS="-latomic $LIBS" fi +PKG_PROG_PKG_CONFIG + +AC_ARG_ENABLE(shared, AC_HELP_STRING([--enable-shared], + [Build shared libraries for Nix [default=yes]]), + shared=$enableval, shared=yes) +if test "$shared" = yes; then + AC_SUBST(BUILD_SHARED_LIBS, 1, [Whether to build shared libraries.]) +else + AC_SUBST(BUILD_SHARED_LIBS, 0, [Whether to build shared libraries.]) + PKG_CONFIG="$PKG_CONFIG --static" +fi + # Look for OpenSSL, a required dependency. FIXME: this is only (maybe) # used by S3BinaryCacheStore. PKG_CHECK_MODULES([OPENSSL], [libcrypto], [CXXFLAGS="$OPENSSL_CFLAGS $CXXFLAGS"]) @@ -285,16 +297,6 @@ AC_ARG_WITH(sandbox-shell, AC_HELP_STRING([--with-sandbox-shell=PATH], sandbox_shell=$withval) AC_SUBST(sandbox_shell) -AC_ARG_ENABLE(shared, AC_HELP_STRING([--enable-shared], - [Build shared libraries for Nix [default=yes]]), - shared=$enableval, shared=yes) -if test "$shared" = yes; then - AC_SUBST(BUILD_SHARED_LIBS, 1, [Whether to build shared libraries.]) -else - AC_SUBST(BUILD_SHARED_LIBS, 0, [Whether to build shared libraries.]) -fi - - # Expand all variables in config.status. test "$prefix" = NONE && prefix=$ac_default_prefix test "$exec_prefix" = NONE && exec_prefix='${prefix}' |