Skip to content

Commit

Permalink
Add liba2i to the build system
Browse files Browse the repository at this point in the history
Signed-off-by: Alejandro Colomar <alx@kernel.org>
  • Loading branch information
alejandro-colomar committed Aug 26, 2024
1 parent 85174e7 commit a13ba66
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 2 deletions.
4 changes: 4 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,10 @@ if test "$enable_logind" = "yes"; then
fi
AM_CONDITIONAL(ENABLE_LOGIND, test "x$enable_logind" != "xno")

AC_SUBST(LIBA2I)
AC_CHECK_LIB(a2i, str2si, [LIBA2I=-la2i],
[AC_MSG_ERROR([str2si() not found])])

AC_SUBST(LIBCRYPT)
AC_CHECK_LIB(crypt, crypt, [LIBCRYPT=-lcrypt],
[AC_MSG_ERROR([crypt() not found])])
Expand Down
2 changes: 1 addition & 1 deletion lib/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ libshadow_la_CPPFLAGS += -DVENDORDIR=\"$(VENDORDIR)\"
endif

libshadow_la_CPPFLAGS += -I$(top_srcdir)
libshadow_la_CFLAGS = $(LIBBSD_CFLAGS) $(LIBCRYPT_PAM) $(LIBSYSTEMD)
libshadow_la_CFLAGS = $(LIBBSD_CFLAGS) $(LIBA2I) $(LIBCRYPT_PAM) $(LIBSYSTEMD)
libshadow_la_LIBADD = $(LIBADD_DLOPEN)

libshadow_la_SOURCES = \
Expand Down
1 change: 1 addition & 0 deletions libsubid/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ libsubid_la_LDFLAGS = -version-info @LIBSUBID_ABI_MAJOR@ -export-symbols-regex '
pkginclude_HEADERS = subid.h

MISCLIBS = \
$(LIBA2I) \
$(LIBAUDIT) \
$(LIBSELINUX) \
$(LIBSEMANAGE) \
Expand Down
4 changes: 3 additions & 1 deletion src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,9 @@ if WITH_TCB
shadowsgidubins = passwd
endif

LDADD = $(INTLLIBS) \
LDADD = \
$(LIBA2I) \
$(INTLLIBS) \
$(top_builddir)/lib/libshadow.la \
$(LIBTCB)

Expand Down

0 comments on commit a13ba66

Please sign in to comment.