From: Andrea Zagli <azagli@libero.it>
Date: Tue, 19 Jul 2016 07:30:14 +0000 (+0200)
Subject: Merge conflict from origin/confi.
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=289aec6327dec12785bcac199e65d44e9a48da79;p=zakauthe%2Fplugins%2Fdb

Merge conflict from origin/confi.
---

289aec6327dec12785bcac199e65d44e9a48da79
diff --cc configure.ac
index 6ba2870,9fa6692..0afd734
--- a/configure.ac
+++ b/configure.ac
@@@ -20,29 -20,18 +20,29 @@@ AC_LIBTOOL_WIN32_DL
  AC_PROG_CC
  AC_PROG_LIBTOOL
  
 +dnl ******************************
 +dnl Translations
 +dnl ******************************
 +GETTEXT_PACKAGE=zakformtests
 +AC_SUBST(GETTEXT_PACKAGE)
 +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
 +                   [The prefix for our gettext translation domains.])
 +AM_GLIB_GNU_GETTEXT
 +
  # Checks for libraries.
- PKG_CHECK_MODULES(LIBAUTEDB, [libzakauthe >= 0.5.0
-                               libzakform
-                               libzakformgtk
-                               libzakformgdaex])
+ PKG_CHECK_MODULES(LIBZAKAUTHEDB, [libzakauthe >= 0.5.0
 -								 libgtkform >= 0.5.0])
++                                  libzakform
++                                  libzakformgtk
++                                  libzakformgdaex])
  
- AC_SUBST(LIBAUTEDB_CFLAGS)
- AC_SUBST(LIBAUTEDB_LIBS)
+ AC_SUBST(LIBZAKAUTHEDB_CFLAGS)
+ AC_SUBST(LIBZAKAUTHEDB_LIBS)
  
- PKG_CHECK_MODULES(LIBCONFI, [libconfi >= 0.0.2], [AC_DEFINE(HAVE_LIBCONFI, [1], [libconfi is present]), have_libconfi=yes], have_libconfi=no)
+ PKG_CHECK_MODULES(LIBZAKCONFI, [libzakconfi >= 0.0.2], [AC_DEFINE(HAVE_LIBZAKCONFI, [1], [libzakconfi is present]), have_libzakconfi=yes], have_libzakconfi=no)
  
- AM_CONDITIONAL(HAVE_LIBCONFI, test x"$have_libconfi" = "xyes")
- AC_SUBST(LIBCONFI_CFLAGS)
- AC_SUBST(LIBCONFI_LIBS)
+ AM_CONDITIONAL(HAVE_LIBZAKCONFI, test x"$have_libzakconfi" = "xyes")
+ AC_SUBST(LIBZAKCONFI_CFLAGS)
+ AC_SUBST(LIBZAKCONFI_LIBS)
  
  AM_PATH_LIBGCRYPT(1.2.1, :, [AC_MSG_ERROR([libgcrypt >= 1.2.1 not found.])])
  
diff --cc src/aute_db.c
index 58887fc,ece9c4e..beee9bd
--- a/src/aute_db.c
+++ b/src/aute_db.c
@@@ -24,10 -24,10 +24,10 @@@
  #include <gtk/gtk.h>
  #include <gcrypt.h>
  #include <libgdaex/libgdaex.h>
 -#include <libgtkform/fielddatetime.h>
 +#include <libzakutils/libzakutils.h>
  
- #ifdef HAVE_LIBCONFI
- 	#include <libconfi.h>
+ #ifdef HAVE_LIBZAKCONFI
+ 	#include <libzakconfi/libzakconfi.h>
  #endif
  
  #include "user.h"