From 9def01f51ce6d294e498334c25c2a01e7e532a64 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 21 Oct 2002 16:31:02 +0000 Subject: [PATCH] * configure.ac (try_gettext): Remove special case for cygwin. This removes all the DOS specific macros and let Cygwin work like a real OS. Needs a couple of changes elsewhere but after all, GnuPG presents itself much more like a Posix program and can be used in a full Cygwin environment; e.g. used along with mutt. Changes suggested by Volker Quetschke. * acinclude.m4 (GNUPG_SYS_NM_PARSE): Allow for underscore in test symbols. Useful for Cygwin builds. (GNUPG_SYS_SYMBOL_UNDERSCORE): Don't hardwire to yes for Cygwin. --- ChangeLog | 13 +++++++++++++ THANKS | 1 + acinclude.m4 | 10 +++++----- configure.ac | 4 ++-- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6c81057b1..95c2a4dee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2002-10-21 Werner Koch + + * configure.ac (try_gettext): Remove special case for cygwin. + This removes all the DOS specific macros and let Cygwin work like + a real OS. Needs a couple of changes elsewhere but after all, + GnuPG presents itself much more like a Posix program and can be + used in a full Cygwin environment; e.g. used along with mutt. + Changes suggested by Volker Quetschke. + + * acinclude.m4 (GNUPG_SYS_NM_PARSE): Allow for underscore in test + symbols. Useful for Cygwin builds. + (GNUPG_SYS_SYMBOL_UNDERSCORE): Don't hardwire to yes for Cygwin. + 2002-10-17 Werner Koch Released 1.2.1rc1. diff --git a/THANKS b/THANKS index dd7424dad..9e1968369 100644 --- a/THANKS +++ b/THANKS @@ -199,6 +199,7 @@ Thomas Mikkelsen tbm@image.dk Ulf Möller 3umoelle@informatik.uni-hamburg.de Urko Lusa ulusa@euskalnet.net Vincent P. Broman broman@spawar.navy.mil +Volker Quetschke quetschke@scytek.de W Lewis wiml@hhhh.org Walter Hofmann Walter.Hofmann@physik.stud.uni-erlangen.de Walter Koch koch@hsp.de diff --git a/acinclude.m4 b/acinclude.m4 index 4a2c91672..63704e4e4 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -570,8 +570,8 @@ changequote([,])dnl fi # Make sure that we snagged all the symbols we need. - if egrep ' nm_test_var$' "$ac_nlist" >/dev/null; then - if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then + if egrep ' _?nm_test_var$' "$ac_nlist" >/dev/null; then + if egrep ' _?nm_test_func$' "$ac_nlist" >/dev/null; then cat < conftest.c #ifdef __cplusplus extern "C" { @@ -579,7 +579,7 @@ extern "C" { EOF # Now generate the symbol file. - sed 's/^.* \(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c + sed 's/^.* _\?\(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c cat <> conftest.c #if defined (__STDC__) && __STDC__ @@ -601,7 +601,7 @@ dld_preloaded_symbols[] = changequote([,])dnl { EOF - sed 's/^\(.*\) \(.*\)$/ {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c + sed 's/^_\?\(.*\) _\?\(.*\)$/ {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c cat <<\EOF >> conftest.c {0, (__ptr_t) 0} }; @@ -661,7 +661,7 @@ AC_CHECK_TOOL(AS, as, false) AC_DEFUN(GNUPG_SYS_SYMBOL_UNDERSCORE, [tmp_do_check="no" case "${target}" in - i386-emx-os2 | i[3456]86-pc-os2*emx | i386-pc-msdosdjgpp | *-*-cygwin) + i386-emx-os2 | i[3456]86-pc-os2*emx | i386-pc-msdosdjgpp) ac_cv_sys_symbol_underscore=yes ;; *) diff --git a/configure.ac b/configure.ac index 97aa5fbdc..398c813b1 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ dnlAC_REVISION($Revision$)dnl AC_PREREQ(2.52) # Remember to change the version number immediately *after* a release -# and remove the "-cvs" or suffix immediately *before* a release. +# and remove the "-cvs" or "rc" suffix immediately *before* a release. AC_INIT(gnupg, 1.2.1rc1, bug-gnupg@gnu.org) # Set development_version to yes if the minor number is odd or you # feel that the default check for a development version is not @@ -288,7 +288,7 @@ MPI_OPT_FLAGS="" try_gettext=yes case "${target}" in - *-*-mingw32*|*-*-cygwin*) + *-*-mingw32*) # special stuff for Windoze NT ac_cv_have_dev_random=no AC_DEFINE(USE_ONLY_8DOT3,1,