Support for GNU/kFreeBSD (STR #2367)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@6876 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/backend/parallel.c b/backend/parallel.c
index c08b6286209e176bdb2a937f8bd6df2584a5be94..f792a6e7ecb98fa713735ca498d9f3c584a6573b 100644 (file)
--- a/backend/parallel.c
+++ b/backend/parallel.c
@@ -558,7 +558,7 @@ list_devices(void)
       printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
     }
   }
-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
   int  i;                      /* Looping var */
   int  fd;                     /* File descriptor */
   char device[255];            /* Device filename */

diff --git a/backend/serial.c b/backend/serial.c
index cab0a8f5faf8dbde48976074c12ae30708613c60..420039d15bd499372db95bd366dee925a635654d 100644 (file)
--- a/backend/serial.c
+++ b/backend/serial.c
@@ -722,11 +722,11 @@ main(int  argc,                           /* I - Number of command-line arguments (6 or 7) */
 static void
 list_devices(void)
 {
-#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
   static char  *funky_hex = "0123456789abcdefghijklmnopqrstuvwxyz";
                                        /* Funky hex numbering used for some *
                                         * devices                           */
-#endif /* __hpux || __sgi || __sun || __FreeBSD__ || __OpenBSD__ */
+#endif /* __hpux || __sgi || __sun || __FreeBSD__ || __OpenBSD__ || __FreeBSD_kernel__ */
 
 #ifdef __linux
   int                  i, j;           /* Looping vars */
@@ -1022,7 +1022,7 @@ list_devices(void)
       printf("serial serial:%s?baud=38400 \"Unknown\" \"Serial Port #%d\"\n",
              device, i + 1);
   }
-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
   int  i, j;           /* Looping vars */
   int  fd;             /* File descriptor */
   char device[255];    /* Device filename */

diff --git a/backend/usb-unix.c b/backend/usb-unix.c
index 2ae852ea8a772e94ac62ca56e992c4c71e14a787..d83ed99d3393142f45000709055c8754e08d22d4 100644 (file)
--- a/backend/usb-unix.c
+++ b/backend/usb-unix.c
@@ -281,7 +281,7 @@ list_devices(void)
   }
 #elif defined(__hpux)
 #elif defined(__osf)
-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
   int   i;                      /* Looping var */
   char  device[255];            /* Device filename */
 

diff --git a/backend/usb.c b/backend/usb.c
index 10e99364fd926c5301d7d28e573a2d8588a06468..bf1730ff98a6ddfc269b572ccfb56fcf3133bb8e 100644 (file)
--- a/backend/usb.c
+++ b/backend/usb.c
@@ -64,7 +64,7 @@ int   print_device(const char *uri, const char *hostname,
 
 #ifdef __APPLE__
 #  include "usb-darwin.c"
-#elif defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+#elif defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
 #  include "usb-unix.c"
 #else
 /*

diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4
index 9d4499be8f8da810887645da99afe346a918e810..1babc48a75ab820d8fa613268e3ed2c7115de432 100644 (file)
--- a/config-scripts/cups-directories.m4
+++ b/config-scripts/cups-directories.m4
@@ -157,7 +157,7 @@ if test x$rcdir = x; then
                        RCSTOP="25"
                        ;;
 
-               Linux | GNU)
+               Linux | GNU | GNU/k*BSD*)
                        # Linux/HURD seems to choose an init.d directory at random...
                        if test -d /sbin/init.d; then
                                # SuSE