|
 |
b6b7852 |
From 8875112f5c57ec5d575e717c5638fbc919145efb Mon Sep 17 00:00:00 2001
|
|
|
b6b7852 |
From: Adam Jackson <ajax@redhat.com>
|
|
|
b6b7852 |
Date: Mon, 16 Nov 2009 18:01:26 -0500
|
|
|
b6b7852 |
Subject: [PATCH] configure: Only link against libcrypto
|
|
|
b6b7852 |
|
|
|
b6b7852 |
openssl.pc will link you against libssl, which we don't need, and which
|
|
|
b6b7852 |
brings in another seven libraries we also don't need. This is still
|
|
|
b6b7852 |
bogus, we're really only trying to get a SHA1 routine, we could link it
|
|
|
b6b7852 |
statically and be even better off.
|
|
|
b6b7852 |
---
|
|
|
b6b7852 |
configure.ac | 6 ------
|
|
|
b6b7852 |
1 files changed, 0 insertions(+), 6 deletions(-)
|
|
|
b6b7852 |
|
|
|
b6b7852 |
diff --git a/configure.ac b/configure.ac
|
|
|
b6b7852 |
index f69f97e..254d33d 100644
|
|
|
b6b7852 |
--- a/configure.ac
|
|
|
b6b7852 |
+++ b/configure.ac
|
|
|
b6b7852 |
@@ -1297,14 +1297,8 @@ if test "x$SHA1_LIB" = "x" ; then
|
|
|
b6b7852 |
fi
|
|
|
b6b7852 |
|
|
|
b6b7852 |
if test "x$SHA1_LIB" = "x" ; then
|
|
|
b6b7852 |
- PKG_CHECK_EXISTS([OPENSSL], [openssl], [HAVE_OPENSSL_PKC=yes],
|
|
|
b6b7852 |
- [HAVE_OPENSSL_PKC=no])
|
|
|
b6b7852 |
- if test "x$HAVE_OPENSSL_PKC" = xyes; then
|
|
|
b6b7852 |
- REQUIRED_LIBS="$REQUIRED_LIBS openssl"
|
|
|
b6b7852 |
- else
|
|
|
b6b7852 |
AC_CHECK_LIB([crypto], [SHA1_Init], [SHA1_LIB="-lcrypto"],
|
|
|
b6b7852 |
[AC_MSG_ERROR([OpenSSL must be installed in order to build the X server.])])
|
|
|
b6b7852 |
- fi
|
|
|
b6b7852 |
fi
|
|
|
b6b7852 |
|
|
|
b6b7852 |
PKG_CHECK_MODULES([XSERVERCFLAGS], [$REQUIRED_MODULES $REQUIRED_LIBS])
|
|
|
b6b7852 |
--
|
|
|
b6b7852 |
1.6.5.2
|
|
|
b6b7852 |
|