-include wallet headers if compiling wallet library

src/include/taler_util_wallet.h

@@ -20,7 +20,6 @@
  */
 #ifndef TALER_UTIL_H
 #define TALER_UTIL_H
-
 #include <gnunet/gnunet_util_taler_wallet_lib.h>
 #include "taler_amount_lib.h"
 #include "taler_crypto_lib.h"

src/mintdb/plugin_mintdb_postgres.c

@@ -165,7 +165,7 @@ postgres_create_tables (void *cls,
   if (CONNECTION_OK != PQstatus (conn))
   {
     TALER_LOG_ERROR ("Database connection failed: %s\n",
-               PQerrorMessage (conn));
+                     PQerrorMessage (conn));
     GNUNET_break (0);
     PQfinish (conn);
     return GNUNET_SYSERR;

src/util/crypto.c

@@ -23,7 +23,13 @@
  */
 #include "platform.h"
 #include "taler_util.h"
+
+#if HAVE_GNUNET_GNUNET_UTIL_TALER_WALLET_LIB_H
+#include <gnunet/gnunet_util_taler_wallet_lib.h>
+#endif
+#if HAVE_GNUNET_GNUNET_UTIL_LIB_H
 #include <gnunet/gnunet_util_lib.h>
+#endif
 #include <gcrypt.h>
 
 

src/util/json.c

@@ -19,7 +19,12 @@
  * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  */
 #include "platform.h"
+#if HAVE_GNUNET_GNUNET_UTIL_TALER_WALLET_LIB_H
+#include <gnunet/gnunet_util_taler_wallet_lib.h>
+#endif
+#if HAVE_GNUNET_GNUNET_UTIL_LIB_H
 #include <gnunet/gnunet_util_lib.h>
+#endif
 #include "taler_util.h"
 
 /**

src/util/util.c

@@ -24,8 +24,12 @@
 
 #include "platform.h"
 #include "taler_util.h"
-#include <gnunet/gnunet_common.h>
+#if HAVE_GNUNET_GNUNET_UTIL_TALER_WALLET_LIB_H
+#include <gnunet/gnunet_util_taler_wallet_lib.h>
+#endif
+#if HAVE_GNUNET_GNUNET_UTIL_LIB_H
 #include <gnunet/gnunet_util_lib.h>
+#endif
 #include <gcrypt.h>