1 files changed, 13 insertions, 0 deletions
diff --git a/m4/fhs.m4 b/m4/fhs.m4
index 194709c4..803693e4 100644
--- a/m4/fhs.m4
+++ b/m4/fhs.m4
@@ -25,6 +25,7 @@ AC_MSG_CHECKING(for --with-fhs)
 AC_ARG_WITH(fhs, [  --with-fhs   Use FHS layout],
 [
   with_fhs=yes
+  AC_MSG_RESULT(yes)
 ],
 AC_MSG_RESULT(no))
 
@@ -32,3 +33,15 @@ if test "$with_fhs" = "yes"; then
   AC_DEFINE([IS_FHS], [1], [Use FHS layout])
 fi
 
+# check for --with-fhs-opt
+AC_MSG_CHECKING(for --with-fhs-opt)
+AC_ARG_WITH(fhs-opt, [  --with-fhs-opt   Use FHS optional layout],
+[
+  with_fhs_opt=yes
+  AC_MSG_RESULT(yes)
+],
+AC_MSG_RESULT(no))
+
+if test "$with_fhs" = "yes" -a "$with_fhs_opt" = "yes"; then
+  AC_MSG_ERROR([Can't set both --with-fhs and --with-fhs-opt.  Please only use one of these options.])
+fi