From 80f21d8dc33a5b1236ef7b27e4849ec85c3edf72 Mon Sep 17 00:00:00 2001
From: marschap <marschap@users.sourceforge.net>
Date: Thu, 28 Sep 2006 20:12:08 +0000
Subject: [PATCH] order --enable-... lines in configure in a more logical
 manner; fix bug that with --disable-stats-{smbfs,nfs}; new option
 --enable-seamless-hbars

---
 configure.in | 80 ++++++++++++++++++++++++++++++++++------------------
 1 file changed, 52 insertions(+), 28 deletions(-)

diff --git a/configure.in b/configure.in
index 30ba2a5..f8562bb 100644
--- a/configure.in
+++ b/configure.in
@@ -157,7 +157,6 @@ AC_CHECK_HEADERS(fcntl.h sys/ioctl.h sys/time.h unistd.h sys/io.h errno.h)
 AC_CHECK_HEADERS(limits.h kvm.h sys/param.h sys/dkstat.h)
 
 dnl check sys/sysctl.h seperately, as it requires other headers on at least OpenBSD
-
 AC_CHECK_HEADERS([sys/sysctl.h], [], [],
 [[#if HAVE_SYS_PARAM_H
 # include <sys/param.h>
@@ -197,22 +196,13 @@ AC_CHECK_FUNC(getopt_long,
     AC_LIBOBJ(getopt1)
   ])
 
-dnl Check for various defines and features
 
+dnl Check how to find the mtab file and how to get filesystem staticstics
 AC_FIND_MTAB_FILE
 AC_GET_FS_INFO
 
-AC_ARG_ENABLE(stat-nfs,
-  [  --enable-stat-nfs       display filesystem stats for NFS],
-  AC_DEFINE(STAT_NFS,[1],[Define to 1 to display filesystem stats for NFS])
-)
-
-AC_ARG_ENABLE(stat-smbfs,
-  [  --enable-stat-smbfs     display filesystem stats for SMBFS],
-  AC_DEFINE(STAT_SMBFS,[1],[Define to 1 to display filesystem stats for SMBFS])
-)
-
 
+dnl Check for various defines and features
 AC_ARG_WITH(lcdport,
   [  --with-lcdport=<port>   the server port [13666]],
   LCDPORT=$withval,
@@ -225,8 +215,10 @@ AC_DEFINE_UNQUOTED(PROTOCOL_VERSION, "0.3", [Define version of lcdproc client-se
 AC_DEFINE_UNQUOTED(API_VERSION, "0.5", [Define version of lcdproc API])
 
 
+dnl Check compiler flags to dynamically load modules
 AC_MODULES_INFO
 
+
 dnl ######################################################################
 dnl USB support
 dnl
@@ -335,8 +327,6 @@ else
 fi
 
 
-LCD_DRIVERS_SELECT
-
 dnl ######################################################################
 dnl Open LDAP
 dnl based on code from perdition http://www.vergenet.net/linux/perdition/
@@ -513,29 +503,63 @@ else
     ldap_includes="";
 fi
 
+
+dnl Select drivers to build
+LCD_DRIVERS_SELECT
+
+
+# Features applicable to the server
+AC_ARG_ENABLE(seamless-hbars,
+	[  --enable-seamless-hbars no gaps in horizontal bar graphs (if HW supports it)],
+	[ if test "$enableval" = "yes" ; then
+		AC_DEFINE(SEAMLESS_HBARS,[1],
+			[Define to 1 to avoid gaps in horizontal bar graphs (if HW supports it)])
+	fi ]
+)
+
 AC_ARG_ENABLE(testmenus,
-  [  --enable-testmenus      enable server test menus],
-  if [[[ "$enableval" = "yes" ]]]; then
-        AC_DEFINE(LCDPROC_TESTMENUS,[1],[Define to 1 to enable server test menus])
-  fi,
+	[  --enable-testmenus      enable server test menus],
+	if test "$enableval" = "yes" ; then
+		AC_DEFINE(LCDPROC_TESTMENUS,[1],
+			[Define to 1 to enable server test menus])
+	fi
 )
 
 AC_ARG_ENABLE(permissive_menu_goto,
-  [  --enable-permissive-menu-goto allow transitions]
-  [                        between different client's menus],
-  if [[[ "$enableval" = "yes" ]]]; then
-        AC_DEFINE(LCDPROC_PERMISSIVE_MENU_GOTO,[1],
-		  [Define to 1 to allow transitions between different client's menus])
-  fi,
+	  [  --enable-permissive-menu-goto allow transitions]
+	  [                        between different client's menus],
+	  if test "$enableval" = "yes" ; then
+		AC_DEFINE(LCDPROC_PERMISSIVE_MENU_GOTO,[1],
+			[Define to 1 to allow transitions between different client's menus])
+	  fi
 )
 
+dnl Features applicable to the lcdproc client
 AC_ARG_ENABLE(lcdproc-menus,
-  [  --enable-lcdproc-menus  enable menu support in lcdproc client],
-  if [[[ "$enableval" = "yes" ]]]; then
-        AC_DEFINE(LCDPROC_MENUS,[1],[Define to 1 to enable menu support in lcdproc client])
-  fi,
+	  [  --enable-lcdproc-menus  enable menu support in lcdproc client],
+	  if test "$enableval" = "yes" ; then
+		AC_DEFINE(LCDPROC_MENUS,[1],
+			[Define to 1 to enable menu support in lcdproc client])
+	  fi
 )
 
+AC_ARG_ENABLE(stat-nfs,
+	  [  --enable-stat-nfs       display NFS filesystem stats in lcdproc client],
+	  if test "$enableval" = "yes" ; then
+		AC_DEFINE(STAT_NFS,[1],
+			[Define to 1 to display NFS filesystem stats in lcdproc client])
+	  fi
+)
+
+AC_ARG_ENABLE(stat-smbfs,
+	  [  --enable-stat-smbfs     display SMBFS filesystem stats in lcdproc client],
+	  if test "$enableval" = "yes" ; then
+		AC_DEFINE(STAT_SMBFS,[1],
+			[Define to 1 to display SMBFS filesystem stats in lcdproc client])
+	  fi
+)
+
+
 # check for doxygen
 BB_ENABLE_DOXYGEN