kes Dirk committed the qwt library code for drawing graphs in bat.

kes  Tweak install of qwt so that it is integrated with ./configure.

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

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 976db7dca13c35c37d55bc1a28aa81500ec5d345..95ae9dc6ed569ac68c66c7999935e78a391e1baa 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -2187,7 +2187,14 @@ chmod 755 src/win32/build-depkgs-mingw32
 
 if test "${support_bat}" = "yes" ; then
   cd src/qt-console
-  chmod 755 install_conf_file
+  a=`pwd`
+  chmod 755 install_conf_file build-depkgs-qt-console
+  echo " "
+  echo "Downloading, building, and installing the qwt graphics library"
+  echo " The install will be to directory ${a}/qwt ..."
+  echo " "
+  ./build-depkgs-qt-console
+  echo "Creating bat Makefile" 
   qmake
 fi
 

diff --git a/bacula/configure b/bacula/configure
index c3a1909f6e0d2057c207d32ee00c93bb5261b9e6..8439d97d14dde8651c61a3ec403d007f61a00221 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -35838,7 +35838,14 @@ chmod 755 src/win32/build-depkgs-mingw32
 
 if test "${support_bat}" = "yes" ; then
   cd src/qt-console
-  chmod 755 install_conf_file
+  a=`pwd`
+  chmod 755 install_conf_file build-depkgs-qt-console
+  echo " "
+  echo "Downloading, building, and installing the qwt graphics library"
+  echo " The install will be to directory ${a}/qwt ..."
+  echo " "
+  ./build-depkgs-qt-console
+  echo "Creating bat Makefile"
   qmake
 fi
 

diff --git a/bacula/src/lib/md5.c b/bacula/src/lib/md5.c
index d4d9b467172856a16d6e82694faad4d3801c2820..97b0517f48d304db738ae0daa4a8a593c7d6c89d 100644 (file)
--- a/bacula/src/lib/md5.c
+++ b/bacula/src/lib/md5.c
@@ -1,30 +1,7 @@
-/*
- * This code implements the MD5 message-digest algorithm.
- * The algorithm is due to Ron Rivest.  This code was
- * written by Colin Plumb in 1993, no copyright is claimed.
- * This code is in the public domain; do with it what you wish.
- *
- * Equivalent code is available from RSA Data Security, Inc.
- * This code has been tested against that, and is equivalent,
- * except that you don't need to include two pages of legalese
- * with every copy.
- *
- * To compute the message digest of a chunk of bytes, declare an
- * MD5Context structure, pass it to MD5Init, call MD5Update as
- * needed on buffers full of bytes, and then call MD5Final, which
- * will fill a supplied 16-byte array with the digest.
- *
- *   Version $Id$
- */
-
-/* Brutally hacked by John Walker back from ANSI C to K&R (no
-   prototypes) to maintain the tradition that Netfone will compile
-   with Sun's original "cc". */
-
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2007 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.
@@ -48,6 +25,29 @@
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
 */
+/*
+ * This code implements the MD5 message-digest algorithm.
+ * The algorithm is due to Ron Rivest.  This code was
+ * written by Colin Plumb in 1993, no copyright is claimed.
+ * This code is in the public domain; do with it what you wish.
+ *
+ * Equivalent code is available from RSA Data Security, Inc.
+ * This code has been tested against that, and is equivalent,
+ * except that you don't need to include two pages of legalese
+ * with every copy.
+ *
+ * To compute the message digest of a chunk of bytes, declare an
+ * MD5Context structure, pass it to MD5Init, call MD5Update as
+ * needed on buffers full of bytes, and then call MD5Final, which
+ * will fill a supplied 16-byte array with the digest.
+ *
+ *   Version $Id$
+ */
+
+/* Brutally hacked by John Walker back from ANSI C to K&R (no
+   prototypes) to maintain the tradition that Netfone will compile
+   with Sun's original "cc". */
+
 
 
 #include "bacula.h"

diff --git a/bacula/src/qt-console/build-depkgs-qt-console b/bacula/src/qt-console/build-depkgs-qt-console
index 4c9230607adcb4f0611eedb0d93e9fd4a87b8bce..f18887cffa212d7003538705e3da5a381d31e4a4 100755 (executable)
--- a/bacula/src/qt-console/build-depkgs-qt-console
+++ b/bacula/src/qt-console/build-depkgs-qt-console
@@ -65,7 +65,7 @@ echo "in get_source URL is $URL SRC_DIR is $SRC_DIR MAKE_DIR is $MAKE_DIR ARCHIV
    *)              echo "Unsupported archive type - $ARCHIVE"; exit 1;;
    esac
    
-   cd ${DEPPKG_DIR}/src
+// cd ${DEPPKG_DIR}/src
    
    if [ ! -e "${ARCHIVE}" ]
    then 
@@ -142,18 +142,15 @@ do_make()
 process_qwt()
 {
    get_source "${URL_QWT}" "${DIR_QWT}" "${MKD_QWT}"
-   echo "Building qwt"
-   echo "${DEPPKG_DIR}"
-   pwd
-   > make.log
+   echo "Building qwt graphics library. This takes some time ..."
    echo "unix {" >${TOP_DIR}/depkgs/qwt-5.0.2/qwtconfig.pri                    
    echo " INSTALLBASE = ${TOP_DIR}/qwt" >>${TOP_DIR}/depkgs/qwt-5.0.2/qwtconfig.pri
    echo "}" >>${TOP_DIR}/depkgs/qwt-5.0.2/qwtconfig.pri
    cat ${TOP_DIR}/qwtconfig.pri >>${TOP_DIR}/depkgs/qwt-5.0.2/qwtconfig.pri
-   qmake 
-   do_make Makefile
-   echo "Installing" 
-   do_make Makefile install
+   qmake >make.log
+   do_make Makefile >>make.log
+   do_make Makefile install >>make.log
+   echo "In case of problems see: `pwd`/make.log"
 }
 
 if [ "$#" -eq 0 ]

diff --git a/bacula/src/version.h b/bacula/src/version.h
index e42fc8a8325f49048951f8f1b9b9bb6e64b62b70..2bce5f5292387ab796f6757324535c9781d4a10a 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "2.1.22"
-#define BDATE   "25 June 2007"
-#define LSMDATE "25Jun07"
+#define BDATE   "26 June 2007"
+#define LSMDATE "26Jun07"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2007 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2007"       /* year for copyright messages in progs */

diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index 2c40f032851038bbee39096279c51bf98c3c3821..93230e409cf2f4eb682568e8f6d879b66e64fc88 100644 (file)
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -3,6 +3,9 @@
 General:
 
 Release 2.1.22 beta
+26Jun07
+kes  Dirk committed the qwt library code for drawing graphs in bat.
+kes  Tweak install of qwt so that it is integrated with ./configure.
 25Jun07
 kes  Fix HAVE_BATCH_INSERT to be HAVE_BATCH_FILE_INSERT, pointed
      out by Eric (my typo).