Don't assume -lcrypt32 is available 0.4.1
authorJ. Ali Harlow <ali@juiblex.co.uk>
Mon Jan 30 13:35:28 2012 +0000 (2012-01-30)
changeset 1743df682785f5
parent 16 596d5cf9a807
child 18 cb43820f94ce
child 19 5cafc65a6183
Don't assume -lcrypt32 is available
app-manager/Makefile.am
configure.ac
     1.1 --- a/app-manager/Makefile.am	Mon Jan 30 07:59:58 2012 +0000
     1.2 +++ b/app-manager/Makefile.am	Mon Jan 30 13:35:28 2012 +0000
     1.3 @@ -5,7 +5,7 @@
     1.4  app_manager_SOURCES=app-manager.c app-manager.h packagelist.c applications.c \
     1.5  	localmedia.c localmedia.h
     1.6  fetch_SOURCES=fetch.c
     1.7 -fetch_LDADD=$(LDADD) -lcrypt32
     1.8 +fetch_LDADD=$(LDADD) $(FETCH_LIBS)
     1.9  if HAVE_WINDRES
    1.10  app_manager_SOURCES+=resources.rc app-manager.exe.manifest
    1.11  endif
     2.1 --- a/configure.ac	Mon Jan 30 07:59:58 2012 +0000
     2.2 +++ b/configure.ac	Mon Jan 30 13:35:28 2012 +0000
     2.3 @@ -122,6 +122,19 @@
     2.4  AC_SUBST(SETUP_LIBS)
     2.5  AC_SUBST(SETUP_CFLAGS)
     2.6  LIBS="$save_LIBS"
     2.7 +LIBS="$LIBS -lcrypt32"
     2.8 +AC_MSG_CHECKING([for library containing CertEnumCertificatesInStore])
     2.9 +AC_LINK_IFELSE([AC_LANG_PROGRAM(
    2.10 +  [[#include <windows.h>]],
    2.11 +  [return !CertEnumCertificatesInStore((HCERTSTORE)0,NULL);])],
    2.12 +  [FETCH_LIBS="-lcrypt32"])
    2.13 +if test -z "$FETCH_LIBS"; then
    2.14 +    AC_MSG_RESULT([no])
    2.15 +else
    2.16 +    AC_MSG_RESULT([$FETCH_LIBS])
    2.17 +fi
    2.18 +AC_SUBST([FETCH_LIBS])
    2.19 +LIBS="$save_LIBS"
    2.20  
    2.21  ##################################################
    2.22  # Checks for library functions.