New configure from changed aclocal.m4

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

diff --git a/bacula/configure b/bacula/configure
index 79cad225cdadf9db14b63fe41f91b9e33d97b8a1..3f679b5759ce073048d11bdb5b23e1e54fde0398 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -7053,8 +7053,8 @@ echo "$as_me: error: Unable to find libpq-fe.h in standard locations" >&2;}
       else
           echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
-          { { echo "$as_me:$LINENO: error: Invalid SQLite directory $withval - unable to find libpq-fe.h under $withval" >&5
-echo "$as_me: error: Invalid SQLite directory $withval - unable to find libpq-fe.h under $withval" >&2;}
+          { { echo "$as_me:$LINENO: error: Invalid PostgreSQL directory $withval - unable to find libpq-fe.h under $withval" >&5
+echo "$as_me: error: Invalid PostgreSQL directory $withval - unable to find libpq-fe.h under $withval" >&2;}
    { (exit 1); exit 1; }; }
       fi
       POSTGRESQL_LFLAGS="-L$POSTGRESQL_LIBDIR -lpq"

diff --git a/bacula/kernstodo b/bacula/kernstodo
index ab6bbae26eda66ee2a04150928e387314091dead..fe847d8baecdee00bd3b61d4525a8e60f17b4f1e 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -55,6 +55,14 @@ For 1.33 Testing/Documentation:
 - Add subsections to the Disaster Recovery index section.
                 
 For 1.33
+- Notes for integrating Nic's code:
+  - Most likely jcr crash is the free_jcr(). The ref count was not incremented
+    in the watchdog call to cancel_job() as it is in the UA -- see
+    dird/job.c.
+  - The ua->jcr = control_jcr in job_monitor_watchdog() dird/job.c doesn't
+    look right.
+  - Add: fd->timer_start = 0;   /* turn off timer */
+    just before "fd->timed_out = TRUE;"in lib/jcr.c jcr_timeout_check.
 - In restore, provide option for limiting to a particular Pool.
 - In restore, list FileSets that only have different base names --
   i.e. any FileSet with the same name should be treated as the same.