diff options
Diffstat (limited to 'm4/libunistring.m4')
-rw-r--r-- | m4/libunistring.m4 | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/m4/libunistring.m4 b/m4/libunistring.m4 index c1bf4d553..e3d944793 100644 --- a/m4/libunistring.m4 +++ b/m4/libunistring.m4 | |||
@@ -1,9 +1,11 @@ | |||
1 | # libunistring.m4 serial 11 | 1 | # libunistring.m4 serial 12 |
2 | dnl Copyright (C) 2009-2012 Free Software Foundation, Inc. | 2 | dnl Copyright (C) 2009-2021 Free Software Foundation, Inc. |
3 | dnl This file is free software; the Free Software Foundation | 3 | dnl This file is free software; the Free Software Foundation |
4 | dnl gives unlimited permission to copy and/or distribute it, | 4 | dnl gives unlimited permission to copy and/or distribute it, |
5 | dnl with or without modifications, as long as this notice is preserved. | 5 | dnl with or without modifications, as long as this notice is preserved. |
6 | 6 | ||
7 | AC_PREREQ([2.64]) | ||
8 | |||
7 | dnl gl_LIBUNISTRING | 9 | dnl gl_LIBUNISTRING |
8 | dnl Searches for an installed libunistring. | 10 | dnl Searches for an installed libunistring. |
9 | dnl If found, it sets and AC_SUBSTs HAVE_LIBUNISTRING=yes and the LIBUNISTRING | 11 | dnl If found, it sets and AC_SUBSTs HAVE_LIBUNISTRING=yes and the LIBUNISTRING |
@@ -12,8 +14,8 @@ dnl augments the CPPFLAGS variable, and #defines HAVE_LIBUNISTRING to 1. | |||
12 | dnl Otherwise, it sets and AC_SUBSTs HAVE_LIBUNISTRING=no and LIBUNISTRING and | 14 | dnl Otherwise, it sets and AC_SUBSTs HAVE_LIBUNISTRING=no and LIBUNISTRING and |
13 | dnl LTLIBUNISTRING to empty. | 15 | dnl LTLIBUNISTRING to empty. |
14 | 16 | ||
15 | dnl Define gl_LIBUNISTRING using AC_DEFUN_ONCE for Autoconf >= 2.64, in order | 17 | dnl Define gl_LIBUNISTRING using AC_DEFUN_ONCE, in order dnl to avoid warnings |
16 | dnl to avoid warnings like | 18 | dnl like |
17 | dnl "warning: AC_REQUIRE: `gl_LIBUNISTRING' was expanded before it was required". | 19 | dnl "warning: AC_REQUIRE: `gl_LIBUNISTRING' was expanded before it was required". |
18 | dnl This is tricky because of the way 'aclocal' is implemented: | 20 | dnl This is tricky because of the way 'aclocal' is implemented: |
19 | dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN. | 21 | dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN. |
@@ -21,16 +23,7 @@ dnl Otherwise aclocal's initial scan pass would miss the macro definition. | |||
21 | dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions. | 23 | dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions. |
22 | dnl Otherwise aclocal would emit many "Use of uninitialized value $1" | 24 | dnl Otherwise aclocal would emit many "Use of uninitialized value $1" |
23 | dnl warnings. | 25 | dnl warnings. |
24 | m4_define([gl_libunistring_AC_DEFUN], | 26 | AC_DEFUN_ONCE([gl_LIBUNISTRING], |
25 | m4_version_prereq([2.64], | ||
26 | [[AC_DEFUN_ONCE( | ||
27 | [$1], [$2])]], | ||
28 | [m4_ifdef([gl_00GNULIB], | ||
29 | [[AC_DEFUN_ONCE( | ||
30 | [$1], [$2])]], | ||
31 | [[AC_DEFUN( | ||
32 | [$1], [$2])]])])) | ||
33 | gl_libunistring_AC_DEFUN([gl_LIBUNISTRING], | ||
34 | [ | 27 | [ |
35 | AC_BEFORE([$0], [gl_LIBUNISTRING_MODULE]) | 28 | AC_BEFORE([$0], [gl_LIBUNISTRING_MODULE]) |
36 | AC_BEFORE([$0], [gl_LIBUNISTRING_LIBHEADER]) | 29 | AC_BEFORE([$0], [gl_LIBUNISTRING_LIBHEADER]) |