From 4fbbf561a41be515a96b34afce1fd40fec9d3182 Mon Sep 17 00:00:00 2001 From: Damien Zammit Date: Tue, 28 Dec 2021 16:51:14 +1100 Subject: rumpdisk: Link with rumpvfs_nofifofs if present Message-Id: <20211228055114.173039-1-damien@zamaudio.com> --- configure.ac | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 9f131e9a..cb9d3fdc 100644 --- a/configure.ac +++ b/configure.ac @@ -233,11 +233,34 @@ AS_IF([test "x$with_libz" != xno], [ ]) AC_SUBST([HAVE_LIBZ]) -AC_CHECK_HEADER([rump/rump.h], [ - AC_CHECK_LIB(rump, rump_init, [HAVE_LIBRUMP=yes], [HAVE_LIBRUMP=no]) - ], [HAVE_LIBRUMP=no]) +# Save +oldLIBS="$LIBS" + +LIBS="$oldLIBS -lrump" +AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include +#define _STANDALONE +#include ]], + [])], + [HAVE_LIBRUMP=yes], + [HAVE_LIBRUMP=no]) AC_SUBST([HAVE_LIBRUMP]) +LIBS="$oldLIBS -lrumpvfs_nofifofs_pic" +AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include +#define _STANDALONE +#include ]], + [])], + [HAVE_LIBRUMP_VFSNOFIFO=yes], + [HAVE_LIBRUMP_VFSNOFIFO=no]) +AC_SUBST([HAVE_LIBRUMP_VFSNOFIFO]) + +# Reset +LIBS="$oldLIBS" + AC_ARG_ENABLE(boot-store-types, [ --enable-boot-store-types=TYPES... list of store types included in statically -- cgit v1.2.3