mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-11-10 11:26:16 +01:00
bc54ea6edf
positional parameters: (#79488) * glib/gstrfuncs.c: * glib/gspawn-win32.c: * glib/gscanner.c: * glib/gconvert.c: * glib/gbacktrace.c: Use _g_printf wrappers. * glib/gutils.c (g_vsnprintf): Simplify, since we can assume C99 snprintf semantics now. * glib/gmessages.c (printf_string_upper_bound): No longer needed, since we can assume C99 snprintf semantics now. (g_logv): Simplify. * acinclude.m4 (AC_FUNC_PRINTF_UNIX98): New macro to check wether printf supports SUS positional parameters. * configure.in: New option --enable-included-printf to force compilation of trio; otherwise trio is compiled if the system printf misses either C99 snprintf semantics of SUS positional parameters. * glib/Makefile.am (SUBDIRS): Conditionally compile trio. (libglib_2_0_la_SOURCES): Add gprintf.c and gprintfint.h. (glibsubinclude_HEADERS): Add gprintf.h. * glib/gprintfint.h: New private wrapping either system printf or trio printf variants in _g_printf wrappers for use inside glib. * glib/gprintf.h: New public header declaring g_printf variants. * glib/gprintf.c: Corresponding implementations. * glib/trio/*: New directory, containing the trio-1.9 sources. * glib/tmpl/string_utils.sgml: Add note on including gprintf.h, move some docs inline. * glib/glib-sections.txt: Add g_printf, g_vprintf, g_fprintf, g_vfprintf, g_sprintf, g_vsprintf.
364 lines
11 KiB
Plaintext
364 lines
11 KiB
Plaintext
# Macro to add for using GNU gettext.
|
|
# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
|
|
#
|
|
# 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.
|
|
#
|
|
#
|
|
# If you make changes to this file, you MUST update the copy in
|
|
# acinclude.m4. [ aclocal dies on duplicate macros, so if
|
|
# we run 'aclocal -I macros/' then we'll run into problems
|
|
# once we've installed glib-gettext.m4 :-( ]
|
|
#
|
|
|
|
AC_DEFUN([AM_GLIB_LC_MESSAGES],
|
|
[if test $ac_cv_header_locale_h = yes; then
|
|
AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
|
|
[AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
|
|
am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
|
|
if test $am_cv_val_LC_MESSAGES = yes; then
|
|
AC_DEFINE(HAVE_LC_MESSAGES, 1,
|
|
[Define if your <locale.h> file defines LC_MESSAGES.])
|
|
fi
|
|
fi])
|
|
|
|
dnl AM_GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
|
|
dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
|
|
AC_DEFUN([AM_GLIB_PATH_PROG_WITH_TEST],
|
|
[# Extract the first word of "$2", so it can be a program name with args.
|
|
set dummy $2; ac_word=[$]2
|
|
AC_MSG_CHECKING([for $ac_word])
|
|
AC_CACHE_VAL(ac_cv_path_$1,
|
|
[case "[$]$1" in
|
|
/*)
|
|
ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
|
|
;;
|
|
*)
|
|
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
|
|
for ac_dir in ifelse([$5], , $PATH, [$5]); do
|
|
test -z "$ac_dir" && ac_dir=.
|
|
if test -f $ac_dir/$ac_word; then
|
|
if [$3]; then
|
|
ac_cv_path_$1="$ac_dir/$ac_word"
|
|
break
|
|
fi
|
|
fi
|
|
done
|
|
IFS="$ac_save_ifs"
|
|
dnl If no 4th arg is given, leave the cache variable unset,
|
|
dnl so AC_PATH_PROGS will keep looking.
|
|
ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
|
|
])dnl
|
|
;;
|
|
esac])dnl
|
|
$1="$ac_cv_path_$1"
|
|
if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
|
|
AC_MSG_RESULT([$]$1)
|
|
else
|
|
AC_MSG_RESULT(no)
|
|
fi
|
|
AC_SUBST($1)dnl
|
|
])
|
|
|
|
# serial 5
|
|
|
|
AC_DEFUN(AM_GLIB_WITH_NLS,
|
|
dnl NLS is obligatory
|
|
[USE_NLS=yes
|
|
AC_SUBST(USE_NLS)
|
|
|
|
dnl Figure out what method
|
|
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
|
|
XGETTEXT=:
|
|
|
|
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)])
|
|
|
|
gt_cv_func_dgettext_libintl="no"
|
|
libintl_extra_libs=""
|
|
|
|
if test "$gt_cv_func_dgettext_libc" != "yes" ; then
|
|
AC_CHECK_LIB(intl, bindtextdomain,
|
|
[AC_CHECK_LIB(intl, dgettext,
|
|
gt_cv_func_dgettext_libintl=yes)])
|
|
|
|
if test "$gt_cv_func_dgettext_libc" != "yes" ; then
|
|
AC_MSG_CHECKING([if -liconv is needed to use gettext])
|
|
AC_MSG_RESULT([])
|
|
AC_CHECK_LIB(intl, dcgettext,
|
|
[gt_cv_func_dgettext_libintl=yes
|
|
libintl_extra_libs=-liconv],
|
|
:,-liconv)
|
|
fi
|
|
fi
|
|
|
|
if test "$gt_cv_func_dgettext_libintl" = "yes"; then
|
|
LIBS="$LIBS -lintl $libintl_extra_libs";
|
|
fi
|
|
|
|
if test "$gt_cv_func_dgettext_libc" = "yes" \
|
|
|| test "$gt_cv_func_dgettext_libintl" = "yes"; then
|
|
AC_DEFINE(HAVE_GETTEXT,1,
|
|
[Define if the GNU gettext() function is already present or preinstalled.])
|
|
AM_GLIB_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_GLIB_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 $libintl_extra_libs"
|
|
LIBS=`echo $LIBS | sed -e 's/-lintl//'`
|
|
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, 1,
|
|
[always defined to indicate that i18n is enabled])
|
|
else
|
|
dnl Unset this variable since we use the non-zero value as a flag.
|
|
CATOBJEXT=
|
|
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
|
|
|
|
AC_OUTPUT_COMMANDS(
|
|
[case "$CONFIG_FILES" in *po/Makefile.in*)
|
|
sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
|
|
esac])
|
|
|
|
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(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_GLIB_GNU_GETTEXT,
|
|
[AC_REQUIRE([AC_PROG_MAKE_SET])dnl
|
|
AC_REQUIRE([AC_PROG_CC])dnl
|
|
AC_REQUIRE([AC_PROG_RANLIB])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])
|
|
|
|
AM_GLIB_LC_MESSAGES
|
|
AM_GLIB_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 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 po || mkdir po
|
|
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/po/$msgformat-msg.sed > po/po2msg.sed
|
|
fi
|
|
|
|
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 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
|
|
])
|
|
|
|
|
|
dnl @synopsis AC_FUNC_VSNPRINTF_C99
|
|
dnl
|
|
dnl Check whether there is a vsnprintf() function with C99 semantics installed.
|
|
dnl
|
|
AC_DEFUN([AC_FUNC_VSNPRINTF_C99],
|
|
[AC_CACHE_CHECK(for C99 vsnprintf,
|
|
ac_cv_func_vsnprintf_c99,
|
|
[AC_TRY_RUN(
|
|
[#include <stdio.h>
|
|
#include <stdarg.h>
|
|
|
|
int
|
|
doit(char * s, ...)
|
|
{
|
|
char buffer[32];
|
|
va_list args;
|
|
int r;
|
|
|
|
va_start(args, s);
|
|
r = vsnprintf(buffer, 5, s, args);
|
|
va_end(args);
|
|
|
|
if (r != 7)
|
|
exit(1);
|
|
|
|
exit(0);
|
|
}
|
|
|
|
int
|
|
main(void)
|
|
{
|
|
doit("1234567");
|
|
exit(1);
|
|
}], ac_cv_func_vsnprintf_c99=yes, ac_cv_func_vsnprintf_c99=no, ac_cv_func_vsnprintf_c99=no)])
|
|
dnl Note that the default is to be pessimistic in the case of cross compilation.
|
|
dnl If you know that the target has a C99 vsnprintf(), you can get around this
|
|
dnl by setting ac_func_vsnprintf_c99 to yes, as described in the Autoconf manual.
|
|
if test $ac_cv_func_vsnprintf_c99 = yes; then
|
|
AC_DEFINE(HAVE_C99_VSNPRINTF, 1,
|
|
[Define if you have a version of the vsnprintf function
|
|
with semantics as specified by the ISO C99 standard.])
|
|
fi
|
|
])# AC_FUNC_VSNPRINTF_C99
|
|
|
|
|
|
dnl @synopsis AC_FUNC_PRINTF_UNIX98
|
|
dnl
|
|
dnl Check whether the printf() family supports Unix98 %n$ positional parameters
|
|
dnl
|
|
AC_DEFUN([AC_FUNC_PRINTF_UNIX98],
|
|
[AC_CACHE_CHECK(whether printf supports positional parameters,
|
|
ac_cv_func_printf_unix98,
|
|
[AC_TRY_RUN(
|
|
[#include <stdio.h>
|
|
|
|
int
|
|
main (void)
|
|
{
|
|
char buffer[128];
|
|
|
|
sprintf (buffer, "%2\$d %3\$d %1\$d", 1, 2, 3);
|
|
if (strcmp ("2 3 1", buffer) == 0)
|
|
exit (0);
|
|
exit (1);
|
|
}], ac_cv_func_printf_unix98=yes, ac_cv_func_printf_unix98=no, ac_cv_func_printf_unix98=no)])
|
|
dnl Note that the default is to be pessimistic in the case of cross compilation.
|
|
dnl If you know that the target printf() supports positional parameters, you can get around
|
|
dnl this by setting ac_func_printf_unix98 to yes, as described in the Autoconf manual.
|
|
if test $ac_cv_func_printf_unix98 = yes; then
|
|
AC_DEFINE(HAVE_UNIX98_PRINTF, 1,
|
|
[Define if your printf function family supports positional parameters
|
|
as specified by Unix98.])
|
|
fi
|
|
])# AC_FUNC_PRINTF_UNIX98
|
|
|
|
|
|
|
|
|