X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fversion.h;h=6964da85e089818df913a163011a20d9ae644489;hb=f7baed75284306092c153924637d7316dd1bc1a8;hp=4d72489e81a337987efa575ea3565991fab59a45;hpb=0ba2aba7e869f9a23abc4d463e6707433940e00e;p=bacula%2Fbacula

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 4d72489e81..6964da85e0 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,19 +1,16 @@
-/*
- *  Version $Id$
- */
 
 #undef  VERSION
-#define VERSION "3.0.2"
-#define BDATE   "07 July 2009"
-#define LSMDATE "07Jul09"
+#define VERSION "5.1.4"
+#define BDATE   "10 May 2010"
+#define LSMDATE "10May10"
 
-#define PROG_COPYRIGHT "Copyright (C) %d-2009 Free Software Foundation Europe e.V.\n"
-#define BYEAR "2009"       /* year for copyright messages in progs */
+#define PROG_COPYRIGHT "Copyright (C) %d-2010 Free Software Foundation Europe e.V.\n"
+#define BYEAR "2010"       /* year for copyright messages in progs */
 
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2010 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -38,6 +35,28 @@
    Switzerland, email:ftf@fsfeurope.org.
 */
 
+/* Shared object library versions */
+#define LIBBAC_LT_CURRENT  5
+#define LIBBAC_LT_REVISION 1
+#define LIBBAC_LT_AGE 0
+
+#define LIBBACCFG_LT_CURRENT 5
+#define LIBBACCFG_LT_REVISION 1
+#define LIBBACCFG_LT_AGE 0
+
+#define LIBBACPY_LT_CURRENT 5
+#define LIBBACPY_LT_REVISION 1
+#define LIBBACPY_LT_AGE 0
+
+#define LIBBACSQL_LT_CURRENT 5
+#define LIBBACSQL_LT_REVISION 1
+#define LIBBACSQL_LT_AGE 0
+
+#define LIBBACFIND_LT_CURRENT 5
+#define LIBBACFIND_LT_REVISION 1
+#define LIBBACFIND_LT_AGE 0
+
+
 
 /* Debug flags */
 #undef  DEBUG
@@ -65,10 +84,19 @@
 #if DEVELOPER
 # ifndef _USE_LOCKMGR
 #  define _USE_LOCKMGR
-# endif
-#endif
+# endif /* _USE_LOCKMGR */
+/*
+ * Enable priority management with the lock manager
+ *
+ * Note, turning this on will cause the Bacula SD to abort if
+ *  mutexes are executed out of order, which could lead to a
+ *  deadlock.  However, note that this is not necessarily a
+ *  deadlock, so turn this on only for debugging.
+ */
+#define USE_LOCKMGR_PRIORITY
+#endif  /* DEVELOPER */
 
-#if !HAVE_LINUX_OS
+#if !HAVE_LINUX_OS && !HAVE_SUN_OS && !HAVE_DARWIN_OS && !HAVE_FREEBSD_OS
 # undef _USE_LOCKMGR
 #endif
 
@@ -109,6 +137,7 @@
 /* #define TRACE_RES 1 */
 /* #define DEBUG_MEMSET 1 */
 /* #define DEBUG_MUTEX 1 */
+#define BEEF 0
 
 /*
  * Set SMALLOC_SANITY_CHECK to zero to turn off, otherwise