From 22975f2375030811c8fe7956044b23f87ffa8272 Mon Sep 17 00:00:00 2001 From: J. Ali Harlow Date: Mon, 30 Jan 2012 13:35:28 +0000 Subject: [PATCH] Don't assume -lcrypt32 is available --- app-manager/Makefile.am | 2 +- configure.ac | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/app-manager/Makefile.am b/app-manager/Makefile.am index bcee882..4007415 100644 --- a/app-manager/Makefile.am +++ b/app-manager/Makefile.am @@ -5,7 +5,7 @@ bin_PROGRAMS=app-manager fetch app_manager_SOURCES=app-manager.c app-manager.h packagelist.c applications.c \ localmedia.c localmedia.h fetch_SOURCES=fetch.c -fetch_LDADD=$(LDADD) -lcrypt32 +fetch_LDADD=$(LDADD) $(FETCH_LIBS) if HAVE_WINDRES app_manager_SOURCES+=resources.rc app-manager.exe.manifest endif diff --git a/configure.ac b/configure.ac index e1c8241..03a93e4 100644 --- a/configure.ac +++ b/configure.ac @@ -122,6 +122,19 @@ SETUP_CFLAGS="$SETUP_CFLAGS $RAZOR_CFLAGS" AC_SUBST(SETUP_LIBS) AC_SUBST(SETUP_CFLAGS) LIBS="$save_LIBS" +LIBS="$LIBS -lcrypt32" +AC_MSG_CHECKING([for library containing CertEnumCertificatesInStore]) +AC_LINK_IFELSE([AC_LANG_PROGRAM( + [[#include ]], + [return !CertEnumCertificatesInStore((HCERTSTORE)0,NULL);])], + [FETCH_LIBS="-lcrypt32"]) +if test -z "$FETCH_LIBS"; then + AC_MSG_RESULT([no]) +else + AC_MSG_RESULT([$FETCH_LIBS]) +fi +AC_SUBST([FETCH_LIBS]) +LIBS="$save_LIBS" ################################################## # Checks for library functions. -- 1.7.1