Skip to content

Commit

Permalink
build: drop FreeBSD automatic --disable-diodmount
Browse files Browse the repository at this point in the history
Problem: logic for platform defaults in configure.ac is a bit complex.

Drop the platform-specific logic that to set --disable-diodmount on
FreeBSD.  Those building server-only FreeBSD diod installations
(if there still are any!) can specify that option explicitly.
  • Loading branch information
garlick committed Jan 18, 2025
1 parent 2a97ff6 commit 09de2ff
Showing 1 changed file with 3 additions and 22 deletions.
25 changes: 3 additions & 22 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,8 @@ AC_SYS_LARGEFILE
# Optional features
##
AC_ARG_ENABLE([diodmount],
[AS_HELP_STRING([--disable-diodmount], [do not build diodmount])],
[],
[enable_diodmount=auto])
[AS_HELP_STRING([--disable-diodmount], [do not build diodmount])])

AC_ARG_ENABLE([impersonation],
[AS_HELP_STRING([--enable-impersonation], [allow access=user])],
[],
Expand All @@ -117,12 +116,6 @@ AS_IF([test "x$enable_config" != "xno"], [

case "${host_os}" in
linux*)
case "${enable_diodmount}" in
no)
;;
*)
enable_diodmount=yes;;
esac
case "${enable_impersonation}" in
no)
;;
Expand All @@ -133,12 +126,6 @@ case "${host_os}" in
esac
;;
freebsd*)
case "${enable_diodmount}" in
yes)
;;
*)
enable_diodmount=no;;
esac
case "${enable_impersonation}" in
no|auto)
enable_impersonation=no;;
Expand All @@ -149,12 +136,6 @@ case "${host_os}" in
esac
;;
*)
case "${enable_diodmount}" in
yes)
;;
*)
enable_diodmount=no;;
esac
case "${enable_impersonation}" in
no|auto)
enable_impersonation=no;;
Expand All @@ -164,7 +145,7 @@ case "${host_os}" in
;;
esac

AM_CONDITIONAL([ENABLE_DIODMOUNT], [test "x${enable_diodmount}" = "xyes"])
AM_CONDITIONAL([ENABLE_DIODMOUNT], [test "x${enable_diodmount}" != "xno"])
AM_CONDITIONAL([USE_IMPERSONATION_LINUX], [test "x${enable_impersonation}" = "xlinux"])
AM_CONDITIONAL([USE_IMPERSONATION_GANESHA], [test "x${enable_impersonation}" = "xganesha"])

Expand Down

0 comments on commit 09de2ff

Please sign in to comment.