build fixes

Hello

I'm compiling gnunet on fencepost.gnu.org.  Here are a couple of minor
changes (below) I needed to get the svn head to build.

In plugin_datastore_sqlite.c sqlite3_int64 doesn't seem to exist, I
only found sqlite_int64 in the sqlite headers.

The version of sqlite installed is:
ii  libsqlite3-dev    3.4.2-2   SQLite 3 development files

The other change is to support an arbitrary libiconv in addition to
the system one.  Otherwise the link fails with an undefined reference
to libiconv functions.


Index: src/datastore/plugin_datastore_sqlite.c
===================================================================
--- src/datastore/plugin_datastore_sqlite.c	(revision 12519)
+++ src/datastore/plugin_datastore_sqlite.c	(working copy)
@@ -756,7 +756,7 @@
       (SQLITE_OK != sqlite3_bind_int (stmt, 2, type)) ||
       (SQLITE_OK != sqlite3_bind_int (stmt, 3, priority)) ||
       (SQLITE_OK != sqlite3_bind_int (stmt, 4, anonymity)) ||
-      (SQLITE_OK != sqlite3_bind_int64 (stmt, 5, (sqlite3_int64) expiration.value)) ||
+      (SQLITE_OK != sqlite3_bind_int64 (stmt, 5, (sqlite_int64) expiration.value)) ||
       (SQLITE_OK !=
        sqlite3_bind_blob (stmt, 6, key, sizeof (GNUNET_HashCode),
                           SQLITE_TRANSIENT)) ||
Index: src/util/Makefile.am
===================================================================
--- src/util/Makefile.am	(revision 12519)
+++ src/util/Makefile.am	(working copy)
@@ -72,6 +72,7 @@
 libgnunetutil_la_LIBADD = \
   $(GCLIBADD) $(WINLIB) \
   $(LIBGCRYPT_LIBS) \
+  $(LTLIBICONV) \
   -lgmp -lltdl -lz $(XLIB)
 
 libgnunetutil_la_LDFLAGS = \