diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2010-12-11 00:52:34 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2010-12-15 16:05:17 +0100 |
| commit | 68b2a9818b296038bf601d9578bd424ae901ad3f (patch) | |
| tree | bca69739fab828dd80c32538ae403317f97faa97 | |
| parent | a7cf30f8081f98bdcd3f999a13c619374792f4c6 (diff) | |
configure: make --with-axtls set prefix
In tradition with other options, have this point to the directory prefix
and not the lib directory. Otherwise we can't set the include path
reliably.
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 9096531d0..ea5168935 100644 --- a/configure.ac +++ b/configure.ac @@ -1937,7 +1937,7 @@ fi dnl OPENSSL != 1 -a GNUTLS_ENABLED != 1 OPT_AXTLS=off AC_ARG_WITH(axtls,dnl -AC_HELP_STRING([--with-axtls=PATH],[Where to look for axTLS, PATH points to the axTLS installation (default: /usr/local/lib). Ignored if another SSL engine is selected.]) +AC_HELP_STRING([--with-axtls=PATH],[Where to look for axTLS, PATH points to the axTLS installation prefix (default: /usr/local). Ignored if another SSL engine is selected.]) AC_HELP_STRING([--without-axtls], [disable axTLS]), OPT_AXTLS=$withval) @@ -1951,8 +1951,10 @@ if test "$curl_ssl_msg" = "$init_ssl_msg"; then case "$OPT_AXTLS" in yes) dnl --with-axtls (without path) used - PREFIX_AXTLS=/usr/local/lib - LIB_AXTLS="$PREFIX_AXTLS" + PREFIX_AXTLS=/usr/local + LIB_AXTLS="$PREFIX_AXTLS/lib" + LDFLAGS="$LDFLAGS -L$LIB_AXTLS" + CPPFLAGS="$CPPFLAGS -I$PREFIX_AXTLS/include" ;; off) dnl no --with-axtls option given, just check default places @@ -1961,9 +1963,9 @@ if test "$curl_ssl_msg" = "$init_ssl_msg"; then *) dnl check the given --with-axtls spot PREFIX_AXTLS=$OPT_AXTLS - LIB_AXTLS="$PREFIX_AXTLS" + LIB_AXTLS="$PREFIX_AXTLS/lib" LDFLAGS="$LDFLAGS -L$LIB_AXTLS" - CPPFLAGS="$CPPFLAGS -I$PREFIX_AXTLS/ssl" + CPPFLAGS="$CPPFLAGS -I$PREFIX_AXTLS/include" ;; esac |