1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
--- util-linux-2.28.orig/configure.ac 2016-04-12 12:32:55.652316240 +0200
+++ util-linux-2.28/configure.ac 2016-06-03 03:59:03.583369345 +0200
@@ -64,16 +64,6 @@ LIBFDISK_LT_MINOR=1
LIBFDISK_LT_MICRO=0
LIBFDISK_VERSION_INFO=`expr $LIBFDISK_LT_MAJOR + $LIBFDISK_LT_MINOR`:$LIBFDISK_LT_MICRO:$LIBFDISK_LT_MINOR
-# Check whether exec_prefix=/usr:
-AS_CASE([$exec_prefix:$prefix],
-[NONE:NONE | NONE:/usr | /usr:*],
- [AC_MSG_NOTICE([Default --exec-prefix detected.])
- AS_CASE([$bindir], ['${exec_prefix}/bin'], [bindir=/bin; AC_MSG_NOTICE([ --bindir defaults to /bin]) ])
- AS_CASE([$sbindir], ['${exec_prefix}/sbin'], [sbindir=/sbin; AC_MSG_NOTICE([ --sbindir defaults to /sbin])])
- AS_CASE([$libdir], ['${exec_prefix}/lib'], [libdir=/lib; AC_MSG_NOTICE([ --libdir defaults to /lib]) ])
- ]
-)
-
AS_CASE([$prefix:$localstatedir],
[NONE:'${prefix}/var' | /usr:'${prefix}/var'],
[localstatedir=/run
@@ -187,16 +177,6 @@ UL_SET_ARCH([HPPA], [hppa*])
AC_SYS_LARGEFILE
AC_HEADER_ASSERT
-dnl Don't forget to maintain alternatively allowed versions in autogen.sh!
-AM_GNU_GETTEXT_VERSION([0.18.3])
-AM_GNU_GETTEXT([external])
-
-AS_IF([test -d "$srcdir/po"], [
- ALL_LINGUAS=`cd $srcdir/po > /dev/null && echo *.po | sed 's/\.po//g'`
-], [
- ALL_LINGUAS="af am ar as be bg bn_IN bn ca cs cy da de el en_GB es et eu_ES fa fi fr gl gu he hi hr hu hy id is it ja ka kn ko ku lo lt lv mk ml mr ms my nb nl nn no nso or pa pl pt_BR pt ro ru si sk sl sq sr@Latn sr sv ta te th tr uk ur vi zh_CN zh_TW zu"
-])
-
AC_CHECK_HEADERS([linux/compiler.h linux/blkpg.h linux/major.h], [], [], [
#ifdef HAVE_LINUX_COMPILER_H
#include <linux/compiler.h>
@@ -565,7 +545,7 @@ AC_CACHE_VAL([scanf_cv_alloc_modifier],
#include <stdio.h>
#include <unistd.h>
- #ifdef __GLIBC__
+ #if defined(__GLIBC__) && !defined(__UCLIBC__)
#if !(__GLIBC_PREREQ(2, 7))
#error %m is not available
@@ -2134,7 +2114,9 @@ libmount/src/libmount.h
libsmartcols/docs/Makefile
libsmartcols/docs/version.xml
libsmartcols/src/libsmartcols.h
-po/Makefile.in
+libblkid/blkid.pc
+libuuid/uuid.pc
+libmount/mount.pc
])
AC_OUTPUT
|
