Skip to content

Commit

Permalink
Maint: gnulib: Update gnulib for build changes.
Browse files Browse the repository at this point in the history
Now that we are using gnulib's own build stuff, including libtool, we
need to update various macros to reflect those changes.  These changes
would also be done by running "make gnulib-update", but that would also
update all the other gnulib stuff which seems like too much for the
moment.  It's easy enough to apply by hand.

This was originally written by Jan Pokorný as part of
#1756.
  • Loading branch information
clumens committed Mar 30, 2022
1 parent 6068a05 commit 755d3a8
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 16 deletions.
17 changes: 10 additions & 7 deletions lib/gnu/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
# --aux-dir=. \
# --lgpl=2 \
# --no-conditional-dependencies \
# --no-libtool \
# --libtool \
# --macro-prefix=gl \
# --no-vc-files \
# --avoid=stdint \
Expand All @@ -56,12 +56,15 @@ MAINTAINERCLEANFILES =
AM_CPPFLAGS =
AM_CFLAGS =

noinst_LIBRARIES += libgnu.a
noinst_LTLIBRARIES += libgnu.la

libgnu_a_SOURCES =
libgnu_a_LIBADD = $(gl_LIBOBJS)
libgnu_a_DEPENDENCIES = $(gl_LIBOBJS)
EXTRA_libgnu_a_SOURCES =
libgnu_la_SOURCES =
libgnu_la_LIBADD = $(gl_LTLIBOBJS)
libgnu_la_DEPENDENCIES = $(gl_LTLIBOBJS)
EXTRA_libgnu_la_SOURCES =
libgnu_la_LDFLAGS = $(AM_LDFLAGS)
libgnu_la_LDFLAGS += -no-undefined
libgnu_la_LDFLAGS += $(LIB_CRYPTO)

## begin gnulib module byteswap

Expand All @@ -88,7 +91,7 @@ EXTRA_DIST += byteswap.in.h

## begin gnulib module crypto/md5-buffer

libgnu_a_SOURCES += md5.c
libgnu_la_SOURCES += md5.c

EXTRA_DIST += gl_openssl.h md5.h

Expand Down
3 changes: 2 additions & 1 deletion m4/gnulib-cache.m4
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# --aux-dir=. \
# --lgpl=2 \
# --no-conditional-dependencies \
# --no-libtool \
# --libtool \
# --macro-prefix=gl \
# --no-vc-files \
# --avoid=stdint \
Expand All @@ -56,6 +56,7 @@ gl_TESTS_BASE([tests])
gl_LIB([libgnu])
gl_LGPL([2])
gl_MAKEFILE_NAME([])
gl_LIBTOOL
gl_MACRO_PREFIX([gl])
gl_PO_DOMAIN([])
gl_WITNESS_C_MACRO([])
Expand Down
10 changes: 2 additions & 8 deletions m4/gnulib-comp.m4
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,8 @@ AC_DEFUN([gl_EARLY],
# "Check for header files, types and library functions".
AC_DEFUN([gl_INIT],
[
AM_CONDITIONAL([GL_COND_LIBTOOL], [false])
gl_cond_libtool=false
gl_libdeps=
gl_ltlibdeps=
AM_CONDITIONAL([GL_COND_LIBTOOL], [true])
gl_cond_libtool=true
gl_m4_base='m4'
m4_pushdef([AC_LIBOBJ], m4_defn([gl_LIBOBJ]))
m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gl_REPLACE_FUNCS]))
Expand Down Expand Up @@ -147,10 +145,6 @@ changequote([, ])dnl
AC_SUBST([gltests_LIBOBJS], [$gltests_libobjs])
AC_SUBST([gltests_LTLIBOBJS], [$gltests_ltlibobjs])
])
LIBGNU_LIBDEPS="$gl_libdeps"
AC_SUBST([LIBGNU_LIBDEPS])
LIBGNU_LTLIBDEPS="$gl_ltlibdeps"
AC_SUBST([LIBGNU_LTLIBDEPS])
])

# Like AC_LIBOBJ, except that the module name goes
Expand Down

0 comments on commit 755d3a8

Please sign in to comment.