[pkg-bacula-commits] [bacula] 16/27: Updated debian/patches/fix-libbaccats-rpath.patch

[Carsten Leonhardt]

This is an automated email from the git hooks/post-receive script.

cl-guest pushed a commit to branch master
in repository bacula.

commit 9cc919ebfb8da7c7b0ab9a6e54165ca5e49345a7
Author: Carsten Leonhardt <leo at debian.org>
Date:   Mon Jul 20 00:14:38 2015 +0200

    Updated debian/patches/fix-libbaccats-rpath.patch
---
 debian/patches/fix-libbaccats-rpath.patch | 42 ++++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/debian/patches/fix-libbaccats-rpath.patch b/debian/patches/fix-libbaccats-rpath.patch
index b49c0ec..d8238b5 100644
--- a/debian/patches/fix-libbaccats-rpath.patch
+++ b/debian/patches/fix-libbaccats-rpath.patch
@@ -4,16 +4,25 @@ Last-Update: 2012-06-02
 
 --- a/autoconf/bacula-macros/db.m4
 +++ b/autoconf/bacula-macros/db.m4
-@@ -425,7 +425,7 @@
-         if test -f $MYSQL_LIBDIR/libmysqlclient_r.a \
-              -o -f $MYSQL_LIBDIR/libmysqlclient_r.so; then
-            if test x$use_libtool != xno; then
--              MYSQL_LIBS="-R $MYSQL_LIBDIR -L$MYSQL_LIBDIR -lmysqlclient_r -lz"
-+              MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqlclient_r -lz"
-            else
-               MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqlclient_r -lz"
-            fi
-@@ -552,7 +552,7 @@ AC_HELP_STRING([--with-embedded-mysql@<:@=DIR@:>@], [Include MySQL support. DIR
+@@ -98,7 +98,7 @@
+      fi
+      DBI_INCLUDE=-I$DBI_INCDIR
+      if test x$use_libtool != xno; then
+-        DBI_LIBS="-R $DBI_LIBDIR -L$DBI_LIBDIR -ldbi"
++        DBI_LIBS="-L$DBI_LIBDIR -ldbi"
+      else
+         DBI_LIBS="-L$DBI_LIBDIR -ldbi"
+      fi
+@@ -432,7 +432,7 @@
+      if test -f $MYSQL_LIBDIR/libmysqlclient_r.a \
+           -o -f $MYSQL_LIBDIR/libmysqlclient_r.so; then
+         if test x$use_libtool != xno; then
+-           MYSQL_LIBS="-R $MYSQL_LIBDIR -L$MYSQL_LIBDIR -lmysqlclient_r -lz"
++           MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqlclient_r -lz"
+         else
+            MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqlclient_r -lz"
+         fi
+@@ -558,7 +558,7 @@
          fi
       MYSQL_INCLUDE=-I$MYSQL_INCDIR
       if test x$use_libtool != xno; then
@@ -22,7 +31,16 @@ Last-Update: 2012-06-02
       else
          MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqld -lz -lm -lcrypt"
       fi
-@@ -728,7 +728,7 @@ AC_HELP_STRING([--with-sqlite3@<:@=DIR@:>@], [Include SQLite3 support. DIR is th
+@@ -648,7 +648,7 @@
+      fi
+      INGRES_INCLUDE=-I$INGRES_INCDIR
+      if test x$use_libtool != xno; then
+-        INGRES_LIBS="-R $INGRES_LIBDIR -L$INGRES_LIBDIR -lq.1 -lcompat.1 -lframe.1"
++        INGRES_LIBS="-L$INGRES_LIBDIR -lq.1 -lcompat.1 -lframe.1"
+      else
+         INGRES_LIBS="-L$INGRES_LIBDIR -lq.1 -lcompat.1 -lframe.1"
+      fi
+@@ -734,7 +734,7 @@
       fi
       SQLITE_INCLUDE=-I$SQLITE_INCDIR
       if test x$use_libtool != xno; then
@@ -31,7 +49,7 @@ Last-Update: 2012-06-02
       else
          SQLITE_LIBS="-L$SQLITE_LIBDIR -lsqlite3"
       fi
-@@ -852,7 +852,7 @@ AC_HELP_STRING([--with-postgresql@<:@=DIR@:>@], [Include PostgreSQL support. DIR
+@@ -858,7 +858,7 @@
  
       POSTGRESQL_INCLUDE=-I$POSTGRESQL_INCDIR
       if test x$use_libtool != xno; then

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git