From 0af1637f7d945ca1b1df19c1043828ef41e43c1b Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Tue, 1 Nov 2016 09:38:08 +0100 Subject: [PATCH] Changed name. --- .gitignore | 1 + autogen.sh | 4 ++-- configure.ac | 22 +++++++++---------- data/Makefile.am | 4 ++-- data/libauteldap/gui/Makefile.am | 5 ----- .../Makefile.am | 0 data/libzakautheldap/gui/Makefile.am | 5 +++++ .../gui/zakautheldap.gui} | 0 ...hema.xml => zakautheldap_confi_schema.xml} | 0 src/Makefile.am | 18 +++++++-------- src/aute_ldap.c | 8 +++---- tests/Makefile.am | 7 +++--- tests/test.c | 13 ++++++----- 13 files changed, 44 insertions(+), 43 deletions(-) delete mode 100644 data/libauteldap/gui/Makefile.am rename data/{libauteldap => libzakautheldap}/Makefile.am (100%) create mode 100644 data/libzakautheldap/gui/Makefile.am rename data/{libauteldap/gui/auteldap.gui => libzakautheldap/gui/zakautheldap.gui} (100%) rename data/{auteldap_confi_schema.xml => zakautheldap_confi_schema.xml} (100%) diff --git a/.gitignore b/.gitignore index 92fb8b9..7c42fa0 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ config.h stamp-h1 tests/test tools/aute-db-mkpwd +compile diff --git a/autogen.sh b/autogen.sh index a2f1aba..0767506 100755 --- a/autogen.sh +++ b/autogen.sh @@ -4,13 +4,13 @@ srcdir=`dirname $0` test -z "$srcdir" && srcdir=. -PKG_NAME="libaute-ldap" +PKG_NAME="libzakautheldap" (test -f $srcdir/configure.ac \ && test -d $srcdir/src \ && test -f $srcdir/src/aute_ldap.c) || { echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level libauteldap directory" + echo " top-level libzakautheldap directory" exit 1 } diff --git a/configure.ac b/configure.ac index 2441086..7126a61 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([libaute-ldap], [0.0.1], [azagli@libero.it]) +AC_INIT([libzakautheldap], [0.5.0], [azagli@libero.it]) AC_CONFIG_SRCDIR([src/aute_ldap.c]) AC_CONFIG_HEADER([config.h]) @@ -18,11 +18,11 @@ AC_PROG_CC AC_PROG_LIBTOOL # Checks for libraries. -PKG_CHECK_MODULES(LIBAUTELDAP, [gtk+-2.0 >= 2.16.0 - libaute >= 0.0.2]) +PKG_CHECK_MODULES(LIBZAKAUTHELDAP, [gtk+-3.0 >= 3.0.00 + libzakauthe >= 0.5.0]) -AC_SUBST(LIBAUTELDAP_CFLAGS) -AC_SUBST(LIBAUTELDAP_LIBS) +AC_SUBST(LIBZAKAUTHELDAP_CFLAGS) +AC_SUBST(LIBZAKAUTHELDAP_LIBS) with_ldap=no AC_CHECK_LIB([ldap], [ldap_initialize], with_ldap=yes) @@ -32,11 +32,11 @@ then AC_SUBST(LIBLDAP_LIBS, [" -lldap"]) 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. @@ -50,7 +50,7 @@ AC_CONFIG_FILES([ src/Makefile tests/Makefile data/Makefile - data/libauteldap/Makefile - data/libauteldap/gui/Makefile + data/libzakautheldap/Makefile + data/libzakautheldap/gui/Makefile ]) AC_OUTPUT diff --git a/data/Makefile.am b/data/Makefile.am index f4a0be3..50c8b15 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = libauteldap +SUBDIRS = libzakautheldap -EXTRA_DIST = auteldap_confi_schema.xml +EXTRA_DIST = zakautheldap_confi_schema.xml diff --git a/data/libauteldap/gui/Makefile.am b/data/libauteldap/gui/Makefile.am deleted file mode 100644 index 3f0a988..0000000 --- a/data/libauteldap/gui/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -guidir = $(datadir)/libauteldap/gui - -gui_DATA = auteldap.gui - -EXTRA_DIST = $(gui_DATA) diff --git a/data/libauteldap/Makefile.am b/data/libzakautheldap/Makefile.am similarity index 100% rename from data/libauteldap/Makefile.am rename to data/libzakautheldap/Makefile.am diff --git a/data/libzakautheldap/gui/Makefile.am b/data/libzakautheldap/gui/Makefile.am new file mode 100644 index 0000000..1278c6a --- /dev/null +++ b/data/libzakautheldap/gui/Makefile.am @@ -0,0 +1,5 @@ +guidir = $(datadir)/$(PACKAGE)/gui + +gui_DATA = zakautheldap.gui + +EXTRA_DIST = $(gui_DATA) diff --git a/data/libauteldap/gui/auteldap.gui b/data/libzakautheldap/gui/zakautheldap.gui similarity index 100% rename from data/libauteldap/gui/auteldap.gui rename to data/libzakautheldap/gui/zakautheldap.gui diff --git a/data/auteldap_confi_schema.xml b/data/zakautheldap_confi_schema.xml similarity index 100% rename from data/auteldap_confi_schema.xml rename to data/zakautheldap_confi_schema.xml diff --git a/src/Makefile.am b/src/Makefile.am index 1de7250..51ae483 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,17 +1,17 @@ -guidir = $(datadir)/libauteldap/gui +guidir = $(datadir)/$(PACKAGE)/gui -AM_CPPFLAGS = $(LIBAUTELDAP_CFLAGS) \ +AM_CPPFLAGS = $(LIBZAKAUTHELDAP_CFLAGS) \ $(LIBLDAP_CFLAGS) \ - $(LIBCONFI_CFLAGS) \ + $(LIBZAKCONFI_CFLAGS) \ -DGUIDIR=\""$(guidir)"\" -LIBS = $(LIBAUTELDAP_LIBS) \ +LIBS = $(LIBZAKAUTHELDAP_LIBS) \ $(LIBLDAP_LIBS) \ - $(LIBCONFI_LIBS) + $(LIBZAKCONFI_LIBS) -libaute_pluginsdir = $(libdir)/libaute/plugins -libaute_plugins_LTLIBRARIES = libaute-ldap.la +libzakauthe_pluginsdir = $(libdir)/libzakauthe/plugins +libzakauthe_plugins_LTLIBRARIES = libzakautheldap.la -libaute_ldap_la_SOURCES = aute_ldap.c +libzakautheldap_la_SOURCES = aute_ldap.c -libaute_ldap_la_LDFLAGS = -no-undefined +libzakautheldap_la_LDFLAGS = -no-undefined diff --git a/src/aute_ldap.c b/src/aute_ldap.c index c9c397d..072a3e2 100644 --- a/src/aute_ldap.c +++ b/src/aute_ldap.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Andrea Zagli + * Copyright (C) 2005-2016 Andrea Zagli * * 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 @@ -19,12 +19,12 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif - + #include #include -#ifdef HAVE_LIBCONFI - #include +#ifdef HAVE_LIBZAKCONFI + #include #endif static GtkWidget *txt_utente; diff --git a/tests/Makefile.am b/tests/Makefile.am index 10f47f9..fdb1d3c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,13 +1,12 @@ AM_CPPFLAGS = $(WARN_CFLAGS) \ $(DISABLE_DEPRECATED_CFLAGS) \ - $(LIBAUTELDAP_CFLAGS) \ + $(LIBZAKAUTHELDAP_CFLAGS) \ $(LIBLDAP_CFLAGS) \ -I../src -LIBS = $(GTK_LIBS) \ - $(LIBAUTELDAP_LIBS) \ +LIBS = $(LIBZAKAUTHELDAP_LIBS) \ $(LIBLDAP_LIBS) -LDADD = ../src/libaute-ldap.la +LDADD = ../src/libzakautheldap.la noinst_PROGRAMS = test diff --git a/tests/test.c b/tests/test.c index c532811..0ab8fd5 100644 --- a/tests/test.c +++ b/tests/test.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Andrea Zagli + * Copyright (C) 2010-2016 Andrea Zagli * * 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 @@ -18,26 +18,27 @@ #include -#include +#include int main (int argc, char **argv) { - Aute *aute; + ZakAuthe *aute; GSList *params; gtk_init (&argc, &argv); - aute = aute_new (); + 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]); params = g_slist_append (params, argv[4]); - aute_set_config (aute, params); + zak_authe_set_config (aute, params); - g_fprintf (stderr, "Utente %s\n", aute_autentica (aute)); + g_warning ("User %s\n", zak_authe_authe (aute)); return 0; } -- 2.49.0