summaryrefslogtreecommitdiffstats
path: root/misc-utils
diff options
context:
space:
mode:
authorKarel Zak2010-11-15 16:47:13 +0100
committerKarel Zak2010-11-15 16:47:13 +0100
commitf7a29259ee46b1065ca3ba36f921fecfcbb6fdc6 (patch)
treea66b300f7272a5750c0e10455cf985b24f0145fe /misc-utils
parentlib: add fallback for nl_langinfo() (diff)
downloadkernel-qcow2-util-linux-f7a29259ee46b1065ca3ba36f921fecfcbb6fdc6.tar.gz
kernel-qcow2-util-linux-f7a29259ee46b1065ca3ba36f921fecfcbb6fdc6.tar.xz
kernel-qcow2-util-linux-f7a29259ee46b1065ca3ba36f921fecfcbb6fdc6.zip
findmnt: follow HAVE_LANGINFO
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'misc-utils')
-rw-r--r--misc-utils/Makefile.am3
-rw-r--r--misc-utils/findmnt.c3
2 files changed, 3 insertions, 3 deletions
diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am
index 6a16f9994..794b88180 100644
--- a/misc-utils/Makefile.am
+++ b/misc-utils/Makefile.am
@@ -60,6 +60,9 @@ dist_man_MANS += findmnt.8
findmnt_LDADD = $(ul_libmount_la)
findmnt_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir)
findmnt_SOURCES = findmnt.c $(top_srcdir)/lib/tt.c
+if !HAVE_LANGINFO
+findmnt_SOURCES += $(top_srcdir)/lib/langinfo.c
+endif
endif
cal_SOURCES = cal.c $(top_srcdir)/lib/mbsalign.c
diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index b1fb90a47..0e3cc3765 100644
--- a/misc-utils/findmnt.c
+++ b/misc-utils/findmnt.c
@@ -26,9 +26,6 @@
#include <getopt.h>
#include <string.h>
#include <termios.h>
-#ifdef HAVE_LANGINFO_H
-#include <langinfo.h>
-#endif
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
#endif