diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2011-11-04 00:35:33 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2011-11-04 00:35:33 +0100 |
| commit | 6e47f6043aa7c25055e43b2a9d5322db63604d52 (patch) | |
| tree | d3719b3dd77a82bf60020fb0077797aaf066a7fa /guile | |
| parent | 9d31ac4504a6cbaa1cf701efed301961f4ad5359 (diff) | |
| download | gnutls-6e47f6043aa7c25055e43b2a9d5322db63604d52.tar.gz | |
guile: Rename `libguile-gnutls-v-2.la' to `guile-gnutls-v-2.la'.
Diffstat (limited to 'guile')
| -rw-r--r-- | guile/modules/gnutls.in | 2 | ||||
| -rw-r--r-- | guile/pre-inst-guile.in | 2 | ||||
| -rw-r--r-- | guile/src/Makefile.am | 9 |
3 files changed, 7 insertions, 6 deletions
diff --git a/guile/modules/gnutls.in b/guile/modules/gnutls.in index 69e9d3ef73..56e31372ee 100644 --- a/guile/modules/gnutls.in +++ b/guile/modules/gnutls.in @@ -386,7 +386,7 @@ (or (getenv "GNUTLS_GUILE_EXTENSION_DIR") "@guileextensiondir@")) -(load-extension (string-append %libdir "/libguile-gnutls-v-2") +(load-extension (string-append %libdir "/guile-gnutls-v-2") "scm_init_gnutls") ;; Renaming. diff --git a/guile/pre-inst-guile.in b/guile/pre-inst-guile.in index 6a7cc6aee0..12789d7e04 100644 --- a/guile/pre-inst-guile.in +++ b/guile/pre-inst-guile.in @@ -27,5 +27,5 @@ GNUTLS_GUILE_EXTENSION_DIR="@abs_top_srcdir@/guile/src" export GNUTLS_GUILE_EXTENSION_DIR exec @abs_top_builddir@/libtool --mode=execute \ - -dlopen "@abs_top_builddir@/guile/src/libguile-gnutls-v-2.la" \ + -dlopen "@abs_top_builddir@/guile/src/guile-gnutls-v-2.la" \ @GUILE@ "$@" diff --git a/guile/src/Makefile.am b/guile/src/Makefile.am index e3b915ada2..06d24e0821 100644 --- a/guile/src/Makefile.am +++ b/guile/src/Makefile.am @@ -31,7 +31,8 @@ BUILT_SOURCES = enum-map.i.c smob-types.i.c enums.h smobs.h \ CLEANFILES = $(BUILT_SOURCES) -guileextension_LTLIBRARIES = libguile-gnutls-v-2.la +guileextension_LTLIBRARIES = guile-gnutls-v-2.la +guile_gnutls_v_2_la_LDFLAGS = -module # Linking against GnuTLS. GNUTLS_CORE_LIBS = $(top_builddir)/lib/libgnutls.la @@ -41,10 +42,10 @@ GNULIB_LIBS = $(top_builddir)/gl/libgnu.la GNULIB_CFLAGS = -I$(top_builddir)/gl -I$(top_srcdir)/gl -libguile_gnutls_v_2_la_SOURCES = core.c errors.c utils.c -libguile_gnutls_v_2_la_CFLAGS = \ +guile_gnutls_v_2_la_SOURCES = core.c errors.c utils.c +guile_gnutls_v_2_la_CFLAGS = \ $(AM_CFLAGS) $(GNULIB_CFLAGS) $(GUILE_CFLAGS) -libguile_gnutls_v_2_la_LIBADD = \ +guile_gnutls_v_2_la_LIBADD = \ $(GNUTLS_CORE_LIBS) $(GNULIB_LIBS) \ $(GUILE_LDFLAGS) |