moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-22 15:58:50 -05:00
Code Issues Releases Wiki Activity

buildsys: use pkg-config for openssl detection

Browse Source 
Signed-off-by: Dave Reisner <dreisner@archlinux.org>
This commit is contained in:
Dave Reisner 2012-03-30 14:26:35 -04:00
parent bcfc2155a0
commit c5d951846d
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
configure.ac
View File

@ -157,17 +157,15 @@ AC_CHECK_LIB([archive], [archive_read_data], ,
AC_MSG_ERROR([libarchive is needed to compile pacman!])) AC_MSG_ERROR([libarchive is needed to compile pacman!]))
# Check for OpenSSL # Check for OpenSSL
AC_MSG_CHECKING(whether to link with libssl) have_openssl=no
AS_IF([test "x$with_openssl" != "xno"], if test "x$with_openssl" != "xno"; then
[AC_MSG_RESULT(yes) PKG_CHECK_MODULES(LIBSSL, [libssl libcrypto],
AC_CHECK_LIB([ssl], [MD5_Final], , [AC_DEFINE(HAVE_LIBSSL, 1, [Define if libcrypto is available]) have_openssl=yes], have_openssl=no)
[if test "x$with_openssl" != "xcheck"; then if test "x$have_openssl" = xno -a "x$with_openssl" = xyes; then
AC_MSG_FAILURE([--with-openssl was given, but -lssl was not found]) AC_MSG_ERROR([*** openssl support requested but libraries not found])
fi], fi
[-lcrypto]) fi
with_openssl=$ac_cv_lib_ssl_MD5_Final], AM_CONDITIONAL(HAVE_LIBSSL, [test "$have_openssl" = "yes"])
AC_MSG_RESULT(no))
AM_CONDITIONAL([HAVE_LIBSSL], [test "x$with_openssl" = "xyes"])
# Check for gpgme # Check for gpgme
AC_MSG_CHECKING(whether to link with libgpgme) AC_MSG_CHECKING(whether to link with libgpgme)
@ -414,7 +412,7 @@ ${PACKAGE_NAME}:
preprocessor flags : ${CPPFLAGS} preprocessor flags : ${CPPFLAGS}
compiler flags : ${CFLAGS} compiler flags : ${CFLAGS}
defines : ${DEFS} defines : ${DEFS}
library flags : ${LIBS} library flags : ${LIBS} ${LIBSSL_LIBS}
linker flags : ${LDFLAGS} linker flags : ${LDFLAGS}
Architecture : ${CARCH} Architecture : ${CARCH}
@ -436,7 +434,7 @@ ${PACKAGE_NAME}:
Compilation options: Compilation options:
Use libcurl : ${with_libcurl} Use libcurl : ${with_libcurl}
Use GPGME : ${with_gpgme} Use GPGME : ${with_gpgme}
Use OpenSSL : ${with_openssl} Use OpenSSL : ${have_openssl}
Run make in doc/ dir : ${wantdoc} ${asciidoc} Run make in doc/ dir : ${wantdoc} ${asciidoc}
Doxygen support : ${usedoxygen} Doxygen support : ${usedoxygen}
debug support : ${debug} debug support : ${debug}

9
lib/libalpm/Makefile.am
View File

@ -64,6 +64,13 @@ libalpm_la_SOURCES += \
endif endif
libalpm_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION_INFO) @LIBCURL@ libalpm_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION_INFO) @LIBCURL@
libalpm_la_LIBADD = $(LTLIBINTL)
libalpm_la_CFLAGS = \
$(AM_CFLAGS) \
$(LIBSSL_CFLAGS)
libalpm_la_LIBADD = \
$(LTLIBINTL) \
$(LIBSSL_LIBS)
# vim:set ts=2 sw=2 noet: # vim:set ts=2 sw=2 noet:

2
src/util/Makefile.am
View File

@ -35,6 +35,6 @@ testpkg_SOURCES = testpkg.c
testpkg_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la testpkg_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la
vercmp_SOURCES = vercmp.c vercmp_SOURCES = vercmp.c
vercmp_LDADD = $(top_builddir)/lib/libalpm/version.lo vercmp_LDADD = $(top_builddir)/lib/libalpm/libalpm_la-version.lo
# vim:set ts=2 sw=2 noet: # vim:set ts=2 sw=2 noet: