Change lgpl/ library name to liblgnu, to avoid weird libtool errors.

diff --git a/lgl/Makefile.am b/lgl/Makefile.am
index af201a87968c6281975d55dd4cf5fb85a18e9148..0395097309fd7a36cf1d65e7707f405f8daaeb63 100644 (file)
--- a/lgl/Makefile.am
+++ b/lgl/Makefile.am
@@ -9,16 +9,16 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lgl --m4-base=lgl/m4 --doc-base=doc --aux-dir=. --lgpl --libtool --macro-prefix=lgl gc gc-arcfour gc-arctwo gc-des gc-hmac-md5 gc-md2 gc-md4 gc-md5 gc-pbkdf2-sha1 gc-random gc-rijndael gc-sha1 gettext memmem memmove minmax read-file snprintf socklen stdint
+# Reproduce by: gnulib-tool --import --dir=. --lib=liblgnu --source-base=lgl --m4-base=lgl/m4 --doc-base=doc --aux-dir=. --lgpl --libtool --macro-prefix=lgl gc gc-arcfour gc-arctwo gc-des gc-hmac-md5 gc-md2 gc-md4 gc-md5 gc-pbkdf2-sha1 gc-random gc-rijndael gc-sha1 gettext memmem memmove minmax read-file snprintf socklen stdint
 
 AUTOMAKE_OPTIONS = 1.5 gnits
 
-noinst_LTLIBRARIES = libgnu.la
+noinst_LTLIBRARIES = liblgnu.la
 
-libgnu_la_SOURCES =
-libgnu_la_LIBADD = $(lgl_LTLIBOBJS)
-libgnu_la_DEPENDENCIES = $(lgl_LTLIBOBJS)
-libgnu_la_LDFLAGS = $(AM_LDFLAGS)
+liblgnu_la_SOURCES =
+liblgnu_la_LIBADD = $(lgl_LTLIBOBJS)
+liblgnu_la_DEPENDENCIES = $(lgl_LTLIBOBJS)
+liblgnu_la_LDFLAGS = $(AM_LDFLAGS)
 noinst_HEADERS =
 EXTRA_DIST =
 BUILT_SOURCES =
@@ -51,7 +51,7 @@ EXTRA_DIST += alloca_.h
 ## begin gnulib module gc
 
 if GL_COND_LIBTOOL
-libgnu_la_LDFLAGS += $(LTLIBGCRYPT)
+liblgnu_la_LDFLAGS += $(LTLIBGCRYPT)
 endif
 
 EXTRA_DIST += gc-gnulib.c gc-libgcrypt.c gc.h
@@ -102,7 +102,7 @@ EXTRA_DIST += md4.c md4.h
 
 ## begin gnulib module gc-md5
 
-libgnu_la_SOURCES += md5.h
+liblgnu_la_SOURCES += md5.h
 
 EXTRA_DIST += md5.c
 
@@ -145,7 +145,7 @@ AM_CPPFLAGS += -I$(top_builddir)/intl
 
 ## begin gnulib module gettext-h
 
-libgnu_la_SOURCES += gettext.h
+liblgnu_la_SOURCES += gettext.h
 
 ## end   gnulib module gettext-h
 
@@ -172,7 +172,7 @@ EXTRA_DIST += memmove.c
 
 ## begin gnulib module minmax
 
-libgnu_la_SOURCES += minmax.h
+liblgnu_la_SOURCES += minmax.h
 
 ## end   gnulib module minmax
 
@@ -185,7 +185,7 @@ EXTRA_DIST += read-file.c read-file.h
 
 ## begin gnulib module size_max
 
-libgnu_la_SOURCES += size_max.h
+liblgnu_la_SOURCES += size_max.h
 
 ## end   gnulib module size_max
 
@@ -264,13 +264,13 @@ EXTRA_DIST += asnprintf.c printf-args.c printf-args.h printf-parse.c printf-pars
 
 ## begin gnulib module xsize
 
-libgnu_la_SOURCES += xsize.h
+liblgnu_la_SOURCES += xsize.h
 
 ## end   gnulib module xsize
 
 ## begin gnulib module dummy
 
-libgnu_la_SOURCES += dummy.c
+liblgnu_la_SOURCES += dummy.c
 
 ## end   gnulib module dummy
 

diff --git a/lgl/m4/gnulib-cache.m4 b/lgl/m4/gnulib-cache.m4
index f9a74be8f850497588a7bad2cdc9df12a5fa1151..ee20f74c24795ef89ef66b652ea20d5216c46a45 100644 (file)
--- a/lgl/m4/gnulib-cache.m4
+++ b/lgl/m4/gnulib-cache.m4
@@ -15,17 +15,17 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libgnu --source-base=lgl --m4-base=lgl/m4 --doc-base=doc --aux-dir=. --lgpl --libtool --macro-prefix=lgl gc gc-arcfour gc-arctwo gc-des gc-hmac-md5 gc-md2 gc-md4 gc-md5 gc-pbkdf2-sha1 gc-random gc-rijndael gc-sha1 gettext memmem snprintf socklen stdint
+#   gnulib-tool --import --dir=. --lib=liblgnu --source-base=lgl --m4-base=lgl/m4 --doc-base=doc --aux-dir=. --lgpl --libtool --macro-prefix=lgl gc gc-arcfour gc-arctwo gc-des gc-hmac-md5 gc-md2 gc-md4 gc-md5 gc-pbkdf2-sha1 gc-random gc-rijndael gc-sha1 gettext memmem memmove minmax read-file snprintf socklen stdint
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
-gl_MODULES([gc gc-arcfour gc-arctwo gc-des gc-hmac-md5 gc-md2 gc-md4 gc-md5 gc-pbkdf2-sha1 gc-random gc-rijndael gc-sha1 gettext memmem snprintf socklen stdint])
+gl_MODULES([gc gc-arcfour gc-arctwo gc-des gc-hmac-md5 gc-md2 gc-md4 gc-md5 gc-pbkdf2-sha1 gc-random gc-rijndael gc-sha1 gettext memmem memmove minmax read-file snprintf socklen stdint])
 gl_AVOID([])
 gl_SOURCE_BASE([lgl])
 gl_M4_BASE([lgl/m4])
 gl_DOC_BASE([doc])
 gl_TESTS_BASE([tests])
-gl_LIB([libgnu])
+gl_LIB([liblgnu])
 gl_LGPL
 gl_MAKEFILE_NAME([])
 gl_LIBTOOL