comparison aclocal.m4 @ 447:00924eeb2ec8 3.0

Fixed segfault with output outside of a section
author lost@l-w.ca
date Thu, 04 Nov 2010 23:25:18 -0600
parents b8bf63962a99
children
comparison
equal deleted inserted replaced
446:194787ce2a77 447:00924eeb2ec8
11 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A 11 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
12 # PARTICULAR PURPOSE. 12 # PARTICULAR PURPOSE.
13 13
14 m4_ifndef([AC_AUTOCONF_VERSION], 14 m4_ifndef([AC_AUTOCONF_VERSION],
15 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl 15 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
16 m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, 16 m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
17 [m4_warning([this file was generated for autoconf 2.65. 17 [m4_warning([this file was generated for autoconf 2.67.
18 You have another version of autoconf. It may work, but is not guaranteed to. 18 You have another version of autoconf. It may work, but is not guaranteed to.
19 If you have problems, you may need to regenerate the build system entirely. 19 If you have problems, you may need to regenerate the build system entirely.
20 To do so, use the procedure documented by the package, typically `autoreconf'.])]) 20 To do so, use the procedure documented by the package, typically `autoreconf'.])])
21 21
22 # po.m4 serial 15 (gettext-0.17) 22 # po.m4 serial 17 (gettext-0.18)
23 dnl Copyright (C) 1995-2007 Free Software Foundation, Inc. 23 dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
24 dnl This file is free software; the Free Software Foundation 24 dnl This file is free software; the Free Software Foundation
25 dnl gives unlimited permission to copy and/or distribute it, 25 dnl gives unlimited permission to copy and/or distribute it,
26 dnl with or without modifications, as long as this notice is preserved. 26 dnl with or without modifications, as long as this notice is preserved.
27 dnl 27 dnl
28 dnl This file can can be used in projects which are not available under 28 dnl This file can can be used in projects which are not available under
36 36
37 dnl Authors: 37 dnl Authors:
38 dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. 38 dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
39 dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. 39 dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
40 40
41 AC_PREREQ(2.50) 41 AC_PREREQ([2.50])
42 42
43 dnl Checks for all prerequisites of the po subdirectory. 43 dnl Checks for all prerequisites of the po subdirectory.
44 AC_DEFUN([AM_PO_SUBDIRS], 44 AC_DEFUN([AM_PO_SUBDIRS],
45 [ 45 [
46 AC_REQUIRE([AC_PROG_MAKE_SET])dnl 46 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
48 AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake 48 AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
49 AC_REQUIRE([AM_NLS])dnl 49 AC_REQUIRE([AM_NLS])dnl
50 50
51 dnl Release version of the gettext macros. This is used to ensure that 51 dnl Release version of the gettext macros. This is used to ensure that
52 dnl the gettext macros and po/Makefile.in.in are in sync. 52 dnl the gettext macros and po/Makefile.in.in are in sync.
53 AC_SUBST([GETTEXT_MACRO_VERSION], [0.17]) 53 AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
54 54
55 dnl Perform the following tests also if --disable-nls has been given, 55 dnl Perform the following tests also if --disable-nls has been given,
56 dnl because they are needed for "make dist" to work. 56 dnl because they are needed for "make dist" to work.
57 57
58 dnl Search for GNU msgfmt in the PATH. 58 dnl Search for GNU msgfmt in the PATH.
60 dnl The second test excludes FreeBSD msgfmt. 60 dnl The second test excludes FreeBSD msgfmt.
61 AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, 61 AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
62 [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && 62 [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
63 (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], 63 (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
64 :) 64 :)
65 AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) 65 AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
66 66
67 dnl Test whether it is GNU msgfmt >= 0.15. 67 dnl Test whether it is GNU msgfmt >= 0.15.
68 changequote(,)dnl 68 changequote(,)dnl
69 case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in 69 case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
70 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;; 70 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;