- (dtucker) [configure.ac] Bug #1756: Check for the existence of a lib64 dir
in the openssl install directory (some newer openssl versions do this on at least some amd64 platforms).
This commit is contained in:
parent
e25a9bd740
commit
9f8703b573
|
@ -1,3 +1,8 @@
|
||||||
|
20100423
|
||||||
|
- (dtucker) [configure.ac] Bug #1756: Check for the existence of a lib64 dir
|
||||||
|
in the openssl install directory (some newer openssl versions do this on at
|
||||||
|
least some amd64 platforms).
|
||||||
|
|
||||||
20100418
|
20100418
|
||||||
- OpenBSD CVS Sync
|
- OpenBSD CVS Sync
|
||||||
- jmc@cvs.openbsd.org 2010/04/16 06:45:01
|
- jmc@cvs.openbsd.org 2010/04/16 06:45:01
|
||||||
|
|
10
configure.ac
10
configure.ac
|
@ -1,4 +1,4 @@
|
||||||
# $Id: configure.ac,v 1.449 2010/04/10 12:58:01 dtucker Exp $
|
# $Id: configure.ac,v 1.450 2010/04/23 01:12:06 dtucker Exp $
|
||||||
#
|
#
|
||||||
# Copyright (c) 1999-2004 Damien Miller
|
# Copyright (c) 1999-2004 Damien Miller
|
||||||
#
|
#
|
||||||
|
@ -15,7 +15,7 @@
|
||||||
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
|
|
||||||
AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
|
AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
|
||||||
AC_REVISION($Revision: 1.449 $)
|
AC_REVISION($Revision: 1.450 $)
|
||||||
AC_CONFIG_SRCDIR([ssh.c])
|
AC_CONFIG_SRCDIR([ssh.c])
|
||||||
|
|
||||||
AC_CONFIG_HEADER(config.h)
|
AC_CONFIG_HEADER(config.h)
|
||||||
|
@ -1906,6 +1906,12 @@ AC_ARG_WITH(ssl-dir,
|
||||||
else
|
else
|
||||||
LDFLAGS="-L${withval}/lib ${LDFLAGS}"
|
LDFLAGS="-L${withval}/lib ${LDFLAGS}"
|
||||||
fi
|
fi
|
||||||
|
elif test -d "$withval/lib64"; then
|
||||||
|
if test -n "${need_dash_r}"; then
|
||||||
|
LDFLAGS="-L${withval}/lib64 -R${withval}/lib64 ${LDFLAGS}"
|
||||||
|
else
|
||||||
|
LDFLAGS="-L${withval}/lib64 ${LDFLAGS}"
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
if test -n "${need_dash_r}"; then
|
if test -n "${need_dash_r}"; then
|
||||||
LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}"
|
LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}"
|
||||||
|
|
Loading…
Reference in New Issue