diff options
author | Christian Grothoff <christian@grothoff.org> | 2021-04-27 23:29:48 +0200 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2021-04-28 10:25:39 +0200 |
commit | 1b87a306f0ec3da8bdb1907e2b4efb9e1b3cb9bd (patch) | |
tree | b2c2e39f0815220bc8f23af2c97dbe4d4612ad0e /m4 | |
parent | 5e347ac9df8b49503a1fdfa38707a99a6b2b3b0c (diff) | |
download | gnunet-1b87a306f0ec3da8bdb1907e2b4efb9e1b3cb9bd.tar.gz gnunet-1b87a306f0ec3da8bdb1907e2b4efb9e1b3cb9bd.zip |
- fix misc typos
Diffstat (limited to 'm4')
-rw-r--r-- | m4/freetype2.m4 | 2 | ||||
-rw-r--r-- | m4/glib-2.0.m4 | 24 | ||||
-rw-r--r-- | m4/gtk-2.0.m4 | 20 | ||||
-rw-r--r-- | m4/libxml2.m4 | 14 | ||||
-rw-r--r-- | m4/pkg.m4 | 4 |
5 files changed, 32 insertions, 32 deletions
diff --git a/m4/freetype2.m4 b/m4/freetype2.m4 index 7424a32ab..f03906e9d 100644 --- a/m4/freetype2.m4 +++ b/m4/freetype2.m4 | |||
@@ -162,7 +162,7 @@ main() | |||
162 | The FreeType test program failed to run. If your system uses | 162 | The FreeType test program failed to run. If your system uses |
163 | shared libraries and they are installed outside the normal | 163 | shared libraries and they are installed outside the normal |
164 | system library path, make sure the variable LD_LIBRARY_PATH | 164 | system library path, make sure the variable LD_LIBRARY_PATH |
165 | (or whatever is appropiate for your system) is correctly set. | 165 | (or whatever is appropriate for your system) is correctly set. |
166 | ]) | 166 | ]) |
167 | fi | 167 | fi |
168 | fi | 168 | fi |
diff --git a/m4/glib-2.0.m4 b/m4/glib-2.0.m4 index 13a3ce68f..e8ac8522e 100644 --- a/m4/glib-2.0.m4 +++ b/m4/glib-2.0.m4 | |||
@@ -2,11 +2,11 @@ | |||
2 | # Owen Taylor 1997-2001 | 2 | # Owen Taylor 1997-2001 |
3 | 3 | ||
4 | dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) | 4 | dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) |
5 | dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or | 5 | dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or |
6 | dnl gthread is specified in MODULES, pass to pkg-config | 6 | dnl gthread is specified in MODULES, pass to pkg-config |
7 | dnl | 7 | dnl |
8 | AC_DEFUN([AM_PATH_GLIB_2_0], | 8 | AC_DEFUN([AM_PATH_GLIB_2_0], |
9 | [dnl | 9 | [dnl |
10 | dnl Get the cflags and libraries from pkg-config | 10 | dnl Get the cflags and libraries from pkg-config |
11 | dnl | 11 | dnl |
12 | AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], | 12 | AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], |
@@ -16,13 +16,13 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run | |||
16 | for module in . $4 | 16 | for module in . $4 |
17 | do | 17 | do |
18 | case "$module" in | 18 | case "$module" in |
19 | gmodule) | 19 | gmodule) |
20 | pkg_config_args="$pkg_config_args gmodule-2.0" | 20 | pkg_config_args="$pkg_config_args gmodule-2.0" |
21 | ;; | 21 | ;; |
22 | gobject) | 22 | gobject) |
23 | pkg_config_args="$pkg_config_args gobject-2.0" | 23 | pkg_config_args="$pkg_config_args gobject-2.0" |
24 | ;; | 24 | ;; |
25 | gthread) | 25 | gthread) |
26 | pkg_config_args="$pkg_config_args gthread-2.0" | 26 | pkg_config_args="$pkg_config_args gthread-2.0" |
27 | ;; | 27 | ;; |
28 | esac | 28 | esac |
@@ -89,7 +89,7 @@ dnl | |||
89 | #include <stdio.h> | 89 | #include <stdio.h> |
90 | #include <stdlib.h> | 90 | #include <stdlib.h> |
91 | 91 | ||
92 | int | 92 | int |
93 | main () | 93 | main () |
94 | { | 94 | { |
95 | int major, minor, micro; | 95 | int major, minor, micro; |
@@ -108,17 +108,17 @@ main () | |||
108 | (glib_minor_version != $glib_config_minor_version) || | 108 | (glib_minor_version != $glib_config_minor_version) || |
109 | (glib_micro_version != $glib_config_micro_version)) | 109 | (glib_micro_version != $glib_config_micro_version)) |
110 | { | 110 | { |
111 | printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", | 111 | printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", |
112 | $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, | 112 | $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, |
113 | glib_major_version, glib_minor_version, glib_micro_version); | 113 | glib_major_version, glib_minor_version, glib_micro_version); |
114 | printf ("*** was found! If pkg-config was correct, then it is best\n"); | 114 | printf ("*** was found! If pkg-config was correct, then it is best\n"); |
115 | printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); | 115 | printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); |
116 | printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); | 116 | printf("*** by modifying your LD_LIBRARY_PATH environment variable, or by editing\n"); |
117 | printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); | 117 | printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); |
118 | printf("*** required on your system.\n"); | 118 | printf("*** required on your system.\n"); |
119 | printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); | 119 | printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); |
120 | printf("*** to point to the correct configuration files\n"); | 120 | printf("*** to point to the correct configuration files\n"); |
121 | } | 121 | } |
122 | else if ((glib_major_version != GLIB_MAJOR_VERSION) || | 122 | else if ((glib_major_version != GLIB_MAJOR_VERSION) || |
123 | (glib_minor_version != GLIB_MINOR_VERSION) || | 123 | (glib_minor_version != GLIB_MINOR_VERSION) || |
124 | (glib_micro_version != GLIB_MICRO_VERSION)) | 124 | (glib_micro_version != GLIB_MICRO_VERSION)) |
@@ -149,7 +149,7 @@ main () | |||
149 | printf("*** being found. The easiest way to fix this is to remove the old version\n"); | 149 | printf("*** being found. The easiest way to fix this is to remove the old version\n"); |
150 | printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); | 150 | printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); |
151 | printf("*** correct copy of pkg-config. (In this case, you will have to\n"); | 151 | printf("*** correct copy of pkg-config. (In this case, you will have to\n"); |
152 | printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); | 152 | printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n"); |
153 | printf("*** so that the correct libraries are found at run-time))\n"); | 153 | printf("*** so that the correct libraries are found at run-time))\n"); |
154 | } | 154 | } |
155 | } | 155 | } |
@@ -162,7 +162,7 @@ main () | |||
162 | fi | 162 | fi |
163 | if test "x$no_glib" = x ; then | 163 | if test "x$no_glib" = x ; then |
164 | AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) | 164 | AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) |
165 | ifelse([$2], , :, [$2]) | 165 | ifelse([$2], , :, [$2]) |
166 | else | 166 | else |
167 | AC_MSG_RESULT(no) | 167 | AC_MSG_RESULT(no) |
168 | if test "$PKG_CONFIG" = "no" ; then | 168 | if test "$PKG_CONFIG" = "no" ; then |
@@ -191,7 +191,7 @@ main () | |||
191 | echo "*** If you have an old version installed, it is best to remove it, although" | 191 | echo "*** If you have an old version installed, it is best to remove it, although" |
192 | echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], | 192 | echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], |
193 | [ echo "*** The test program failed to compile or link. See the file config.log for the" | 193 | [ echo "*** The test program failed to compile or link. See the file config.log for the" |
194 | echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) | 194 | echo "*** exact error that occurred. This usually means GLIB is incorrectly installed."]) |
195 | CFLAGS="$ac_save_CFLAGS" | 195 | CFLAGS="$ac_save_CFLAGS" |
196 | LIBS="$ac_save_LIBS" | 196 | LIBS="$ac_save_LIBS" |
197 | fi | 197 | fi |
diff --git a/m4/gtk-2.0.m4 b/m4/gtk-2.0.m4 index 3deba01be..a1059264e 100644 --- a/m4/gtk-2.0.m4 +++ b/m4/gtk-2.0.m4 | |||
@@ -2,11 +2,11 @@ | |||
2 | # Owen Taylor 1997-2001 | 2 | # Owen Taylor 1997-2001 |
3 | 3 | ||
4 | dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) | 4 | dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) |
5 | dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, | 5 | dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, |
6 | dnl pass to pkg-config | 6 | dnl pass to pkg-config |
7 | dnl | 7 | dnl |
8 | AC_DEFUN([AM_PATH_GTK_2_0], | 8 | AC_DEFUN([AM_PATH_GTK_2_0], |
9 | [dnl | 9 | [dnl |
10 | dnl Get the cflags and libraries from pkg-config | 10 | dnl Get the cflags and libraries from pkg-config |
11 | dnl | 11 | dnl |
12 | AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program], | 12 | AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program], |
@@ -16,7 +16,7 @@ AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run | |||
16 | for module in . $4 | 16 | for module in . $4 |
17 | do | 17 | do |
18 | case "$module" in | 18 | case "$module" in |
19 | gthread) | 19 | gthread) |
20 | pkg_config_args="$pkg_config_args gthread-2.0" | 20 | pkg_config_args="$pkg_config_args gthread-2.0" |
21 | ;; | 21 | ;; |
22 | esac | 22 | esac |
@@ -79,7 +79,7 @@ dnl | |||
79 | #include <stdio.h> | 79 | #include <stdio.h> |
80 | #include <stdlib.h> | 80 | #include <stdlib.h> |
81 | 81 | ||
82 | int | 82 | int |
83 | main () | 83 | main () |
84 | { | 84 | { |
85 | int major, minor, micro; | 85 | int major, minor, micro; |
@@ -98,17 +98,17 @@ main () | |||
98 | (gtk_minor_version != $gtk_config_minor_version) || | 98 | (gtk_minor_version != $gtk_config_minor_version) || |
99 | (gtk_micro_version != $gtk_config_micro_version)) | 99 | (gtk_micro_version != $gtk_config_micro_version)) |
100 | { | 100 | { |
101 | printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", | 101 | printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", |
102 | $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, | 102 | $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, |
103 | gtk_major_version, gtk_minor_version, gtk_micro_version); | 103 | gtk_major_version, gtk_minor_version, gtk_micro_version); |
104 | printf ("*** was found! If pkg-config was correct, then it is best\n"); | 104 | printf ("*** was found! If pkg-config was correct, then it is best\n"); |
105 | printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); | 105 | printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); |
106 | printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); | 106 | printf("*** by modifying your LD_LIBRARY_PATH environment variable, or by editing\n"); |
107 | printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); | 107 | printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); |
108 | printf("*** required on your system.\n"); | 108 | printf("*** required on your system.\n"); |
109 | printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); | 109 | printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); |
110 | printf("*** to point to the correct configuration files\n"); | 110 | printf("*** to point to the correct configuration files\n"); |
111 | } | 111 | } |
112 | else if ((gtk_major_version != GTK_MAJOR_VERSION) || | 112 | else if ((gtk_major_version != GTK_MAJOR_VERSION) || |
113 | (gtk_minor_version != GTK_MINOR_VERSION) || | 113 | (gtk_minor_version != GTK_MINOR_VERSION) || |
114 | (gtk_micro_version != GTK_MICRO_VERSION)) | 114 | (gtk_micro_version != GTK_MICRO_VERSION)) |
@@ -139,7 +139,7 @@ main () | |||
139 | printf("*** being found. The easiest way to fix this is to remove the old version\n"); | 139 | printf("*** being found. The easiest way to fix this is to remove the old version\n"); |
140 | printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n"); | 140 | printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n"); |
141 | printf("*** correct copy of pkg-config. (In this case, you will have to\n"); | 141 | printf("*** correct copy of pkg-config. (In this case, you will have to\n"); |
142 | printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); | 142 | printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n"); |
143 | printf("*** so that the correct libraries are found at run-time))\n"); | 143 | printf("*** so that the correct libraries are found at run-time))\n"); |
144 | } | 144 | } |
145 | } | 145 | } |
@@ -152,7 +152,7 @@ main () | |||
152 | fi | 152 | fi |
153 | if test "x$no_gtk" = x ; then | 153 | if test "x$no_gtk" = x ; then |
154 | AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)) | 154 | AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)) |
155 | ifelse([$2], , :, [$2]) | 155 | ifelse([$2], , :, [$2]) |
156 | else | 156 | else |
157 | AC_MSG_RESULT(no) | 157 | AC_MSG_RESULT(no) |
158 | if test "$PKG_CONFIG" = "no" ; then | 158 | if test "$PKG_CONFIG" = "no" ; then |
@@ -181,7 +181,7 @@ main () | |||
181 | echo "*** If you have an old version installed, it is best to remove it, although" | 181 | echo "*** If you have an old version installed, it is best to remove it, although" |
182 | echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], | 182 | echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], |
183 | [ echo "*** The test program failed to compile or link. See the file config.log for the" | 183 | [ echo "*** The test program failed to compile or link. See the file config.log for the" |
184 | echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."]) | 184 | echo "*** exact error that occurred. This usually means GTK+ is incorrectly installed."]) |
185 | CFLAGS="$ac_save_CFLAGS" | 185 | CFLAGS="$ac_save_CFLAGS" |
186 | LIBS="$ac_save_LIBS" | 186 | LIBS="$ac_save_LIBS" |
187 | fi | 187 | fi |
diff --git a/m4/libxml2.m4 b/m4/libxml2.m4 index 68cd8242f..2865b54f8 100644 --- a/m4/libxml2.m4 +++ b/m4/libxml2.m4 | |||
@@ -9,7 +9,7 @@ | |||
9 | dnl AM_PATH_XML2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) | 9 | dnl AM_PATH_XML2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) |
10 | dnl Test for XML, and define XML_CPPFLAGS and XML_LIBS | 10 | dnl Test for XML, and define XML_CPPFLAGS and XML_LIBS |
11 | dnl | 11 | dnl |
12 | AC_DEFUN([AM_PATH_XML2],[ | 12 | AC_DEFUN([AM_PATH_XML2],[ |
13 | AC_ARG_WITH(xml-prefix, | 13 | AC_ARG_WITH(xml-prefix, |
14 | [ --with-xml-prefix=PFX Prefix where libxml is installed (optional)], | 14 | [ --with-xml-prefix=PFX Prefix where libxml is installed (optional)], |
15 | xml_config_prefix="$withval", xml_config_prefix="") | 15 | xml_config_prefix="$withval", xml_config_prefix="") |
@@ -64,7 +64,7 @@ dnl | |||
64 | #include <string.h> | 64 | #include <string.h> |
65 | #include <libxml/xmlversion.h> | 65 | #include <libxml/xmlversion.h> |
66 | 66 | ||
67 | int | 67 | int |
68 | main() | 68 | main() |
69 | { | 69 | { |
70 | int xml_major_version, xml_minor_version, xml_micro_version; | 70 | int xml_major_version, xml_minor_version, xml_micro_version; |
@@ -100,9 +100,9 @@ main() | |||
100 | printf("*** xml2-config (version %d.%d.%d)\n", | 100 | printf("*** xml2-config (version %d.%d.%d)\n", |
101 | $xml_config_major_version, $xml_config_minor_version, $xml_config_micro_version); | 101 | $xml_config_major_version, $xml_config_minor_version, $xml_config_micro_version); |
102 | return 1; | 102 | return 1; |
103 | } | 103 | } |
104 | /* Compare the headers to the library to make sure we match */ | 104 | /* Compare the headers to the library to make sure we match */ |
105 | /* Less than ideal -- doesn't provide us with return value feedback, | 105 | /* Less than ideal -- doesn't provide us with return value feedback, |
106 | * only exits if there's a serious mismatch between header and library. | 106 | * only exits if there's a serious mismatch between header and library. |
107 | */ | 107 | */ |
108 | LIBXML_TEST_VERSION; | 108 | LIBXML_TEST_VERSION; |
@@ -128,7 +128,7 @@ main() | |||
128 | printf("*** being found. The easiest way to fix this is to remove the old version\n"); | 128 | printf("*** being found. The easiest way to fix this is to remove the old version\n"); |
129 | printf("*** of LIBXML, but you can also set the XML2_CONFIG environment to point to the\n"); | 129 | printf("*** of LIBXML, but you can also set the XML2_CONFIG environment to point to the\n"); |
130 | printf("*** correct copy of xml2-config. (In this case, you will have to\n"); | 130 | printf("*** correct copy of xml2-config. (In this case, you will have to\n"); |
131 | printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); | 131 | printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n"); |
132 | printf("*** so that the correct libraries are found at run-time))\n"); | 132 | printf("*** so that the correct libraries are found at run-time))\n"); |
133 | } | 133 | } |
134 | return 1; | 134 | return 1; |
@@ -141,7 +141,7 @@ main() | |||
141 | 141 | ||
142 | if test "x$no_xml" = x ; then | 142 | if test "x$no_xml" = x ; then |
143 | AC_MSG_RESULT(yes (version $xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version)) | 143 | AC_MSG_RESULT(yes (version $xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version)) |
144 | ifelse([$2], , :, [$2]) | 144 | ifelse([$2], , :, [$2]) |
145 | else | 145 | else |
146 | AC_MSG_RESULT(no) | 146 | AC_MSG_RESULT(no) |
147 | if test "$XML2_CONFIG" = "no" ; then | 147 | if test "$XML2_CONFIG" = "no" ; then |
@@ -170,7 +170,7 @@ main() | |||
170 | echo "*** If you have an old version installed, it is best to remove it, although" | 170 | echo "*** If you have an old version installed, it is best to remove it, although" |
171 | echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], | 171 | echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], |
172 | [ echo "*** The test program failed to compile or link. See the file config.log for the" | 172 | [ echo "*** The test program failed to compile or link. See the file config.log for the" |
173 | echo "*** exact error that occured. This usually means LIBXML was incorrectly installed" | 173 | echo "*** exact error that occurred. This usually means LIBXML was incorrectly installed" |
174 | echo "*** or that you have moved LIBXML since it was installed. In the latter case, you" | 174 | echo "*** or that you have moved LIBXML since it was installed. In the latter case, you" |
175 | echo "*** may want to edit the xml2-config script: $XML2_CONFIG" ]) | 175 | echo "*** may want to edit the xml2-config script: $XML2_CONFIG" ]) |
176 | CPPFLAGS="$ac_save_CPPFLAGS" | 176 | CPPFLAGS="$ac_save_CPPFLAGS" |
@@ -86,7 +86,7 @@ dnl Check to see whether a particular set of modules exists. Similar to | |||
86 | dnl PKG_CHECK_MODULES(), but does not set variables or print errors. | 86 | dnl PKG_CHECK_MODULES(), but does not set variables or print errors. |
87 | dnl | 87 | dnl |
88 | dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) | 88 | dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) |
89 | dnl only at the first occurence in configure.ac, so if the first place | 89 | dnl only at the first occurrence in configure.ac, so if the first place |
90 | dnl it's called might be skipped (such as if it is within an "if", you | 90 | dnl it's called might be skipped (such as if it is within an "if", you |
91 | dnl have to call PKG_CHECK_EXISTS manually | 91 | dnl have to call PKG_CHECK_EXISTS manually |
92 | AC_DEFUN([PKG_CHECK_EXISTS], | 92 | AC_DEFUN([PKG_CHECK_EXISTS], |
@@ -156,7 +156,7 @@ if test $pkg_failed = yes; then | |||
156 | _PKG_SHORT_ERRORS_SUPPORTED | 156 | _PKG_SHORT_ERRORS_SUPPORTED |
157 | if test $_pkg_short_errors_supported = yes; then | 157 | if test $_pkg_short_errors_supported = yes; then |
158 | $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` | 158 | $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` |
159 | else | 159 | else |
160 | $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` | 160 | $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` |
161 | fi | 161 | fi |
162 | # Put the nasty error message in config.log where it belongs | 162 | # Put the nasty error message in config.log where it belongs |