From ebaa1c0e736dbc090822fd090d548ef75c3c99ae Mon Sep 17 00:00:00 2001 From: Rodney Dawes Date: Fri, 27 Feb 2004 16:15:01 +0000 Subject: Use a different variable for linking to the static version of gnutls, so 2004-02-27 Rodney Dawes * configure.in: * libsoup/Makefile.am: Use a different variable for linking to the static version of gnutls, so we don't pull the .a files into the .pc Fixes #53346 --- ChangeLog | 8 ++++++++ configure.in | 5 ++++- libsoup/Makefile.am | 7 ++++--- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0908ba05..eee2c419 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-02-27 Rodney Dawes + + * configure.in: + * libsoup/Makefile.am: Use a different variable for linking to the + static version of gnutls, so we don't pull the .a files into the .pc + + Fixes #53346 + 2004-02-20 Dan Winship * libsoup/soup-message-io.c (read_metadata, read_body_chunk, diff --git a/configure.in b/configure.in index 5a9e00db..4a90561c 100644 --- a/configure.in +++ b/configure.in @@ -206,6 +206,7 @@ if test "$enable_ssl" != "no"; then fi fi +LIBGNUTLS_LIBS_STATIC="" if test "$enable_ssl" != "no"; then AC_DEFINE(HAVE_SSL, 1, [Defined if you have SSL support]) @@ -224,12 +225,14 @@ if test "$enable_ssl" != "no"; then if test "$enable_static_ssl" = "yes"; then gnutls_libdir=`$LIBGNUTLS_CONFIG --exec-prefix`/lib - LIBGNUTLS_LIBS="$gnutls_libdir/libgnutls.a $gnutls_libdir/libgcrypt.a $libgpg_error_libs_static" + LIBGNUTLS_LIBS="" + LIBGNUTLS_LIBS_STATIC="$gnutls_libdir/libgnutls.a $gnutls_libdir/libgcrypt.a $libgpg_error_libs_static" fi fi AC_SUBST(LIBGNUTLS_CFLAGS) AC_SUBST(LIBGNUTLS_LIBS) +AC_SUBST(LIBGNUTLS_LIBS_STATIC) dnl *************** dnl *** gtk-doc *** diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am index dd417188..38a79ac6 100644 --- a/libsoup/Makefile.am +++ b/libsoup/Makefile.am @@ -54,9 +54,10 @@ lib_LTLIBRARIES = libsoup-2.2.la libsoup_2_2_la_LDFLAGS = \ -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -libsoup_2_2_la_LIBADD = \ - $(GLIB_LIBS) \ - $(XML_LIBS) \ +libsoup_2_2_la_LIBADD = \ + $(GLIB_LIBS) \ + $(XML_LIBS) \ + $(LIBGNUTLS_LIBS_STATIC) \ $(LIBGNUTLS_LIBS) libsoup_2_2_la_SOURCES = \ -- cgit v1.2.1