commit 56de31119e040404ace90529b38edd3d7dcbf5aa from: Omar Polo date: Thu Sep 07 10:01:08 2023 UTC add configure check for libmd; needed on some OSes for amused-web On the BSDs the SHA1Init() and friends are part of libc, while on linux (and maybe other systems as well) we need an implementation of these function: libmd for example. commit - f26a3c7347e47b6db0aa39d040442b85b6dc1bb0 commit + 56de31119e040404ace90529b38edd3d7dcbf5aa blob - cba9d33512896f76a5b4f1cac66e8bff315cc645 blob + 4868c31fe2dbfbce63d6671a590c5f91f919cfc7 --- configure +++ configure @@ -68,6 +68,7 @@ Variables available: LDADD_LIBOPUSFILE linker flags for libopusfile LDADD_LIBVORBISFILE linker flags for libvorbisfile LDADD_SNDIO linker flags for libsndio + LDADD_LIB_MD linker flags for libmd LDADD_LIBSOCKET linker flags for libsocket LDFLAGS extra linker flags CPPFLAGS C preprocessors flags @@ -142,6 +143,7 @@ LDADD_LIB_MPG123= LDADD_LIB_VORBISFILE= LDADD_LIB_ASOUND= LDADD_LIB_SNDIO= +LDADD_LIB_MD= LDADD_LIB_SOCKET= LDADD_STATIC= CPPFLAGS= @@ -252,6 +254,8 @@ while [ $# -gt 0 ]; do LDADD_SNDIO="$val" ;; LDADD_LIBSOCKET) LDADD_LIBSOCKET="$val" ;; + LDADD_LIB_MD) + LDADD_LIB_MD="$val" ;; LDFLAGS) LDFLAGS="$val" ;; CPPFLAGS) @@ -306,6 +310,7 @@ HAVE_LIB_OPUSFILE= HAVE_LIB_VORBISFILE= HAVE_LIB_ASOUND= HAVE_LIB_SNDIO= +HAVE_LIB_LIB_MD= HAVE_LIB_SOCKET= HAVE_MEMMEM= HAVE_MEMRCHR= @@ -503,6 +508,7 @@ runtest lib_mpg123 LIB_MPG123 "" "" "-lmpg123" "libmpg runtest lib_opusfile LIB_OPUSFILE "" "" "-lopusfile" "opusfile" || true runtest lib_vorbisfile LIB_VORBISFILE "" "" "-lvorbisfile" "vorbisfile" || true +runtest lib_md LIB_MD "" "" "-lmd" "libmd" || true runtest lib_socket LIB_SOCKET "" "" "-lsocket -lnsl" || true runtest memmem MEMMEM || true runtest memrchr MEMRCHR || true @@ -941,6 +947,7 @@ LDADD = ${LDADD} LDADD_IMSG = ${LDADD_IMSG} LDADD_DECODERS = ${LDADD_LIB_FLAC} ${LDADD_LIB_MPG123} ${LDADD_LIB_OPUSFILE} \ ${LDADD_LIB_VORBISFILE} +LDADD_LIB_MD = ${LDADD_LIB_MD} LDADD_LIB_SOCKET = ${LDADD_LIB_SOCKET} LDADD_BACKEND = ${LDADD_LIB_SNDIO} ${LDADD_LIB_ASOUND} LDADD_STATIC = ${LDADD_STATIC} blob - 97d001ee588d347a32317376b5a0b6cfc0e42721 blob + 09c4e40861e32f277455583416069ecdf4fe55dc --- tests.c +++ tests.c @@ -942,3 +942,20 @@ main(void) return 0; } #endif /* TEST_LIB_SNDIO */ +#if TEST_LIB_MD +#include +#include + +int +main(void) +{ + SHA1_CTX ctx; + char result[SHA1_DIGEST_STRING_LENGTH]; + + SHA1Init(&ctx); + SHA1Update(&ctx, (const unsigned char *)"abcd", 4); + SHA1End(&ctx, result); + + return 0; +} +#endif /* TEST_LIB_MD */ blob - e921426e3c074a8e6f511e046843c12195bf5c66 blob + 5a7ae6032aa118a59924e2a41de5d9cf737caf55 --- web/Makefile +++ web/Makefile @@ -22,7 +22,7 @@ include ../Makefile.configure ${PROG}: ${OBJS} ${CC} -o $@ ${OBJS} ${LDFLAGS} ${LDADD} ${LDADD_IMSG} \ - ${LDADD_LIB_SOCKET} + ${LDADD_LIB_MD} ${LDADD_LIB_SOCKET} clean: rm -f ${OBJS} ${OBJS:.o=.d} ${PROG}