[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis-gtk] branch master updated: -build system fixes
|
From: |
gnunet |
|
Subject: |
[taler-anastasis-gtk] branch master updated: -build system fixes |
|
Date: |
Tue, 17 Jan 2023 15:59:27 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository anastasis-gtk.
The following commit(s) were added to refs/heads/master by this push:
new 2c5b752 -build system fixes
2c5b752 is described below
commit 2c5b752f2eda4f28f365df5fc5a561fda98884b3
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Tue Jan 17 15:59:24 2023 +0100
-build system fixes
---
configure.ac | 62 ++++++++++++++++++-----------------------------
po/anastasis-gtk.pot | 59 +++++++++++++++++++++++---------------------
po/de.po | 57 +++++++++++++++++++++++--------------------
src/anastasis/Makefile.am | 2 +-
4 files changed, 87 insertions(+), 93 deletions(-)
diff --git a/configure.ac b/configure.ac
index 977f91e..277cacd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -179,46 +179,30 @@ LIBS=$SAVE_LIBS
CPPFLAGS=$SAVE_CPPFLAGS
-# test for GNUnet
-gnunet=0
-lookin=${prefix}
-GNUNET_LIBS="-L${lookin}/lib"
-GNUNET_CFLAGS="-I${lookin}/include"
-GNUNET_CPPFLAGS="-I${lookin}/include"
-LIBS="$GNUNET_LIBS $LIBS"
-CFLAGS="$GNUNET_CFLAGS $CFLAGS"
-CPPFLAGS="$GNUNET_CPPFLAGS $CPPFLAGS"
-
-AC_MSG_CHECKING(for GNUnet)
+# Check for GNUnet's libgnunetutil.
+libgnunetutil=0
+AC_MSG_CHECKING([for libgnunetutil])
AC_ARG_WITH(gnunet,
- [ --with-gnunet=PFX Base of GNUnet installation],
- [AC_MSG_RESULT([$with_gnunet])
- AS_CASE([$with_gnunet],
- [no],[lookin=""].
- [yes],[lookin="${prefix}"],
- [lookin="$with_gnunet"])
- ],
- [
- AC_MSG_RESULT([--with-gnunet not specified])
- PKG_CHECK_MODULES([GNUNET], [gnunetutil >= 0.9.0], gnunet=1)
- ]
-)
-
-AS_IF([test "x$gnunet" = "x0" -a ! "x$lookin" = "x"],
-[
- AC_MSG_CHECKING(for libgnunetutil library in $lookin)
- AC_CHECK_HEADERS([gnunet/gnunet_util_lib.h],
- AC_CHECK_LIB([gnunetutil], [GNUNET_xfree_],
- [
- gnunet=1
- EXT_LIB_PATH="-L${lookin}/lib $EXT_LIB_PATH"
- ]
- )
- )
-])
-
-AS_IF([test "x$gnunet" = "x0"],
- [AC_MSG_ERROR([anastasis-gtk requires GNUnet])])
+ [AS_HELP_STRING([--with-gnunet=PFX], [base of GNUnet
installation])],
+ [AC_MSG_RESULT([given as $with_gnunet])],
+ [AC_MSG_RESULT(not given)
+ with_gnunet=yes])
+AS_CASE([$with_gnunet],
+ [yes], [],
+ [no], [AC_MSG_ERROR([--with-gnunet is required])],
+ [LDFLAGS="-L$with_gnunet/lib $LDFLAGS"
+ CPPFLAGS="-I$with_gnunet/include $CPPFLAGS"])
+AC_CHECK_HEADERS([gnunet/gnunet_util_lib.h],
+ [AC_CHECK_LIB([gnunetutil],
+ [GNUNET_SCHEDULER_run],
+ [libgnunetutil=1])])
+AS_IF([test $libgnunetutil != 1],
+ [AC_MSG_ERROR([[
+***
+*** You need libgnunetutil to build this program.
+*** This library is part of GNUnet, available at
+*** https://gnunet.org
+*** ]])])
AC_SUBST(GNUNET_CFLAGS)
diff --git a/po/anastasis-gtk.pot b/po/anastasis-gtk.pot
index 9794506..54d990e 100644
--- a/po/anastasis-gtk.pot
+++ b/po/anastasis-gtk.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: anastasis-gtk 0.3.0\n"
+"Project-Id-Version: anastasis-gtk 0.3.1\n"
"Report-Msgid-Bugs-To: bug-anastasis@gnu.org\n"
-"POT-Creation-Date: 2022-09-26 20:05+0200\n"
+"POT-Creation-Date: 2023-01-17 15:52+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -111,93 +111,93 @@ msgstr ""
msgid "You did not name this secret"
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c:251
+#: src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c:252
msgid "View _privacy policy..."
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c:266
+#: src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c:267
msgid "View _terms of service..."
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c:316
+#: src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c:317
msgid "new"
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c:503
+#: src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c:504
msgid "available"
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c:517
+#: src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c:518
#, c-format
msgid "Network failure: %s (#%u)"
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c:526
+#: src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c:527
msgid "disabled"
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c:533
+#: src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c:534
#, c-format
msgid "HTTP %s (%u): %s (#%u)"
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-method-email.c:182
+#: src/anastasis/anastasis-gtk_handle-method-email.c:181
#, c-format
msgid "e-mail address %s"
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-method-iban.c:86
+#: src/anastasis/anastasis-gtk_handle-method-iban.c:85
#, c-format
msgid "IBAN %s"
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-method-post.c:83
+#: src/anastasis/anastasis-gtk_handle-method-post.c:82
#, c-format
msgid "postal address %s"
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-method-sms.c:162
+#: src/anastasis/anastasis-gtk_handle-method-sms.c:161
#, c-format
msgid "phone number %s"
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-policy-meta.c:244
+#: src/anastasis/anastasis-gtk_handle-policy-meta.c:243
msgid "_Edit policy..."
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-policy-meta.c:261
+#: src/anastasis/anastasis-gtk_handle-policy-meta.c:260
msgid "Delete challenge"
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-policy-meta.c:263
+#: src/anastasis/anastasis-gtk_handle-policy-meta.c:262
msgid "Delete policy"
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-policy-meta.c:293
+#: src/anastasis/anastasis-gtk_handle-policy-meta.c:292
msgid "_Add policy..."
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-policy-version-changed.c:98
+#: src/anastasis/anastasis-gtk_handle-policy-version-changed.c:97
msgid "This action will reset all of your challenge solving progress!"
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-print.c:137
+#: src/anastasis/anastasis-gtk_handle-print.c:136
msgid "Failed to generate PDF file."
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-print.c:176
+#: src/anastasis/anastasis-gtk_handle-print.c:175
msgid "_Cancel"
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-print.c:178
+#: src/anastasis/anastasis-gtk_handle-print.c:177
msgid "_Save"
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-print.c:185
+#: src/anastasis/anastasis-gtk_handle-print.c:184
msgid "anastasis-personal-details.pdf"
msgstr ""
-#: src/anastasis/anastasis-gtk_io.c:173
+#: src/anastasis/anastasis-gtk_io.c:172
msgid "This will write your secret to disk in cleartext!"
msgstr ""
@@ -206,6 +206,15 @@ msgstr ""
msgid "<off>"
msgstr ""
+#: contrib/anastasis_gtk_about_window.glade:10
+msgid "(C) 2020-@ANASTASIS_YEARTO@ Anastasis SARL"
+msgstr ""
+
+#: contrib/anastasis_gtk_about_window.glade:12
+#: contrib/anastasis_gtk_auth_add_totp.glade:138
+msgid "Anastasis"
+msgstr ""
+
#: contrib/anastasis_gtk_add_provider.glade:113
#: contrib/anastasis_gtk_edit_providers.glade:118
msgid "Provider URL:"
@@ -373,10 +382,6 @@ msgstr ""
msgid "TOTP Name"
msgstr ""
-#: contrib/anastasis_gtk_auth_add_totp.glade:138
-msgid "Anastasis"
-msgstr ""
-
#: contrib/anastasis_gtk_auth_add_totp.glade:190
msgid ""
"Confirm that your TOTP App works by entering the current 8-digit TOTP code "
diff --git a/po/de.po b/po/de.po
index c38a8c3..27ad662 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: anastasis-gtk unknown\n"
"Report-Msgid-Bugs-To: bug-anastasis@gnu.org\n"
-"POT-Creation-Date: 2022-09-26 20:05+0200\n"
+"POT-Creation-Date: 2023-01-17 15:52+0100\n"
"PO-Revision-Date: 2021-09-29 19:18+0000\n"
"Last-Translator: Stefan Kügel <skuegel@web.de>\n"
"Language-Team: German <http://weblate.taler.net/projects/anastasis/anastasis-";
@@ -113,93 +113,93 @@ msgstr ""
msgid "You did not name this secret"
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c:251
+#: src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c:252
msgid "View _privacy policy..."
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c:266
+#: src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c:267
msgid "View _terms of service..."
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c:316
+#: src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c:317
msgid "new"
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c:503
+#: src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c:504
msgid "available"
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c:517
+#: src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c:518
#, c-format
msgid "Network failure: %s (#%u)"
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c:526
+#: src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c:527
msgid "disabled"
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c:533
+#: src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c:534
#, c-format
msgid "HTTP %s (%u): %s (#%u)"
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-method-email.c:182
+#: src/anastasis/anastasis-gtk_handle-method-email.c:181
#, c-format
msgid "e-mail address %s"
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-method-iban.c:86
+#: src/anastasis/anastasis-gtk_handle-method-iban.c:85
#, c-format
msgid "IBAN %s"
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-method-post.c:83
+#: src/anastasis/anastasis-gtk_handle-method-post.c:82
#, c-format
msgid "postal address %s"
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-method-sms.c:162
+#: src/anastasis/anastasis-gtk_handle-method-sms.c:161
#, c-format
msgid "phone number %s"
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-policy-meta.c:244
+#: src/anastasis/anastasis-gtk_handle-policy-meta.c:243
msgid "_Edit policy..."
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-policy-meta.c:261
+#: src/anastasis/anastasis-gtk_handle-policy-meta.c:260
msgid "Delete challenge"
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-policy-meta.c:263
+#: src/anastasis/anastasis-gtk_handle-policy-meta.c:262
msgid "Delete policy"
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-policy-meta.c:293
+#: src/anastasis/anastasis-gtk_handle-policy-meta.c:292
msgid "_Add policy..."
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-policy-version-changed.c:98
+#: src/anastasis/anastasis-gtk_handle-policy-version-changed.c:97
msgid "This action will reset all of your challenge solving progress!"
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-print.c:137
+#: src/anastasis/anastasis-gtk_handle-print.c:136
msgid "Failed to generate PDF file."
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-print.c:176
+#: src/anastasis/anastasis-gtk_handle-print.c:175
msgid "_Cancel"
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-print.c:178
+#: src/anastasis/anastasis-gtk_handle-print.c:177
msgid "_Save"
msgstr ""
-#: src/anastasis/anastasis-gtk_handle-print.c:185
+#: src/anastasis/anastasis-gtk_handle-print.c:184
msgid "anastasis-personal-details.pdf"
msgstr ""
-#: src/anastasis/anastasis-gtk_io.c:173
+#: src/anastasis/anastasis-gtk_io.c:172
msgid "This will write your secret to disk in cleartext!"
msgstr ""
@@ -208,6 +208,15 @@ msgstr ""
msgid "<off>"
msgstr ""
+#: contrib/anastasis_gtk_about_window.glade:10
+msgid "(C) 2020-@ANASTASIS_YEARTO@ Anastasis SARL"
+msgstr ""
+
+#: contrib/anastasis_gtk_about_window.glade:12
+#: contrib/anastasis_gtk_auth_add_totp.glade:138
+msgid "Anastasis"
+msgstr "Anastasis"
+
#: contrib/anastasis_gtk_add_provider.glade:113
#: contrib/anastasis_gtk_edit_providers.glade:118
msgid "Provider URL:"
@@ -375,10 +384,6 @@ msgstr ""
msgid "TOTP Name"
msgstr ""
-#: contrib/anastasis_gtk_auth_add_totp.glade:138
-msgid "Anastasis"
-msgstr "Anastasis"
-
#: contrib/anastasis_gtk_auth_add_totp.glade:190
msgid ""
"Confirm that your TOTP App works by entering the current 8-digit TOTP code "
diff --git a/src/anastasis/Makefile.am b/src/anastasis/Makefile.am
index 1439063..9b08b15 100644
--- a/src/anastasis/Makefile.am
+++ b/src/anastasis/Makefile.am
@@ -63,7 +63,7 @@ anastasis_gtk_SOURCES = \
if HPDF_ENABLED
anastasis_gtk_SOURCES += \
anastasis-gtk_handle-print.c \
- print.c
+ print.c print.h
else
anastasis_gtk_SOURCES += \
anastasis-gtk_handle-noprint.c
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-anastasis-gtk] branch master updated: -build system fixes,
gnunet <=