Update of /cvsroot/easyh10/easyh10
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv24899
Modified Files:
Makefile.in aclocal.m4 config.h.in configure configure.in
Log Message:
Automatic detection of the character encoding is now working.
Index: config.h.in
===================================================================
RCS file: /cvsroot/easyh10/easyh10/config.h.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** config.h.in 8 Oct 2006 08:32:37 -0000 1.12
--- config.h.in 8 Oct 2006 19:29:18 -0000 1.13
***************
*** 37,40 ****
--- 37,43 ----
#undef HAVE_INTTYPES_H
+ /* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
+ #undef HAVE_LANGINFO_CODESET
+
/* Define to 1 if you have the `m' library (-lm). */
#undef HAVE_LIBM
Index: configure
===================================================================
RCS file: /cvsroot/easyh10/easyh10/configure,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** configure 8 Oct 2006 08:32:37 -0000 1.30
--- configure 8 Oct 2006 19:29:18 -0000 1.31
***************
*** 3661,3665 ****
# Define the identity of the package.
PACKAGE=easyh10
! VERSION=1.4
--- 3661,3665 ----
# Define the identity of the package.
PACKAGE=easyh10
! VERSION=1.5
***************
*** 26364,26367 ****
--- 26364,26430 ----
esac
+ echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
+ echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
+ if test "${am_cv_langinfo_codeset+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <langinfo.h>
+ int
+ main ()
+ {
+ char* cs = nl_langinfo(CODESET);
+ ;
+ 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_c_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
+ am_cv_langinfo_codeset=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ am_cv_langinfo_codeset=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+ fi
+ echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ if test $am_cv_langinfo_codeset = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_LANGINFO_CODESET 1
+ _ACEOF
+
+ fi
+
+
Index: configure.in
===================================================================
RCS file: /cvsroot/easyh10/easyh10/configure.in,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** configure.in 8 Oct 2006 08:36:47 -0000 1.38
--- configure.in 8 Oct 2006 19:29:18 -0000 1.39
***************
*** 180,183 ****
--- 180,184 ----
;;
esac
+ AM_LANGINFO_CODESET
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/easyh10/easyh10/aclocal.m4,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** aclocal.m4 6 Sep 2006 04:26:14 -0000 1.11
--- aclocal.m4 8 Oct 2006 19:29:17 -0000 1.12
***************
*** 12,15 ****
--- 12,37 ----
# PARTICULAR PURPOSE.
+ # codeset.m4 serial AM1 (gettext-0.10.40)
+ dnl Copyright (C) 2000-2002 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);],
+ 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
+ ])
+
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
|
