Minor build fixes

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@611 c6295689-39f2-0310-b995-f0e70906c6a9

src/pam/Makefile.am

@@ -20,3 +20,4 @@ pam_opensc_la_LDFLAGS = -module -avoid-version
 
 pam_opensc_test_SOURCES = pam_opensc.c pam_support.c pam_support.h misc_conv.c
 pam_opensc_test_CFLAGS = -DPAMTEST
+pam_opensc_test_LDADD = @LIBSCRANDOM@

src/scam/p15_eid.c

@@ -352,12 +352,12 @@ struct scam_framework_ops scam_fw_p15_eid =
 	p15_eid_qualify,	/* qualify */
 	p15_eid_auth,		/* auth */
 	p15_eid_deinit,		/* deinit */
-#ifndef HAVE_SCIDI
+#if defined(HAVE_OPENSSL) && defined(HAVE_LDAP) && defined(HAVE_SCIDI)
-	NULL,			/* open_session */
-	NULL			/* close_session */
-#else
 	sp_open_session,	/* open_session */
 	sp_close_session	/* close_session */
+#else
+	NULL,			/* open_session */
+	NULL			/* close_session */
 #endif
 };
 

src/scam/p15_ldap.c

@@ -291,12 +291,12 @@ struct scam_framework_ops scam_fw_p15_ldap =
 	p15_ldap_qualify,	/* qualify */
 	p15_ldap_auth,		/* auth */
 	p15_ldap_deinit,	/* deinit */
-#ifndef HAVE_SCIDI
+#if defined(HAVE_OPENSSL) && defined(HAVE_LDAP) && defined(HAVE_SCIDI)
-	NULL,			/* open_session */
-	NULL			/* close_session */
-#else
 	sp_open_session,	/* open_session */
 	sp_close_session	/* close_session */
+#else
+	NULL,			/* open_session */
+	NULL			/* close_session */
 #endif
 };
 

src/scam/scam.c

@@ -36,11 +36,11 @@
 
 struct scam_framework_ops *scam_frameworks[] =
 {
+#ifdef HAVE_OPENSSL
+#ifdef HAVE_LDAP
 #ifdef HAVE_SCIDI
 	&scam_fw_sp,
 #endif
-#ifdef HAVE_OPENSSL
-#ifdef HAVE_LDAP
 	&scam_fw_p15_ldap,
 #endif
 	&scam_fw_p15_eid,