+2007-11-08 Jim Meyering <meyering@redhat.com>
+
+ Change cache variable name prefix "jm_" to "gl_" everywhere.
+ * m4/d-type.m4, m4/jm-winsz1.m4, m4/jm-winsz2.m4, m4/link-follow.m4:
+ * m4/putenv.m4, m4/strtoimax.m4, m4/strtoumax.m4, m4/unlink-busy.m4:
+ * m4/uptime.m4: s/gl_/jm_/
+
2007-11-07 Bruno Haible <bruno@clisp.org>
Update to GNU gettext 0.17.
AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE],
[AC_CACHE_CHECK([for d_type member in directory struct],
- jm_cv_struct_dirent_d_type,
+ gl_cv_struct_dirent_d_type,
[AC_TRY_LINK(dnl
[
#include <sys/types.h>
],
[struct dirent dp; dp.d_type = 0;],
- jm_cv_struct_dirent_d_type=yes,
- jm_cv_struct_dirent_d_type=no)
+ gl_cv_struct_dirent_d_type=yes,
+ gl_cv_struct_dirent_d_type=no)
]
)
- if test $jm_cv_struct_dirent_d_type = yes; then
+ if test $gl_cv_struct_dirent_d_type = yes; then
AC_DEFINE(HAVE_STRUCT_DIRENT_D_TYPE, 1,
[Define if there is a member named d_type in the struct describing
directory headers.])
AC_DEFUN([gl_HEADER_TIOCGWINSZ_IN_TERMIOS_H],
[AC_REQUIRE([AC_SYS_POSIX_TERMIOS])
AC_CACHE_CHECK([whether use of TIOCGWINSZ requires termios.h],
- jm_cv_sys_tiocgwinsz_needs_termios_h,
- [jm_cv_sys_tiocgwinsz_needs_termios_h=no
+ gl_cv_sys_tiocgwinsz_needs_termios_h,
+ [gl_cv_sys_tiocgwinsz_needs_termios_h=no
if test $ac_cv_sys_posix_termios = yes; then
AC_EGREP_CPP([yes],
# ifdef TIOCGWINSZ
yes
# endif
- ], jm_cv_sys_tiocgwinsz_needs_termios_h=yes)
+ ], gl_cv_sys_tiocgwinsz_needs_termios_h=yes)
fi
])
])
AC_DEFUN([gl_WINSIZE_IN_PTEM],
[AC_REQUIRE([AC_SYS_POSIX_TERMIOS])
AC_CACHE_CHECK([whether use of struct winsize requires sys/ptem.h],
- jm_cv_sys_struct_winsize_needs_sys_ptem_h,
- [jm_cv_sys_struct_winsize_needs_sys_ptem_h=yes
+ gl_cv_sys_struct_winsize_needs_sys_ptem_h,
+ [gl_cv_sys_struct_winsize_needs_sys_ptem_h=yes
if test $ac_cv_sys_posix_termios = yes; then
AC_TRY_COMPILE([#include <termios.h>],
[struct winsize x;
if (sizeof x > 0) return 0;],
- [jm_cv_sys_struct_winsize_needs_sys_ptem_h=no])
+ [gl_cv_sys_struct_winsize_needs_sys_ptem_h=no])
fi
- if test $jm_cv_sys_struct_winsize_needs_sys_ptem_h = yes; then
+ if test $gl_cv_sys_struct_winsize_needs_sys_ptem_h = yes; then
AC_TRY_COMPILE([#include <sys/ptem.h>],
[struct winsize x;
if (sizeof x > 0) return 0;],
- [], [jm_cv_sys_struct_winsize_needs_sys_ptem_h=no])
+ [], [gl_cv_sys_struct_winsize_needs_sys_ptem_h=no])
fi])
- if test $jm_cv_sys_struct_winsize_needs_sys_ptem_h = yes; then
+ if test $gl_cv_sys_struct_winsize_needs_sys_ptem_h = yes; then
AC_DEFINE([WINSIZE_IN_PTEM], 1,
[Define if sys/ptem.h is required for struct winsize.])
fi])
AC_DEFUN([gl_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL],
[AC_REQUIRE([gl_HEADER_TIOCGWINSZ_IN_TERMIOS_H])
AC_CACHE_CHECK([whether use of TIOCGWINSZ requires sys/ioctl.h],
- jm_cv_sys_tiocgwinsz_needs_sys_ioctl_h,
- [jm_cv_sys_tiocgwinsz_needs_sys_ioctl_h=no
+ gl_cv_sys_tiocgwinsz_needs_sys_ioctl_h,
+ [gl_cv_sys_tiocgwinsz_needs_sys_ioctl_h=no
- if test $jm_cv_sys_tiocgwinsz_needs_termios_h = no; then
+ if test $gl_cv_sys_tiocgwinsz_needs_termios_h = no; then
AC_EGREP_CPP([yes],
[#include <sys/types.h>
# include <sys/ioctl.h>
# ifdef TIOCGWINSZ
yes
# endif
- ], jm_cv_sys_tiocgwinsz_needs_sys_ioctl_h=yes)
+ ], gl_cv_sys_tiocgwinsz_needs_sys_ioctl_h=yes)
fi
])
- if test $jm_cv_sys_tiocgwinsz_needs_sys_ioctl_h = yes; then
+ if test $gl_cv_sys_tiocgwinsz_needs_sys_ioctl_h = yes; then
AC_DEFINE(GWINSZ_IN_SYS_IOCTL, 1,
[Define if your system defines TIOCGWINSZ in sys/ioctl.h.])
fi
[dnl
AC_CACHE_CHECK(
[whether link(2) dereferences a symlink specified with a trailing slash],
- jm_ac_cv_func_link_follows_symlink,
+ gl_ac_cv_func_link_follows_symlink,
[
# Create a regular file.
echo > conftest.file
return SAME_INODE (sb_hard, sb_file) ? 0 : 1;
}
],
- jm_ac_cv_func_link_follows_symlink=yes,
- jm_ac_cv_func_link_follows_symlink=no,
- jm_ac_cv_func_link_follows_symlink=yes dnl We're cross compiling.
+ gl_ac_cv_func_link_follows_symlink=yes,
+ gl_ac_cv_func_link_follows_symlink=no,
+ gl_ac_cv_func_link_follows_symlink=yes dnl We're cross compiling.
)
])
- if test $jm_ac_cv_func_link_follows_symlink = yes; then
+ if test $gl_ac_cv_func_link_follows_symlink = yes; then
AC_DEFINE(LINK_FOLLOWS_SYMLINKS, 1,
[Define if `link(2)' dereferences symbolic links.])
fi
[
AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
AC_CACHE_CHECK([for putenv compatible with GNU and SVID],
- [jm_cv_func_svid_putenv],
+ [gl_cv_func_svid_putenv],
[AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],[
/* Put it in env. */
if (putenv ("CONFTEST_putenv=val"))
return 0;
])],
- jm_cv_func_svid_putenv=yes,
- jm_cv_func_svid_putenv=no,
+ gl_cv_func_svid_putenv=yes,
+ gl_cv_func_svid_putenv=no,
dnl When crosscompiling, assume putenv is broken.
- jm_cv_func_svid_putenv=no)
+ gl_cv_func_svid_putenv=no)
])
- if test $jm_cv_func_svid_putenv = no; then
+ if test $gl_cv_func_svid_putenv = no; then
REPLACE_PUTENV=1
AC_LIBOBJ(putenv)
fi
AC_REQUIRE([AC_PROG_EGREP])
AC_CACHE_CHECK([whether <inttypes.h> defines strtoimax as a macro],
- jm_cv_func_strtoimax_macro,
+ gl_cv_func_strtoimax_macro,
[AC_EGREP_CPP([inttypes_h_defines_strtoimax], [#include <inttypes.h>
#ifdef strtoimax
inttypes_h_defines_strtoimax
#endif],
- jm_cv_func_strtoimax_macro=yes,
- jm_cv_func_strtoimax_macro=no)])
+ gl_cv_func_strtoimax_macro=yes,
+ gl_cv_func_strtoimax_macro=no)])
- if test "$jm_cv_func_strtoimax_macro" != yes; then
+ if test "$gl_cv_func_strtoimax_macro" != yes; then
AC_REPLACE_FUNCS(strtoimax)
if test $ac_cv_func_strtoimax = no; then
gl_PREREQ_STRTOIMAX
AC_REQUIRE([AC_PROG_EGREP])
AC_CACHE_CHECK([whether <inttypes.h> defines strtoumax as a macro],
- jm_cv_func_strtoumax_macro,
+ gl_cv_func_strtoumax_macro,
[AC_EGREP_CPP([inttypes_h_defines_strtoumax], [#include <inttypes.h>
#ifdef strtoumax
inttypes_h_defines_strtoumax
#endif],
- jm_cv_func_strtoumax_macro=yes,
- jm_cv_func_strtoumax_macro=no)])
+ gl_cv_func_strtoumax_macro=yes,
+ gl_cv_func_strtoumax_macro=no)])
- if test "$jm_cv_func_strtoumax_macro" != yes; then
+ if test "$gl_cv_func_strtoumax_macro" != yes; then
AC_REPLACE_FUNCS(strtoumax)
if test $ac_cv_func_strtoumax = no; then
gl_PREREQ_STRTOUMAX
AC_DEFUN([gl_FUNC_UNLINK_BUSY_TEXT],
[dnl
AC_CACHE_CHECK([whether a running program can be unlinked],
- jm_cv_func_unlink_busy_text,
+ gl_cv_func_unlink_busy_text,
[
AC_RUN_IFELSE(
[AC_LANG_SOURCE(
{
return !argc || unlink (argv[0]) != 0;
}]])],
- jm_cv_func_unlink_busy_text=yes,
- jm_cv_func_unlink_busy_text=no,
- jm_cv_func_unlink_busy_text=no
+ gl_cv_func_unlink_busy_text=yes,
+ gl_cv_func_unlink_busy_text=no,
+ gl_cv_func_unlink_busy_text=no
)
]
)
- if test $jm_cv_func_unlink_busy_text = no; then
+ if test $gl_cv_func_unlink_busy_text = no; then
INSTALL=$ac_install_sh
fi
])
AC_DEFUN([gl_SYS_PROC_UPTIME],
[ dnl Require AC_PROG_CC to see if we're cross compiling.
AC_REQUIRE([AC_PROG_CC])
- AC_CACHE_CHECK([for /proc/uptime], jm_cv_have_proc_uptime,
- [jm_cv_have_proc_uptime=no
+ AC_CACHE_CHECK([for /proc/uptime], gl_cv_have_proc_uptime,
+ [gl_cv_have_proc_uptime=no
test -f /proc/uptime \
&& test "$cross_compiling" = no \
&& cat < /proc/uptime >/dev/null 2>/dev/null \
- && jm_cv_have_proc_uptime=yes])
- if test $jm_cv_have_proc_uptime = yes; then
+ && gl_cv_have_proc_uptime=yes])
+ if test $gl_cv_have_proc_uptime = yes; then
AC_DEFINE(HAVE_PROC_UPTIME, 1,
[ Define if your system has the /proc/uptime special file.])
fi