From 2b88e564fb6beb7b0e8ad16d4acd2b4d14be8e8f Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 15 Apr 2003 15:48:12 +0000 Subject: [PATCH] * configure.ac (HAVE_DOSISH_SYSTEM): New automake conditional. * acinclude.m4 (GNUPG_CHECK_ENDIAN): Fixed quoting of r.e. using quadrigraphs. --- ChangeLog | 7 +++++++ NEWS | 2 ++ acinclude.m4 | 4 ++-- configure.ac | 19 +++++++++++++------ 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index ab9a4e920..b4b7f7df5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-04-15 Werner Koch + + * configure.ac (HAVE_DOSISH_SYSTEM): New automake conditional. + + * acinclude.m4 (GNUPG_CHECK_ENDIAN): Fixed quoting of r.e. using + quadrigraphs. + 2003-04-08 David Shaw * configure.ac: Big warning that TIGER is being removed from the diff --git a/NEWS b/NEWS index b5fbd9615..b7f6a4c59 100644 --- a/NEWS +++ b/NEWS @@ -41,6 +41,8 @@ Noteworthy changes in version 1.2.2 (unreleased) * Add read-only support for the SHA-256 hash, and optional read-only support for the SHA-384 and SHA-512 hashes. + * New option --enable-progress-filter for use with frontends. + Noteworthy changes in version 1.2.1 (2002-10-25) ------------------------------------------------ diff --git a/acinclude.m4 b/acinclude.m4 index 75ac88090..4e18c2605 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,5 +1,5 @@ dnl macros to configure gnupg -dnl Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. +dnl Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. dnl dnl This file is part of GnuPG. dnl @@ -115,7 +115,7 @@ define(GNUPG_CHECK_ENDIAN, tmp_assumed_endian=big if test "$cross_compiling" = yes; then case "$host_cpu" in - i[345678]* ) + i@<:@345678@:>@* ) tmp_assumed_endian=little ;; *) diff --git a/configure.ac b/configure.ac index 48f153df5..d7253b71e 100644 --- a/configure.ac +++ b/configure.ac @@ -309,7 +309,9 @@ GNUPG_CHECK_DOCBOOK_TO_TEXI MPI_OPT_FLAGS="" + try_gettext=yes +have_dosish_system=no case "${target}" in *-*-mingw32*) # special stuff for Windoze NT @@ -318,21 +320,18 @@ case "${target}" in [set this to limit filenames to the 8.3 format]) AC_DEFINE(HAVE_DRIVE_LETTERS,1, [defined if we must run on a stupid file system]) - AC_DEFINE(HAVE_DOSISH_SYSTEM,1, - [defined if we run on some of the PCDOS like systems - (DOS, Windoze. OS/2) with special properties like - no file modes]) AC_DEFINE(USE_SIMPLE_GETTEXT,1, [because the Unix gettext has too much overhead on MingW32 systems and these systems lack Posix functions, we use a simplified version of gettext]) + have_dosish_system=yes try_gettext="no" ;; i?86-emx-os2 | i?86-*-os2*emx ) # OS/2 with the EMX environment ac_cv_have_dev_random=no AC_DEFINE(HAVE_DRIVE_LETTERS) - AC_DEFINE(HAVE_DOSISH_SYSTEM) + have_dosish_system=yes try_gettext="no" ;; @@ -340,7 +339,7 @@ case "${target}" in # DOS with the DJGPP environment ac_cv_have_dev_random=no AC_DEFINE(HAVE_DRIVE_LETTERS) - AC_DEFINE(HAVE_DOSISH_SYSTEM) + have_dosish_system=yes try_gettext="no" ;; @@ -377,6 +376,14 @@ case "${target}" in ;; esac +if test "$have_dosish_system" = yes; then + AC_DEFINE(HAVE_DOSISH_SYSTEM,1, + [defined if we run on some of the PCDOS like systems + (DOS, Windoze. OS/2) with special properties like + no file modes]) +fi +AM_CONDITIONAL(HAVE_DOSISH_SYSTEM, test "$have_dosish_system" = yes) + AC_SUBST(MPI_OPT_FLAGS) GNUPG_SYS_SYMBOL_UNDERSCORE