On Tue, 9 Nov 2004, Mashrab Kuvatov wrote: > On Monday 08 November 2004 20:27, Vin Shelton wrote: > > 2. Since I need to support building on multiple platforms, I solved that > > problem by creating a tree of symlinks and I then discovered my second > > problem; it appears I cannot build on this platform if I've configured > > --disable-nls: > > I second this. I also cannot build neither 0.60 nor 0.60.1 with --dasable-nls. > Without --dasable-nls it builds. I have Linux, gcc-3.3.1 and glibc-2.3.2. > Below is what happens.
Your problem is completely different that his. However, the attached patch should also fix your problem. -- http://kevin.atkinson.dhs.org
diff -ur aspell-0.60.1/common/config.cpp aspell-0.60.1.1-cvs/common/config.cpp --- aspell-0.60.1/common/config.cpp 2004-11-01 13:07:32.000000000 -0700 +++ aspell-0.60.1.1-cvs/common/config.cpp 2004-11-09 00:45:01.000000000 -0700 @@ -12,6 +12,7 @@ #include "dirs.h" #include "settings.h" +#include "gettext.h" #ifdef USE_LOCALE # include <locale.h> diff -ur aspell-0.60.1/common/convert.cpp aspell-0.60.1.1-cvs/common/convert.cpp --- aspell-0.60.1/common/convert.cpp 2004-10-30 12:32:59.000000000 -0600 +++ aspell-0.60.1.1-cvs/common/convert.cpp 2004-11-09 00:45:27.000000000 -0700 @@ -8,6 +8,8 @@ #include <string.h> #include <math.h> +#include "gettext.h" + #include "asc_ctype.hpp" #include "convert.hpp" #include "fstream.hpp" diff -ur aspell-0.60.1/common/errors.cpp aspell-0.60.1.1-cvs/common/errors.cpp --- aspell-0.60.1/common/errors.cpp 2004-09-25 08:14:26.000000000 -0600 +++ aspell-0.60.1.1-cvs/common/errors.cpp 2004-11-09 00:45:42.000000000 -0700 @@ -7,6 +7,8 @@ * at http://www.gnu.org/. */ #include "settings.h" +#include "gettext.h" + #include "error.hpp" #include "errors.hpp" diff -ur aspell-0.60.1/common/file_util.cpp aspell-0.60.1.1-cvs/common/file_util.cpp --- aspell-0.60.1/common/file_util.cpp 2004-10-26 06:30:43.000000000 -0600 +++ aspell-0.60.1.1-cvs/common/file_util.cpp 2004-11-08 01:13:53.000000000 -0700 @@ -18,9 +18,6 @@ # include <fcntl.h> # include <unistd.h> # include <sys/types.h> -// Uncomment the next line (remove the leading "//") if you are -// getting errors with ftruncate being undefined: -// int ftruncate(int fd, off_t length); #endif #include <stdio.h> diff -ur aspell-0.60.1/common/gettext_init.cpp aspell-0.60.1.1-cvs/common/gettext_init.cpp --- aspell-0.60.1/common/gettext_init.cpp 2004-07-06 08:13:58.000000000 -0600 +++ aspell-0.60.1.1-cvs/common/gettext_init.cpp 2004-11-09 00:51:36.000000000 -0700 @@ -1,5 +1,5 @@ -#include "settings.h" +#include "gettext.h" #if ENABLE_NLS diff -ur aspell-0.60.1/common/info.cpp aspell-0.60.1.1-cvs/common/info.cpp --- aspell-0.60.1/common/info.cpp 2004-09-23 07:30:12.000000000 -0600 +++ aspell-0.60.1.1-cvs/common/info.cpp 2004-11-09 00:44:30.000000000 -0700 @@ -10,6 +10,8 @@ #include <ctype.h> #include <dirent.h> +#include "gettext.h" + // POSIX includes #ifdef __bsdi__ /* BSDi defines u_intXX_t types in machine/types.h */ diff -ur aspell-0.60.1/common/posib_err.cpp aspell-0.60.1.1-cvs/common/posib_err.cpp --- aspell-0.60.1/common/posib_err.cpp 2004-10-29 14:06:06.000000000 -0600 +++ aspell-0.60.1.1-cvs/common/posib_err.cpp 2004-11-09 00:48:49.000000000 -0700 @@ -8,10 +8,11 @@ #include <stdio.h> #include <assert.h> -#include "iostream.hpp" +//#include "iostream.hpp" #include "settings.h" // needed for NLS support +#include "gettext.h" #include "posib_err.hpp" namespace acommon { diff -ur aspell-0.60.1/configure aspell-0.60.1.1-cvs/configure --- aspell-0.60.1/configure 2004-11-07 18:12:49.000000000 -0700 +++ aspell-0.60.1.1-cvs/configure 2004-11-09 00:57:31.000000000 -0700 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for GNU Aspell 0.60.1. +# Generated by GNU Autoconf 2.59 for GNU Aspell 0.60.1.1-cvs. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -421,8 +421,8 @@ # Identity of this package. PACKAGE_NAME='GNU Aspell' PACKAGE_TARNAME='aspell' -PACKAGE_VERSION='0.60.1' -PACKAGE_STRING='GNU Aspell 0.60.1' +PACKAGE_VERSION='0.60.1.1-cvs' +PACKAGE_STRING='GNU Aspell 0.60.1.1-cvs' PACKAGE_BUGREPORT='' ac_unique_file="prog/aspell.cpp" @@ -952,7 +952,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GNU Aspell 0.60.1 to adapt to many kinds of systems. +\`configure' configures GNU Aspell 0.60.1.1-cvs to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1019,7 +1019,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU Aspell 0.60.1:";; + short | recursive ) echo "Configuration of GNU Aspell 0.60.1.1-cvs:";; esac cat <<\_ACEOF @@ -1178,7 +1178,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -GNU Aspell configure 0.60.1 +GNU Aspell configure 0.60.1.1-cvs generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1192,7 +1192,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNU Aspell $as_me 0.60.1, which was +It was created by GNU Aspell $as_me 0.60.1.1-cvs, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1918,7 +1918,7 @@ # Define the identity of the package. PACKAGE='aspell' - VERSION='0.60.1' + VERSION='0.60.1.1-cvs' cat >>confdefs.h <<_ACEOF @@ -21501,6 +21501,9 @@ + + + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # Platform Specific Tests # @@ -22220,11 +22223,6 @@ # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # -cat >>confdefs.h <<\_ACEOF -#define _XOPEN_SOURCE_EXTENDED 1 -_ACEOF - - echo "$as_me:$LINENO: checking if mblen is supported" >&5 echo $ECHO_N "checking if mblen is supported... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF @@ -22654,6 +22652,64 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#define _XOPEN_SOURCE_EXTENDED 1 + #include <wchar.h> + #include CURSES_HEADER + +int +main () +{ +wchar_t wch = 0; + addnwstr(&wch, 1); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + cat >>confdefs.h <<\_ACEOF +#define HAVE_WIDE_CURSES 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define DEFINE_XOPEN_SOURCE_EXTENDED 1 +_ACEOF + + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 { echo "$as_me:$LINENO: WARNING: Aspell will not be able to Display UTF-8 characters correctly." >&5 @@ -22661,6 +22717,9 @@ fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext else echo "$as_me:$LINENO: result: no, because \"mblen\" is not supported" >&5 echo "${ECHO_T}no, because \"mblen\" is not supported" >&6 @@ -22676,7 +22735,10 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <termios.h> +#ifdef DEFINE_XOPEN_SOURCE_EXTENDED + # define _XOPEN_SOURCE_EXTENDED 1 + #endif + #include <termios.h> #include <unistd.h> #include CURSES_HEADER #include <term.h> @@ -22739,7 +22801,10 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <termios.h> +#ifdef DEFINE_XOPEN_SOURCE_EXTENDED + # define _XOPEN_SOURCE_EXTENDED 1 + #endif + #include <termios.h> #include <unistd.h> #include CURSES_HEADER extern "C" {char * tigetstr(char * capname);} @@ -23497,7 +23562,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by GNU Aspell $as_me 0.60.1, which was +This file was extended by GNU Aspell $as_me 0.60.1.1-cvs, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23560,7 +23625,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -GNU Aspell config.status 0.60.1 +GNU Aspell config.status 0.60.1.1-cvs configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -ur aspell-0.60.1/configure.ac aspell-0.60.1.1-cvs/configure.ac --- aspell-0.60.1/configure.ac 2004-11-07 18:11:41.000000000 -0700 +++ aspell-0.60.1.1-cvs/configure.ac 2004-11-09 00:56:33.000000000 -0700 @@ -1,4 +1,4 @@ -AC_INIT(GNU Aspell, 0.60.1) +AC_INIT(GNU Aspell, 0.60.1.1-cvs) AC_CONFIG_SRCDIR(prog/aspell.cpp) AC_CANONICAL_SYSTEM AM_INIT_AUTOMAKE @@ -126,8 +126,11 @@ AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION(0.14.1) -AH_BOTTOM([#include "gettext.h"]) + +AH_TOP([#ifndef ASPELL_SETTINGS__H +#define ASPELL_SETTINGS__H]) AH_BOTTOM([#define C_EXPORT extern "C"]) +AH_BOTTOM([#endif /* ASPELL_SETTINGS__H */]) # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # @@ -277,8 +280,8 @@ # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # -AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, - [Needed to enable wide curses support on some platforms]) +dnl AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, +dnl [Needed to enable wide curses support on some platforms]) AC_MSG_CHECKING(if mblen is supported) AC_TRY_LINK( @@ -381,8 +384,23 @@ addnwstr(&wch, 1);], [AC_MSG_RESULT(yes) AC_DEFINE(HAVE_WIDE_CURSES, 1, [Defined if curses libraray includes wide character support])], + [ + dnl ELSE IF + AC_TRY_LINK( + [#define _XOPEN_SOURCE_EXTENDED 1 + #include <wchar.h> + #include CURSES_HEADER + ], + [wchar_t wch = 0; + addnwstr(&wch, 1);], + [AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_WIDE_CURSES, 1) + AC_DEFINE(DEFINE_XOPEN_SOURCE_EXTENDED, 1, + [Defined if _XOPEN_SOURCE_EXTENDED needs to be defined. + (Can't define globally as that will cause problems with some systems)]) + ], [AC_MSG_RESULT(no) - AC_MSG_WARN([Aspell will not be able to Display UTF-8 characters correctly.])]) + AC_MSG_WARN([Aspell will not be able to Display UTF-8 characters correctly.])])]) else AC_MSG_RESULT([no, because "mblen" is not supported]) AC_MSG_WARN([Aspell will not be able to Display UTF-8 characters correctly.]) @@ -390,7 +408,10 @@ AC_MSG_CHECKING(if standard curses include sequence will work) AC_TRY_LINK( - [#include <termios.h> + [#ifdef DEFINE_XOPEN_SOURCE_EXTENDED + # define _XOPEN_SOURCE_EXTENDED 1 + #endif + #include <termios.h> #include <unistd.h> #include CURSES_HEADER #include <term.h> @@ -407,7 +428,10 @@ dnl else if AC_MSG_CHECKING(if curses workaround I will work) AC_TRY_LINK( - [#include <termios.h> + [#ifdef DEFINE_XOPEN_SOURCE_EXTENDED + # define _XOPEN_SOURCE_EXTENDED 1 + #endif + #include <termios.h> #include <unistd.h> #include CURSES_HEADER extern "C" {char * tigetstr(char * capname);}], diff -ur aspell-0.60.1/gen/settings.h.in aspell-0.60.1.1-cvs/gen/settings.h.in --- aspell-0.60.1/gen/settings.h.in 2004-11-07 18:13:27.000000000 -0700 +++ aspell-0.60.1.1-cvs/gen/settings.h.in 2004-11-09 00:58:06.000000000 -0700 @@ -1,5 +1,8 @@ /* gen/settings.h.in. Generated from configure.ac by autoheader. */ +#ifndef ASPELL_SETTINGS__H +#define ASPELL_SETTINGS__H + /* Defined if filters should be compiled in */ #undef COMPILE_IN_FILTER @@ -15,6 +18,10 @@ /* Defined if curses like POSIX Functions should be used */ #undef CURSES_ONLY +/* Defined if _XOPEN_SOURCE_EXTENDED needs to be defined. (Can't define + globally as that will cause problems with some systems) */ +#undef DEFINE_XOPEN_SOURCE_EXTENDED + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -131,9 +138,6 @@ /* Version number of package */ #undef VERSION -/* Needed to enable wide curses support on some platforms */ -#undef _XOPEN_SOURCE_EXTENDED - -#include "gettext.h" - #define C_EXPORT extern "C" + +#endif /* ASPELL_SETTINGS__H */ diff -ur aspell-0.60.1/lib/find_speller.cpp aspell-0.60.1.1-cvs/lib/find_speller.cpp --- aspell-0.60.1/lib/find_speller.cpp 2004-07-06 08:14:08.000000000 -0600 +++ aspell-0.60.1.1-cvs/lib/find_speller.cpp 2004-11-09 00:53:23.000000000 -0700 @@ -11,6 +11,7 @@ #include <sys/types.h> #include <dirent.h> +#include "gettext.h" #include "asc_ctype.hpp" #include "can_have_error.hpp" #include "config.hpp" diff -ur aspell-0.60.1/lib/new_filter.cpp aspell-0.60.1.1-cvs/lib/new_filter.cpp --- aspell-0.60.1/lib/new_filter.cpp 2004-08-28 01:52:49.000000000 -0600 +++ aspell-0.60.1.1-cvs/lib/new_filter.cpp 2004-11-08 01:13:54.000000000 -0700 @@ -30,6 +30,7 @@ #include "string_map.hpp" #include "strtonum.hpp" #include "file_util.hpp" + #include <stdio.h> #ifdef HAVE_LIBDL diff -ur aspell-0.60.1/lib/new_fmode.cpp aspell-0.60.1.1-cvs/lib/new_fmode.cpp --- aspell-0.60.1/lib/new_fmode.cpp 2004-11-04 16:24:11.000000000 -0700 +++ aspell-0.60.1.1-cvs/lib/new_fmode.cpp 2004-11-09 00:48:37.000000000 -0700 @@ -3,6 +3,7 @@ // license version 2.0 or 2.1. You should have received a copy of the // LGPL license along with this library if you did not you can find it // at http://www.gnu.org/. + #include "settings.h" #ifdef USE_POSIX_REGEX @@ -10,6 +11,7 @@ # include <regex.h> #endif +#include "gettext.h" #include "stack_ptr.hpp" #include "cache-t.hpp" #include "string.hpp" diff -ur aspell-0.60.1/modules/filter/tex.cpp aspell-0.60.1.1-cvs/modules/filter/tex.cpp --- aspell-0.60.1/modules/filter/tex.cpp 2004-07-06 08:14:10.000000000 -0600 +++ aspell-0.60.1.1-cvs/modules/filter/tex.cpp 2004-11-09 00:54:10.000000000 -0700 @@ -4,6 +4,7 @@ // license along with this library if you did not you can find // it at http://www.gnu.org/. +#include "gettext.h" #include "asc_ctype.hpp" #include "config.hpp" #include "string.hpp" diff -ur aspell-0.60.1/modules/speller/default/affix.cpp aspell-0.60.1.1-cvs/modules/speller/default/affix.cpp --- aspell-0.60.1/modules/speller/default/affix.cpp 2004-09-25 01:26:46.000000000 -0600 +++ aspell-0.60.1.1-cvs/modules/speller/default/affix.cpp 2004-11-09 00:48:17.000000000 -0700 @@ -45,8 +45,9 @@ #include <cstring> #include <cstdio> -#include "iostream.hpp" +//#include "iostream.hpp" +#include "gettext.h" #include "affix.hpp" #include "errors.hpp" #include "getdata.hpp" diff -ur aspell-0.60.1/modules/speller/default/data.cpp aspell-0.60.1.1-cvs/modules/speller/default/data.cpp --- aspell-0.60.1/modules/speller/default/data.cpp 2004-10-31 14:46:40.000000000 -0700 +++ aspell-0.60.1.1-cvs/modules/speller/default/data.cpp 2004-11-09 00:52:09.000000000 -0700 @@ -4,6 +4,7 @@ // LGPL license along with this library if you did not you can find it // at http://www.gnu.org/. +#include "gettext.h" #include "config.hpp" #include "convert.hpp" #include "data.hpp" diff -ur aspell-0.60.1/modules/speller/default/language.cpp aspell-0.60.1.1-cvs/modules/speller/default/language.cpp --- aspell-0.60.1/modules/speller/default/language.cpp 2004-11-01 13:09:34.000000000 -0700 +++ aspell-0.60.1.1-cvs/modules/speller/default/language.cpp 2004-11-09 00:48:19.000000000 -0700 @@ -7,6 +7,7 @@ #include <iostream.hpp> +#include "gettext.h" #include "asc_ctype.hpp" #include "clone_ptr-t.hpp" #include "config.hpp" diff -ur aspell-0.60.1/modules/speller/default/readonly_ws.cpp aspell-0.60.1.1-cvs/modules/speller/default/readonly_ws.cpp --- aspell-0.60.1/modules/speller/default/readonly_ws.cpp 2004-09-23 07:24:15.000000000 -0600 +++ aspell-0.60.1.1-cvs/modules/speller/default/readonly_ws.cpp 2004-11-09 00:50:42.000000000 -0700 @@ -37,6 +37,7 @@ #include "settings.h" +#include "gettext.h" #include "block_vector.hpp" #include "config.hpp" #include "data.hpp" diff -ur aspell-0.60.1/prog/aspell.cpp aspell-0.60.1.1-cvs/prog/aspell.cpp --- aspell-0.60.1/prog/aspell.cpp 2004-11-05 17:25:00.000000000 -0700 +++ aspell-0.60.1.1-cvs/prog/aspell.cpp 2004-11-09 00:48:28.000000000 -0700 @@ -34,6 +34,7 @@ # include <fcntl.h> #endif +#include "gettext.h" #include "asc_ctype.hpp" #include "check_funs.hpp" #include "config.hpp" diff -ur aspell-0.60.1/prog/check_funs.cpp aspell-0.60.1.1-cvs/prog/check_funs.cpp --- aspell-0.60.1/prog/check_funs.cpp 2004-09-18 19:53:11.000000000 -0600 +++ aspell-0.60.1.1-cvs/prog/check_funs.cpp 2004-11-09 00:48:22.000000000 -0700 @@ -18,12 +18,17 @@ #include "settings.h" +#ifdef DEFINE_XOPEN_SOURCE_EXTENDED +# define _XOPEN_SOURCE_EXTENDED 1 +#endif + #ifdef CURSES_NON_POSIX #define CURSES_ONLY 1 #endif #include <signal.h> +#include "gettext.h" #include "asc_ctype.hpp" #include "check_funs.hpp" #include "convert.hpp" diff -ur aspell-0.60.1/README aspell-0.60.1.1-cvs/README --- aspell-0.60.1/README 2004-11-07 18:13:25.000000000 -0700 +++ aspell-0.60.1.1-cvs/README 2004-11-09 00:25:10.000000000 -0700 @@ -232,8 +232,8 @@ the `/lib' directory. After removing or renaming this file, the build progress should work (GCC-2.95 and GCC-3.x should work). -Building Aspell using MinGW: -............................ +Building Aspell using MinGW +........................... There are several different ways to build Aspell using MinGW. The easiest way is to use a Cygwin compiler but instruct it to build a
_______________________________________________ Aspell-user mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/aspell-user
