diff options
| author | Rodney Dawes <dobey@ximian.com> | 2004-02-27 16:15:01 +0000 |
|---|---|---|
| committer | Rodney Dawes <dobey@src.gnome.org> | 2004-02-27 16:15:01 +0000 |
| commit | ebaa1c0e736dbc090822fd090d548ef75c3c99ae (patch) | |
| tree | e9f12fe0bd5ec944fe96e96319fd27a437da4509 | |
| parent | 4e25ca0d9c44cfa2a3427b628859bae5cc3f79aa (diff) | |
| download | libsoup-ebaa1c0e736dbc090822fd090d548ef75c3c99ae.tar.gz | |
Use a different variable for linking to the static version of gnutls, so
2004-02-27 Rodney Dawes <dobey@ximian.com>
* 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
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 5 | ||||
| -rw-r--r-- | libsoup/Makefile.am | 7 |
3 files changed, 16 insertions, 4 deletions
@@ -1,3 +1,11 @@ +2004-02-27 Rodney Dawes <dobey@ximian.com> + + * 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 <danw@ximian.com> * 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 = \ |