summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorDamien Zammit <damien@zamaudio.com>2021-12-28 16:51:14 +1100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2021-12-28 10:32:47 +0100
commit4fbbf561a41be515a96b34afce1fd40fec9d3182 (patch)
treeea2ea3f2e325b0f38abb8c3aa1383457cc3450fc /configure.ac
parent570fa49449ad9e01f7087f725ee6e073220db237 (diff)
rumpdisk: Link with rumpvfs_nofifofs if present
Message-Id: <20211228055114.173039-1-damien@zamaudio.com>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac29
1 files changed, 26 insertions, 3 deletions
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 <hurd.h>
+#define _STANDALONE
+#include <rump/rump.h>]],
+ [])],
+ [HAVE_LIBRUMP=yes],
+ [HAVE_LIBRUMP=no])
AC_SUBST([HAVE_LIBRUMP])
+LIBS="$oldLIBS -lrumpvfs_nofifofs_pic"
+AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <hurd.h>
+#define _STANDALONE
+#include <rump/rump.h>]],
+ [])],
+ [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