Mercurial > pidgin
changeset 14735:52c90bdfd34c
[gaim-migrate @ 17491]
SF Patch #1578297 from Matteo Settenvini
"Gaim 2.0.0_beta3 (and, as far as I can tell, other
versions too) doesn't build correctly with
LDFLAGS="-Wl,--as-needed"."
"This is caused to an incorrect use of the LDFLAGS
variable inside the configure.ac."
committer: Tailor Script <tailor@pidgin.im>
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Tue, 17 Oct 2006 03:23:08 +0000 |
| parents | a176569a0462 |
| children | d1eb55b1b28d |
| files | COPYRIGHT configure.ac |
| diffstat | 2 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Mon Oct 16 21:57:03 2006 +0000 +++ b/COPYRIGHT Tue Oct 17 03:23:08 2006 +0000 @@ -254,6 +254,7 @@ Andrew Sayman Alceste Scalas Carsten Schaar +Matteo Settenvini Colin Seymour Luke Schierer Ralph Schmieder
--- a/configure.ac Mon Oct 16 21:57:03 2006 +0000 +++ b/configure.ac Tue Oct 17 03:23:08 2006 +0000 @@ -1243,7 +1243,7 @@ if test "x$with_gnutls_libs" != "xno" -a \ "x$have_gnutls_includes" != "xno"; then - LDFLAGS_save="$LDFLAGS" + LIBS_save="$LIBS" case $with_gnutls_libs in ""|-L*) ;; @@ -1252,9 +1252,9 @@ AC_CACHE_CHECK([for GnuTLS libraries], gnutls_libs, [ - LDFLAGS="$LDFLAGS $with_gnutls_libs -lgnutls -lgcrypt" + LIBS="$LIBS $with_gnutls_libs -lgnutls -lgcrypt" AC_TRY_LINK_FUNC(gnutls_init, gnutls_libs="yes", gnutls_libs="no") - LDFLAGS="$LDFLAGS_save" + LIBS="$LIBS_save" ]) if test "x$gnutls_libs" != "xno"; then @@ -1498,7 +1498,7 @@ AC_CACHE_CHECK([for Mozilla nss libraries], moz_nss_libs, [ LIBS_save=$LIBS - LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs" + LDFLAGS="$LDFLAGS -L$with_nspr_libs -L$with_nss_libs" LIBS="$nsslibs $nsprlibs" AC_TRY_LINK_FUNC(NSS_Init, @@ -1507,7 +1507,8 @@ if test "x$moz_nss_libs" = "xno"; then nsslibs="-lssl3 -lsmime3 -lnss3 -lsoftokn3" - LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs" + LDFLAGS="$LDFLAGS -L$with_nspr_libs -L$with_nss_libs" + LIBS="$LIBS $nsslibs" AC_TRY_LINK_FUNC(NSS_Init, [moz_nss_libs="yes"], [moz_nss_libs="no"])