From 7cffa125a263432bad7839f0d1ee51904d6a8170 Mon Sep 17 00:00:00 2001
From: Andrea Zagli <azagli@libero.it>
Date: Wed, 27 Apr 2016 16:28:30 +0200
Subject: [PATCH] Under gnu/linux doesn't take into account GUIDIR.

Adjustments on autotools for namespace changing.
---
 configure.ac       | 14 +++++++-------
 src/Makefile.am    |  8 ++++----
 src/aute_smbldap.c | 15 ++++++++++-----
 tests/Makefile.am  |  4 ++--
 tests/test.c       |  4 +++-
 5 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6672955..a66fcbb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,11 +21,11 @@ AC_PROG_CC
 AC_PROG_LIBTOOL
 
 # Checks for libraries.
-PKG_CHECK_MODULES(LIBAUTESMBLDAP, [gtk+-3.0 >= 3.0.0
+PKG_CHECK_MODULES(LIBZAKAUTHESMBLDAP, [gtk+-3.0 >= 3.0.0
                                    libzakauthe >= 0.5.0])
 
-AC_SUBST(LIBAUTESMBLDAP_CFLAGS)
-AC_SUBST(LIBAUTESMBLDAP_LIBS)
+AC_SUBST(LIBZAKAUTHESMBLDAP_CFLAGS)
+AC_SUBST(LIBZAKAUTHESMBLDAP_LIBS)
 
 with_ldap=no
 AC_CHECK_LIB([ldap], [ldap_initialize], with_ldap=yes)
@@ -49,11 +49,11 @@ else
 	exit 1;
 fi
 
-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.10.0], [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)
 
 # Checks for header files.
 
diff --git a/src/Makefile.am b/src/Makefile.am
index ebd35d6..951bd7b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,15 +1,15 @@
 guidir = $(datadir)/$(PACKAGE_NAME)/gui
 
-AM_CPPFLAGS = $(LIBAUTESMBLDAP_CFLAGS) \
+AM_CPPFLAGS = $(LIBZAKAUTHESMBLDAP_CFLAGS) \
               $(LIBLDAP_CFLAGS) \
               $(LIBSSH_CFLAGS) \
-              $(LIBCONFI_CFLAGS) \
+              $(LIBZAKCONFI_CFLAGS) \
               -DGUIDIR=\""$(guidir)"\"
 
-LIBS = $(LIBAUTESMBLDAP_LIBS) \
+LIBS = $(LIBZAKAUTHESMBLDAP_LIBS) \
        $(LIBLDAP_LIBS) \
        $(LIBSSH_LIBS) \
-       $(LIBCONFI_LIBS)
+       $(LIBZAKCONFI_LIBS)
 
 libzakauthe_pluginsdir = $(libdir)/libzakauthe/plugins
 libzakauthe_plugins_LTLIBRARIES = libzakauthesmbldap.la
diff --git a/src/aute_smbldap.c b/src/aute_smbldap.c
index d8cfb9f..c052c65 100644
--- a/src/aute_smbldap.c
+++ b/src/aute_smbldap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2015 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2010-2016 Andrea Zagli <azagli@libero.it>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -30,8 +30,8 @@
 #include <ldap.h>
 #include <libssh/libssh.h>
 
-#ifdef HAVE_LIBCONFI
-	#include <libconfi.h>
+#ifdef HAVE_LIBZAKCONFI
+	#include <libzakconfi/libzakconfi.h>
 #endif
 
 #include "aute_smbldap.h"
@@ -933,6 +933,10 @@ gchar
 			guidir = g_build_filename (moddir, "share", PACKAGE, "gui", NULL);
 		}
 
+#else
+
+	guidir = g_strdup (GUIDIR);
+
 #endif
 
 	guifile = g_build_filename (guidir, "zak_authe_smbldap.ui", NULL);
@@ -940,8 +944,9 @@ gchar
 	                                        g_strsplit ("diag_main", "|", -1),
 	                                        &error))
 		{
-			g_warning ("Impossibile trovare il file di definizione dell'interfaccia utente: %s.",
-			         error != NULL && error->message != NULL ? error->message : "no details");
+			g_warning ("Unable to find gui file definition in «%s»: %s.",
+					   guifile,
+					   error != NULL && error->message != NULL ? error->message : "no details");
 			return NULL;
 		}
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 26a9569..c942d71 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,10 +1,10 @@
 AM_CPPFLAGS = $(WARN_CFLAGS) \
               $(DISABLE_DEPRECATED_CFLAGS) \
-              $(LIBAUTESMBLDAP_CFLAGS) \
+              $(LIBZAKAUTHESMBLDAP_CFLAGS) \
               -I../src
 
 LIBS = $(GTK_LIBS) \
-       $(LIBAUTESMBLDAP_LIBS)
+       $(LIBZAKAUTHESMBLDAP_LIBS)
 
 LDADD = ../src/libzakauthesmbldap.la
 
diff --git a/tests/test.c b/tests/test.c
index 3ee66c5..a2fcfd8 100644
--- a/tests/test.c
+++ b/tests/test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2015 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2013-2016 Andrea Zagli <azagli@libero.it>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -30,6 +30,8 @@ main (int argc, char **argv)
 
 	aute = zak_authe_new ();
 
+	params = NULL;
+
 	params = g_slist_append (params, argv[1]);
 	params = g_slist_append (params, argv[2]);
 	params = g_slist_append (params, argv[3]);
-- 
2.49.0