[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-466-gcdcc7e1

[Bastiaan Jacques]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  cdcc7e11fd940e72be0845775e212ae5f3eb6409 (commit)
      from  945bc55badd175f36cdf53c132b59a73372073a8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=cdcc7e11fd940e72be0845775e212ae5f3eb6409


commit cdcc7e11fd940e72be0845775e212ae5f3eb6409
Author: Bastiaan Jacques <address@hidden>
Date:   Sat Apr 2 01:31:48 2011 +0200

    Link to liblber only if curl fails to link without it. Bug #25499.

diff --git a/configure.ac b/configure.ac
index 0015f41..be8178a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1861,10 +1861,6 @@ AC_CHECK_HEADERS(signal.h)
 AC_CHECK_HEADERS(unistd.h)
 AC_CHECK_HEADERS(sys/time.h)
 AC_CHECK_HEADERS(ieeefp.h)
-dnl libcurl3-dev on Ubuntu has a dependency on lber, and Gnash won't link
-dnl on most machines without it. While it isn't diretly used by Gnash at all,
-dnl it's to work around an Ubuntu packaging bug.
-AC_CHECK_LIB(lber, ber_free)
 AC_CHECK_LIB(bz2, BZ2_bzopen, [AC_SUBST(BZ2_LIBS, -lbz2)])
 AC_CHECK_LIB(c, getpwnam, AC_DEFINE(HAVE_GETPWNAM, 1, [Has getpwnam] ))
 
diff --git a/macros/curl.m4 b/macros/curl.m4
index 5417c4d..9a1e74a 100644
--- a/macros/curl.m4
+++ b/macros/curl.m4
@@ -118,6 +118,14 @@ AC_DEFUN([GNASH_PATH_CURL],
 
   if test x"${ac_cv_path_curl_lib}" != x ; then
     CURL_LIBS="${ac_cv_path_curl_lib}"
+    dnl libcurl3-dev on Ubuntu has a dependency on lber, and Gnash won't link
+    dnl on most machines without it. (Ubuntu packaging bug.)
+    save_LIBS="$LIBS"
+    LIBS="$LIBS $CURL_LIBS"
+    AC_TRY_LINK_FUNC(curl_easy_init, [echo "ok!"], 
+      [AC_CHECK_LIB(lber, ber_free, [CURL_LIBS="$CURL_LIBS -llber"])])
+    dnl FIXME: complain if that didn't do the trick?
+    LIBS="$save_LIBS"
   else
     CURL_LIBS=""
   fi

-----------------------------------------------------------------------

Summary of changes:
 configure.ac   |    4 ----
 macros/curl.m4 |    8 ++++++++
 2 files changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Gnash