<URL: http://bugs.freeciv.org/Ticket/Display.html?id=40301 >
- Added standard codeset.m4 -file that provides AM_LANGINFO_CODESET identical to one we had in locale.m4. Removed macro from locale.m4 - Made locale.m4 serial number legal fixing last of the illegal serial number warnings - ML
diff -Nurd -X.diff_ignore freeciv/m4/codeset.m4 freeciv/m4/codeset.m4 --- freeciv/m4/codeset.m4 1970-01-01 02:00:00.000000000 +0200 +++ freeciv/m4/codeset.m4 2008-06-22 06:32:46.000000000 +0300 @@ -0,0 +1,21 @@ +# codeset.m4 serial 2 (gettext-0.16) +dnl Copyright (C) 2000-2002, 2006 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Bruno Haible. + +AC_DEFUN([AM_LANGINFO_CODESET], +[ + AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, + [AC_TRY_LINK([#include <langinfo.h>], + [char* cs = nl_langinfo(CODESET); return !cs;], + am_cv_langinfo_codeset=yes, + am_cv_langinfo_codeset=no) + ]) + if test $am_cv_langinfo_codeset = yes; then + AC_DEFINE(HAVE_LANGINFO_CODESET, 1, + [Define if you have <langinfo.h> and nl_langinfo(CODESET).]) + fi +]) diff -Nurd -X.diff_ignore freeciv/m4/locale.m4 freeciv/m4/locale.m4 --- freeciv/m4/locale.m4 2007-08-04 18:36:08.000000000 +0300 +++ freeciv/m4/locale.m4 2008-06-22 06:37:07.000000000 +0300 @@ -1,19 +1,4 @@ -#serial AM1 -dnl From Bruno Haible. - -AC_DEFUN([AM_LANGINFO_CODESET], -[ - AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, - [AC_TRY_LINK([#include <langinfo.h>], - [char* cs = nl_langinfo(CODESET);], - am_cv_langinfo_codeset=yes, - am_cv_langinfo_codeset=no) - ]) - if test $am_cv_langinfo_codeset = yes; then - AC_DEFINE(HAVE_LANGINFO_CODESET, 1, - [Define if you have <langinfo.h> and nl_langinfo(CODESET).]) - fi -]) +#serial 0 AC_DEFUN([AM_LIBCHARSET], [
_______________________________________________ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
