Correct lib/Makefile.in to include enh_fnmatch.o that was removed

     in back porting from 2.3.x

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.2@5721 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/lib/Makefile.in b/bacula/src/lib/Makefile.in
index c32085f46045bbdd69db204be21f3ac3cea6746a..0e53207d73ddcd21c9ba39eacb4df31fe277c33f 100644 (file)
--- a/bacula/src/lib/Makefile.in
+++ b/bacula/src/lib/Makefile.in
@@ -22,7 +22,8 @@ dummy:
 LIBSRCS = attr.c base64.c berrno.c bsys.c bget_msg.c \
          bnet.c bnet_server.c runscript.c \
          bsock.c bpipe.c bsnprintf.c btime.c \
-         cram-md5.c crc32.c crypto.c daemon.c edit.c fnmatch.c \
+         cram-md5.c crc32.c crypto.c daemon.c edit.c \
+         enh_fnmatch.c fnmatch.c \
          guid_to_name.c hmac.c jcr.c lex.c alist.c dlist.c \
          md5.c message.c mem_pool.c openssl.c parse_conf.c \
          queue.c bregex.c \
@@ -35,7 +36,8 @@ LIBSRCS = attr.c base64.c berrno.c bsys.c bget_msg.c \
 LIBOBJS = attr.o base64.o berrno.o bsys.o bget_msg.o \
          bnet.o bnet_server.o runscript.o \
          bsock.o bpipe.o bsnprintf.o btime.o \
-         cram-md5.o crc32.o crypto.o daemon.o edit.o fnmatch.o \
+         cram-md5.o crc32.o crypto.o daemon.o edit.o \
+         enh_fnmatch.o fnmatch.o \
          guid_to_name.o hmac.o jcr.o lex.o alist.o dlist.o \
          md5.o message.o mem_pool.o openssl.o parse_conf.o \
          queue.o bregex.o \

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 5a707861db3c4ab2bfcac7b474dd75109317d938..58ac0e4d1a7a243284fe3721a52a2195b0d41928 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "2.2.5"
-#define BDATE   "03 October 2007"
-#define LSMDATE "03Oct07"
+#define BDATE   "04 October 2007"
+#define LSMDATE "04Oct07"
 
 #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 f5d4aac55d54dd2bce4c684fd793d88b77f6654e..025c71c751ce0a6d391a95aa1c62e4b741775601 100644 (file)
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -1,6 +1,9 @@
               Technical notes on version 2.2
 
 General:
+04Oct07 
+kes  Correct lib/Makefile.in to include enh_fnmatch.o that was removed
+     in back porting from 2.3.x
 03Oct07
 kes  Backport almost 4000 lines of 2.3 code that fixes a number of bugs.
      The details are included in the notes in this file.