build-sys: cleanup usage of linux/major.h

The utils like fdisk or login are usable on non-linux systems.
This patch allows to compile on systems without linux/major.h.

Signed-off-by: Karel Zak <kzak@redhat.com>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

diff --git a/configure.ac b/configure.ac
index ed12e60b5e2895bad8c322bc66bf052e9907d46a..8a1d96d7e4b66a35b44d5595ab85889ca884ff73 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ AC_PATH_PROG(VOLID, vol_id, [], [$PATH:/lib/udev])
 
 AC_SYS_LARGEFILE
 
-AC_CHECK_HEADERS([linux/compiler.h linux/blkpg.h], [], [], [
+AC_CHECK_HEADERS([linux/compiler.h linux/blkpg.h linux/major.h], [], [], [
 #ifdef HAVE_LINUX_COMPILER_H
 #include <linux/compiler.h>
 #endif

diff --git a/fdisk/fdisksgilabel.c b/fdisk/fdisksgilabel.c
index 5adf64e39314f0b78a3d150bcdd3908147a85776..c970c7cf9c9207e793ffe2d438ecf1e064094763 100644 (file)
--- a/fdisk/fdisksgilabel.c
+++ b/fdisk/fdisksgilabel.c
@@ -22,7 +22,6 @@
 
 #include <endian.h>
 #include "nls.h"
-#include <linux/major.h>        /* FLOPPY_MAJOR */
 
 #include "blkdev.h"
 

diff --git a/fdisk/fdisksunlabel.c b/fdisk/fdisksunlabel.c
index ff9a182db41151da47355480d7cbb7bc2d69c5f0..4ed973305ee6bc9bf20db4468cb1bb88403edb52 100644 (file)
--- a/fdisk/fdisksunlabel.c
+++ b/fdisk/fdisksunlabel.c
@@ -27,7 +27,9 @@
 #include <scsi/scsi.h>         /* SCSI_IOCTL_GET_IDLUN */
 #undef u_char
 #endif
+#ifdef HAVE_LINUX_MAJOR_H
 #include <linux/major.h>       /* FLOPPY_MAJOR */
+#endif
 
 #include "common.h"
 #include "fdisk.h"
@@ -69,6 +71,9 @@ static inline __u32 __swap32(__u32 x) {
 #define SSWAP32(x) (other_endian ? __swap32(x) \
                                 : (__u32)(x))
 
+#ifndef FLOPPY_MAJOR
+#define FLOPPY_MAJOR 2
+#endif
 #ifndef IDE0_MAJOR
 #define IDE0_MAJOR 3
 #endif

diff --git a/login-utils/checktty.c b/login-utils/checktty.c
index 16f9f2e88b9626cb1eb2475e3b65cbbdc008d08f..c28ee833da1010f0baf0551171afe94605240cf3 100644 (file)
--- a/login-utils/checktty.c
+++ b/login-utils/checktty.c
@@ -25,12 +25,18 @@
 #include "nls.h"
 
 #include <sys/sysmacros.h>
+#ifdef HAVE_LINUX_MAJOR_H
 #include <linux/major.h>
+#endif
 
 #include "pathnames.h"
 #include "login.h"
 #include "xstrncpy.h"
 
+#ifndef TTY_MAJOR
+#define TTY_MAJOR 4
+#endif
+
 static gid_t mygroups[NGROUPS];
 static int   num_groups;
 
@@ -118,6 +124,7 @@ add_to_class(struct ttyclass *tc, char *tty)
 static int
 isapty(const char *tty)
 {
+#ifdef __linux__
     char devname[100];
     struct stat stb;
 
@@ -147,6 +154,7 @@ isapty(const char *tty)
 #endif
 
     }
+#endif /* __linux__ */
     return 0;
 }