Merge branch 'master' into basejobv3

[bacula/bacula] / bacula / configure

diff --git a/bacula/configure b/bacula/configure
index 25a0a85cc8b348d570f7a51e27cee085ec58db23..b711d9fc9682bb22a82bc7efd7bc4128d798b507 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -16408,6 +16408,9 @@ then
 elif test -f /etc/slackware-version
 then
         DISTNAME=slackware
+elif test x$host_vendor = xapple
+then
+    DISTNAME=osx
 elif test $HAVE_UNAME=yes -a x`uname -s` = xDarwin
 then
     DISTNAME=darwin
@@ -42624,6 +42627,14 @@ darwin)
    PFILES="${PFILES} \
       platforms/darwin/Makefile"
   ;;
+osx)
+   DISTVER=`uname -r`
+   TAPEDRIVE="/dev/nst0"
+   PSCMD="ps -e -o pid,command"
+   MACOSX=macosx
+   PFILES="${PFILES} \
+      platforms/osx/Makefile"
+  ;;
 debian)
    if `test -f /etc/apt/sources.list && grep -q ubuntu /etc/apt/sources.list`; then
       DISTNAME="ubuntu"