Mercurial > hg > octave-shane > gnulib-hg
annotate m4/libunistring-base.m4 @ 13381:25bed74b17cc
Avoid expanding two macros in the wrong order.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Tue, 01 Jun 2010 01:26:32 +0200 |
parents | b5887f4fd7df |
children | c8df5a4f551f |
rev | line source |
---|---|
13381
25bed74b17cc
Avoid expanding two macros in the wrong order.
Bruno Haible <bruno@clisp.org>
parents:
13357
diff
changeset
|
1 # libunistring-base.m4 serial 3 |
13354
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2 dnl Copyright (C) 2010 Free Software Foundation, Inc. |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
3 dnl This file is free software; the Free Software Foundation |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4 dnl gives unlimited permission to copy and/or distribute it, |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5 dnl with or without modifications, as long as this notice is preserved. |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6 |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7 dnl From Paolo Bonzini and Bruno Haible. |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
8 |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
9 dnl gl_LIBUNISTRING_LIBSOURCE([VERSION], [SourceFile]) |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
10 dnl Declares that SourceFile should be compiled, unless we are linking |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
11 dnl with libunistring and its version is >= the given VERSION. |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
12 dnl SourceFile should be relative to the lib directory and end in '.c'. |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
13 dnl This macro is to be used for public libunistring API, not for |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
14 dnl undocumented API. |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
15 dnl |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
16 dnl You have to bump the VERSION argument to the next projected version |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
17 dnl number each time you make a change that affects the behaviour of the |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
18 dnl functions defined in SourceFile (even if SourceFile itself does not |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
19 dnl change). |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
20 |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
21 AC_DEFUN([gl_LIBUNISTRING_LIBSOURCE], |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
22 [ |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
23 AC_REQUIRE([gl_LIBUNISTRING_LIB_PREPARE]) |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
24 dnl Use the variables HAVE_LIBUNISTRING, LIBUNISTRING_VERSION from |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
25 dnl gl_LIBUNISTRING_CORE if that macro has been run. |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
26 if gl_LIBUNISTRING_VERSION_CMP([$1]) |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
27 then |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
28 m4_foreach_w([gl_source_file], [$2], |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
29 [AC_LIBOBJ(m4_bpatsubst(m4_defn([gl_source_file]), [\.c$], [])) |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
30 ]) |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
31 fi |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
32 ]) |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
33 |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
34 dnl gl_LIBUNISTRING_LIBHEADER([VERSION], [HeaderFile]) |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
35 dnl Declares that HeaderFile should be created, unless we are linking |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
36 dnl with libunistring and its version is >= the given VERSION. |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
37 dnl HeaderFile should be relative to the lib directory and end in '.h'. |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
38 dnl Prepares for substituting LIBUNISTRING_HEADERFILE (to HeaderFile or empty). |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
39 dnl |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
40 dnl When we are linking with the already installed libunistring and its version |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
41 dnl is < VERSION, we create HeaderFile here, because we may compile functions |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
42 dnl (via gl_LIBUNISTRING_LIBSOURCE above) that are not contained in the |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
43 dnl installed version. |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
44 dnl When we are linking with the already installed libunistring and its version |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
45 dnl is > VERSION, we don't create HeaderFile here: it could cause compilation |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
46 dnl errors in other libunistring header files if some types are missing. |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
47 dnl |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
48 dnl You have to bump the VERSION argument to the next projected version |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
49 dnl number each time you make a non-comment change to the HeaderFile. |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
50 |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
51 AC_DEFUN([gl_LIBUNISTRING_LIBHEADER], |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
52 [ |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
53 AC_REQUIRE([gl_LIBUNISTRING_LIB_PREPARE]) |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
54 dnl Use the variables HAVE_LIBUNISTRING, LIBUNISTRING_VERSION from |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
55 dnl gl_LIBUNISTRING_CORE if that macro has been run. |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
56 if gl_LIBUNISTRING_VERSION_CMP([$1]) |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
57 then |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
58 LIBUNISTRING_[]AS_TR_CPP([$2])='$2' |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
59 else |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
60 LIBUNISTRING_[]AS_TR_CPP([$2])= |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
61 fi |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
62 AC_SUBST([LIBUNISTRING_]AS_TR_CPP([$2])) |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
63 ]) |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
64 |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
65 dnl Miscellaneous preparations/initializations. |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
66 |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
67 AC_DEFUN([gl_LIBUNISTRING_LIB_PREPARE], |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
68 [ |
13381
25bed74b17cc
Avoid expanding two macros in the wrong order.
Bruno Haible <bruno@clisp.org>
parents:
13357
diff
changeset
|
69 dnl Ensure that HAVE_LIBUNISTRING is fully determined at this point. |
25bed74b17cc
Avoid expanding two macros in the wrong order.
Bruno Haible <bruno@clisp.org>
parents:
13357
diff
changeset
|
70 m4_ifdef([gl_LIBUNISTRING], [AC_REQUIRE([gl_LIBUNISTRING])]) |
25bed74b17cc
Avoid expanding two macros in the wrong order.
Bruno Haible <bruno@clisp.org>
parents:
13357
diff
changeset
|
71 |
13354
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
72 AC_REQUIRE([AC_PROG_AWK]) |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
73 |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
74 dnl Sed expressions to extract the parts of a version number. |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
75 changequote(,) |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
76 gl_libunistring_sed_extract_major='/^[0-9]/{s/^\([0-9]*\).*/\1/p;q;} |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
77 i\ |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
78 0 |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
79 q |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
80 ' |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
81 gl_libunistring_sed_extract_minor='/^[0-9][0-9]*[.][0-9]/{s/^[0-9]*[.]\([0-9]*\).*/\1/p;q;} |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
82 i\ |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
83 0 |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
84 q |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
85 ' |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
86 gl_libunistring_sed_extract_subminor='/^[0-9][0-9]*[.][0-9][0-9]*[.][0-9]/{s/^[0-9]*[.][0-9]*[.]\([0-9]*\).*/\1/p;q;} |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
87 i\ |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
88 0 |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
89 q |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
90 ' |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
91 changequote([,]) |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
92 |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
93 if test "$HAVE_LIBUNISTRING" = yes; then |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
94 LIBUNISTRING_VERSION_MAJOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_major"` |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
95 LIBUNISTRING_VERSION_MINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_minor"` |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
96 LIBUNISTRING_VERSION_SUBMINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_subminor"` |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
97 fi |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
98 ]) |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
99 |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
100 dnl gl_LIBUNISTRING_VERSION_CMP([VERSION]) |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
101 dnl Expands to a shell statement that evaluates to true if LIBUNISTRING_VERSION |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
102 dnl is less than the VERSION argument. |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
103 AC_DEFUN([gl_LIBUNISTRING_VERSION_CMP], |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
104 [ { test "$HAVE_LIBUNISTRING" != yes \ |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
105 || { |
13357
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
106 dnl AS_LITERAL_IF exists and works fine since autoconf-2.59 at least. |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
107 AS_LITERAL_IF([$1], |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
108 [dnl This is the optimized variant, that assumes the argument is a literal: |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
109 m4_pushdef([requested_version_major], |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
110 [gl_LIBUNISTRING_ARG_OR_ZERO(m4_bpatsubst([$1], [^\([0-9]*\).*], [\1]), [])]) |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
111 m4_pushdef([requested_version_minor], |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
112 [gl_LIBUNISTRING_ARG_OR_ZERO(m4_bpatsubst([$1], [^[0-9]*[.]\([0-9]*\).*], [\1]), [$1])]) |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
113 m4_pushdef([requested_version_subminor], |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
114 [gl_LIBUNISTRING_ARG_OR_ZERO(m4_bpatsubst([$1], [^[0-9]*[.][0-9]*[.]\([0-9]*\).*], [\1]), [$1])]) |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
115 test $LIBUNISTRING_VERSION_MAJOR -lt requested_version_major \ |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
116 || { test $LIBUNISTRING_VERSION_MAJOR -eq requested_version_major \ |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
117 && { test $LIBUNISTRING_VERSION_MINOR -lt requested_version_minor \ |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
118 || { test $LIBUNISTRING_VERSION_MINOR -eq requested_version_minor \ |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
119 && test $LIBUNISTRING_VERSION_SUBMINOR -lt requested_version_subminor |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
120 } |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
121 } |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
122 } |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
123 m4_popdef([requested_version_subminor]) |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
124 m4_popdef([requested_version_minor]) |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
125 m4_popdef([requested_version_major]) |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
126 ], |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
127 [dnl This is the unoptimized variant: |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
128 requested_version_major=`echo '$1' | sed -n -e "$gl_libunistring_sed_extract_major"` |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
129 requested_version_minor=`echo '$1' | sed -n -e "$gl_libunistring_sed_extract_minor"` |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
130 requested_version_subminor=`echo '$1' | sed -n -e "$gl_libunistring_sed_extract_subminor"` |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
131 test $LIBUNISTRING_VERSION_MAJOR -lt $requested_version_major \ |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
132 || { test $LIBUNISTRING_VERSION_MAJOR -eq $requested_version_major \ |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
133 && { test $LIBUNISTRING_VERSION_MINOR -lt $requested_version_minor \ |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
134 || { test $LIBUNISTRING_VERSION_MINOR -eq $requested_version_minor \ |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
135 && test $LIBUNISTRING_VERSION_SUBMINOR -lt $requested_version_subminor |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
136 } |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
137 } |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
138 } |
b5887f4fd7df
Clean up dead code in recent commit.
Bruno Haible <bruno@clisp.org>
parents:
13354
diff
changeset
|
139 ]) |
13354
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
140 } |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
141 } |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
142 ]) |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
143 |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
144 dnl gl_LIBUNISTRING_ARG_OR_ZERO([ARG], [ORIG]) expands to ARG if it is not the |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
145 dnl same as ORIG, otherwise to 0. |
86634e33e086
New module 'libunistring-optional'.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
146 m4_define([gl_LIBUNISTRING_ARG_OR_ZERO], [m4_if([$1], [$2], [0], [$1])]) |