From 5fe5923a00c8e66b8cae09da36b9b4e558cb47d8 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Thu, 1 Nov 2007 18:34:38 +0100 Subject: [PATCH] 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_/ --- ChangeLog | 7 +++++++ m4/d-type.m4 | 8 ++++---- m4/jm-winsz1.m4 | 18 +++++++++--------- m4/jm-winsz2.m4 | 10 +++++----- m4/link-follow.m4 | 10 +++++----- m4/putenv.m4 | 10 +++++----- m4/strtoimax.m4 | 8 ++++---- m4/strtoumax.m4 | 8 ++++---- m4/unlink-busy.m4 | 10 +++++----- m4/uptime.m4 | 8 ++++---- 10 files changed, 52 insertions(+), 45 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce2ce52af..6f1bad33e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-11-08 Jim Meyering + + 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 Update to GNU gettext 0.17. diff --git a/m4/d-type.m4 b/m4/d-type.m4 index 7675dd2b0..92f9b1584 100644 --- a/m4/d-type.m4 +++ b/m4/d-type.m4 @@ -14,7 +14,7 @@ dnl 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 @@ -22,11 +22,11 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE], ], [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.]) diff --git a/m4/jm-winsz1.m4 b/m4/jm-winsz1.m4 index 52653b74b..bde5cc5ab 100644 --- a/m4/jm-winsz1.m4 +++ b/m4/jm-winsz1.m4 @@ -9,8 +9,8 @@ dnl From Jim Meyering and Paul Eggert. 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], @@ -19,7 +19,7 @@ AC_DEFUN([gl_HEADER_TIOCGWINSZ_IN_TERMIOS_H], # ifdef TIOCGWINSZ yes # endif - ], jm_cv_sys_tiocgwinsz_needs_termios_h=yes) + ], gl_cv_sys_tiocgwinsz_needs_termios_h=yes) fi ]) ]) @@ -27,21 +27,21 @@ AC_DEFUN([gl_HEADER_TIOCGWINSZ_IN_TERMIOS_H], 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 ], [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 ], [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]) diff --git a/m4/jm-winsz2.m4 b/m4/jm-winsz2.m4 index 66c504092..ee710a552 100644 --- a/m4/jm-winsz2.m4 +++ b/m4/jm-winsz2.m4 @@ -8,20 +8,20 @@ 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 # include # 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 diff --git a/m4/link-follow.m4 b/m4/link-follow.m4 index 69a701877..ceec0675c 100644 --- a/m4/link-follow.m4 +++ b/m4/link-follow.m4 @@ -11,7 +11,7 @@ AC_DEFUN([gl_AC_FUNC_LINK_FOLLOWS_SYMLINK], [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 @@ -52,12 +52,12 @@ AC_DEFUN([gl_AC_FUNC_LINK_FOLLOWS_SYMLINK], 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 diff --git a/m4/putenv.m4 b/m4/putenv.m4 index 226a9ebce..9c76a006f 100644 --- a/m4/putenv.m4 +++ b/m4/putenv.m4 @@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_PUTENV], [ 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")) @@ -29,12 +29,12 @@ AC_DEFUN([gl_FUNC_PUTENV], 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 diff --git a/m4/strtoimax.m4 b/m4/strtoimax.m4 index 9957637a6..6ed66c968 100644 --- a/m4/strtoimax.m4 +++ b/m4/strtoimax.m4 @@ -11,15 +11,15 @@ AC_DEFUN([gl_FUNC_STRTOIMAX], AC_REQUIRE([AC_PROG_EGREP]) AC_CACHE_CHECK([whether defines strtoimax as a macro], - jm_cv_func_strtoimax_macro, + gl_cv_func_strtoimax_macro, [AC_EGREP_CPP([inttypes_h_defines_strtoimax], [#include #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 diff --git a/m4/strtoumax.m4 b/m4/strtoumax.m4 index 1935250ed..aef5b4309 100644 --- a/m4/strtoumax.m4 +++ b/m4/strtoumax.m4 @@ -11,15 +11,15 @@ AC_DEFUN([gl_FUNC_STRTOUMAX], AC_REQUIRE([AC_PROG_EGREP]) AC_CACHE_CHECK([whether defines strtoumax as a macro], - jm_cv_func_strtoumax_macro, + gl_cv_func_strtoumax_macro, [AC_EGREP_CPP([inttypes_h_defines_strtoumax], [#include #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 diff --git a/m4/unlink-busy.m4 b/m4/unlink-busy.m4 index 687f900da..a38eb707c 100644 --- a/m4/unlink-busy.m4 +++ b/m4/unlink-busy.m4 @@ -12,7 +12,7 @@ dnl HPUX and other systems can't unlink shared text that is being executed. 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( @@ -22,14 +22,14 @@ AC_DEFUN([gl_FUNC_UNLINK_BUSY_TEXT], { 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 ]) diff --git a/m4/uptime.m4 b/m4/uptime.m4 index 680e30fdb..05c9e5f88 100644 --- a/m4/uptime.m4 +++ b/m4/uptime.m4 @@ -10,13 +10,13 @@ AC_PREREQ(2.13) 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 -- 2.11.0