Add ./configure detection of sys/tape.h

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1492 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/autoconf/config.h.in b/bacula/autoconf/config.h.in
index eb39c8f7d80c13c4179bee2b9cf56de1d08eca6c..b5a7a2278544d6f4492290ac25653fc6160c5dde 100644 (file)
--- a/bacula/autoconf/config.h.in
+++ b/bacula/autoconf/config.h.in
@@ -475,6 +475,9 @@
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
+/* Define to 1 if you have the <sys/tape.h> header file. */
+#undef HAVE_SYS_TAPE_H
+
 /* Define to 1 if you have the <sys/time.h> header file. */
 #undef HAVE_SYS_TIME_H
 

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index b9b99087c9bc7f0df5a3750fa44ca8e1b01e982e..159384b0432d8f9b4a5438d2a6812efc1eca899b 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -983,6 +983,7 @@ AC_CHECK_HEADERS( \
        resolv.h \
        mtio.h \
        sys/mtio.h \
+       sys/tape.h \
        regex.h \
 )
 AC_HEADER_STDC

diff --git a/bacula/configure b/bacula/configure
index 5ea5e5a5398af58851ee305d74aec7edbd1f0a50..a9fb245b9f164f56304e1a4bc29882a0d8b2c31d 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -9137,6 +9137,7 @@ fi
 
 
 
+
 
 
 for ac_header in \
@@ -9163,6 +9164,7 @@ for ac_header in \
        resolv.h \
        mtio.h \
        sys/mtio.h \
+       sys/tape.h \
        regex.h \
 
 do

diff --git a/bacula/src/stored/stored.h b/bacula/src/stored/stored.h
index 547183fbde3f1585822db6f94aeb4dec39b2b369..afe8a2075e59a43280d779645d5c9c1bbad52ff6 100644 (file)
--- a/bacula/src/stored/stored.h
+++ b/bacula/src/stored/stored.h
@@ -30,9 +30,14 @@
 
 #ifdef HAVE_MTIO_H
 #include <mtio.h>
-#endif
-#ifdef HAVE_SYS_MTIO_H
-#include <sys/mtio.h>
+#else
+# ifdef HAVE_SYS_MTIO_H
+# include <sys/mtio.h>
+# else
+#   ifdef HAVE_SYS_TAPE
+#   include <sys/tape.h>
+#   endif
+# endif
 #endif
 #include "block.h"
 #include "record.h"

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 8623f08e1b1a2f983ed0b56e55431e41e6423741..29d1678a830a9fcbd80253cc68f0fcdecc604d26 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 /* */
 #undef  VERSION
 #define VERSION "1.35.1"
-#define BDATE   "26 July 2004"
-#define LSMDATE "26Jul04"
+#define BDATE   "27 July 2004"
+#define LSMDATE "27Jul04"
 
 /* Debug flags */
 #undef  DEBUG