New file
authorPadraig O'Briain <padraigo@src.gnome.org>
Mon, 4 Nov 2002 15:10:32 +0000 (15:10 +0000)
committerPadraig O'Briain <padraigo@src.gnome.org>
Mon, 4 Nov 2002 15:10:32 +0000 (15:10 +0000)
* acinclude.m4: New file

* autogen.sh: Add i18n support (copied from gtk+).

* configure.in: Add definition for atklocaledir and check for
bind_textdomain_codeset()

* atk/Makefile.am: Add DEfininition of ATKLOCALEDIR to INCLUDES

* atk/atkobject.c (atk_role_get_localized_name): Add code to
initialize i18n.

* po/.cvsignore: Add extra files.

ChangeLog
acinclude.m4 [new file with mode: 0644]
atk/Makefile.am
atk/atkobject.c
autogen.sh
configure.in
po/.cvsignore

index f361c53..58e6b63 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2002-11-04  Padraig O'Briain  <padraig.obriain@sun.com>
+
+       * acinclude.m4: New file
+
+       * autogen.sh: Add i18n support (copied from gtk+).
+
+       * configure.in: Add definition for atklocaledir and check for
+       bind_textdomain_codeset()
+
+       * atk/Makefile.am: Add DEfininition of ATKLOCALEDIR to INCLUDES
+
+       * atk/atkobject.c (atk_role_get_localized_name): Add code to
+       initialize i18n.
+       
+       * po/.cvsignore: Add extra files.
+
 2002-11-01  Padraig O'Briain  <padraig.obriain@sun.com>
 
        * configure.in: Create po/Makefile; patch supplied by 
diff --git a/acinclude.m4 b/acinclude.m4
new file mode 100644 (file)
index 0000000..3e6d9e1
--- /dev/null
@@ -0,0 +1,338 @@
+# autoconf 2.13 / 2.50 compatibility macro
+
+# Ulrich Drepper <drepper@cygnus.com>, 1995.
+#
+# Modified to never use included libintl. 
+# Owen Taylor <otaylor@redhat.com>, 12/15/1998
+#
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+# Please note that the actual code is *not* freely available.
+
+# serial 5
+
+AC_DEFUN(AM_ATK_WITH_NLS,
+  [AC_MSG_CHECKING([whether NLS is requested])
+    dnl Default is enabled NLS
+    AC_ARG_ENABLE(nls,
+      [  --disable-nls           do not use Native Language Support],
+      USE_NLS=$enableval, USE_NLS=yes)
+    AC_MSG_RESULT($USE_NLS)
+    AC_SUBST(USE_NLS)
+
+    USE_INCLUDED_LIBINTL=no
+
+    dnl If we use NLS figure out what method
+    if test "$USE_NLS" = "yes"; then
+#      AC_DEFINE(ENABLE_NLS)
+#      AC_MSG_CHECKING([whether included gettext is requested])
+#      AC_ARG_WITH(included-gettext,
+#        [  --with-included-gettext use the GNU gettext library included here],
+#        nls_cv_force_use_gnu_gettext=$withval,
+#        nls_cv_force_use_gnu_gettext=no)
+#      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
+      nls_cv_force_use_gnu_gettext="no"
+
+      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+        dnl User does not insist on using GNU NLS library.  Figure out what
+        dnl to use.  If gettext or catgets are available (in this order) we
+        dnl use this.  Else we have to fall back to GNU NLS library.
+       dnl catgets is only used if permitted by option --with-catgets.
+       nls_cv_header_intl=
+       nls_cv_header_libgt=
+       CATOBJEXT=NONE
+
+       AC_CHECK_HEADER(libintl.h,
+         [AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
+           [AC_TRY_LINK([#include <libintl.h>], [return (int) dgettext ("","")],
+              gt_cv_func_dgettext_libc=yes, gt_cv_func_dgettext_libc=no)])
+
+          if test "$gt_cv_func_dgettext_libc" != "yes"; then
+            AC_CHECK_LIB(intl, bindtextdomain,
+              [AC_CACHE_CHECK([for dgettext in libintl],
+                gt_cv_func_dgettext_libintl,
+                [AC_CHECK_LIB(intl, dgettext,
+                 gt_cv_func_dgettext_libintl=yes,
+                 gt_cv_func_dgettext_libintl=no)],
+                gt_cv_func_dgettext_libintl=no)])
+          fi
+
+           if test "$gt_cv_func_dgettext_libintl" = "yes"; then
+            LIBS="$LIBS -lintl";
+           fi
+
+          if test "$gt_cv_func_dgettext_libc" = "yes" \
+             || test "$gt_cv_func_dgettext_libintl" = "yes"; then
+             AC_DEFINE(HAVE_GETTEXT)
+             AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+               [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
+             if test "$MSGFMT" != "no"; then
+               AC_CHECK_FUNCS(dcgettext)
+               AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+               AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+                 [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+               AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+                              return _nl_msg_cat_cntr],
+                 [CATOBJEXT=.gmo
+                  DATADIRNAME=share],
+                 [CATOBJEXT=.mo
+                  DATADIRNAME=lib])
+               INSTOBJEXT=.mo
+             fi
+           fi
+
+           # Added by Martin Baulig 12/15/98 for libc5 systems
+           if test "$gt_cv_func_dgettext_libc" != "yes" \
+              && test "$gt_cv_func_dgettext_libintl" = "yes"; then
+              INTLLIBS=-lintl
+              LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+           fi
+       ])
+
+        if test "$CATOBJEXT" = "NONE"; then
+         AC_MSG_CHECKING([whether catgets can be used])
+         AC_ARG_WITH(catgets,
+           [  --with-catgets          use catgets functions if available],
+           nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
+         AC_MSG_RESULT($nls_cv_use_catgets)
+
+         if test "$nls_cv_use_catgets" = "yes"; then
+           dnl No gettext in C library.  Try catgets next.
+           AC_CHECK_LIB(i, main)
+           AC_CHECK_FUNC(catgets,
+             [AC_DEFINE(HAVE_CATGETS)
+              INTLOBJS="\$(CATOBJS)"
+              AC_PATH_PROG(GENCAT, gencat, no)dnl
+#             if test "$GENCAT" != "no"; then
+#               AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
+#               if test "$GMSGFMT" = "no"; then
+#                 AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
+#                  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
+#               fi
+#               AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+#                 [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+#               USE_INCLUDED_LIBINTL=yes
+#               CATOBJEXT=.cat
+#               INSTOBJEXT=.cat
+#               DATADIRNAME=lib
+#               INTLDEPS='$(top_builddir)/intl/libintl.a'
+#               INTLLIBS=$INTLDEPS
+#               LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+#               nls_cv_header_intl=intl/libintl.h
+#               nls_cv_header_libgt=intl/libgettext.h
+#              fi
+            ])
+         fi
+        fi
+
+        if test "$CATOBJEXT" = "NONE"; then
+         dnl Neither gettext nor catgets in included in the C library.
+         dnl Fall back on GNU gettext library.
+         nls_cv_use_gnu_gettext=yes
+        fi
+      fi
+
+      if test "$nls_cv_use_gnu_gettext" != "yes"; then
+        AC_DEFINE(ENABLE_NLS)
+      else
+         # Unset this variable since we use the non-zero value as a flag.
+         CATOBJEXT=
+#        dnl Mark actions used to generate GNU NLS library.
+#        INTLOBJS="\$(GETTOBJS)"
+#        AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+#        [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
+#        AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+#        AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+#        [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+#        AC_SUBST(MSGFMT)
+#      USE_INCLUDED_LIBINTL=yes
+#        CATOBJEXT=.gmo
+#        INSTOBJEXT=.mo
+#        DATADIRNAME=share
+#      INTLDEPS='$(top_builddir)/intl/libintl.a'
+#      INTLLIBS=$INTLDEPS
+#      LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+#        nls_cv_header_intl=intl/libintl.h
+#        nls_cv_header_libgt=intl/libgettext.h
+      fi
+
+      dnl Test whether we really found GNU xgettext.
+      if test "$XGETTEXT" != ":"; then
+       dnl If it is no GNU xgettext we define it as : so that the
+       dnl Makefiles still can work.
+       if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+         : ;
+       else
+         AC_MSG_RESULT(
+           [found xgettext program is not GNU xgettext; ignore it])
+         XGETTEXT=":"
+       fi
+      fi
+
+      # We need to process the po/ directory.
+      POSUB=po
+    else
+      DATADIRNAME=share
+      nls_cv_header_intl=intl/libintl.h
+      nls_cv_header_libgt=intl/libgettext.h
+    fi
+    AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
+    AC_OUTPUT_COMMANDS(
+     [case "$CONFIG_FILES" in *po/Makefile.in*)
+        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+      esac])
+
+
+#    # If this is used in GNU gettext we have to set USE_NLS to `yes'
+#    # because some of the sources are only built for this goal.
+#    if test "$PACKAGE" = gettext; then
+#      USE_NLS=yes
+#      USE_INCLUDED_LIBINTL=yes
+#    fi
+
+    dnl These rules are solely for the distribution goal.  While doing this
+    dnl we only have to keep exactly one list of the available catalogs
+    dnl in configure.in.
+    for lang in $ALL_LINGUAS; do
+      GMOFILES="$GMOFILES $lang.gmo"
+      POFILES="$POFILES $lang.po"
+    done
+
+    dnl Make all variables we use known to autoconf.
+    AC_SUBST(USE_INCLUDED_LIBINTL)
+    AC_SUBST(CATALOGS)
+    AC_SUBST(CATOBJEXT)
+    AC_SUBST(DATADIRNAME)
+    AC_SUBST(GMOFILES)
+    AC_SUBST(INSTOBJEXT)
+    AC_SUBST(INTLDEPS)
+    AC_SUBST(INTLLIBS)
+    AC_SUBST(INTLOBJS)
+    AC_SUBST(POFILES)
+    AC_SUBST(POSUB)
+  ])
+
+AC_DEFUN(AM_ATK_GNU_GETTEXT,
+  [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+   AC_REQUIRE([AC_PROG_CC])dnl
+   AC_REQUIRE([AC_PROG_RANLIB])dnl
+   AC_REQUIRE([AC_ISC_POSIX])dnl
+   AC_REQUIRE([AC_HEADER_STDC])dnl
+   AC_REQUIRE([AC_C_CONST])dnl
+   AC_REQUIRE([AC_C_INLINE])dnl
+   AC_REQUIRE([AC_TYPE_OFF_T])dnl
+   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
+   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
+   AC_REQUIRE([AC_FUNC_MMAP])dnl
+
+   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
+unistd.h sys/param.h])
+   AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
+strdup __argz_count __argz_stringify __argz_next])
+
+   if test "${ac_cv_func_stpcpy+set}" != "set"; then
+     AC_CHECK_FUNCS(stpcpy)
+   fi
+   if test "${ac_cv_func_stpcpy}" = "yes"; then
+     AC_DEFINE(HAVE_STPCPY)
+   fi
+
+   AM_LC_MESSAGES
+   AM_ATK_WITH_NLS
+
+   if test "x$CATOBJEXT" != "x"; then
+     if test "x$ALL_LINGUAS" = "x"; then
+       LINGUAS=
+     else
+       AC_MSG_CHECKING(for catalogs to be installed)
+       NEW_LINGUAS=
+       for lang in ${LINGUAS=$ALL_LINGUAS}; do
+         case "$ALL_LINGUAS" in
+          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
+         esac
+       done
+       LINGUAS=$NEW_LINGUAS
+       AC_MSG_RESULT($LINGUAS)
+     fi
+
+     dnl Construct list of names of catalog files to be constructed.
+     if test -n "$LINGUAS"; then
+       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+     fi
+   fi
+
+   dnl The reference to <locale.h> in the installed <libintl.h> file
+   dnl must be resolved because we cannot expect the users of this
+   dnl to define HAVE_LOCALE_H.
+   if test $ac_cv_header_locale_h = yes; then
+     INCLUDE_LOCALE_H="#include <locale.h>"
+   else
+     INCLUDE_LOCALE_H="\
+/* The system does not provide the header <locale.h>.  Take care yourself.  */"
+   fi
+   AC_SUBST(INCLUDE_LOCALE_H)
+
+   dnl Determine which catalog format we have (if any is needed)
+   dnl For now we know about two different formats:
+   dnl   Linux libc-5 and the normal X/Open format
+   test -d intl || mkdir intl
+   if test "$CATOBJEXT" = ".cat"; then
+     AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
+
+     dnl Transform the SED scripts while copying because some dumb SEDs
+     dnl cannot handle comments.
+     sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
+   fi
+   dnl po2tbl.sed is always needed.
+   sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
+     $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
+
+   dnl In the intl/Makefile.in we have a special dependency which makes
+   dnl only sense for gettext.  We comment this out for non-gettext
+   dnl packages.
+   if test "$PACKAGE" = "gettext"; then
+     GT_NO="#NO#"
+     GT_YES=
+   else
+     GT_NO=
+     GT_YES="#YES#"
+   fi
+   AC_SUBST(GT_NO)
+   AC_SUBST(GT_YES)
+
+   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+   dnl Try to locate is.
+   MKINSTALLDIRS=
+   if test -n "$ac_aux_dir"; then
+     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+   fi
+   if test -z "$MKINSTALLDIRS"; then
+     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+   fi
+   AC_SUBST(MKINSTALLDIRS)
+
+   dnl *** For now the libtool support in intl/Makefile is not for real.
+   l=
+   AC_SUBST(l)
+
+   dnl Generate list of files to be processed by xgettext which will
+   dnl be included in po/Makefile.
+   test -d po || mkdir po
+   if test "x$srcdir" != "x."; then
+     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+       posrcprefix="$srcdir/"
+     else
+       posrcprefix="../$srcdir/"
+     fi
+   else
+     posrcprefix="../"
+   fi
+   rm -f po/POTFILES
+   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,        $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+       < $srcdir/po/POTFILES.in > po/POTFILES
+  ])
+
index f34e6e9..4e19235 100644 (file)
@@ -74,7 +74,8 @@ MAINTAINERCLEANFILES +=       \
 INCLUDES = \
        -I$(top_srcdir)         \
        -DG_DISABLE_DEPRECATED  \
-       @DEP_CFLAGS@
+       @DEP_CFLAGS@            \
+       -DATKLOCALEDIR=\""$(atklocaledir)"\"
 
 LDFLAGS =                                      \
        -version-info $(LT_VERSION_INFO)        \
index 261da36..f29cee7 100755 (executable)
@@ -1154,6 +1154,17 @@ G_CONST_RETURN gchar*
 atk_role_get_localized_name (AtkRole role)
 {
   G_CONST_RETURN gchar *name;
+  gboolean gettext_initialized = FALSE;
+
+#ifdef ENABLE_NLS
+  if (!gettext_initialized)
+    {
+      bindtextdomain (GETTEXT_PACKAGE, ATKLOCALEDIR);
+#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
+      bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+#endif
+    }
+#endif
 
   switch (role)
     {
index fe05456..7f6389d 100755 (executable)
@@ -72,6 +72,26 @@ if test -z "$AUTOGEN_SUBDIR_MODE"; then
         fi
 fi
 
+
+if test -z "$ACLOCAL_FLAGS"; then
+
+       acdir=`aclocal-1.4 --print-ac-dir`
+       m4list="glib-2.0.m4 glib-gettext.m4"
+
+       for file in $m4list
+       do
+               if [ ! -f "$acdir/$file" ]; then
+                       echo "WARNING: aclocal's directory is $acdir, but..."
+                       echo "          no file $acdir/$file"
+                       echo "          You may see fatal macro warnings below."
+                       echo "          If these files are installed in /some/dir, set the ACLOCAL_FLAGS "
+                        echo "         environment variable to \"-I /some/dir\", or install"
+                       echo "          $acdir/$file."
+                       echo ""
+               fi
+       done
+fi
+
 aclocal-1.4 $ACLOCAL_FLAGS
 
 automake-1.4 -a $am_opt
index d92a36b..a28bf27 100644 (file)
@@ -69,6 +69,13 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
 ALL_LINGUAS=""
 AM_GLIB_GNU_GETTEXT
 
+# AM_GLIB_GNU_GETTEXT above substs $DATADIRNAME
+# this is the directory where the *.{mo,gmo} files are installed
+atklocaledir='${prefix}/${DATADIRNAME}/locale'
+AC_SUBST(atklocaledir)
+
+AC_CHECK_FUNCS(bind_textdomain_codeset)
+
 AC_PROG_CC
 AM_DISABLE_STATIC
 AC_LIBTOOL_WIN32_DLL
@@ -204,4 +211,4 @@ tests/Makefile
 docs/Makefile
 atk.spec
 atk-zip.sh
-],[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
+])
index f0c0b67..291db36 100644 (file)
@@ -1,11 +1,13 @@
 *.gmo
 *.mo
+*.pot
 Makefile
 Makefile.in
 Makefile.in.in
 POTFILES
 cat-id-tbl.c
-atk10.pot
 messages
-stamp-cat-id
+mising
 po2tbl.sed
+po2tbl.sed.in
+stamp-cat-id