NETPGP: Minor fixes

Tracking down issues

src/pgp_netpgp.h

@@ -61,7 +61,9 @@ PEP_STATUS pgp_get_key_rating(
     );
 
 PEP_STATUS pgp_import_keydata(PEP_SESSION session, const char *key_data,
-        size_t size, identity_list **private_idents);
+                              size_t size, identity_list **private_idents,
+                              stringlist_t** imported_keys,
+                              uint64_t* changed_key_index);
 
 PEP_STATUS pgp_recv_key(PEP_SESSION session, const char *pattern);
 PEP_STATUS pgp_send_key(PEP_SESSION session, const char *pattern);

test/Makefile

@@ -64,9 +64,9 @@ ifdef SQLITE3_FROM_OS
 endif
 
 ifeq ($(OPENPGP),GPG)
-    #LDLIBS+= -lgpgme
+    LDLIBS+= -lgpgme
 else ifeq ($(OPENPGP),NETPGP)
-    LDLIBS+= -lnetpgp
+    LDLIBS+=$(NETPGP_LIB)
     ifeq ($(BUILD_FOR),Linux)
         LDLIBS+= -ltre
     endif
@@ -115,7 +115,9 @@ all:
 LDLIBS+=-lgtest -lgtest_main
 ifeq ($(BUILD_ON),OS/390)
     LDLIBS+=-lzz
-else
+endif
+
+ifeq ($(OPENPGP),SEQUOIA)
     LDLIBS+=-lsequoia_openpgp_ffi 
 endif