diff options
| author | Brent Cook <bcook@openbsd.org> | 2015-07-15 20:00:21 -0500 |
|---|---|---|
| committer | Brent Cook <bcook@openbsd.org> | 2015-07-15 20:02:38 -0500 |
| commit | db974c34e95a24eda7ce575cc14bbc0eebfbdbb4 (patch) | |
| tree | f884d9c33c5dd2c5e44b42d8b104a4117bbb2ea2 /configure.ac | |
| parent | 4cffda193ba3fd6d0a167e5188ae52517c0c476d (diff) | |
| download | portable-db974c34e95a24eda7ce575cc14bbc0eebfbdbb4.tar.gz portable-db974c34e95a24eda7ce575cc14bbc0eebfbdbb4.tar.bz2 portable-db974c34e95a24eda7ce575cc14bbc0eebfbdbb4.zip | |
fixup how OPENSSLDIR is derived and expanded
As per
http://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Installation-Directory-Variables.html
we should not try to expand variables like sysconfdir in the
configure script, but rather derive the correct value in the Makefiles
instead. This fixes missing expansions as the preprocessor define.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 4f6fb38..43ef0cd 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -57,11 +57,10 @@ AC_CHECK_HEADERS([err.h]) | |||
| 57 | AC_ARG_WITH([openssldir], | 57 | AC_ARG_WITH([openssldir], |
| 58 | AS_HELP_STRING([--with-openssldir], | 58 | AS_HELP_STRING([--with-openssldir], |
| 59 | [Set the default openssl directory]), | 59 | [Set the default openssl directory]), |
| 60 | OPENSSLDIR="$withval", | 60 | OPENSSLDIR="$withval" |
| 61 | OPENSSLDIR="$sysconfdir/ssl" | 61 | AC_SUBST(OPENSSLDIR) |
| 62 | ) | 62 | ) |
| 63 | AC_SUBST(OPENSSLDIR) | 63 | AM_CONDITIONAL([OPENSSLDIR_DEFINED], [test x$with_openssldir != x]) |
| 64 | AC_DEFINE_UNQUOTED(OPENSSLDIR, "$OPENSSLDIR") | ||
| 65 | 64 | ||
| 66 | AC_ARG_ENABLE([extratests], | 65 | AC_ARG_ENABLE([extratests], |
| 67 | AS_HELP_STRING([--enable-extratests], [Enable extra tests that may be unreliable on some platforms])) | 66 | AS_HELP_STRING([--enable-extratests], [Enable extra tests that may be unreliable on some platforms])) |