- release 15

[packages/bacula.git] / bacula-link.patch

diff --git a/bacula-link.patch b/bacula-link.patch
index e7f6d92a7ca254bd8f6d15e1caa48a2e31102c80..19b6d1714a837fe04bc69d459326ddcb8567e17a 100644 (file)
--- a/bacula-link.patch
+++ b/bacula-link.patch
@@ -1,24 +1,29 @@
---- 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 " "
+--- src/lib/Makefile.in.orig   2010-08-14 23:46:56.290270219 +0200
++++ src/lib/Makefile.in        2010-08-14 23:47:35.640255402 +0200
+@@ -119,7 +119,7 @@
  
- 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)
+ libbac.la: Makefile $(LIBBAC_LOBJS)
+       @echo "Making $@ ..."
+-      $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_RELEASE) $(WRAPLIBS) $(CAP_LIBS) $(ZLIBS)
++      $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_RELEASE) $(WRAPLIBS) $(CAP_LIBS) $(ZLIBS) $(OPENSSL_LIBS) $(LIBS)
  
+ libbaccfg.a: $(LIBBACCFG_OBJS) 
+       @echo "Making $@ ..."
+@@ -128,7 +128,7 @@
  
- 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 $@
+ libbaccfg.la: Makefile $(LIBBACCFG_LOBJS) 
+       @echo "Making $@ ..."
+-      $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_RELEASE)
++      $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_RELEASE) $(OPENSSL_LIBS) $(LIBS)
+ 
+ libbacpy.a: $(LIBBACPY_OBJS) 
+       @echo "Making $@ ..."
+@@ -137,7 +137,7 @@
  
+ libbacpy.la: Makefile $(LIBBACPY_LOBJS) 
+       @echo "Making $@ ..."
+-      $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACPY_LT_RELEASE) $(PYTHON_LIBS)
++      $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACPY_LT_RELEASE) $(PYTHON_LIBS) $(OPENSSL_LIBS) $(LIBS)
  
+ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
+       cd $(topdir) \