Fix bug #1870 GNU binutils-gold build failure.

Use some extra libtool magic to determine what lib to use
to get dlopen and friends for loading plugins from libbac.

diff --git a/bacula/autoconf/Make.common.in b/bacula/autoconf/Make.common.in
index fdcd3a2c7be6c7947de13f694e3311708c2b4a9d..17467bbb7f60ed435f1f3a213c2180549b470203 100644 (file)
--- a/bacula/autoconf/Make.common.in
+++ b/bacula/autoconf/Make.common.in
@@ -90,6 +90,7 @@ DLIB = @DLIB@
 PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_INC = @PYTHON_INCDIR@
 OPENSSL_LIBS = @OPENSSL_LIBS@
+DLLIBS = @LIBADD_DLOPEN@
 
 
 # Windows (cygwin) flags 

diff --git a/bacula/autoconf/aclocal.m4 b/bacula/autoconf/aclocal.m4
index 8188873dfac519dcdd9557315b32143f70028fe1..de6977daeab504170d6c5327aa8554f57c9a8be5 100644 (file)
--- a/bacula/autoconf/aclocal.m4
+++ b/bacula/autoconf/aclocal.m4
@@ -16,6 +16,7 @@ m4_include([libtool/ltoptions.m4])
 m4_include([libtool/ltsugar.m4])
 m4_include([libtool/ltversion.m4])
 m4_include([libtool/lt~obsolete.m4])
+m4_include([libtool/ltdl.m4])
 m4_include([gettext-macros/codeset.m4])
 m4_include([gettext-macros/gettext.m4])
 m4_include([gettext-macros/glibc2.m4])

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 6ee6577ee07bbd95d24cec47f8790b8469814426..9fd2f3975583993286f7261fc5de618babc08974 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -178,6 +178,7 @@ AC_ARG_ENABLE(libtool,
    ]
 )
 LT_INIT([shared disable-static])
+LT_LIB_DLLOAD
 LT_LANG([C++])
 
 if test x$use_libtool != xno; then

diff --git a/bacula/src/lib/Makefile.in b/bacula/src/lib/Makefile.in
index 487fc593d3ac0ddefa684784ca96b7f7c2b20679..009f15742cb03af5f6936ac0fda791d4feef72e7 100644 (file)
--- a/bacula/src/lib/Makefile.in
+++ b/bacula/src/lib/Makefile.in
@@ -120,7 +120,7 @@ libbac.a: $(LIBBAC_OBJS)
 
 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) $(OPENSSL_LIBS) $(LIBS)
+       $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_RELEASE) $(WRAPLIBS) $(CAP_LIBS) $(ZLIBS) $(OPENSSL_LIBS) $(LIBS) $(DLLIBS)
 
 libbaccfg.a: $(LIBBACCFG_OBJS) 
        @echo "Making $@ ..."