[svn] pinentry - r152 - trunk
svn author marcus
cvs at cvs.gnupg.org
Wed Sep 28 23:18:14 CEST 2005
Author: marcus
Date: 2005-09-28 23:18:14 +0200 (Wed, 28 Sep 2005)
New Revision: 152
Modified:
trunk/ChangeLog
trunk/configure.ac
Log:
2005-09-28 Marcus Brinkmann <marcus at g10code.de>
* configure.ac (PINENTRY_GTK): Error out if iconv is not found but
needed.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2005-09-28 20:57:35 UTC (rev 151)
+++ trunk/ChangeLog 2005-09-28 21:18:14 UTC (rev 152)
@@ -1,5 +1,8 @@
2005-09-28 Marcus Brinkmann <marcus at g10code.de>
+ * configure.ac (PINENTRY_GTK): Error out if iconv is not found but
+ needed.
+
* config.rpath: New file from gettext. Needed by iconv.m4.
2005-07-11 Marcus Brinkmann <marcus at g10code.de>
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2005-09-28 20:57:35 UTC (rev 151)
+++ trunk/configure.ac 2005-09-28 21:18:14 UTC (rev 152)
@@ -220,8 +220,15 @@
if test "$pinentry_curses" = "yes" \
-o "$fallback_curses" = "yes" \
-o "$pinentry_gtk" = "yes"; then
-dnl Additional checks pinentry Curses/GTK+.
-AM_ICONV
+ dnl Additional checks pinentry Curses/GTK+.
+ AM_ICONV
+ if test "$am_cv_func_iconv" != "yes"; then
+ AC_MSG_ERROR([[
+***
+*** The iconv function is required. You can specify its location
+*** using the --with-libiconv-prefix=PREFIX option to configure.
+***]])
+ fi
fi
dnl if test "$pinentry_gtk" = "yes"; then
More information about the Gnupg-commits
mailing list