initial import
[patches.git] / e2fsprogs-AC_MSG.patch
CommitLineData
5e993f12 1diff --git a/configure.in b/configure.in
2index c29f438..0eba7dc 100644
3--- a/configure.in
4+++ b/configure.in
5@@ -36,7 +36,7 @@ Sep) MONTH_NUM=09; E2FSPROGS_MONTH="September" ;;
6 Oct) MONTH_NUM=10; E2FSPROGS_MONTH="October" ;;
7 Nov) MONTH_NUM=11; E2FSPROGS_MONTH="November" ;;
8 Dec) MONTH_NUM=12; E2FSPROGS_MONTH="December" ;;
9-*) echo "Unknown month $MONTH??" ;;
10+*) AC_MSG_WARN([Unknown month $MONTH??]) ;;
11 esac
12
13 base_ver=`echo $E2FSPROGS_VERSION | \
14@@ -54,8 +54,8 @@ case $E2FSPROGS_VERSION in
15 esac
16
17 unset DATE MONTH YEAR base_ver pre_vers date_spec
18-echo "Generating configuration file for e2fsprogs version $E2FSPROGS_VERSION"
19-echo "Release date is ${E2FSPROGS_MONTH}, ${E2FSPROGS_YEAR}"
20+AC_MSG_RESULT([Generating configuration file for e2fsprogs version $E2FSPROGS_VERSION])
21+AC_MSG_RESULT([Release date is ${E2FSPROGS_MONTH}, ${E2FSPROGS_YEAR}])
22 AC_SUBST(E2FSPROGS_YEAR)
23 AC_SUBST(E2FSPROGS_MONTH)
24 AC_SUBST(E2FSPROGS_DAY)
25@@ -161,14 +161,14 @@ AC_ARG_ENABLE([maintainer-mode],
26 if test "$enableval" = "no"
27 then
28 MAINTAINER_CMT=#
29- echo "Disabling maintainer mode"
30+ AC_MSG_RESULT([Disabling maintainer mode])
31 else
32 MAINTAINER_CMT=
33- echo "Enabling maintainer mode"
34+ AC_MSG_RESULT([Enabling maintainer mode])
35 fi
36 ,
37 MAINTAINER_CMT=#
38-echo "Disabling maintainer mode by default"
39+AC_MSG_RESULT([Disabling maintainer mode by default])
40 )
41 AC_SUBST(MAINTAINER_CMT)
42 dnl
43@@ -178,14 +178,14 @@ AC_ARG_ENABLE([compression],
44 [ --enable-compression enable EXPERIMENTAL compression support],
45 if test "$enableval" = "no"
46 then
47- echo "Disabling compression support"
48+ AC_MSG_RESULT([Disabling compression support])
49 else
50 AC_DEFINE(ENABLE_COMPRESSION)
51- echo "Enabling compression support"
52- echo "WARNING: Compression support is experimental"
53+ AC_MSG_RESULT([Enabling compression support])
54+ AC_MSG_WARN([Compression support is experimental])
55 fi
56 ,
57-echo "Disabling compression support by default"
58+AC_MSG_RESULT([Disabling compression support by default])
59 )
60 dnl
61 dnl handle --enable-htree
62@@ -195,16 +195,16 @@ AC_ARG_ENABLE([htree],
63 if test "$enableval" = "no"
64 then
65 HTREE_CMT=#
66- echo "Disabling htree directory support"
67+ AC_MSG_RESULT([Disabling htree directory support])
68 else
69 HTREE_CMT=
70 AC_DEFINE(ENABLE_HTREE)
71- echo "Enabling htree directory support"
72+ AC_MSG_RESULT([Enabling htree directory support])
73 fi
74 ,
75 HTREE_CMT=
76 AC_DEFINE(ENABLE_HTREE)
77-echo "Enabling htree directory support by default"
78+AC_MSG_RESULT([Enabling htree directory support by default])
79 )
80 AC_SUBST(HTREE_CMT)
81 dnl
82@@ -220,7 +220,7 @@ if test "$enableval" = "no"
83 then
84 ELF_CMT=#
85 MAKEFILE_ELF=/dev/null
86- echo "Disabling ELF shared libraries"
87+ AC_MSG_RESULT([Disabling ELF shared libraries])
88 else
89 E2_PKG_CONFIG_STATIC=
90 ELF_CMT=
91@@ -232,12 +232,12 @@ else
92 esac]
93 BINARY_TYPE=elfbin
94 LIB_EXT=.so
95- echo "Enabling ELF shared libraries"
96+ AC_MSG_RESULT([Enabling ELF shared libraries])
97 fi
98 ,
99 MAKEFILE_ELF=/dev/null
100 ELF_CMT=#
101-echo "Disabling ELF shared libraries by default"
102+AC_MSG_RESULT([Disabling ELF shared libraries by default])
103 )
104 AC_SUBST(ELF_CMT)
105 AC_SUBST_FILE(MAKEFILE_ELF)
106@@ -250,7 +250,7 @@ if test "$enableval" = "no"
107 then
108 BSDLIB_CMT=#
109 MAKEFILE_BSDLIB=/dev/null
110- echo "Disabling BSD shared libraries"
111+ AC_MSG_RESULT([Disabling BSD shared libraries])
112 else
113 E2_PKG_CONFIG_STATIC=
114 BSDLIB_CMT=
115@@ -262,12 +262,12 @@ else
116 LIB_EXT=.dylib
117 ;;
118 esac]
119- echo "Enabling BSD shared libraries"
120+ AC_MSG_RESULT([Enabling BSD shared libraries])
121 fi
122 ,
123 MAKEFILE_BSDLIB=/dev/null
124 BSDLIB_CMT=#
125-echo "Disabling BSD shared libraries by default"
126+AC_MSG_RESULT([Disabling BSD shared libraries by default])
127 )
128 AC_SUBST(BSDLIB_CMT)
129 AC_SUBST_FILE(MAKEFILE_BSDLIB)
130@@ -280,17 +280,17 @@ if test "$enableval" = "no"
131 then
132 PROFILE_CMT=#
133 MAKEFILE_PROFILE=/dev/null
134- echo "Disabling profiling libraries"
135+ AC_MSG_RESULT([Disabling profiling libraries])
136 else
137 PROFILE_CMT=
138 MAKEFILE_PROFILE=$srcdir/lib/Makefile.profile
139 PROFILED_LIB_EXT=_p.a
140- echo "Building profiling libraries"
141+ AC_MSG_RESULT([Building profiling libraries])
142 fi
143 ,
144 PROFILE_CMT=#
145 MAKEFILE_PROFILE=/dev/null
146-echo "Disabling profiling libraries by default"
147+AC_MSG_RESULT([Disabling profiling libraries by default])
148 )
149 AC_SUBST(PROFILE_CMT)
150 AC_SUBST_FILE(MAKEFILE_PROFILE)
151@@ -303,16 +303,16 @@ if test "$enableval" = "no"
152 then
153 CHECKER_CMT=#
154 MAKEFILE_CHECKER=/dev/null
155- echo "Disabling checker libraries"
156+ AC_MSG_RESULT([Disabling checker libraries])
157 else
158 CHECKER_CMT=
159 MAKEFILE_CHECKER=$srcdir/lib/Makefile.checker
160- echo "Building checker libraries"
161+ AC_MSG_RESULT([Building checker libraries])
162 fi
163 ,
164 CHECKER_CMT=#
165 MAKEFILE_CHECKER=/dev/null
166-echo "Disabling checker libraries by default"
167+AC_MSG_RESULT([Disabling checker libraries by default])
168 )
169 AC_SUBST(CHECKER_CMT)
170 AC_SUBST_FILE(MAKEFILE_CHECKER)
171@@ -329,13 +329,13 @@ AC_ARG_ENABLE([jbd-debug],
172 [ --enable-jbd-debug enable journal debugging],
173 if test "$enableval" = "no"
174 then
175- echo "Disabling journal debugging"
176+ AC_MSG_RESULT([Disabling journal debugging])
177 else
178 AC_DEFINE(CONFIG_JBD_DEBUG)
179- echo "Enabling journal debugging"
180+ AC_MSG_RESULT([Enabling journal debugging])
181 fi
182 ,
183-echo "Disabling journal debugging by default"
184+AC_MSG_RESULT([Disabling journal debugging by default])
185 )
186 dnl
187 dnl handle --enable-blkid-debug
188@@ -344,13 +344,13 @@ AC_ARG_ENABLE([blkid-debug],
189 [ --enable-blkid-debug enable blkid debugging],
190 if test "$enableval" = "no"
191 then
192- echo "Disabling blkid debugging"
193+ AC_MSG_RESULT([Disabling blkid debugging])
194 else
195 AC_DEFINE(CONFIG_BLKID_DEBUG)
196- echo "Enabling blkid debugging"
197+ AC_MSG_RESULT([Enabling blkid debugging])
198 fi
199 ,
200-echo "Disabling blkid debugging by default"
201+AC_MSG_RESULT([Disabling blkid debugging by default])
202 )
203 dnl
204 dnl handle --enable-testio-debug
205@@ -359,13 +359,13 @@ AC_ARG_ENABLE([testio-debug],
206 [ --enable-testio-debug enable the use of the test I/O manager for debugging],
207 if test "$enableval" = "no"
208 then
209- echo "Disabling testio debugging"
210+ AC_MSG_RESULT([Disabling testio debugging])
211 else
212 AC_DEFINE(CONFIG_TESTIO_DEBUG)
213- echo "Enabling testio debugging"
214+ AC_MSG_RESULT([Enabling testio debugging])
215 fi
216 ,
217-echo "Disabling testio debugging by default"
218+AC_MSG_RESULT([Disabling testio debugging by default])
219 )
220 dnl
221 dnl handle --enable-debugfs
222@@ -374,14 +374,14 @@ AC_ARG_ENABLE([debugfs],
223 [ --disable-debugfs disable support of debugfs program],
224 if test "$enableval" = "no"
225 then
226- echo "Disabling debugfs support"
227+ AC_MSG_RESULT([Disabling debugfs support])
228 DEBUGFS_CMT="#"
229 else
230 DEBUGFS_CMT=
231- echo "Enabling debugfs support"
232+ AC_MSG_RESULT([Enabling debugfs support])
233 fi
234 ,
235-echo "Enabling debugfs support by default"
236+AC_MSG_RESULT([Enabling debugfs support by default])
237 DEBUGFS_CMT=
238 )
239 AC_SUBST(DEBUGFS_CMT)
240@@ -392,14 +392,14 @@ AC_ARG_ENABLE([imager],
241 [ --disable-imager disable support of e2image program],
242 if test "$enableval" = "no"
243 then
244- echo "Disabling e2image support"
245+ AC_MSG_RESULT([Disabling e2image support])
246 IMAGER_CMT="#"
247 else
248 IMAGER_CMT=
249- echo "Enabling e2image support"
250+ AC_MSG_RESULT([Enabling e2image support])
251 fi
252 ,
253-echo "Enabling e2image support by default"
254+AC_MSG_RESULT([Enabling e2image support by default])
255 IMAGER_CMT=
256 )
257 AC_SUBST(IMAGER_CMT)
258@@ -410,14 +410,14 @@ AC_ARG_ENABLE([resizer],
259 [ --disable-resizer disable support of e2resize program],
260 if test "$enableval" = "no"
261 then
262- echo "Disabling e2resize support"
263+ AC_MSG_RESULT([Disabling e2resize support])
264 RESIZER_CMT="#"
265 else
266 RESIZER_CMT=
267- echo "Enabling e2resize support"
268+ AC_MSG_RESULT([Enabling e2resize support])
269 fi
270 ,
271-echo "Enabling e2resize support by default"
272+AC_MSG_RESULT([Enabling e2resize support by default])
273 RESIZER_CMT=
274 )
275 AC_SUBST(RESIZER_CMT)
276@@ -429,20 +429,20 @@ AC_ARG_ENABLE([fsck],
277 [if test "$enableval" = "no"
278 then
279 FSCK_PROG='' FSCK_MAN=''
280- echo "Not building fsck wrapper"
281+ AC_MSG_RESULT([Not building fsck wrapper])
282 else
283 FSCK_PROG=fsck FSCK_MAN=fsck.8
284- echo "Building fsck wrapper"
285+ AC_MSG_RESULT([Building fsck wrapper])
286 fi]
287 ,
288 [case "$host_os" in
289 gnu*)
290 FSCK_PROG='' FSCK_MAN=''
291- echo "Not building fsck wrapper by default"
292+ AC_MSG_RESULT([Not building fsck wrapper by default])
293 ;;
294 *)
295 FSCK_PROG=fsck FSCK_MAN=fsck.8
296- echo "Building fsck wrapper by default"
297+ AC_MSG_RESULT([Building fsck wrapper by default])
298 esac]
299 )
300 AC_SUBST(FSCK_PROG)
301@@ -455,14 +455,14 @@ AC_ARG_ENABLE([e2initrd-helper],
302 [if test "$enableval" = "no"
303 then
304 E2INITRD_PROG='' E2INITRD_MAN=''
305- echo "Not building e2initrd helper"
306+ AC_MSG_RESULT([Not building e2initrd helper])
307 else
308 E2INITRD_PROG=e2initrd_helper E2INITRD_MAN=e2initrd_helper.8
309- echo "Building e2initrd helper"
310+ AC_MSG_RESULT([Building e2initrd helper])
311 fi]
312 ,
313 E2INITRD_PROG=e2initrd_helper E2INITRD_MAN=e2initrd_helper.8
314-echo "Building e2initrd helper by default"
315+AC_MSG_RESULT([Building e2initrd helper by default])
316 )
317 AC_SUBST(E2INITRD_PROG)
318 AC_SUBST(E2INITRD_MAN)
319@@ -473,19 +473,18 @@ AC_ARG_ENABLE([blkid-devmapper],
320 [ --enable-blkid-devmapper build with device-mapper support],
321 [if test "$enableval" = "no"
322 then
323- echo "Disabling device-mapper support"
324+ AC_MSG_RESULT([Disabling device-mapper support])
325 DEVMAPPER_REQ=''
326 DEVMAPPER_LIBS=''
327 STATIC_DEVMAPPER_LIBS=''
328 else
329 AC_DEFINE(HAVE_DEVMAPPER)
330- echo "Enabling device-mapper support"
331+ AC_MSG_RESULT([Enabling device-mapper support])
332
333 PKG_PROG_PKG_CONFIG()
334
335 if test -z "$PKG_CONFIG"; then
336- echo "pkg-config not installed; please install it."
337- exit 1;
338+ AC_MSG_ERROR([pkg-config not installed; please install it.])
339 fi
340
341 AC_CHECK_LIB(devmapper, dm_tree_create,
342@@ -500,7 +499,7 @@ else
343 *pthread*)
344 ;;
345 *)
346- echo "Working around Debian bug #390243..."
347+ AC_MSG_WARN([Working around Debian bug #390243...])
348 STATIC_DEVMAPPER_LIBS="-pthread $STATIC_DEVMAPPER_LIBS"
349 ;;
350 esac
351@@ -510,7 +509,7 @@ else
352 fi
353 fi]
354 ,
355-echo "Disabling device-mapper support by default"
356+AC_MSG_RESULT([Disabling device-mapper support by default])
357 )
358 AC_SUBST(DEVMAPPER_REQ)
359 AC_SUBST(DEVMAPPER_PC_LIBS)
360@@ -525,19 +524,19 @@ AC_ARG_ENABLE([tls],
361 [if test "$enableval" = "no"
362 then
363 try_tls=""
364- echo "Disabling thread local support"
365+ AC_MSG_RESULT([Disabling thread local support])
366 else
367 try_tls="yes"
368- echo "Enabling thread local support"
369+ AC_MSG_RESULT([Enabling thread local support])
370 fi]
371 ,
372 if test -n "$WITH_DIET_LIBC"
373 then
374 try_tls=""
375- echo "Diet libc does not support thread local support"
376+ AC_MSG_RESULT([Diet libc does not support thread local support])
377 else
378 try_tls="yes"
379- echo "Try using thread local support by default"
380+ AC_MSG_RESULT([Try using thread local support by default])
381 fi
382 )
383 if test "$try_tls" = "yes"
384@@ -551,17 +550,17 @@ AC_ARG_ENABLE([uuidd],
385 [ --disable-uuidd disable building the uuid daemon],
386 [if test "$enableval" = "no"
387 then
388- echo "Not building uuidd"
389+ AC_MSG_RESULT([Not building uuidd])
390 UUIDD_CMT="#"
391 else
392 AC_DEFINE(USE_UUIDD)
393 UUIDD_CMT=""
394- echo "Building uuidd"
395+ AC_MSG_RESULT([Building uuidd])
396 fi]
397 ,
398 AC_DEFINE(USE_UUIDD)
399 UUIDD_CMT=""
400-echo "Building uuidd by default"
401+AC_MSG_RESULT([Building uuidd by default])
402 )
403 AC_SUBST(UUIDD_CMT)
404 dnl
405@@ -812,7 +811,7 @@ case "$host_os" in
406 linux* | gnu* | k*bsd*-gnu)
407 if test "$prefix" = NONE -a "$root_prefix" = NONE ; then
408 root_prefix="";
409- echo "On $host_os systems, root_prefix defaults to ''"
410+ AC_MSG_RESULT([On $host_os systems, root_prefix defaults to ''])
411 fi
412 ;;
413 esac
414@@ -823,9 +822,9 @@ case "$host_os" in
415 linux* | gnu* | k*bsd*-gnu)
416 if test "$prefix" = NONE ; then
417 prefix="/usr";
418- echo "On $host_os systems, prefix defaults to /usr"
419+ AC_MSG_RESULT([On $host_os systems, prefix defaults to /usr])
420 if test "$mandir" = '${prefix}/man' ; then
421- echo "...and mandir defaults to /usr/share/man"
422+ AC_MSG_RESULT([...and mandir defaults to /usr/share/man])
423 mandir=/usr/share/man
424 fi
425 fi
426@@ -849,19 +848,19 @@ else
427 fi
428 if test "$bindir" != '${exec_prefix}/bin'; then
429 root_bindir=$bindir
430- echo "Setting root_bindir to $root_bindir"
431+ AC_MSG_RESULT([Setting root_bindir to $root_bindir])
432 fi
433 if test "$sbindir" != '${exec_prefix}/sbin'; then
434 root_sbindir=$sbindir
435- echo "Setting root_sbindir to $root_sbindir"
436+ AC_MSG_RESULT([Setting root_sbindir to $root_sbindir])
437 fi
438 if test "$libdir" != '${exec_prefix}/lib'; then
439 root_libdir=$libdir
440- echo "Setting root_libdir to $root_libdir"
441+ AC_MSG_RESULT([Setting root_libdir to $root_libdir])
442 fi
443 if test "$sysconfdir" != '${prefix}/etc'; then
444 root_sysconfdir=$sysconfdir
445- echo "Setting root_sysconfdir to $root_sysconfdir"
446+ AC_MSG_RESULT([Setting root_sysconfdir to $root_sysconfdir])
447 fi
448 AC_SUBST(root_prefix)
449 AC_SUBST(root_bindir)
450@@ -902,7 +901,7 @@ dnl Apple hacked gcc somehow?)
451 dnl
452 case "$host_os" in
453 darwin*)
454- echo "Using Apple Darwin / GNU libintl workaround"
455+ AC_MSG_RESULT([Using Apple Darwin / GNU libintl workaround])
456 AC_DEFINE(_INTL_REDIRECT_MACROS)
457 ;;
458 esac