mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-02-12 13:49:22 +01:00
Incorporate AM_LC_MESSAGES, AM_PATH_PROG_WITH_TEST as AM_GLIB_* to avoid
Thu May 16 12:24:00 2002 Owen Taylor <otaylor@redhat.com>
* acinclude.m4 m4macros/glib-gettext.m4: Incorporate
AM_LC_MESSAGES, AM_PATH_PROG_WITH_TEST as AM_GLIB_* to avoid
dependencies on gettext m4 files. (#81885, Hidetoshi Tajima.)
This commit is contained in:
Owen Taylor
Owen Taylor
parent
32a120fa79
commit
93cc655dab
@ -1,3 +1,9 @@
|
||||
Thu May 16 12:24:00 2002 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* acinclude.m4 m4macros/glib-gettext.m4: Incorporate
|
||||
AM_LC_MESSAGES, AM_PATH_PROG_WITH_TEST as AM_GLIB_* to avoid
|
||||
dependencies on gettext m4 files. (#81885, Hidetoshi Tajima.)
|
||||
|
||||
2002-05-14 Alex Larsson <alexl@redhat.com>
|
||||
|
||||
* glib/gstrfuncs.c:
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
Thu May 16 12:24:00 2002 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* acinclude.m4 m4macros/glib-gettext.m4: Incorporate
|
||||
AM_LC_MESSAGES, AM_PATH_PROG_WITH_TEST as AM_GLIB_* to avoid
|
||||
dependencies on gettext m4 files. (#81885, Hidetoshi Tajima.)
|
||||
|
||||
2002-05-14 Alex Larsson <alexl@redhat.com>
|
||||
|
||||
* glib/gstrfuncs.c:
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
Thu May 16 12:24:00 2002 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* acinclude.m4 m4macros/glib-gettext.m4: Incorporate
|
||||
AM_LC_MESSAGES, AM_PATH_PROG_WITH_TEST as AM_GLIB_* to avoid
|
||||
dependencies on gettext m4 files. (#81885, Hidetoshi Tajima.)
|
||||
|
||||
2002-05-14 Alex Larsson <alexl@redhat.com>
|
||||
|
||||
* glib/gstrfuncs.c:
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
Thu May 16 12:24:00 2002 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* acinclude.m4 m4macros/glib-gettext.m4: Incorporate
|
||||
AM_LC_MESSAGES, AM_PATH_PROG_WITH_TEST as AM_GLIB_* to avoid
|
||||
dependencies on gettext m4 files. (#81885, Hidetoshi Tajima.)
|
||||
|
||||
2002-05-14 Alex Larsson <alexl@redhat.com>
|
||||
|
||||
* glib/gstrfuncs.c:
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
Thu May 16 12:24:00 2002 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* acinclude.m4 m4macros/glib-gettext.m4: Incorporate
|
||||
AM_LC_MESSAGES, AM_PATH_PROG_WITH_TEST as AM_GLIB_* to avoid
|
||||
dependencies on gettext m4 files. (#81885, Hidetoshi Tajima.)
|
||||
|
||||
2002-05-14 Alex Larsson <alexl@redhat.com>
|
||||
|
||||
* glib/gstrfuncs.c:
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
Thu May 16 12:24:00 2002 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* acinclude.m4 m4macros/glib-gettext.m4: Incorporate
|
||||
AM_LC_MESSAGES, AM_PATH_PROG_WITH_TEST as AM_GLIB_* to avoid
|
||||
dependencies on gettext m4 files. (#81885, Hidetoshi Tajima.)
|
||||
|
||||
2002-05-14 Alex Larsson <alexl@redhat.com>
|
||||
|
||||
* glib/gstrfuncs.c:
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
Thu May 16 12:24:00 2002 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* acinclude.m4 m4macros/glib-gettext.m4: Incorporate
|
||||
AM_LC_MESSAGES, AM_PATH_PROG_WITH_TEST as AM_GLIB_* to avoid
|
||||
dependencies on gettext m4 files. (#81885, Hidetoshi Tajima.)
|
||||
|
||||
2002-05-14 Alex Larsson <alexl@redhat.com>
|
||||
|
||||
* glib/gstrfuncs.c:
|
||||
|
||||
57
acinclude.m4
57
acinclude.m4
@ -1,5 +1,5 @@
|
||||
# Macro to add for using GNU gettext.
|
||||
# Ulrich Drepper <drepper@cygnus.com>, 1995.
|
||||
# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
|
||||
#
|
||||
# Modified to never use included libintl.
|
||||
# Owen Taylor <otaylor@redhat.com>, 12/15/1998
|
||||
@ -17,6 +17,55 @@
|
||||
# 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,
|
||||
@ -59,12 +108,12 @@ AC_DEFUN(AM_GLIB_WITH_NLS,
|
||||
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,
|
||||
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_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
|
||||
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],
|
||||
@ -157,7 +206,7 @@ unistd.h sys/param.h])
|
||||
AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
|
||||
strdup __argz_count __argz_stringify __argz_next])
|
||||
|
||||
AM_LC_MESSAGES
|
||||
AM_GLIB_LC_MESSAGES
|
||||
AM_GLIB_WITH_NLS
|
||||
|
||||
if test "x$CATOBJEXT" != "x"; then
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# Macro to add for using GNU gettext.
|
||||
# Ulrich Drepper <drepper@cygnus.com>, 1995.
|
||||
# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
|
||||
#
|
||||
# Modified to never use included libintl.
|
||||
# Owen Taylor <otaylor@redhat.com>, 12/15/1998
|
||||
@ -17,6 +17,55 @@
|
||||
# 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,
|
||||
@ -60,12 +109,12 @@ AC_DEFUN(AM_GLIB_WITH_NLS,
|
||||
|| 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_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
|
||||
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_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
|
||||
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],
|
||||
@ -159,7 +208,7 @@ unistd.h sys/param.h])
|
||||
AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
|
||||
strdup __argz_count __argz_stringify __argz_next])
|
||||
|
||||
AM_LC_MESSAGES
|
||||
AM_GLIB_LC_MESSAGES
|
||||
AM_GLIB_WITH_NLS
|
||||
|
||||
if test "x$CATOBJEXT" != "x"; then
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user