Make 3.0.3 win32 build work

diff --git a/bacula/src/win32/cats/bacula_cats.def b/bacula/src/win32/cats/bacula_cats.def
index 44d3321588fe151fac27b6fe22c9bbf7afb1cd8d..98504f016fe2b0b4cb0680df64dd2e7ed06bc33a 100644 (file)
--- a/bacula/src/win32/cats/bacula_cats.def
+++ b/bacula/src/win32/cats/bacula_cats.def
@@ -57,14 +57,13 @@ _Z16db_get_file_listP3JCRP4B_DBPcPFiPviPS3_ES4_
 _Z16db_get_media_idsP3JCRP4B_DBP9MEDIA_DBRPiPPj
 _Z17db_get_client_idsP3JCRP4B_DBPiPPj
 _Z17db_get_job_recordP3JCRP4B_DBP7JOB_DBR
-_Z18db_get_int_handlerPviPPc
 _Z18db_get_pool_recordP3JCRP4B_DBP8POOL_DBR
 _Z18db_get_query_dbidsP3JCRP4B_DBR8POOL_MEMR9dbid_list
 _Z19db_get_media_recordP3JCRP4B_DBP9MEDIA_DBR
 _Z20db_get_client_recordP3JCRP4B_DBP10CLIENT_DBR
 _Z21db_get_counter_recordP3JCRP4B_DBP11COUNTER_DBR
 _Z21db_get_fileset_recordP3JCRP4B_DBP11FILESET_DBR
-_Z22db_accurate_get_jobidsP3JCRP4B_DBP7JOB_DBRPc
+_Z22db_accurate_get_jobidsP3JCRP4B_DBP7JOB_DBRP11db_list_ctx
 _Z23db_get_job_volume_namesP3JCRP4B_DBjPPc
 _Z23db_get_num_pool_recordsP3JCRP4B_DB
 _Z24db_get_num_media_recordsP3JCRP4B_DB

diff --git a/bacula/src/win32/cats/make_def b/bacula/src/win32/cats/make_def
index 945f86a9b6f3b6b731fd6a104952f37d3e6ffd20..691881177e10dba4d3478321c5d3f6a2c7f508a7 100755 (executable)
--- a/bacula/src/win32/cats/make_def
+++ b/bacula/src/win32/cats/make_def
@@ -10,7 +10,9 @@ echo "LIBRARY bacula_cats.dll"
 echo "EXPORTS"
 echo " "
 
-NM=../../../../../cross-tools/mingw32/mingw32/bin/nm
+TOPDIR=`(cd ../../..;pwd)`
+TOPDIR=${DEPKGS:-${TOPDIR}}
+NM=${TOPDIR}/cross-tools/mingw32/mingw32/bin/nm
 
 OBJS="sql.o sql_create.o sql_delete.o sql_find.o sql_get.o \
       sql_list.o sql_update.o"
@@ -63,7 +65,7 @@ DATA="\
       uar_sel_jobid_temp" 
 
 
-cd cats_mysql
+cd obj32/cats_mysql
 for i in ${OBJS}; do \
    echo "; $i"; \
    ${NM} $i | grep "^[0-9a-f]* T _" | cut -c13-; \