diff options
| author | David Shaw <[email protected]> | 2002-11-13 16:11:32 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2002-11-13 16:11:32 +0000 |
| commit | 453c471f50b913524f68376b03389b30f871c8e2 (patch) | |
| tree | d51c62678d7fd61d2240dd3324d28af94789df51 /acinclude.m4 | |
| parent | * secmem.c (lock_pool) [__CYGWIN__]: Don't print secmem warning. From (diff) | |
| download | gnupg-453c471f50b913524f68376b03389b30f871c8e2.tar.gz gnupg-453c471f50b913524f68376b03389b30f871c8e2.zip | |
* THANKS: Changes from stable branch.
* configure.ac: Check for ctermid(). From Werner on stable
branch.
* configure.ac (GPGKEYS_LDAP,GPGKEYS_HKP): Add $EXEEXT. From
Werner on stable branch.
* 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. From Werner on stable
branch.
* 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.
From Werner on stable branch.
* README: Add an installation note for Darwin 6.1. From Werner on
stable branch.
Diffstat (limited to '')
| -rw-r--r-- | acinclude.m4 | 10 |
1 files changed, 5 insertions, 5 deletions
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 <<EOF > 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 <<EOF >> 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 ;; *) |