order --enable-... lines in configure in a more logical manner;
fix bug that with --disable-stats-{smbfs,nfs};
new option --enable-seamless-hbars
This commit is contained in:
+46
-22
@@ -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)
|
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
|
dnl check sys/sysctl.h seperately, as it requires other headers on at least OpenBSD
|
||||||
|
|
||||||
AC_CHECK_HEADERS([sys/sysctl.h], [], [],
|
AC_CHECK_HEADERS([sys/sysctl.h], [], [],
|
||||||
[[#if HAVE_SYS_PARAM_H
|
[[#if HAVE_SYS_PARAM_H
|
||||||
# include <sys/param.h>
|
# include <sys/param.h>
|
||||||
@@ -197,22 +196,13 @@ AC_CHECK_FUNC(getopt_long,
|
|||||||
AC_LIBOBJ(getopt1)
|
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_FIND_MTAB_FILE
|
||||||
AC_GET_FS_INFO
|
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,
|
AC_ARG_WITH(lcdport,
|
||||||
[ --with-lcdport=<port> the server port [13666]],
|
[ --with-lcdport=<port> the server port [13666]],
|
||||||
LCDPORT=$withval,
|
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])
|
AC_DEFINE_UNQUOTED(API_VERSION, "0.5", [Define version of lcdproc API])
|
||||||
|
|
||||||
|
|
||||||
|
dnl Check compiler flags to dynamically load modules
|
||||||
AC_MODULES_INFO
|
AC_MODULES_INFO
|
||||||
|
|
||||||
|
|
||||||
dnl ######################################################################
|
dnl ######################################################################
|
||||||
dnl USB support
|
dnl USB support
|
||||||
dnl
|
dnl
|
||||||
@@ -335,8 +327,6 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
LCD_DRIVERS_SELECT
|
|
||||||
|
|
||||||
dnl ######################################################################
|
dnl ######################################################################
|
||||||
dnl Open LDAP
|
dnl Open LDAP
|
||||||
dnl based on code from perdition http://www.vergenet.net/linux/perdition/
|
dnl based on code from perdition http://www.vergenet.net/linux/perdition/
|
||||||
@@ -513,29 +503,63 @@ else
|
|||||||
ldap_includes="";
|
ldap_includes="";
|
||||||
fi
|
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,
|
AC_ARG_ENABLE(testmenus,
|
||||||
[ --enable-testmenus enable server test menus],
|
[ --enable-testmenus enable server test menus],
|
||||||
if [[[ "$enableval" = "yes" ]]]; then
|
if test "$enableval" = "yes" ; then
|
||||||
AC_DEFINE(LCDPROC_TESTMENUS,[1],[Define to 1 to enable server test menus])
|
AC_DEFINE(LCDPROC_TESTMENUS,[1],
|
||||||
fi,
|
[Define to 1 to enable server test menus])
|
||||||
|
fi
|
||||||
)
|
)
|
||||||
|
|
||||||
AC_ARG_ENABLE(permissive_menu_goto,
|
AC_ARG_ENABLE(permissive_menu_goto,
|
||||||
[ --enable-permissive-menu-goto allow transitions]
|
[ --enable-permissive-menu-goto allow transitions]
|
||||||
[ between different client's menus],
|
[ between different client's menus],
|
||||||
if [[[ "$enableval" = "yes" ]]]; then
|
if test "$enableval" = "yes" ; then
|
||||||
AC_DEFINE(LCDPROC_PERMISSIVE_MENU_GOTO,[1],
|
AC_DEFINE(LCDPROC_PERMISSIVE_MENU_GOTO,[1],
|
||||||
[Define to 1 to allow transitions between different client's menus])
|
[Define to 1 to allow transitions between different client's menus])
|
||||||
fi,
|
fi
|
||||||
)
|
)
|
||||||
|
|
||||||
|
dnl Features applicable to the lcdproc client
|
||||||
AC_ARG_ENABLE(lcdproc-menus,
|
AC_ARG_ENABLE(lcdproc-menus,
|
||||||
[ --enable-lcdproc-menus enable menu support in lcdproc client],
|
[ --enable-lcdproc-menus enable menu support in lcdproc client],
|
||||||
if [[[ "$enableval" = "yes" ]]]; then
|
if test "$enableval" = "yes" ; then
|
||||||
AC_DEFINE(LCDPROC_MENUS,[1],[Define to 1 to enable menu support in lcdproc client])
|
AC_DEFINE(LCDPROC_MENUS,[1],
|
||||||
fi,
|
[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
|
# check for doxygen
|
||||||
BB_ENABLE_DOXYGEN
|
BB_ENABLE_DOXYGEN
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user