security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-12 22:11:29 +02:00
Code Activity

* configure.ac: It seems that AM_GNU_GETTEXT doesn't like being run

Browse Source 
conditionally and it confuses the includes when doing later type
checks.  This is bug#810.
This commit is contained in:
David Shaw 2007-07-18 19:36:24 +00:00
parent ab20b58ecd
commit 2aa497521d
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-07-18 David Shaw <dshaw@jabberwocky.com>
* configure.ac: It seems that AM_GNU_GETTEXT doesn't like being
run conditionally and it confuses the includes when doing later
type checks. This is bug#810.
2007-07-08 David Shaw <dshaw@jabberwocky.com> 2007-07-08 David Shaw <dshaw@jabberwocky.com>
* configure.ac: AM_PROG_CC_C_O is desired by automake 1.10 to do * configure.ac: AM_PROG_CC_C_O is desired by automake 1.10 to do

8
configure.ac
View File

@ -827,17 +827,14 @@ AC_SUBST(MPI_OPT_FLAGS)
dnl Checks for libraries. dnl Checks for libraries.
AM_GNU_GETTEXT_VERSION(0.14.1)
if test "$try_gettext" = yes; then if test "$try_gettext" = yes; then
AM_GNU_GETTEXT(,[need-ngettext])
# gettext requires some extra checks. These really should be part of # gettext requires some extra checks. These really should be part of
# the basic AM_GNU_GETTEXT macro. TODO: move other gettext-specific # the basic AM_GNU_GETTEXT macro. TODO: move other gettext-specific
# function checks to here. # function checks to here.
AC_CHECK_FUNCS(strchr) AC_CHECK_FUNCS(strchr)
else else
USE_NLS=no enable_nls=no
USE_INCLUDED_LIBINTL=no USE_INCLUDED_LIBINTL=no
BUILD_INCLUDED_LIBINTL=no BUILD_INCLUDED_LIBINTL=no
AC_SUBST(USE_NLS) AC_SUBST(USE_NLS)
@ -846,6 +843,9 @@ else
AM_PO_SUBDIRS AM_PO_SUBDIRS
fi fi
AM_GNU_GETTEXT_VERSION(0.14.1)
AM_GNU_GETTEXT(,[need-ngettext])
if test "$try_extensions" = yes || test x"$card_support" = xyes ; then if test "$try_extensions" = yes || test x"$card_support" = xyes ; then
if test "$need_dlopen" = yes; then if test "$need_dlopen" = yes; then
_dl_save_libs=$LIBS _dl_save_libs=$LIBS