diff options
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/configure.in b/configure.in index 8f1eb973b..c643d9e54 100644 --- a/configure.in +++ b/configure.in | |||
@@ -158,6 +158,7 @@ AC_ARG_WITH(ssl-dir, | |||
158 | ) | 158 | ) |
159 | 159 | ||
160 | saved_LIBS="$LIBS" | 160 | saved_LIBS="$LIBS" |
161 | saved_LDFLAGS="$LDFLAGS" | ||
161 | saved_CFLAGS="$CFLAGS" | 162 | saved_CFLAGS="$CFLAGS" |
162 | if test "x$prefix" != "xNONE" ; then | 163 | if test "x$prefix" != "xNONE" ; then |
163 | tryssldir="$tryssldir $prefix" | 164 | tryssldir="$tryssldir $prefix" |
@@ -165,19 +166,21 @@ fi | |||
165 | AC_MSG_CHECKING([for OpenSSL/SSLeay directory]) | 166 | AC_MSG_CHECKING([for OpenSSL/SSLeay directory]) |
166 | for ssldir in "" $tryssldir /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl ; do | 167 | for ssldir in "" $tryssldir /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl ; do |
167 | if test ! -z "$ssldir" ; then | 168 | if test ! -z "$ssldir" ; then |
168 | LIBS="$saved_LIBS -L$ssldir/lib -L$ssldir -lcrypto" | 169 | LDFLAGS="$saved_LDFLAGS -L$ssldir/lib -L$ssldir" |
169 | CFLAGS="$CFLAGS -I$ssldir/include" | 170 | CFLAGS="$saved_CFLAGS -I$ssldir/include" |
170 | if test "x$need_dash_r" = "x1" ; then | 171 | if test ! -z "$need_dash_r" ; then |
171 | LIBS="$LIBS -R$ssldir/lib -L$ssldir" | 172 | LDFLAGS="$LDFLAGS -R$ssldir/lib -R$ssldir" |
172 | fi | 173 | fi |
173 | else | 174 | else |
174 | LIBS="$saved_LIBS -lcrypto" | 175 | LDFLAGS="$saved_LDFLAGS" |
175 | fi | 176 | fi |
176 | 177 | ||
177 | for WANTS_RSAREF in "" 1 ; do | 178 | for WANTS_RSAREF in "" 1 ; do |
178 | 179 | ||
179 | if test ! -z "$WANTS_RSAREF" ; then | 180 | if test -z "$WANTS_RSAREF" ; then |
180 | LIBS="$LIBS -lRSAglue -lrsaref" | 181 | LIBS="$saved_LIBS -lcrypto" |
182 | else | ||
183 | LIBS="$saved_LIBS -lcrypto -lRSAglue -lrsaref" | ||
181 | fi | 184 | fi |
182 | 185 | ||
183 | AC_TRY_RUN( | 186 | AC_TRY_RUN( |
@@ -225,15 +228,16 @@ fi | |||
225 | if test -z "$ssldir" ; then | 228 | if test -z "$ssldir" ; then |
226 | ssldir="(system)" | 229 | ssldir="(system)" |
227 | else | 230 | else |
228 | CFLAGS="$CFLAGS -I$ssldir/include" | 231 | CFLAGS="$saved_CFLAGS -I$ssldir/include" |
229 | LDFLAGS="$LDFLAGS -L$ssldir/lib" | 232 | LDFLAGS="$saved_LDFLAGS -L$ssldir/lib -L$ssldir" |
230 | if test "x$need_dash_r" = "x1" ; then | 233 | if test ! -z "$need_dash_r" ; then |
231 | LDFLAGS="$LDFLAGS -R$ssldir" | 234 | LDFLAGS="$LDFLAGS -R$ssldir/lib -R$ssldir" |
232 | fi | 235 | fi |
233 | fi | 236 | fi |
234 | LIBS="$saved_LIBS -lcrypto" | 237 | if test -z "$WANTS_RSAREF" ; then |
235 | if test ! -z "$WANTS_RSAREF" ; then | 238 | LIBS="$saved_LIBS -lcrypto" |
236 | LIBS="$LIBS -lRSAglue -lrsaref" | 239 | else |
240 | LIBS="$saved_LIBS -lcrypto -lRSAglue -lrsaref" | ||
237 | fi | 241 | fi |
238 | AC_MSG_RESULT($ssldir) | 242 | AC_MSG_RESULT($ssldir) |
239 | 243 | ||