SOURCES: bacula-compile.patch (NEW), bacula-link.patch (NEW) - sma...

[sls]

Author: sls                          Date: Fri Oct 20 17:43:35 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- small fixes (allow build all programs from %files section)

---- Files affected:
SOURCES:
   bacula-compile.patch (NONE -> 1.1)  (NEW), bacula-link.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/bacula-compile.patch
diff -u /dev/null SOURCES/bacula-compile.patch:1.1
--- /dev/null	Fri Oct 20 19:43:35 2006
+++ SOURCES/bacula-compile.patch	Fri Oct 20 19:43:30 2006
@@ -0,0 +1,11 @@
+--- bacula-1.38.11/src/console/console.c.orig	2006-10-20 08:02:49.000000000 +0000
++++ bacula-1.38.11/src/console/console.c	2006-10-20 08:03:04.000000000 +0000
+@@ -47,7 +47,7 @@
+ #ifdef HAVE_CYGWIN
+ int rl_catch_signals;
+ #else
+-extern int rl_catch_signals;
++extern "C" int rl_catch_signals;
+ #endif
+ 
+ /* Imported functions */

================================================================
Index: SOURCES/bacula-link.patch
diff -u /dev/null SOURCES/bacula-link.patch:1.1
--- /dev/null	Fri Oct 20 19:43:35 2006
+++ SOURCES/bacula-link.patch	Fri Oct 20 19:43:30 2006
@@ -0,0 +1,24 @@
+--- bacula-1.38.11/src/tray-monitor/Makefile.in.orig	2006-10-20 01:35:19.000000000 +0000
++++ bacula-1.38.11/src/tray-monitor/Makefile.in	2006-10-20 01:39:22.000000000 +0000
+@@ -46,8 +46,8 @@
+ 	@echo " "
+ 
+ bacula-tray-monitor: $(MONITOROBJS) ../lib/libbac.a
+-	$(CXX) $(LDFLAGS) $(MONITOR_LDFLAGS) -L../lib -L../cats -o $@ \
+- $(MONITOROBJS) $(DLIB) -lbac -lm $(LIBS) $(OPENSSL_LIBS)
++	$(CXX) $(LDFLAGS) -L../lib -L../cats -o $@ \
++ $(MONITOROBJS) $(DLIB) $(MONITOR_LDFLAGS) -lbac -lm $(LIBS) $(OPENSSL_LIBS)
+ 
+ 
+ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
+--- bacula-1.38.9/src/filed/Makefile.in.orig	2006-06-26 13:39:07.000000000 +0000
++++ bacula-1.38.9/src/filed/Makefile.in	2006-06-26 13:39:35.000000000 +0000
+@@ -86,7 +86,7 @@
+ static-bacula-fd:  $(SVROBJS) ../findlib/libfind.a ../lib/libbac.a @WIN32@
+ 	$(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
+ 	   $(WIN32LIBS) $(FDLIBS) -lfind -lbac -lm $(PYTHON_LIBS) $(LIBS) \
+-	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
++	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) -ldl
+ 	strip $@
+ 
+ 
================================================================